junit fixes

perwendel · Sep 28, 2015 · 70b54d7 · 70b54d7
1 parent 05278c4
commit 70b54d7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/src/main/java/spark/staticfiles/StaticFiles.java b/src/main/java/spark/staticfiles/StaticFiles.java
@@ -95,7 +95,6 @@ public static void configureStaticResources(String folder) {
                     staticResourceHandlers = new ArrayList<>();
                 }
                 staticResourceHandlers.add(new ClassPathResourceHandler(folder, "index.html"));
-                System.out.println("StaticResourceHandler configured with folder = " + folder);
                 LOG.info("StaticResourceHandler configured with folder = " + folder);
             } catch (IOException e) {
                 LOG.error("Error when creating StaticResourceHandler", e);

diff --git a/src/test/java/spark/StaticFilesTest.java b/src/test/java/spark/StaticFilesTest.java
@@ -43,18 +43,26 @@ public class StaticFilesTest {
 
     private static final String EXTERNAL_FILE_NAME_HTML = "externalFile.html";
     private static final String EXTERNAL_FILE_NAME_CSS = "stylish.css";
-    public static final String CONTENT_OF_EXTERNAL_FILE = "Content of external file";
+
-    public static final String SUB_DIR = "subdir";
+    private static final String CONTENT_OF_EXTERNAL_FILE = "Content of external file";
+    private static final String SUB_DIR = "subdir";
 
     private static SparkTestUtil testUtil;
+
     private static File tmpExternalFile;
+    private static File tmpExternalFolder;
 
     @AfterClass
     public static void tearDown() {
         Spark.stop();
         if (tmpExternalFile != null) {
+            LOGGER.debug("tearDown().deleting: " + tmpExternalFile);
             tmpExternalFile.delete();
         }
+        if (tmpExternalFolder != null) {
+            LOGGER.debug("tearDown().deleting: " + tmpExternalFolder);
+            tmpExternalFolder.delete();
+        }
     }
 
     @BeforeClass
@@ -64,8 +72,6 @@ public static void setup() throws IOException {
         tmpExternalFile = new File(System.getProperty("java.io.tmpdir"), EXTERNAL_FILE_NAME_HTML);
         createExternalSubDirectoryAndFile(System.getProperty("java.io.tmpdir") + SUB_DIR);
 
-        System.out.println("System.getProperty(\"java.io.tmpdir\" = " + System.getProperty("java.io.tmpdir"));
-
         FileWriter writer = new FileWriter(tmpExternalFile);
         writer.write(CONTENT_OF_EXTERNAL_FILE);
         writer.flush();
@@ -80,15 +86,15 @@ public static void setup() throws IOException {
     }
 
     private static void createExternalSubDirectoryAndFile(String directoryName) throws IOException {
-        File directory = new File(directoryName);
+        tmpExternalFolder = new File(directoryName);
 
         // if the directory does not exist, create it
-        if (!directory.exists()) {
+        if (!tmpExternalFolder.exists()) {
             System.out.println("creating directory: " + directoryName);
             boolean result = false;
 
             try {
-                directory.mkdir();
+                tmpExternalFolder.mkdir();
                 result = true;
             } catch (SecurityException se) {
                 //handle it

diff --git a/src/test/java/spark/servlet/MyApp.java b/src/test/java/spark/servlet/MyApp.java
@@ -16,13 +16,15 @@ public class MyApp implements SparkApplication {
 
     public static final String EXTERNAL_FILE = "externalFileServlet.html";
 
+    static File tmpExternalFile;
+
     @Override
     public void init() {
         try {
             externalStaticFileLocation(System.getProperty("java.io.tmpdir"));
             staticFileLocation("/public");
 
-            File tmpExternalFile = new File(System.getProperty("java.io.tmpdir"), EXTERNAL_FILE);
+            tmpExternalFile = new File(System.getProperty("java.io.tmpdir"), EXTERNAL_FILE);
             FileWriter writer = new FileWriter(tmpExternalFile);
             writer.write("Content of external file");
             writer.flush();

diff --git a/src/test/java/spark/servlet/ServletTest.java b/src/test/java/spark/servlet/ServletTest.java
@@ -28,6 +28,10 @@ public class ServletTest {
     @AfterClass
     public static void tearDown() {
         Spark.stop();
+        if (MyApp.tmpExternalFile != null) {
+            LOGGER.debug("tearDown().deleting: " + MyApp.tmpExternalFile);
+            MyApp.tmpExternalFile.delete();
+        }
     }
 
     @BeforeClass