diff options
| author | gjoranv <gv@yahoo-inc.com> | 2017-02-22 14:05:07 +0100 |
|---|---|---|
| committer | gjoranv <gv@yahoo-inc.com> | 2017-02-22 14:05:07 +0100 |
| commit | 9112dca9392e634f49cb27e502d58002f32abdde (patch) | |
| tree | 78a3a2ad95dc16c38db3aa579f903e5d4b62719c /config-model | |
| parent | 82e347d24d63398e8e3d0376a5f3671805dae497 (diff) | |
Rename sets of handler bindings, for clarity.
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java index f6254f9b96d..c02e333c5fc 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertTrue; */ public class AccessControlTest extends ContainerModelBuilderTestBase { - private static final Set<String> REQUIRED_BINDINGS = ImmutableSet.of( + private static final Set<String> REQUIRED_HANDLER_BINDINGS = ImmutableSet.of( "/custom-handler/", "/search/", "/feed/", @@ -42,7 +42,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { "/feedstatus/", ContainerCluster.RESERVED_URI_PREFIX); - private static final Set<String> FORBIDDEN_BINDINGS = ImmutableSet.of( + private static final Set<String> FORBIDDEN_HANDLER_BINDINGS = ImmutableSet.of( "/ApplicationStatus", "/status.html", "/statistics/", @@ -135,15 +135,15 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { Http http = getHttp(clusterElem); - Set<String> foundRequiredBindings = REQUIRED_BINDINGS.stream() + Set<String> foundRequiredBindings = REQUIRED_HANDLER_BINDINGS.stream() .filter(requiredBinding -> containsBinding(http.getBindings(), requiredBinding)) .collect(Collectors.toSet()); - Set<String> missingRequiredBindings = new HashSet<>(REQUIRED_BINDINGS); + Set<String> missingRequiredBindings = new HashSet<>(REQUIRED_HANDLER_BINDINGS); missingRequiredBindings.removeAll(foundRequiredBindings); assertTrue("Access control chain was not bound to: " + CollectionUtil.mkString(missingRequiredBindings, ", "), missingRequiredBindings.isEmpty()); - FORBIDDEN_BINDINGS.forEach(forbiddenBinding -> http.getBindings().forEach( + FORBIDDEN_HANDLER_BINDINGS.forEach(forbiddenBinding -> http.getBindings().forEach( binding -> assertFalse("Access control chain was bound to: " + binding.binding, binding.binding.contains(forbiddenBinding)))); } |