diff options
Diffstat (limited to 'node-repository')
3 files changed, 9 insertions, 13 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java index a936beac797..b33d776ac08 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java @@ -18,9 +18,9 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; -import static junit.framework.TestCase.fail; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; /** * tests basic operation of the node repository @@ -178,4 +178,5 @@ public class NodeRepositoryTest { .map(Node::hostname) .collect(Collectors.toSet()); } + } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java index dce9f694647..1e69b26d0e0 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.provisioning; -import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeType; @@ -16,9 +15,9 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author smorgrav @@ -28,8 +27,8 @@ public class DockerHostCapacityTest { private DockerHostCapacity capacity; private List<Node> nodes; private Node host1, host2, host3; - Node nodeA, nodeB, nodeC, nodeD, nodeE; - Flavor flavorDocker, flavorDocker2; + private Node nodeA, nodeB, nodeC, nodeD, nodeE; + private Flavor flavorDocker, flavorDocker2; @Before public void setup() { @@ -132,10 +131,4 @@ public class DockerHostCapacityTest { return additionalIps; } - private ApplicationId app(String tenant) { - return new ApplicationId.Builder() - .tenant(tenant) - .applicationName("test") - .instanceName("default").build(); - } } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java index de2aaf68788..e885274c154 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java @@ -34,14 +34,15 @@ import static com.yahoo.vespa.athenz.tls.SignatureAlgorithm.SHA256_WITH_RSA; import static java.util.Collections.emptySet; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; -import static junit.framework.TestCase.assertFalse; -import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author bjorncs */ public class NodeIdentifierTest { + private static final String HOSTNAME = "myhostname"; private static final String OPENSTACK_ID = "OPENSTACK-ID"; private static final String AWS_INSTANCE_ID = "i-abcdef123456"; @@ -188,4 +189,5 @@ public class NodeIdentifierTest { b.addFlavor("docker", 1., 2., 50, Flavor.Type.DOCKER_CONTAINER).cost(1); return b.build(); } + }
\ No newline at end of file |