From 7d7662a352ce1164c548fc86f2e690e5eca0c460 Mon Sep 17 00:00:00 2001 From: azhwani Date: Wed, 10 Jun 2020 00:31:44 +0200 Subject: [PATCH] add jndi.properties --- .../jndi/datasource/SimpleJNDIUnitTest.java | 16 ---------------- .../src/test/resources/jndi.properties | 5 +++++ 2 files changed, 5 insertions(+), 16 deletions(-) create mode 100644 persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties diff --git a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleJNDIUnitTest.java b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleJNDIUnitTest.java index f4122246fb..7132999000 100644 --- a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleJNDIUnitTest.java +++ b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleJNDIUnitTest.java @@ -6,7 +6,6 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.sql.DataSource; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,12 +15,6 @@ public class SimpleJNDIUnitTest { @BeforeEach public void setup() throws Exception { - System.setProperty("java.naming.factory.initial", "org.osjava.sj.SimpleContextFactory"); - System.setProperty("org.osjava.sj.root", "file://src/test/resources"); - System.setProperty("org.osjava.sj.delimiter", "."); - System.setProperty("jndi.syntax.separator", "/"); - System.setProperty("org.osjava.sj.space", "java:/comp/env"); - this.initContext = new InitialContext(); } @@ -35,13 +28,4 @@ public class SimpleJNDIUnitTest { assertEquals(dsString, ds.toString()); } - @AfterEach - public void tearDown() { - System.clearProperty("java.naming.factory.initial"); - System.clearProperty("org.osjava.sj.root"); - System.clearProperty("org.osjava.sj.delimiter"); - System.clearProperty("jndi.syntax.separator"); - System.clearProperty("org.osjava.sj.space"); - } - } \ No newline at end of file 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..e056681621 --- /dev/null +++ b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties @@ -0,0 +1,5 @@ +java.naming.factory.initial=org.osjava.sj.SimpleContextFactory +org.osjava.sj.root=file://src/test/resources +org.osjava.sj.delimiter=. +jndi.syntax.separator=/ +org.osjava.sj.space=java:/comp/env \ No newline at end of file