diff options
Diffstat (limited to 'controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/PathGroupTest.java')
-rw-r--r-- | controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/PathGroupTest.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/PathGroupTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/PathGroupTest.java index 1923365976e..4a8e9785c88 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/PathGroupTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/PathGroupTest.java @@ -1,14 +1,14 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.role; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * @author jonmv @@ -17,7 +17,7 @@ import static org.junit.Assert.fail; public class PathGroupTest { @Test - public void uniqueMatches() { + void uniqueMatches() { // Ensure that each path group contains at most one match for any given path, to avoid undefined context extraction. Set<String> checkedAgainstSelf = new HashSet<>(); for (PathGroup group1 : PathGroup.values()) @@ -37,29 +37,29 @@ public class PathGroupTest { // and the other doesn't end with a wildcard matcher ... // and the longest one isn't just one wildcard longer ... // then one is strictly longer than the other, and it's not a match. - if (end < parts1.length && (end == 0 || ! parts2[end - 1].equals("{*}")) && ! parts1[end].equals("{*}")) continue; - if (end < parts2.length && (end == 0 || ! parts1[end - 1].equals("{*}")) && ! parts2[end].equals("{*}")) continue; + if (end < parts1.length && (end == 0 || !parts2[end - 1].equals("{*}")) && !parts1[end].equals("{*}")) continue; + if (end < parts2.length && (end == 0 || !parts1[end - 1].equals("{*}")) && !parts2[end].equals("{*}")) continue; int i; for (i = 0; i < end; i++) if ( ! parts1[i].equals(parts2[i]) - && ! (parts1[i].startsWith("{") && parts1[i].endsWith("}")) - && ! (parts2[i].startsWith("{") && parts2[i].endsWith("}"))) break; + && !(parts1[i].startsWith("{") && parts1[i].endsWith("}")) + && !(parts2[i].startsWith("{") && parts2[i].endsWith("}"))) break; if (i == end) fail("Paths '" + path1 + "' and '" + path2 + "' overlap."); } assertEquals(PathGroup.all().stream().mapToInt(group -> group.pathSpecs.size()).sum(), - checkedAgainstSelf.size()); + checkedAgainstSelf.size()); } @Test - public void contextMatches() { + void contextMatches() { for (PathGroup group : PathGroup.values()) for (String spec : group.pathSpecs) { for (PathGroup.Matcher matcher : PathGroup.Matcher.values()) { if (group.matchers.contains(matcher)) { - if ( ! spec.contains(matcher.pattern)) + if (!spec.contains(matcher.pattern)) fail("Spec '" + spec + "' in '" + group.name() + "' should contain matcher '" + matcher.pattern + "'."); if (spec.replaceFirst(Pattern.quote(matcher.pattern), "").contains(matcher.pattern)) fail("Spec '" + spec + "' in '" + group.name() + "' contains more than one instance of '" + matcher.pattern + "'."); |