profile init?

JMRI · Aug 13, 2018 · 2083894 · 2083894
1 parent a456db5
commit 2083894
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/java/test/jmri/server/json/util/JsonUtilHttpServiceTest.java b/java/test/jmri/server/json/util/JsonUtilHttpServiceTest.java
@@ -46,6 +46,7 @@ public JsonUtilHttpServiceTest() {
     @Before
     public void setUp() throws IOException {
         JUnitUtil.setUp();
+        JUnitUtil.resetInstanceManager();
         JUnitUtil.resetProfileManager(new NullProfile("JsonUtilHttpServiceTest", "12345678", FileUtil.getFile("program:test")));
         JUnitUtil.initConnectionConfigManager();
     }

diff --git a/java/test/jmri/server/json/util/JsonUtilSocketServiceTest.java b/java/test/jmri/server/json/util/JsonUtilSocketServiceTest.java
@@ -27,14 +27,14 @@
  */
 public class JsonUtilSocketServiceTest {
 
-    private static final Logger log = LoggerFactory.getLogger(JsonUtilSocketServiceTest.class);
-
     public JsonUtilSocketServiceTest() {
     }
 
     @BeforeClass
     public static void setUpClass() {
         Log4JFixture.setUp();
+        JUnitUtil.resetInstanceManager();
+        JUnitUtil.resetProfileManager();
     }
 
     @AfterClass
@@ -44,13 +44,13 @@ public static void tearDownClass() {
 
     @Before
     public void setUp() throws IOException {
+        JUnitUtil.resetInstanceManager();
         JUnitUtil.resetProfileManager();
         JUnitUtil.initConfigureManager();
     }
 
     @After
     public void tearDown() {
-        JUnitUtil.resetInstanceManager();
     }
 
     /**
@@ -135,4 +135,5 @@ public void testOnClose() {
         }
     }
 
+    private static final Logger log = LoggerFactory.getLogger(JsonUtilSocketServiceTest.class);
 }