Merge pull request #9530 from eugenp/fix-jndi-test

fix jndi test
This commit is contained in:
Loredana Crusoveanu 2020-06-20 18:03:02 +03:00 committed by GitHub
commit 6072c25d97
2 changed files with 4 additions and 6 deletions

View File

@ -11,8 +11,11 @@ import org.junit.jupiter.api.Test;
import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.springframework.mock.jndi.SimpleNamingContextBuilder; import org.springframework.mock.jndi.SimpleNamingContextBuilder;
// marked as a manual test as the bindings in this test and
// SimpleJNDIUnitTest conflict depending on the order they are run in
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public class SimpleNamingContextBuilderUnitTest { public class SimpleNamingContextBuilderManualTest {
private InitialContext initContext; private InitialContext initContext;

View File

@ -1,5 +0,0 @@
ds.type=javax.sql.DataSource
ds.driver=org.h2.Driver
ds.url=jdbc:jdbc:h2:mem:testdb
ds.user=sa
ds.password=password