diff options
Diffstat (limited to 'clustercontroller-apps/src/test/java')
4 files changed, 8 insertions, 9 deletions
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 7146d95e7ba..d6896aac179 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 @@ -17,7 +17,6 @@ public class StateRestApiV2HandlerTest { ClusterController controller = new ClusterController(); ClusterInfoConfig config = new ClusterInfoConfig( new ClusterInfoConfig.Builder().clusterId("cluster-id").nodeCount(1)); - ClusterInfoConfig.Builder clusterConfig = new ClusterInfoConfig.Builder(); new StateRestApiV2Handler(controller, config, StateRestApiV2Handler.testContext()); } 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 d4eb84677dc..4673ee39080 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 @@ -8,7 +8,7 @@ public class StatusHandlerTest { @Test void testSimple() { ClusterController controller = new ClusterController(); - StatusHandler handler = new StatusHandler(controller, StatusHandler.testContext()); + 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 19a5a2a60f9..23ab03cc673 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 @@ -13,7 +13,7 @@ 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.. + * The handler is mostly tested through the apache tests, using it as endpoint here. * This test class is just to test some special cases. */ public class JDiscHttpRequestHandlerTest { @@ -30,7 +30,7 @@ public class JDiscHttpRequestHandlerTest { } @Test - void testInvalidMethod() throws Exception { + void testInvalidMethod() { try { HttpRequest request = new HttpRequest(); JDiscHttpRequestHandler.setOperation(request, com.yahoo.jdisc.http.HttpRequest.Method.CONNECT); @@ -41,7 +41,7 @@ public class JDiscHttpRequestHandlerTest { } @Test - void testNothingButAddCoverage() throws Exception { + void testNothingButAddCoverage() { 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 a62437d1a8f..a20b4b744f2 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 @@ -7,11 +7,11 @@ import org.junit.jupiter.api.Test; import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class JDiscMetricWrapperTest { - class MetricImpl implements Metric { + static class MetricImpl implements Metric { int calls = 0; @Override public void set(String s, Number number, Context context) { ++calls; } @@ -31,13 +31,13 @@ public class JDiscMetricWrapperTest { JDiscMetricWrapper wrapper = new JDiscMetricWrapper(impl1); wrapper.add("foo", 234, null); wrapper.set("bar", 234, null); - assertTrue(wrapper.createContext(null) != null); + assertNotNull(wrapper.createContext(null)); assertEquals(3, impl1.calls); impl1.calls = 0; wrapper.updateMetricImplementation(impl2); wrapper.add("foo", 234, wrapper.createContext(null)); wrapper.set("bar", 234, wrapper.createContext(null)); - assertTrue(wrapper.createContext(null) != null); + assertNotNull(wrapper.createContext(null)); assertEquals(0, impl1.calls); assertEquals(5, impl2.calls); |