tests for wildcard matches

danthe1st · Mar 11, 2024 · 51b64e4 · 51b64e4
1 parent 06e1cf7
commit 51b64e4
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/src/main/java/io/github/danthe1st/httpsintercept/matcher/HostMatcher.java b/src/main/java/io/github/danthe1st/httpsintercept/matcher/HostMatcher.java
@@ -16,7 +16,7 @@
 import io.github.danthe1st.httpsintercept.config.HostMatcherConfig;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-public final class HostMatcher<@NonNull T> {
+public final class HostMatcher<T> {
 	private final Map<String, List<@NonNull T>> exactHosts;
 	private final Map<String, List<@NonNull T>> hostParts;
 	private final Map<Pattern, List<@NonNull T>> hostRegexes;

diff --git a/src/test/java/io/github/danthe1st/httpsintercept/matcher/HostMatcherTests.java b/src/test/java/io/github/danthe1st/httpsintercept/matcher/HostMatcherTests.java
@@ -123,7 +123,47 @@ void testNoMatchWithoutConfig() {
 		expectNoMatches(matcher, "example.com");
 	}
 
-	// TODO wildcard
+	@Test
+	void testWildcard() {
+		HostMatcher<Object> matcher = new HostMatcher<>(
+				List.of(
+						Map.entry(
+								new HostMatcherConfig(null, null, null), 1
+						)
+				), true
+		);
+		expectSingleMatch(matcher, "localhost");
+		expectSingleMatch(matcher, "");
+	}
+
+	void testWildcardAndNoWildcard() {
+		HostMatcher<Object> matcher = new HostMatcher<>(
+				List.of(
+						Map.entry(
+								new HostMatcherConfig(Set.of("example.com"), null, null), 1
+						),
+						Map.entry(
+								new HostMatcherConfig(null, null, null), 2
+						)
+				), true
+		);
+		expectMatches(matcher, "example.com", 1, 2);
+		expectMatches(matcher, "localhost", 2);
+	}
+
+	@Test
+	void testNoWildcardWithAllowedWildcard() {
+		HostMatcher<Object> matcher = new HostMatcher<>(
+				List.of(
+						Map.entry(
+								new HostMatcherConfig(Set.of("example.com"), null, null), 1
+						)
+				), true
+		);
+		expectSingleMatch(matcher, "example.com");
+		expectNoMatches(matcher, "localhost");
+		expectNoMatches(matcher, "");
+	}
 
 	private HostMatcher<Object> createMatcher(Set<String> exactHosts, Set<String> hostParts, Set<String> hostRegexes) {
 		return new HostMatcher<>(List.of(Map.entry(new HostMatcherConfig(exactHosts, hostParts, hostRegexes), 1)), false);