Skip to content
This repository was archived by the owner on May 10, 2024. It is now read-only.

Commit cf15cd8

Browse files
committed
fix failing tests
1 parent 8c64530 commit cf15cd8

File tree

7 files changed

+18
-12
lines changed

7 files changed

+18
-12
lines changed

src/main/java/dev/katsute/simplehttpserver/SimpleHttpExchangeImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import java.util.*;
2828
import java.util.regex.Matcher;
2929
import java.util.regex.Pattern;
30-
import java.util.stream.Collectors;
31-
import java.util.stream.Stream;
3230
import java.util.zip.GZIPOutputStream;
3331

3432
final class SimpleHttpExchangeImpl extends SimpleHttpExchange {

src/test/java/dev/katsute/simplehttpserver/exchange/SessionTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package dev.katsute.simplehttpserver.exchange;
22

3-
import com.sun.net.httpserver.HttpContext;
43
import dev.katsute.simplehttpserver.*;
54
import org.junit.jupiter.api.*;
65

76
import java.io.IOException;
8-
import java.net.CookieHandler;
97
import java.net.URI;
108
import java.util.concurrent.atomic.AtomicReference;
119

src/test/java/dev/katsute/simplehttpserver/handler/RedirectTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.katsute.simplehttpserver.handler;
22

3-
import dev.katsute.simplehttpserver.*;
3+
import dev.katsute.simplehttpserver.SimpleHttpServer;
44
import org.junit.jupiter.api.*;
55

66
import java.io.IOException;

src/test/java/dev/katsute/simplehttpserver/handler/file/ContextUtilityTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package dev.katsute.simplehttpserver.handler.file;
22

33
import org.junit.jupiter.api.Assertions;
4-
import org.junit.jupiter.api.Test;
54
import org.junit.jupiter.params.ParameterizedTest;
65
import org.junit.jupiter.params.provider.Arguments;
76
import org.junit.jupiter.params.provider.MethodSource;

src/test/java/dev/katsute/simplehttpserver/server/ServerBindTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package dev.katsute.simplehttpserver.server;
22

33
import dev.katsute.simplehttpserver.SimpleHttpServer;
4-
import org.junit.jupiter.api.*;
4+
import org.junit.jupiter.api.Assertions;
5+
import org.junit.jupiter.api.Test;
56

67
import java.io.IOException;
78
import java.net.BindException;

src/test/java/dev/katsute/simplehttpserver/server/ServerCreateTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import dev.katsute.simplehttpserver.SimpleHttpServer;
44
import dev.katsute.simplehttpserver.SimpleHttpsServer;
5-
import org.junit.jupiter.api.BeforeEach;
65
import org.junit.jupiter.api.Test;
76

87
import java.io.IOException;

src/test/java/dev/katsute/simplehttpserver/server/ServerTests.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.sun.net.httpserver.HttpExchange;
55
import dev.katsute.simplehttpserver.*;
66
import org.junit.jupiter.api.Test;
7+
import org.junit.jupiter.api.condition.*;
78

89
import java.io.IOException;
910

@@ -90,7 +91,7 @@ final void testCreateContext() throws IOException{
9091

9192
final SimpleHttpHandler handler = SimpleHttpExchange::close;
9293

93-
assertSame(handler, server.getContextHandler(server.createContext("", handler)));
94+
assertSame(handler, server.getContextHandler(server.createContext("close", handler)));
9495
assertEquals(2, server.getContexts().size());
9596
}
9697

@@ -106,12 +107,22 @@ final void testCreateSlashContext() throws IOException{
106107
server.removeContext("/");
107108
}
108109

109-
@Test
110-
final void testDuplicateContext() throws IOException{
110+
@Test @EnabledForJreRange(min=JRE.JAVA_8, max=JRE.JAVA_17)
111+
final void testDuplicateContext8() throws IOException{
112+
final SimpleHttpServer server = SimpleHttpServer.create();
113+
114+
server.createContext("");
115+
116+
assertDoesNotThrow(() -> server.createContext("", HttpExchange::close));
117+
}
118+
119+
@Test @DisabledForJreRange(min=JRE.JAVA_8, max=JRE.JAVA_17)
120+
final void testDuplicateContext18() throws IOException{
111121
final SimpleHttpServer server = SimpleHttpServer.create();
112122

113123
server.createContext("");
114-
server.createContext("", HttpExchange::close); // supposed to throw an exception, docs are invalid
124+
125+
assertThrows(IllegalArgumentException.class, () -> server.createContext("", HttpExchange::close));
115126
}
116127

117128
}

0 commit comments

Comments
 (0)