diff options
Diffstat (limited to 'container-core/src/test/java/com/yahoo/component/chain')
3 files changed, 33 insertions, 35 deletions
diff --git a/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java index a83de433968..6e107bf9934 100644 --- a/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java +++ b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/ChainBuilderTest.java @@ -8,7 +8,7 @@ import com.yahoo.component.chain.Phase; import com.yahoo.component.chain.dependencies.After; import com.yahoo.component.chain.dependencies.Before; import com.yahoo.component.chain.dependencies.Provides; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -18,8 +18,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -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; /** * @author Tony Vaagenes @@ -56,7 +56,7 @@ public class ChainBuilderTest { } @Test - public void testRegular() throws Exception { + void testRegular() throws Exception { ChainBuilder chainBuilder = createDependencyHandler(); addAtoG(chainBuilder); @@ -64,13 +64,13 @@ public class ChainBuilderTest { Chain<ChainedComponent> res = chainBuilder.orderNodes(); Iterator<ChainedComponent> i = res.components().iterator(); - for (char j=0; j< 'G' - 'A'; ++j) { - assertEquals(String.valueOf((char)('A' + j)), name(i.next())); + for (char j = 0; j < 'G' - 'A'; ++j) { + assertEquals(String.valueOf((char) ('A' + j)), name(i.next())); } } @Test - public void testCycle() throws Exception { + void testCycle() throws Exception { ChainBuilder chainBuilder = createDependencyHandler(); @@ -88,7 +88,7 @@ public class ChainBuilderTest { @Test - public void testPhaseAndSearcher() { + void testPhaseAndSearcher() { ChainBuilder depHandler = newChainBuilder(); depHandler.addPhase(new Phase("phase1", set("phase2"), Collections.<String>emptySet())); depHandler.addPhase(new Phase("phase2", set("phase3"), set("phase1"))); @@ -103,7 +103,7 @@ public class ChainBuilderTest { } @Test - public void testInputOrderPreservedWhenProvidesOverlap() { + void testInputOrderPreservedWhenProvidesOverlap() { ChainBuilder chainBuilder = newChainBuilder(); A a1 = new A(); @@ -136,38 +136,38 @@ public class ChainBuilderTest { } @Test - public void testAfterAll1() throws Exception { + void testAfterAll1() throws Exception { ChainBuilder chainBuilder = createDependencyHandler(); ChainedComponent afterAll1 = new AfterAll(); chainBuilder.addComponent(afterAll1); addAtoG(chainBuilder); - List<ChainedComponent> resolution= chainBuilder.orderNodes().components(); - assertEquals(afterAll1,resolution.get(resolution.size()-1)); + List<ChainedComponent> resolution = chainBuilder.orderNodes().components(); + assertEquals(afterAll1, resolution.get(resolution.size() - 1)); } @Test - public void testAfterAll2() throws Exception { + void testAfterAll2() throws Exception { ChainBuilder chainBuilder = createDependencyHandler(); addAtoG(chainBuilder); ChainedComponent afterAll1 = new AfterAll(); chainBuilder.addComponent(afterAll1); List<ChainedComponent> resolution = chainBuilder.orderNodes().components(); - assertEquals(afterAll1,resolution.get(resolution.size()-1)); + assertEquals(afterAll1, resolution.get(resolution.size() - 1)); } @Test - public void testAfterImplicitProvides() + void testAfterImplicitProvides() throws InstantiationException, IllegalAccessException { ChainBuilder chainBuilder = createDependencyHandler(); - ChainedComponent afterProvidesNothing=new AfterProvidesNothing(); - ChainedComponent providesNothing=new ProvidesNothing(); + ChainedComponent afterProvidesNothing = new AfterProvidesNothing(); + ChainedComponent providesNothing = new ProvidesNothing(); chainBuilder.addComponent(afterProvidesNothing); chainBuilder.addComponent(providesNothing); List<ChainedComponent> resolution = chainBuilder.orderNodes().components(); - assertEquals(providesNothing,resolution.get(0)); - assertEquals(afterProvidesNothing,resolution.get(1)); + assertEquals(providesNothing, resolution.get(0)); + assertEquals(afterProvidesNothing, resolution.get(1)); } private ChainBuilder createDependencyHandler() { diff --git a/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java index c33fb71a07c..a5704b51bbe 100644 --- a/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java +++ b/container-core/src/test/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodesTest.java @@ -1,19 +1,17 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.component.chain.dependencies.ordering; -import static org.junit.Assert.assertEquals; - import java.util.Arrays; import com.yahoo.component.chain.ChainedComponent; -import com.yahoo.component.chain.dependencies.Dependencies; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import com.yahoo.component.chain.dependencies.Dependencies; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.yahoo.component.ComponentId; - /** * Test for OrderedReadyNodes. * @@ -41,13 +39,13 @@ public class OrderedReadyNodesTest { private OrderedReadyNodes readyNodes; - @Before + @BeforeEach public void setup() { readyNodes = new OrderedReadyNodes(); } @Test - public void require_NameProviders_before_SearcherNodes() { + void require_NameProviders_before_SearcherNodes() { NameProvider nameProvider = createDummyNameProvider(100); ComponentNode componentNode = new ComponentNode<>(createFakeComponentA("a"), 1); @@ -72,7 +70,7 @@ public class OrderedReadyNodesTest { } @Test - public void require_SearcherNodes_ordered_by_insertion_order() { + void require_SearcherNodes_ordered_by_insertion_order() { int priority = 0; ComponentNode a = new ComponentNode<>(createFakeComponentB("1"), priority++); ComponentNode b = new ComponentNode<>(createFakeComponentA("2"), priority++); diff --git a/container-core/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java b/container-core/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java index 54b57789ba8..0871b36b0b3 100644 --- a/container-core/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java +++ b/container-core/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java @@ -4,15 +4,15 @@ package com.yahoo.component.chain.model; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; import com.yahoo.container.core.ChainsConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.Set; import static com.yahoo.container.core.ChainsConfig.Components; import static com.yahoo.container.core.ChainsConfig.Chains; -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; /** * @author gjoranv @@ -20,27 +20,27 @@ import static org.junit.Assert.assertTrue; public class ChainsModelBuilderTest { @Test - public void components_are_added_to_componentModels() throws Exception { + void components_are_added_to_componentModels() throws Exception { ChainsModel model = chainsModel(); assertEquals(2, model.allComponents().size()); assertTrue(model.componentModels().containsKey(new ComponentId("componentA"))); } @Test - public void components_are_added_to_chainSpecification() throws Exception { + void components_are_added_to_chainSpecification() throws Exception { ChainsModel model = chainsModel(); ChainSpecification chainSpec = model.chainSpecifications().get(new ComponentId("chain1")).model(); assertTrue(getComponentsByName(chainSpec.componentReferences).containsKey("componentA")); } @Test - public void inherited_chains_are_added_to_chainSpecification() throws Exception { + void inherited_chains_are_added_to_chainSpecification() throws Exception { ChainsModel model = chainsModel(); ChainSpecification inheritsChain1 = model.chainSpecifications().get(new ComponentId("inheritsChain1")).model(); assertEquals(2, model.allChainsFlattened().size()); assertTrue(getComponentsByName(inheritsChain1.inheritance.chainSpecifications).containsKey("chain1")); assertTrue(getComponentsByName(inheritsChain1.inheritance.excludedComponents).containsKey("componentA")); - } + } private ChainsModel chainsModel() { ChainsConfig.Builder builder = new ChainsConfig.Builder() |