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

Commit f409c54

Browse files
KatsuteKatsute
authored
add devcontainer
1 parent ebf6cfa commit f409c54

File tree

4 files changed

+107
-103
lines changed

4 files changed

+107
-103
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "Java",
3+
"image": "maven:3.8.6-eclipse-temurin-17"
4+
}

‎.github/workflows/java_ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
package: true
1515
report: true
1616
secrets:
17-
token: ${{ secrets.BOT }}
17+
token: ${{ secrets.BOT }}

‎src/test/java/dev/katsute/simplehttpserver/ContextUtilityTests.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,36 @@
99

1010
final class ContextUtilityTests {
1111

12-
@ParameterizedTest
13-
@MethodSource("contextArgs")
14-
final void testContexts(final String expected, final String input, final boolean leading, final boolean trailing){
15-
Assertions.assertEquals(expected, ContextUtility.getContext(input, leading, trailing));
16-
}
12+
@ParameterizedTest
13+
@MethodSource("contextArgs")
14+
final void testContexts(final String expected, final String input, final boolean leading, final boolean trailing){
15+
Assertions.assertEquals(expected, ContextUtility.getContext(input, leading, trailing));
16+
}
1717

18-
static Stream<Arguments> contextArgs(){
19-
return Stream.of(
20-
Arguments.of("", "/", false, false),
21-
Arguments.of("/", "", true, false),
22-
Arguments.of("/", "", false, true ),
23-
Arguments.of("/", "", true, true ),
24-
Arguments.of("a", "a", false, false),
25-
Arguments.of("/a", "a", true, false),
26-
Arguments.of("a/", "a", false, true ),
27-
Arguments.of("/a/", "a", true, true ),
28-
Arguments.of("testNone", "/testNone/", false, false),
29-
Arguments.of("/testLeading", "testLeading", true, false),
30-
Arguments.of("testTrailing/", "testTrailing", false, true ),
31-
Arguments.of("/testBoth/", "testBoth", true, true ),
32-
Arguments.of("testNoneBackSlash", "\\testNoneBackSlash\\", false, false),
33-
Arguments.of("/testBackSlash/", "\\testBackSlash\\", true, true ),
34-
Arguments.of("/testConsecutiveBackSlash/", "\\\\testConsecutiveBackSlash\\\\", true, true ),
35-
Arguments.of("/testConsecutiveForwardSlash/", "//testConsecutiveForwardSlash//", true, true ),
36-
Arguments.of("/testWhitespace/", " /testWhitespace/ ", true, true),
37-
Arguments.of("/ testWhitespace /", "/ testWhitespace /", true, true),
38-
Arguments.of(" testWhitespace ", "/ testWhitespace /", false, false),
39-
Arguments.of("testWhitespace", " testWhitespace ", false, false),
40-
Arguments.of("/testWhitespace/", " /testWhitespace/ ", true, true)
41-
);
42-
}
18+
static Stream<Arguments> contextArgs(){
19+
return Stream.of(
20+
Arguments.of("", "/", false, false),
21+
Arguments.of("/", "", true, false),
22+
Arguments.of("/", "", false, true ),
23+
Arguments.of("/", "", true, true ),
24+
Arguments.of("a", "a", false, false),
25+
Arguments.of("/a", "a", true, false),
26+
Arguments.of("a/", "a", false, true ),
27+
Arguments.of("/a/", "a", true, true ),
28+
Arguments.of("testNone", "/testNone/", false, false),
29+
Arguments.of("/testLeading", "testLeading", true, false),
30+
Arguments.of("testTrailing/", "testTrailing", false, true ),
31+
Arguments.of("/testBoth/", "testBoth", true, true ),
32+
Arguments.of("testNoneBackSlash", "\\testNoneBackSlash\\", false, false),
33+
Arguments.of("/testBackSlash/", "\\testBackSlash\\", true, true ),
34+
Arguments.of("/testConsecutiveBackSlash/", "\\\\testConsecutiveBackSlash\\\\", true, true ),
35+
Arguments.of("/testConsecutiveForwardSlash/", "//testConsecutiveForwardSlash//", true, true ),
36+
Arguments.of("/testWhitespace/", " /testWhitespace/ ", true, true),
37+
Arguments.of("/ testWhitespace /", "/ testWhitespace /", true, true),
38+
Arguments.of(" testWhitespace ", "/ testWhitespace /", false, false),
39+
Arguments.of("testWhitespace", " testWhitespace ", false, false),
40+
Arguments.of("/testWhitespace/", " /testWhitespace/ ", true, true)
41+
);
42+
}
4343

4444
}

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

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -29,100 +29,100 @@ final void testProp() throws IOException{
2929
//
3030

3131
@Test
32-
final void testRandomContext() throws IOException{
33-
final SimpleHttpServer server = SimpleHttpServer.create();
32+
final void testRandomContext() throws IOException{
33+
final SimpleHttpServer server = SimpleHttpServer.create();
3434

35-
final String test = server.getRandomContext();
36-
assertNotNull(test);
37-
server.createContext(test);
38-
for(int i = 0; i < 100; i++)
39-
assertNotEquals(test, server.getRandomContext());
40-
}
35+
final String test = server.getRandomContext();
36+
assertNotNull(test);
37+
server.createContext(test);
38+
for(int i = 0; i < 100; i++)
39+
assertNotEquals(test, server.getRandomContext());
40+
}
4141

42-
@Test
43-
final void testRandomContextHead() throws IOException{
44-
final SimpleHttpServer server = SimpleHttpServer.create();
42+
@Test
43+
final void testRandomContextHead() throws IOException{
44+
final SimpleHttpServer server = SimpleHttpServer.create();
4545

46-
final String test = server.getRandomContext("/head");
47-
assertNotNull(test);
48-
assertTrue(test.startsWith("/head/"));
49-
server.createContext(test);
50-
for(int i = 0; i < 100; i++)
51-
assertNotEquals(test, server.getRandomContext("/head"));
52-
}
46+
final String test = server.getRandomContext("/head");
47+
assertNotNull(test);
48+
assertTrue(test.startsWith("/head/"));
49+
server.createContext(test);
50+
for(int i = 0; i < 100; i++)
51+
assertNotEquals(test, server.getRandomContext("/head"));
52+
}
5353

54-
@Test
55-
final void testRemoveNullContext() throws IOException{
56-
final SimpleHttpServer server = SimpleHttpServer.create();
54+
@Test
55+
final void testRemoveNullContext() throws IOException{
56+
final SimpleHttpServer server = SimpleHttpServer.create();
5757

58-
assertThrows(NullPointerException.class, () -> server.removeContext((String) null));
59-
assertThrows(NullPointerException.class, () -> server.removeContext((HttpContext) null));
60-
assertThrows(IllegalArgumentException.class, () -> server.removeContext(""));
61-
}
58+
assertThrows(NullPointerException.class, () -> server.removeContext((String) null));
59+
assertThrows(NullPointerException.class, () -> server.removeContext((HttpContext) null));
60+
assertThrows(IllegalArgumentException.class, () -> server.removeContext(""));
61+
}
6262

63-
@Test
64-
final void testRemoveContext() throws IOException{
65-
final SimpleHttpServer server = SimpleHttpServer.create();
63+
@Test
64+
final void testRemoveContext() throws IOException{
65+
final SimpleHttpServer server = SimpleHttpServer.create();
6666

67-
server.createContext("");
68-
assertDoesNotThrow(() -> server.removeContext(""));
69-
assertDoesNotThrow(() -> server.removeContext(server.createContext("")));
70-
}
67+
server.createContext("");
68+
assertDoesNotThrow(() -> server.removeContext(""));
69+
assertDoesNotThrow(() -> server.removeContext(server.createContext("")));
70+
}
7171

72-
@Test
73-
final void testRemoveNativeContext() throws IOException{
74-
final SimpleHttpServer server = SimpleHttpServer.create();
72+
@Test
73+
final void testRemoveNativeContext() throws IOException{
74+
final SimpleHttpServer server = SimpleHttpServer.create();
7575

76-
server.getHttpServer().createContext("/");
77-
assertDoesNotThrow(() -> server.removeContext(""));
76+
server.getHttpServer().createContext("/");
77+
assertDoesNotThrow(() -> server.removeContext(""));
7878

79-
assertDoesNotThrow(() -> server.removeContext(server.getHttpServer().createContext("/")));
79+
assertDoesNotThrow(() -> server.removeContext(server.getHttpServer().createContext("/")));
8080

81-
server.getHttpServer().removeContext(server.createContext("/"));
82-
assertDoesNotThrow(() -> server.createContext("/"));
83-
}
81+
server.getHttpServer().removeContext(server.createContext("/"));
82+
assertDoesNotThrow(() -> server.createContext("/"));
83+
}
8484

85-
@Test
86-
final void testCreateContext() throws IOException{
87-
final SimpleHttpServer server = SimpleHttpServer.create();
85+
@Test
86+
final void testCreateContext() throws IOException{
87+
final SimpleHttpServer server = SimpleHttpServer.create();
8888

89-
server.createContext("");
90-
assertEquals(1, server.getContexts().size());
89+
server.createContext("");
90+
assertEquals(1, server.getContexts().size());
9191

92-
final SimpleHttpHandler handler = SimpleHttpExchange::close;
92+
final SimpleHttpHandler handler = SimpleHttpExchange::close;
9393

94-
assertSame(handler, server.getContextHandler(server.createContext("close", handler)));
95-
assertEquals(2, server.getContexts().size());
96-
}
94+
assertSame(handler, server.getContextHandler(server.createContext("close", handler)));
95+
assertEquals(2, server.getContexts().size());
96+
}
9797

98-
@Test
99-
final void testCreateSlashContext() throws IOException{
100-
final SimpleHttpServer server = SimpleHttpServer.create();
98+
@Test
99+
final void testCreateSlashContext() throws IOException{
100+
final SimpleHttpServer server = SimpleHttpServer.create();
101101

102-
assertEquals("/", server.createContext("/").getPath());
103-
server.removeContext("/");
104-
assertEquals("/", server.createContext("\\").getPath());
105-
server.removeContext("/");
106-
assertEquals("/", server.createContext("").getPath());
107-
server.removeContext("/");
108-
}
102+
assertEquals("/", server.createContext("/").getPath());
103+
server.removeContext("/");
104+
assertEquals("/", server.createContext("\\").getPath());
105+
server.removeContext("/");
106+
assertEquals("/", server.createContext("").getPath());
107+
server.removeContext("/");
108+
}
109109

110-
@Test @EnabledForJreRange(min=JRE.JAVA_8, max=JRE.JAVA_17)
111-
final void testDuplicateContext8() throws IOException{
112-
final SimpleHttpServer server = SimpleHttpServer.create();
110+
@Test @EnabledForJreRange(min=JRE.JAVA_8, max=JRE.JAVA_17)
111+
final void testDuplicateContext8() throws IOException{
112+
final SimpleHttpServer server = SimpleHttpServer.create();
113113

114-
server.createContext("");
114+
server.createContext("");
115115

116-
assertDoesNotThrow(() -> server.createContext("", HttpExchange::close));
117-
}
116+
assertDoesNotThrow(() -> server.createContext("", HttpExchange::close));
117+
}
118118

119-
@Test @DisabledForJreRange(min=JRE.JAVA_8, max=JRE.JAVA_17)
120-
final void testDuplicateContext18() throws IOException{
121-
final SimpleHttpServer server = SimpleHttpServer.create();
119+
@Test @DisabledForJreRange(min=JRE.JAVA_8, max=JRE.JAVA_17)
120+
final void testDuplicateContext18() throws IOException{
121+
final SimpleHttpServer server = SimpleHttpServer.create();
122122

123-
server.createContext("");
123+
server.createContext("");
124124

125-
assertThrows(IllegalArgumentException.class, () -> server.createContext("", HttpExchange::close));
126-
}
125+
assertThrows(IllegalArgumentException.class, () -> server.createContext("", HttpExchange::close));
126+
}
127127

128128
}

0 commit comments

Comments
 (0)