summaryrefslogtreecommitdiffstats
path: root/chain
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-08-11 18:06:06 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-08-11 18:06:06 +0000
commitdb6c660d7020ebbfa14d7c0fea8fea422c2b4026 (patch)
tree610bdc5791acb54051895b0199c0f379b35161eb /chain
parentce60b7900412c4df420c86d458535cfd6b01065c (diff)
Reduce the use of hamcrest when normal assertEquals/assertTrue does a mucj better job
Diffstat (limited to 'chain')
-rwxr-xr-xchain/pom.xml5
-rw-r--r--chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java7
2 files changed, 3 insertions, 9 deletions
diff --git a/chain/pom.xml b/chain/pom.xml
index 2ead24a89b7..67ee1a4c0e7 100755
--- a/chain/pom.xml
+++ b/chain/pom.xml
@@ -26,11 +26,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.yahoo.vespa</groupId>
<artifactId>provided-dependencies</artifactId>
<version>${project.version}</version>
diff --git a/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java b/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java
index 2a22b5afbf7..7cef03bbb06 100644
--- a/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java
+++ b/chain/src/test/java/com/yahoo/component/chain/model/ChainsModelBuilderTest.java
@@ -11,8 +11,7 @@ import java.util.Set;
import static com.yahoo.container.core.ChainsConfig.Components;
import static com.yahoo.container.core.ChainsConfig.Chains;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
@@ -23,7 +22,7 @@ public class ChainsModelBuilderTest {
@Test
public void components_are_added_to_componentModels() throws Exception {
ChainsModel model = chainsModel();
- assertThat(model.allComponents().size(), is(2));
+ assertEquals(2, model.allComponents().size());
assertTrue(model.componentModels().containsKey(new ComponentId("componentA")));
}
@@ -38,7 +37,7 @@ public class ChainsModelBuilderTest {
public void inherited_chains_are_added_to_chainSpecification() throws Exception {
ChainsModel model = chainsModel();
ChainSpecification inheritsChain1 = model.chainSpecifications().get(new ComponentId("inheritsChain1")).model();
- assertThat(model.allChainsFlattened().size(), is(2));
+ assertEquals(2, model.allChainsFlattened().size());
assertTrue(getComponentsByName(inheritsChain1.inheritance.chainSpecifications).containsKey("chain1"));
assertTrue(getComponentsByName(inheritsChain1.inheritance.excludedComponents).containsKey("componentA"));
}