tostring, remaining test cases

Katsute · Katsute · commit b14f596b0978 · 2022-07-27T14:17:11.000-04:00
diff --git a/src/main/java/dev/katsute/simplehttpserver/FileRecord.java b/src/main/java/dev/katsute/simplehttpserver/FileRecord.java
@@ -77,4 +77,15 @@ public final byte[] getBytes(){
         return Arrays.copyOf(bytes, bytes.length); // dereference
     }
 
+    //
+
+    @Override
+    public String toString(){
+        return "FileRecord{" +
+               "fileName='" + fileName + '\'' +
+               ", contentType='" + contentType + '\'' +
+               ", bytes=" + Arrays.toString(bytes) +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/HttpSessionHandler.java b/src/main/java/dev/katsute/simplehttpserver/HttpSessionHandler.java
@@ -160,4 +160,14 @@ public synchronized final void update(){
         return session;
     }
 
+    //
+
+    @Override
+    public String toString(){
+        return "HttpSessionHandler{" +
+               "sessions=" + sessions +
+               ", cookie='" + cookie + '\'' +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/MultipartFormData.java b/src/main/java/dev/katsute/simplehttpserver/MultipartFormData.java
@@ -67,4 +67,13 @@ public final Map<String,Record> getEntries(){
         return new HashMap<>(data);
     }
 
+    //
+
+    @Override
+    public String toString(){
+        return "MultipartFormData{" +
+               "data=" + data +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/Record.java b/src/main/java/dev/katsute/simplehttpserver/Record.java
@@ -195,4 +195,15 @@ public final Map<String,String> getParameters(){
 
     }
 
+    //
+
+    @Override
+    public String toString(){
+        return "Record{" +
+               "headers=" + headers +
+               ", name='" + name + '\'' +
+               ", value='" + value + '\'' +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/SimpleHttpExchangeImpl.java b/src/main/java/dev/katsute/simplehttpserver/SimpleHttpExchangeImpl.java
@@ -423,4 +423,20 @@ public synchronized final void close(){
         }
     }
 
+    //
+
+
+    @Override
+    public String toString(){
+        return "SimpleHttpExchange{" +
+               "exchange=" + exchange +
+               ", rawGet='" + rawGet + '\'' +
+               ", getMap=" + getMap +
+               ", rawPost='" + rawPost + '\'' +
+               ", postMap=" + postMap +
+               ", multipartFormData=" + multipartFormData +
+               ", cookies=" + cookies +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/SimpleHttpServerImpl.java b/src/main/java/dev/katsute/simplehttpserver/SimpleHttpServerImpl.java
@@ -232,4 +232,13 @@ public synchronized final void stop(final int delay){
 
 // endregion
 
+    @Override
+    public String toString(){
+        return "SimpleHttpServer{" +
+               "server=" + server +
+               ", sessionHandler=" + sessionHandler +
+               ", contexts=" + contexts +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/SimpleHttpsServerImpl.java b/src/main/java/dev/katsute/simplehttpserver/SimpleHttpsServerImpl.java
@@ -247,4 +247,14 @@ public synchronized final void stop(final int delay){
 
 // endregion
 
+
+    @Override
+    public String toString(){
+        return "SimpleHttpsServer{" +
+               "server=" + server +
+               ", sessionHandler=" + sessionHandler +
+               ", contexts=" + contexts +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/PredicateHandler.java b/src/main/java/dev/katsute/simplehttpserver/handler/PredicateHandler.java
@@ -68,4 +68,15 @@ public final void handle(final SimpleHttpExchange exchange) throws IOException{
         (predicate.test(exchange) ? T : F).handle(exchange);
     }
 
+    //
+
+    @Override
+    public String toString(){
+        return "PredicateHandler{" +
+               "T=" + T +
+               ", F=" + F +
+               ", predicate=" + predicate +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/RedirectHandler.java b/src/main/java/dev/katsute/simplehttpserver/handler/RedirectHandler.java
@@ -54,4 +54,13 @@ public final void handle(final HttpExchange exchange) throws IOException{
         exchange.close();
     }
 
+    //
+
+    @Override
+    public String toString(){
+        return "RedirectHandler{" +
+               "link='" + link + '\'' +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/RootHandler.java b/src/main/java/dev/katsute/simplehttpserver/handler/RootHandler.java
@@ -47,4 +47,11 @@ public RootHandler(final HttpHandler index, final HttpHandler other){
         );
     }
 
+    //
+
+    @Override
+    public String toString(){
+        return "RootHandler{}";
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/SSEHandler.java b/src/main/java/dev/katsute/simplehttpserver/handler/SSEHandler.java
@@ -124,6 +124,19 @@ public synchronized final void push(final String data, final int retry, final St
         }
     }
 
+    //
+
+    @Override
+    public String toString(){
+        return "SSEHandler{" +
+               "listeners=" + listeners +
+               ", eventID=" + eventID +
+               ", queue=" + queue +
+               '}';
+    }
+
+    //
+
     private static class EventStreamRecord {
 
         private final int retry;
diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/TemporaryHandler.java b/src/main/java/dev/katsute/simplehttpserver/handler/TemporaryHandler.java
@@ -73,4 +73,14 @@ public synchronized final void handle(final HttpExchange exchange) throws IOExce
         exchange.close();
     }
 
+    //
+
+    @Override
+    public String toString(){
+        return "TemporaryHandler{" +
+               "handler=" + handler +
+               ", expiry=" + expiry +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/file/DirectoryEntry.java b/src/main/java/dev/katsute/simplehttpserver/handler/file/DirectoryEntry.java
@@ -147,4 +147,20 @@ final byte[] getBytes(final String path){
         }
     }
 
+    //
+
+
+    @Override
+    public String toString(){
+        return "DirectoryEntry{" +
+               "file=" + file +
+               ", path=" + path +
+               ", abs='" + abs + '\'' +
+               ", absl='" + absl + '\'' +
+               ", adapter=" + adapter +
+               ", options=" + options +
+               ", files=" + files +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/file/FileEntry.java b/src/main/java/dev/katsute/simplehttpserver/handler/file/FileEntry.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicLong;
 
 import static dev.katsute.simplehttpserver.handler.file.FileOptions.FileLoadingOption.*;
@@ -122,4 +123,21 @@ final boolean isExpired(){
         return options.loading == CACHE && expiry.get() < System.currentTimeMillis();
     }
 
+    //
+
+
+    @Override
+    public String toString(){
+        return "FileEntry{" +
+               "file=" + file +
+               ", path=" + path +
+               ", adapter=" + adapter +
+               ", options=" + options +
+               ", bytes=" + Arrays.toString(bytes) +
+               ", lastModified=" + lastModified +
+               ", expiry=" + expiry +
+               ", expired=" + isExpired() +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/file/FileHandler.java b/src/main/java/dev/katsute/simplehttpserver/handler/file/FileHandler.java
@@ -385,6 +385,12 @@ public final void handle(final SimpleHttpExchange exchange) throws IOException {
 
         if(files.containsKey(context)){ // exact file match
             final FileEntry entry = files.get(context);
+
+            if(entry.isExpired()){
+                refreshExpired = true; // check if other files also need clearing
+                entry.clearBytes();
+            }
+
             handle(exchange, entry.getFile(), entry.getBytes());
         }else{ // leading directory match
             String match = "";
@@ -442,4 +448,15 @@ public void handle(final SimpleHttpExchange exchange, final File source, final b
         exchange.send(bytes, HttpURLConnection.HTTP_OK);
     }
 
+    //
+
+    @Override
+    public String toString(){
+        return "FileHandler{" +
+               "adapter=" + adapter +
+               ", files=" + files +
+               ", directories=" + directories +
+               '}';
+    }
+
 }
diff --git a/src/main/java/dev/katsute/simplehttpserver/handler/file/FileOptions.java b/src/main/java/dev/katsute/simplehttpserver/handler/file/FileOptions.java
@@ -72,6 +72,16 @@ public FileOptions(){ }
      */
     public boolean walk = false;
 
+    @Override
+    public String toString(){
+        return "FileOptions{" +
+               "context='" + context + '\'' +
+               ", loading=" + loading +
+               ", cache=" + cache +
+               ", walk=" + walk +
+               '}';
+    }
+
     //
 
     /**
@@ -192,6 +202,13 @@ public final FileOptions build(){
             return new FileOptions(options);
         }
 
+        @Override
+        public String toString(){
+            return "Builder{" +
+                   "options=" + options +
+                   '}';
+        }
+
     }
 
 }
diff --git a/src/test/java/dev/katsute/simplehttpserver/Requests.java b/src/test/java/dev/katsute/simplehttpserver/Requests.java
@@ -53,6 +53,8 @@ public static String getBody(final HttpURLConnection conn, final boolean ignoreE
         }catch(final IOException e){
             if(!ignoreError)
                 throw new UncheckedIOException(e);
+            else
+                return null;
         }
         return OUT.toString().trim();
     }
diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/FileHandlerTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/FileHandlerTests.java
diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerCacheTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerCacheTests.java
@@ -0,0 +1,78 @@
+package dev.katsute.simplehttpserver.handler.file;
+
+import dev.katsute.simplehttpserver.Requests;
+import dev.katsute.simplehttpserver.SimpleHttpServer;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+final class FileHandlerCacheTests {
+
+    private static SimpleHttpServer server;
+
+    private static final String testContent = String.valueOf(System.currentTimeMillis());
+
+    @TempDir
+    private static File dir = new File(testContent);
+
+    private static final FileHandler handler = new FileHandler();
+
+    @BeforeAll
+    static void beforeAll() throws IOException{
+        server = SimpleHttpServer.create(8080);
+
+        final File cache = new File(dir, testContent);
+        Files.write(cache.toPath(), testContent.getBytes(StandardCharsets.UTF_8));
+
+        final File cache2 = new File(dir, testContent + '0');
+        Files.write(cache2.toPath(), (testContent + '0').getBytes(StandardCharsets.UTF_8));
+
+        final FileOptions opts = new FileOptions.Builder()
+            .setLoadingOption(FileOptions.FileLoadingOption.CACHE)
+            .setCache(2000)
+            .build();
+
+        handler.addFile(cache, opts);
+        handler.addFile(cache2, opts);
+
+        server.createContext("file", handler);
+
+        server.start();
+    }
+
+    @AfterAll
+    static void afterAll(){
+        server.stop();
+    }
+
+    @Test @Order(0)
+    final void testAccess(){
+        Assertions.assertEquals(testContent, Requests.getBody("http://localhost:8080/file/" + testContent));
+        Assertions.assertEquals(testContent + '0', Requests.getBody("http://localhost:8080/file/" + testContent + '0'));
+
+        Assertions.assertFalse(handler.toString().contains("expired=true"));
+    }
+
+    @Test @Order(1)
+    final void testClear() throws InterruptedException{
+        Thread.sleep(2500);
+        Assertions.assertEquals(testContent + '0', Requests.getBody("http://localhost:8080/file/" + testContent + '0'));
+
+        Assertions.assertTrue(handler.toString().contains("expired=true"));
+    }
+
+    @Test @Order(2)
+    final void testReAccess() throws InterruptedException{
+        Thread.sleep(2500);
+        Assertions.assertEquals(testContent, Requests.getBody("http://localhost:8080/file/" + testContent));
+        Assertions.assertEquals(testContent + '0', Requests.getBody("http://localhost:8080/file/" + testContent + '0'));
+
+        Assertions.assertFalse(handler.toString().contains("expired=true"));
+    }
+
+}
diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerDirTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerDirTests.java
diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerFileTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerFileTests.java
diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerFilesTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerFilesTests.java
diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerNoWalkTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerNoWalkTests.java
diff --git a/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerWalkTests.java b/src/test/java/dev/katsute/simplehttpserver/handler/file/FileHandlerWalkTests.java

Original file line number	Diff line number	Diff line change
`@@ -160,4 +160,14 @@ public synchronized final void update(){`
`160`	`160`	`return session;`
`161`	`161`	`}`
`162`	`162`
	`163`	`+ //`
	`164`	`+`
	`165`	`+ @Override`
	`166`	`+ public String toString(){`
	`167`	`+ return "HttpSessionHandler{" +`
	`168`	`+ "sessions=" + sessions +`
	`169`	`+ ", cookie='" + cookie + '\'' +`
	`170`	`+ '}';`
	`171`	`+ }`
	`172`	`+`
`163`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,13 @@ public final Map<String,Record> getEntries(){`
`67`	`67`	`return new HashMap<>(data);`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ //`
	`71`	`+`
	`72`	`+ @Override`
	`73`	`+ public String toString(){`
	`74`	`+ return "MultipartFormData{" +`
	`75`	`+ "data=" + data +`
	`76`	`+ '}';`
	`77`	`+ }`
	`78`	`+`
`70`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,4 +195,15 @@ public final Map<String,String> getParameters(){`
`195`	`195`
`196`	`196`	`}`
`197`	`197`
	`198`	`+ //`
	`199`	`+`
	`200`	`+ @Override`
	`201`	`+ public String toString(){`
	`202`	`+ return "Record{" +`
	`203`	`+ "headers=" + headers +`
	`204`	`+ ", name='" + name + '\'' +`
	`205`	`+ ", value='" + value + '\'' +`
	`206`	`+ '}';`
	`207`	`+ }`
	`208`	`+`
`198`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,13 @@ public final void handle(final HttpExchange exchange) throws IOException{`
`54`	`54`	`exchange.close();`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ //`
	`58`	`+`
	`59`	`+ @Override`
	`60`	`+ public String toString(){`
	`61`	`+ return "RedirectHandler{" +`
	`62`	`+ "link='" + link + '\'' +`
	`63`	`+ '}';`
	`64`	`+ }`
	`65`	`+`
`57`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,11 @@ public RootHandler(final HttpHandler index, final HttpHandler other){`
`47`	`47`	`);`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ //`
	`51`	`+`
	`52`	`+ @Override`
	`53`	`+ public String toString(){`
	`54`	`+ return "RootHandler{}";`
	`55`	`+ }`
	`56`	`+`
`50`	`57`	`}`