diff options
Diffstat (limited to 'container-disc/src/test/java/com/yahoo')
10 files changed, 94 insertions, 79 deletions
diff --git a/container-disc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java b/container-disc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java index 4c58a943199..30c31a64a29 100644 --- a/container-disc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java +++ b/container-disc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java @@ -12,13 +12,13 @@ import com.yahoo.processing.Request; import com.yahoo.processing.Response; import com.yahoo.processing.execution.Execution; import com.yahoo.processing.execution.chain.ChainRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.HashMap; import static com.yahoo.container.jdisc.JdiscBindingsConfig.Handlers; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author gjoranv @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue; public class ApplicationStatusHandlerTest { @Test - public void application_configs_are_rendered() { + void application_configs_are_rendered() { ApplicationMetadataConfig metaConfig = new ApplicationMetadataConfig( new ApplicationMetadataConfig.Builder() .checksum("abc") @@ -52,7 +52,7 @@ public class ApplicationStatusHandlerTest { } @Test - public void object_components_are_rendered() { + void object_components_are_rendered() { HashMap<ComponentId, Object> id2object = new HashMap<>(); id2object.put(new ComponentId("myComponent"), new Object()); @@ -61,7 +61,7 @@ public class ApplicationStatusHandlerTest { } @Test - public void request_handlers_are_rendered() { + void request_handlers_are_rendered() { final String id = "myHandler"; final String serverBinding1 = "http://*/serverBinding"; final String serverBinding2 = "http://*/anotherServerBinding"; @@ -84,7 +84,7 @@ public class ApplicationStatusHandlerTest { } @Test - public void client_providers_are_rendered() { + void client_providers_are_rendered() { final String id = "myClient"; final String clientBinding = "http://*/clientBinding"; final String clientBinding2 = "http://*/anotherClientBinding"; @@ -108,7 +108,7 @@ public class ApplicationStatusHandlerTest { } @Test - public void chains_are_rendered() { + void chains_are_rendered() { ChainRegistry<Processor> chains = new ChainRegistry<>(); Chain<Processor> chain = new Chain<>("myChain", new VoidProcessor(new ComponentId("voidProcessor"))); chains.register(new ComponentId("myChain"), chain); diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/ContainerThreadFactoryTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/ContainerThreadFactoryTest.java index ec727c506b5..d55bf18c823 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/ContainerThreadFactoryTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/ContainerThreadFactoryTest.java @@ -3,13 +3,13 @@ package com.yahoo.container.jdisc; import com.yahoo.container.jdisc.metric.MetricConsumerProvider; import com.yahoo.jdisc.application.ContainerThread; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.concurrent.ThreadFactory; -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; /** * @author Simon Thoresen Hult @@ -17,7 +17,7 @@ import static org.junit.Assert.fail; public class ContainerThreadFactoryTest { @Test - public void requireThatMetricConsumerProviderCanNotBeNull() { + void requireThatMetricConsumerProviderCanNotBeNull() { try { new ContainerThreadFactory(null); fail(); @@ -27,15 +27,15 @@ public class ContainerThreadFactoryTest { } @Test - public void requireThatThreadsCreatedAreJDiscContainerThreads() { + void requireThatThreadsCreatedAreJDiscContainerThreads() { assertEquals(ContainerThread.class, - new ContainerThreadFactory(Mockito.mock(MetricConsumerProvider.class)) - .newThread(Mockito.mock(Runnable.class)) - .getClass()); + new ContainerThreadFactory(Mockito.mock(MetricConsumerProvider.class)) + .newThread(Mockito.mock(Runnable.class)) + .getClass()); } @Test - public void requireThatThreadFactoryCallsProvider() { + void requireThatThreadFactoryCallsProvider() { MetricConsumerProvider provider = Mockito.mock(MetricConsumerProvider.class); ThreadFactory factory = new ContainerThreadFactory(provider); factory.newThread(Mockito.mock(Runnable.class)); diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/DisableOsgiFrameworkTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/DisableOsgiFrameworkTest.java index 46acd5ce2b8..f6b2424e0e1 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/DisableOsgiFrameworkTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/DisableOsgiFrameworkTest.java @@ -1,47 +1,63 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.osgi.framework.BundleException; +import static org.junit.jupiter.api.Assertions.assertThrows; + /** * @author Ulf Lilleengen */ public class DisableOsgiFrameworkTest { - @Test(expected = RuntimeException.class) - public void require_that_installBundle_throws_exception() throws BundleException { - new DisableOsgiFramework().installBundle("foo"); + @Test + void require_that_installBundle_throws_exception() throws BundleException { + assertThrows(RuntimeException.class, () -> { + new DisableOsgiFramework().installBundle("foo"); + }); } - @Test(expected = RuntimeException.class) - public void require_that_startBundles_throws_exception() throws BundleException { - new DisableOsgiFramework().startBundles(null, true); + @Test + void require_that_startBundles_throws_exception() throws BundleException { + assertThrows(RuntimeException.class, () -> { + new DisableOsgiFramework().startBundles(null, true); + }); } - @Test(expected = RuntimeException.class) - public void require_that_bundleContext_throws_exception() throws BundleException { - new DisableOsgiFramework().bundleContext(); + @Test + void require_that_bundleContext_throws_exception() throws BundleException { + assertThrows(RuntimeException.class, () -> { + new DisableOsgiFramework().bundleContext(); + }); } - @Test(expected = RuntimeException.class) - public void require_that_refreshPackages_throws_exception() { - new DisableOsgiFramework().refreshPackages(); + @Test + void require_that_refreshPackages_throws_exception() { + assertThrows(RuntimeException.class, () -> { + new DisableOsgiFramework().refreshPackages(); + }); } - @Test(expected = RuntimeException.class) - public void require_that_bundles_throws_exception() { - new DisableOsgiFramework().bundles(); + @Test + void require_that_bundles_throws_exception() { + assertThrows(RuntimeException.class, () -> { + new DisableOsgiFramework().bundles(); + }); } - @Test(expected = RuntimeException.class) - public void require_that_start_throws_exception() throws BundleException { - new DisableOsgiFramework().start(); + @Test + void require_that_start_throws_exception() throws BundleException { + assertThrows(RuntimeException.class, () -> { + new DisableOsgiFramework().start(); + }); } - @Test(expected = RuntimeException.class) - public void require_that_stop_throws_exception() throws BundleException { - new DisableOsgiFramework().stop(); + @Test + void require_that_stop_throws_exception() throws BundleException { + assertThrows(RuntimeException.class, () -> { + new DisableOsgiFramework().stop(); + }); } } diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java index 70e956480ed..fe18206b5af 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java @@ -9,15 +9,15 @@ import com.yahoo.jdisc.http.ServerConfig; import com.yahoo.jdisc.http.filter.RequestFilter; import com.yahoo.jdisc.http.filter.ResponseFilter; import com.yahoo.jdisc.http.server.jetty.FilterBindings; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; import java.util.stream.Collectors; -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; import static org.mockito.Mockito.mock; /** @@ -28,7 +28,7 @@ public class FilterBindingsProviderTest { final ServerConfig.Builder configBuilder = new ServerConfig.Builder(); @Test - public void requireThatEmptyInputGivesEmptyOutput() { + void requireThatEmptyInputGivesEmptyOutput() { final FilterChainRepository filterChainRepository = new FilterChainRepository( new ChainsConfig(new ChainsConfig.Builder()), new ComponentRegistry<>(), @@ -50,7 +50,7 @@ public class FilterBindingsProviderTest { } @Test - public void requireThatCorrectlyConfiguredFiltersAreIncluded() { + void requireThatCorrectlyConfiguredFiltersAreIncluded() { final String requestFilter1Id = "requestFilter1"; final String requestFilter2Id = "requestFilter2"; final String requestFilter3Id = "requestFilter3"; @@ -107,7 +107,7 @@ public class FilterBindingsProviderTest { private interface DualRoleFilter extends RequestFilter, ResponseFilter {} @Test - public void requireThatInstanceCanNotBeBothRequestAndResponseFilter() { + void requireThatInstanceCanNotBeBothRequestAndResponseFilter() { final String filterId = "filter"; // Set up config. @@ -137,7 +137,7 @@ public class FilterBindingsProviderTest { } @Test - public void requireThatConfigWithUnknownReferenceFails() { + void requireThatConfigWithUnknownReferenceFails() { // Set up config. configBuilder.filter(new ServerConfig.Filter.Builder().id("someFilter").binding("http://*/*")); diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/component/DeconstructorTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/component/DeconstructorTest.java index 715c2759aa6..76b4d7701ea 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/component/DeconstructorTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/component/DeconstructorTest.java @@ -6,8 +6,8 @@ import com.yahoo.container.bundle.MockBundle; import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.jdisc.ResourceReference; import com.yahoo.jdisc.SharedResource; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.time.Instant; import java.util.List; @@ -15,7 +15,7 @@ import java.util.function.Supplier; import static java.util.Collections.emptyList; import static java.util.Collections.singleton; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author gjoranv @@ -23,13 +23,13 @@ import static org.junit.Assert.assertTrue; public class DeconstructorTest { public static Deconstructor deconstructor; - @Before + @BeforeEach public void init() { deconstructor = new Deconstructor(); } @Test - public void deconstructor_waits_for_completion_on_shutdown() { + void deconstructor_waits_for_completion_on_shutdown() { deconstructor = new Deconstructor(); var slowDeconstructComponent = new SlowDeconstructComponent(); @@ -39,7 +39,7 @@ public class DeconstructorTest { } @Test - public void require_abstract_component_destructed() throws InterruptedException { + void require_abstract_component_destructed() throws InterruptedException { TestAbstractComponent abstractComponent = new TestAbstractComponent(); deconstructor.deconstruct(0, List.of(abstractComponent), emptyList()); @@ -48,7 +48,7 @@ public class DeconstructorTest { } @Test - public void require_provider_destructed() throws InterruptedException { + void require_provider_destructed() throws InterruptedException { TestProvider provider = new TestProvider(); deconstructor.deconstruct(0, List.of(provider), emptyList()); @@ -57,7 +57,7 @@ public class DeconstructorTest { } @Test - public void require_shared_resource_released() throws InterruptedException { + void require_shared_resource_released() throws InterruptedException { TestSharedResource sharedResource = new TestSharedResource(); deconstructor.deconstruct(0, List.of(sharedResource), emptyList()); waitForDeconstructToComplete(() -> sharedResource.released); @@ -65,7 +65,7 @@ public class DeconstructorTest { } @Test - public void bundles_are_uninstalled() throws InterruptedException { + void bundles_are_uninstalled() throws InterruptedException { var bundle = new UninstallableMockBundle(); // Done by executor, so it takes some time even with a 0 delay. deconstructor.deconstruct(0, emptyList(), singleton(bundle)); diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumerTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumerTest.java index 95b179c207f..982ad4389c2 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumerTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/ForwardingMetricConsumerTest.java @@ -3,13 +3,13 @@ package com.yahoo.container.jdisc.metric; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.application.MetricConsumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Simon Thoresen Hult @@ -17,7 +17,7 @@ import static org.junit.Assert.assertNotNull; public class ForwardingMetricConsumerTest { @Test - public void requireThatAllMethodsAreForwarded() { + void requireThatAllMethodsAreForwarded() { MetricConsumer fooConsumer = Mockito.mock(MetricConsumer.class); Metric.Context fooCtx = Mockito.mock(Metric.Context.class); Mockito.when(fooConsumer.createContext(Mockito.<Map<String, ?>>any())).thenReturn(fooCtx); @@ -26,7 +26,7 @@ public class ForwardingMetricConsumerTest { Metric.Context barCtx = Mockito.mock(Metric.Context.class); Mockito.when(barConsumer.createContext(Mockito.<Map<String, ?>>any())).thenReturn(barCtx); - MetricConsumer fwdConsumer = new ForwardingMetricConsumer(new MetricConsumer[] { fooConsumer, barConsumer }); + MetricConsumer fwdConsumer = new ForwardingMetricConsumer(new MetricConsumer[]{fooConsumer, barConsumer}); Map<String, ?> properties = new HashMap<>(); Metric.Context ctx = fwdConsumer.createContext(properties); diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java index e4f8c6d76ed..8e38420b872 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java @@ -3,13 +3,13 @@ package com.yahoo.container.jdisc.metric; import com.yahoo.jdisc.Metric; import com.yahoo.test.ManualClock; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.management.ManagementFactory; import java.time.Duration; import java.util.LinkedList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -21,7 +21,7 @@ import static org.mockito.Mockito.verify; */ public class GarbageCollectionMetricsTest { @Test - public void gc_metrics_are_collected_in_a_sliding_window() { + void gc_metrics_are_collected_in_a_sliding_window() { ManualClock clock = new ManualClock(); Metric metric = mock(Metric.class); int garbageCollectors = ManagementFactory.getGarbageCollectorMXBeans().size(); diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java index e0650ad3d0c..5a67b7189c4 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java @@ -2,12 +2,11 @@ package com.yahoo.container.jdisc.metric; import com.yahoo.jdisc.application.MetricConsumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; /** * @author Simon Thoresen Hult @@ -15,14 +14,14 @@ import static org.junit.Assert.assertSame; public class MetricConsumerProviderTest { @Test - public void requireThatSingleConsumerIsNotDelegated() { + void requireThatSingleConsumerIsNotDelegated() { MetricConsumer consumer = Mockito.mock(MetricConsumer.class); MetricConsumerProvider provider = MetricConsumerProviders.newSingletonFactories(consumer); assertSame(consumer, provider.newInstance()); } @Test - public void requireThatMultipleConsumersAreDelegated() { + void requireThatMultipleConsumersAreDelegated() { MetricConsumer foo = Mockito.mock(MetricConsumer.class); MetricConsumer bar = Mockito.mock(MetricConsumer.class); MetricConsumerProvider provider = MetricConsumerProviders.newSingletonFactories(foo, bar); diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricProviderTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricProviderTest.java index eac3ad2f060..5ad7d5767a6 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricProviderTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricProviderTest.java @@ -4,7 +4,7 @@ package com.yahoo.container.jdisc.metric; import com.yahoo.container.di.componentgraph.Provider; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.application.MetricConsumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.concurrent.Callable; @@ -13,9 +13,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import static org.junit.Assert.assertNotNull; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Simon Thoresen Hult @@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue; public class MetricProviderTest { @Test - public void requireThatMetricProviderDelegatesToConsumerFactory() { + void requireThatMetricProviderDelegatesToConsumerFactory() { MetricConsumer consumer = Mockito.mock(MetricConsumer.class); MetricProvider provider = MetricProviders.newInstance(consumer); @@ -38,7 +38,7 @@ public class MetricProviderTest { } @Test - public void requireThatThreadLocalConsumersAreProvided() throws Exception { + void requireThatThreadLocalConsumersAreProvided() throws Exception { AtomicInteger cnt = new AtomicInteger(0); final MetricProvider metricProvider = MetricProviders.newInstance(MetricConsumerFactories.newCounter(cnt)); assertEquals(0, cnt.get()); diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java index 0652f35a5d1..bc196b08ab9 100644 --- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java +++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricUpdaterTest.java @@ -3,7 +3,7 @@ package com.yahoo.container.jdisc.metric; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.statistics.ContainerWatchdogMetrics; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.management.ManagementFactory; import java.time.Duration; @@ -18,16 +18,16 @@ import static org.mockito.Mockito.verify; * @author bjorncs */ public class MetricUpdaterTest { - + @Test - public void metrics_are_updated_in_scheduler_cycle() { + void metrics_are_updated_in_scheduler_cycle() { int gcCount = ManagementFactory.getGarbageCollectorMXBeans().size(); Metric metric = mock(Metric.class); ContainerWatchdogMetrics containerWatchdogMetrics = mock(ContainerWatchdogMetrics.class); new MetricUpdater(new MockScheduler(), metric, containerWatchdogMetrics); verify(containerWatchdogMetrics, times(1)).emitMetrics(any()); - verify(metric, times(13 + 2 * gcCount)).set(anyString(), any(), any()); + verify(metric, times(14 + 2 * gcCount)).set(anyString(), any(), any()); } private static class MockScheduler implements MetricUpdater.Scheduler { |