diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-29 14:00:46 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-29 14:00:46 +0200 |
commit | 6465999c6cf193433c0be24790e65601e8d0625a (patch) | |
tree | 57bdca70d58e093addf3822adcfa25bf90ac86cb /clustercontroller-apps/src/test | |
parent | 7b050af44ac99581e237072d82f22966a802a873 (diff) |
Convert clustercontroller-apps to junit5
Diffstat (limited to 'clustercontroller-apps/src/test')
6 files changed, 44 insertions, 40 deletions
diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurerTest.java index dda18fc3396..7c5913774c3 100644 --- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurerTest.java +++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurerTest.java @@ -6,19 +6,19 @@ import com.yahoo.cloud.config.ZookeepersConfig; import com.yahoo.jdisc.Metric; import com.yahoo.vespa.config.content.FleetcontrollerConfig; import com.yahoo.vespa.config.content.StorDistributionConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class ClusterControllerClusterConfigurerTest { @Test - public void testSimple() throws Exception { + void testSimple() throws Exception { ClusterController controller = new ClusterController(); StorDistributionConfig.Builder distributionConfig = new StorDistributionConfig.Builder(); StorDistributionConfig.Group.Builder group = new StorDistributionConfig.Group.Builder(); @@ -45,13 +45,17 @@ public class ClusterControllerClusterConfigurerTest { zookeepersConfig.zookeeperserverlist("foo"); Metric metric = new Metric() { @Override - public void set(String s, Number number, Context context) {} + public void set(String s, Number number, Context context) { + } @Override - public void add(String s, Number number, Context context) {} + public void add(String s, Number number, Context context) { + } @Override - public Context createContext(Map<String, ?> stringMap) { return null; } + public Context createContext(Map<String, ?> stringMap) { + return null; + } }; - // Used in standalone mode to get config without a cluster controller instance + // Used in standalone mode to get config without a cluster controller instance ClusterControllerClusterConfigurer configurer = new ClusterControllerClusterConfigurer( null, new StorDistributionConfig(distributionConfig), @@ -68,7 +72,7 @@ public class ClusterControllerClusterConfigurerTest { assertEquals(0.7, configurer.getOptions().clusterFeedBlockLimit.get("bar"), 0.01); assertEquals(0.05, configurer.getOptions().clusterFeedBlockNoiseLevel, 0.001); - try{ + try { zookeepersConfig.zookeeperserverlist(""); new ClusterControllerClusterConfigurer( controller, diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerTest.java index 2c33f781737..cfda92b472d 100644 --- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerTest.java +++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerTest.java @@ -5,17 +5,17 @@ import com.yahoo.jdisc.Metric; import com.yahoo.vdslib.distribution.ConfiguredNode; import com.yahoo.vespa.clustercontroller.core.FleetController; import com.yahoo.vespa.clustercontroller.core.FleetControllerOptions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Doesn't really test cluster controller, but runs some lines of code. @@ -34,7 +34,7 @@ public class ClusterControllerTest { public Context createContext(Map<String, ?> stringMap) { return null; } }; - @Before + @BeforeEach public void setUp() { options = new FleetControllerOptions("storage", Set.of(new ConfiguredNode(0, false))); options.zooKeeperServerAddress = null; @@ -43,7 +43,7 @@ public class ClusterControllerTest { } @Test - public void testSimple() throws Exception { + void testSimple() throws Exception { ClusterController cc = new ClusterController(); cc.setOptions(options, metric); cc.setOptions(options, metric); @@ -57,7 +57,7 @@ public class ClusterControllerTest { } @Test - public void testShutdownException() throws Exception { + void testShutdownException() throws Exception { ClusterController cc = new ClusterController() { void shutdownController(FleetController controller) throws Exception { throw new Exception("Foo"); diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java index bf759e3dc76..7146d95e7ba 100644 --- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java +++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2HandlerTest.java @@ -3,17 +3,17 @@ package com.yahoo.vespa.clustercontroller.apps.clustercontroller; import com.yahoo.cloud.config.ClusterInfoConfig; import com.yahoo.vespa.clustercontroller.core.restapiv2.ClusterControllerStateRestAPI; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.TreeMap; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class StateRestApiV2HandlerTest { @Test - public void testNoMatchingSockets() { + void testNoMatchingSockets() { ClusterController controller = new ClusterController(); ClusterInfoConfig config = new ClusterInfoConfig( new ClusterInfoConfig.Builder().clusterId("cluster-id").nodeCount(1)); @@ -22,7 +22,7 @@ public class StateRestApiV2HandlerTest { } @Test - public void testMappingOfIndexToClusterControllers() { + void testMappingOfIndexToClusterControllers() { ClusterInfoConfig.Builder builder = new ClusterInfoConfig.Builder() .clusterId("cluster-id") .nodeCount(1) diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java index 7a204aa791d..d4eb84677dc 100644 --- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java +++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StatusHandlerTest.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.clustercontroller.apps.clustercontroller; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class StatusHandlerTest { @Test - public void testSimple() { + void testSimple() { ClusterController controller = new ClusterController(); StatusHandler handler = new StatusHandler(controller, StatusHandler.testContext()); } diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandlerTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandlerTest.java index 6a27228feab..19a5a2a60f9 100644 --- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandlerTest.java +++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandlerTest.java @@ -2,15 +2,15 @@ package com.yahoo.vespa.clustercontroller.apputil.communication.http; import com.yahoo.vespa.clustercontroller.utils.communication.http.HttpRequest; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -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; /** * The handler is mostly tested through the apache tests, using it as endpoint here.. @@ -20,7 +20,7 @@ public class JDiscHttpRequestHandlerTest { private ThreadPoolExecutor executor; - @Before + @BeforeEach public void setUp() { executor = new ThreadPoolExecutor(10, 100, 100, TimeUnit.SECONDS, new ArrayBlockingQueue<>(1000)); } @@ -30,8 +30,8 @@ public class JDiscHttpRequestHandlerTest { } @Test - public void testInvalidMethod() throws Exception { - try{ + void testInvalidMethod() throws Exception { + try { HttpRequest request = new HttpRequest(); JDiscHttpRequestHandler.setOperation(request, com.yahoo.jdisc.http.HttpRequest.Method.CONNECT); fail("Control should not reach here"); @@ -41,7 +41,7 @@ public class JDiscHttpRequestHandlerTest { } @Test - public void testNothingButAddCoverage() throws Exception { + void testNothingButAddCoverage() throws Exception { new JDiscHttpRequestHandler.EmptyCompletionHandler().failed(null); } } diff --git a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java index e7c8301cfca..a62437d1a8f 100644 --- a/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java +++ b/clustercontroller-apps/src/test/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscMetricWrapperTest.java @@ -2,12 +2,12 @@ package com.yahoo.vespa.clustercontroller.apputil.communication.http; import com.yahoo.jdisc.Metric; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JDiscMetricWrapperTest { @@ -22,10 +22,10 @@ public class JDiscMetricWrapperTest { ++calls; return new Context() {}; } - }; + } @Test - public void testSimple() { + void testSimple() { MetricImpl impl1 = new MetricImpl(); MetricImpl impl2 = new MetricImpl(); JDiscMetricWrapper wrapper = new JDiscMetricWrapper(impl1); |