From f064997840947ec244f29fbd68ec31f3aef3a7ae Mon Sep 17 00:00:00 2001
From: Fuzzlemann <zhang.paul@ymail.com>
Date: Tue, 15 Aug 2017 22:05:30 +0200
Subject: [PATCH] "De-deprecate" setUp and make it private

---
 Plan/test/test/java/utils/TestInit.java | 39 ++++++++++++-------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/Plan/test/test/java/utils/TestInit.java b/Plan/test/test/java/utils/TestInit.java
index 848617790..cd413ab89 100644
--- a/Plan/test/test/java/utils/TestInit.java
+++ b/Plan/test/test/java/utils/TestInit.java
@@ -47,26 +47,7 @@ public class TestInit {
         return t;
     }
 
-    private static File getTestFolder() {
-        File testFolder = new File("temporaryTestFolder");
-        testFolder.mkdir();
-        return testFolder;
-    }
-
-    public static void clean() throws IOException {
-        clean(getTestFolder());
-    }
-
-    public static void clean(File testFolder) throws IOException {
-        if (testFolder.exists() && testFolder.isDirectory()) {
-            for (File f : testFolder.listFiles()) {
-                Files.deleteIfExists(f.toPath());
-            }
-        }
-    }
-
-    @Deprecated // Use Test.init instead.
-    public void setUp(boolean clearOnStart) throws Exception {
+    private void setUp(boolean clearOnStart) throws Exception {
         planMock = PowerMockito.mock(Plan.class);
         StaticHolder.setInstance(Plan.class, planMock);
         StaticHolder.setInstance(planMock.getClass(), planMock);
@@ -108,6 +89,24 @@ public class TestInit {
         when(planMock.fetch()).thenReturn(fetch);
     }
 
+    private static File getTestFolder() {
+        File testFolder = new File("temporaryTestFolder");
+        testFolder.mkdir();
+        return testFolder;
+    }
+
+    public static void clean() throws IOException {
+        clean(getTestFolder());
+    }
+
+    public static void clean(File testFolder) throws IOException {
+        if (testFolder.exists() && testFolder.isDirectory()) {
+            for (File f : testFolder.listFiles()) {
+                Files.deleteIfExists(f.toPath());
+            }
+        }
+    }
+
     private Server mockServer() {
         Server mockServer = PowerMockito.mock(Server.class);
         when(mockServer.getIp()).thenReturn("0.0.0.0");