diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-10-25 11:06:22 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2018-10-25 11:06:22 +0200 |
commit | 109c797d791525325a461aca2114353f0aee5da1 (patch) | |
tree | 4b96f5fb64c55a808ed22ee8f4d516ddc4e5853f /node-repository/src | |
parent | e626d170e31710fd72deaee4b48ef2444015edf7 (diff) |
Simplify assertions
Diffstat (limited to 'node-repository/src')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java index 05cb50d6a3f..5d8bde960d8 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java @@ -27,6 +27,7 @@ import static com.yahoo.vespa.hosted.provision.provisioning.ProvisioningTester.c import static java.util.Collections.singleton; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author mpolden @@ -181,10 +182,6 @@ public class AclProvisioningTest { return allocateNodes(Capacity.fromNodeCount(nodeCount), tester.makeApplicationId()); } - private List<Node> allocateNodes(NodeType nodeType, ApplicationId applicationId) { - return allocateNodes(Capacity.fromRequiredNodeType(nodeType), applicationId); - } - private List<Node> allocateNodes(Capacity capacity, ApplicationId applicationId) { ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42"), false); @@ -194,18 +191,10 @@ public class AclProvisioningTest { } private static void assertAcls(List<List<Node>> expected, NodeAcl actual) { - assertAcls(expected, Collections.emptyList(), Collections.singletonList(actual)); - } - - private static void assertAcls(List<List<Node>> expected, List<NodeAcl> actual) { - assertAcls(expected, Collections.emptyList(), actual); - } - - private static void assertAcls(List<List<Node>> expected, List<String> expectedNetworks, NodeAcl actual) { - assertAcls(expected, expectedNetworks, Collections.singletonList(actual)); + assertAcls(expected, Collections.singletonList(actual)); } - private static void assertAcls(List<List<Node>> expectedNodes, List<String> expectedNetworks, List<NodeAcl> actual) { + private static void assertAcls(List<List<Node>> expectedNodes, List<NodeAcl> actual) { Set<Node> expectedTrustedNodes = expectedNodes.stream() .flatMap(Collection::stream) .collect(Collectors.toSet()); @@ -214,10 +203,9 @@ public class AclProvisioningTest { .collect(Collectors.toSet()); assertEquals(expectedTrustedNodes, actualTrustedNodes); - Set<String> expectedTrustedNetworks = new HashSet<>(expectedNetworks); Set<String> actualTrustedNetworks = actual.stream() .flatMap(acl -> acl.trustedNetworks().stream()) .collect(Collectors.toSet()); - assertEquals(expectedTrustedNetworks, actualTrustedNetworks); + assertTrue("No networks are trusted", actualTrustedNetworks.isEmpty()); } } |