From 1801a5be88b1a3b68c16a6d60c18a64355786e08 Mon Sep 17 00:00:00 2001 From: Loredana Date: Sat, 20 Jun 2020 13:22:01 +0300 Subject: [PATCH 1/4] fix jndi test --- .../src/test/resources/jndi.properties | 6 ++++++ .../src/test/resources/{ => jndi}/datasource.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties rename persistence-modules/spring-persistence-simple-2/src/test/resources/{ => jndi}/datasource.properties (81%) diff --git a/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties new file mode 100644 index 0000000000..c353245f14 --- /dev/null +++ b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties @@ -0,0 +1,6 @@ +java.naming.factory.initial=org.osjava.sj.SimpleContextFactory +org.osjava.sj.jndi.shared=true +org.osjava.sj.delimiter=. +jndi.syntax.separator=/ +org.osjava.sj.space=java:/comp/env +org.osjava.sj.root=src/test/resources/jndi diff --git a/persistence-modules/spring-persistence-simple-2/src/test/resources/datasource.properties b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi/datasource.properties similarity index 81% rename from persistence-modules/spring-persistence-simple-2/src/test/resources/datasource.properties rename to persistence-modules/spring-persistence-simple-2/src/test/resources/jndi/datasource.properties index a86a6c6ce2..8be94daf36 100644 --- a/persistence-modules/spring-persistence-simple-2/src/test/resources/datasource.properties +++ b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi/datasource.properties @@ -2,4 +2,4 @@ ds.type=javax.sql.DataSource ds.driver=org.h2.Driver ds.url=jdbc:jdbc:h2:mem:testdb ds.user=sa -ds.password=password \ No newline at end of file +ds.password=password From dab2c89ec7093e15dd2d529ac7123d838f97c9b7 Mon Sep 17 00:00:00 2001 From: Loredana Date: Sat, 20 Jun 2020 17:38:13 +0300 Subject: [PATCH 2/4] fix jndi test --- ...rUnitTest.java => SimpleNamingContextBuilderManualTest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/{SimpleNamingContextBuilderUnitTest.java => SimpleNamingContextBuilderManualTest.java} (95%) diff --git a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderUnitTest.java b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderManualTest.java similarity index 95% rename from persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderUnitTest.java rename to persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderManualTest.java index d0a06dd2bc..090583acc3 100644 --- a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderUnitTest.java +++ b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderManualTest.java @@ -12,7 +12,7 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.mock.jndi.SimpleNamingContextBuilder; @SuppressWarnings("deprecation") -public class SimpleNamingContextBuilderUnitTest { +public class SimpleNamingContextBuilderManualTest { private InitialContext initContext; From a7ecf714a22085cf595e7ea688ecf46f41441ca0 Mon Sep 17 00:00:00 2001 From: Loredana Date: Sat, 20 Jun 2020 17:53:04 +0300 Subject: [PATCH 3/4] fix jndi test --- .../src/test/resources/jndi.properties | 6 ------ .../src/test/resources/jndi/datasource.properties | 5 ----- 2 files changed, 11 deletions(-) delete mode 100644 persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties delete mode 100644 persistence-modules/spring-persistence-simple-2/src/test/resources/jndi/datasource.properties diff --git a/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties deleted file mode 100644 index c353245f14..0000000000 --- a/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties +++ /dev/null @@ -1,6 +0,0 @@ -java.naming.factory.initial=org.osjava.sj.SimpleContextFactory -org.osjava.sj.jndi.shared=true -org.osjava.sj.delimiter=. -jndi.syntax.separator=/ -org.osjava.sj.space=java:/comp/env -org.osjava.sj.root=src/test/resources/jndi diff --git a/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi/datasource.properties b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi/datasource.properties deleted file mode 100644 index 8be94daf36..0000000000 --- a/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi/datasource.properties +++ /dev/null @@ -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 From cacff0d0c9f16328a8854b3753d5d167f60dd82d Mon Sep 17 00:00:00 2001 From: Loredana Date: Sat, 20 Jun 2020 17:57:33 +0300 Subject: [PATCH 4/4] fix jndi test --- .../jndi/datasource/SimpleNamingContextBuilderManualTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderManualTest.java b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderManualTest.java index 090583acc3..ac33be1c6f 100644 --- a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderManualTest.java +++ b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderManualTest.java @@ -11,6 +11,9 @@ import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.DriverManagerDataSource; 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") public class SimpleNamingContextBuilderManualTest {