Fixing broken tests because of temp files being cleared before used in assertions

1 files changed, 21 insertions, 2 deletions

diff --git a/core/src/test/java/fi/iki/elonen/HttpServerTest.java b/core/src/test/java/fi/iki/elonen/HttpServerTest.java
index 0ccc670..e3f856f 100644
--- a/core/src/test/java/fi/iki/elonen/HttpServerTest.java
+++ b/core/src/test/java/fi/iki/elonen/HttpServerTest.java
@@ -1,5 +1,6 @@
 package fi.iki.elonen;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -19,10 +20,17 @@ import static junit.framework.Assert.assertTrue;
 public class HttpServerTest {
     public static final String URI = "http://www.myserver.org/pub/WWW/someFile.html";
     protected TestServer testServer;
+    private TestTempFileManager tempFileManager;
 
     @Before
     public void setUp() {
         testServer = new TestServer();
+        tempFileManager = new TestTempFileManager();
+    }
+
+    @After
+    public void tearDown() {
+        tempFileManager._clear();
     }
 
     @Test
@@ -48,8 +56,8 @@ public class HttpServerTest {
     protected ByteArrayOutputStream invokeServer(String request) {
         ByteArrayInputStream inputStream = new ByteArrayInputStream(request.getBytes());
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        NanoHTTPD.HTTPSession session = testServer.createSession(new NanoHTTPD.DefaultTempFileManager(), inputStream, outputStream);
-        session.run();
+        NanoHTTPD.HTTPSession session = testServer.createSession(tempFileManager, inputStream, outputStream);
+        session.execute();
         return outputStream;
     }
 
@@ -70,6 +78,17 @@ public class HttpServerTest {
         return lines;
     }
 
+    public static class TestTempFileManager extends NanoHTTPD.DefaultTempFileManager {
+        public void _clear() {
+            super.clear();
+        }
+
+        @Override
+        public void clear() {
+            // ignore
+        }
+    }
+
     public static class TestServer extends NanoHTTPD {
         public Response response = new Response("");
         public String uri;