diff options
Diffstat (limited to 'config-application-package/src/test/java/com/yahoo')
4 files changed, 16 insertions, 27 deletions
diff --git a/config-application-package/src/test/java/com/yahoo/config/application/ConfigDefinitionDirTest.java b/config-application-package/src/test/java/com/yahoo/config/application/ConfigDefinitionDirTest.java index b6b5936eda7..65e06a71583 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/ConfigDefinitionDirTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/ConfigDefinitionDirTest.java @@ -12,8 +12,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.jar.JarFile; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** @@ -32,9 +31,9 @@ public class ConfigDefinitionDirTest { File defDir = temporaryFolder.newFolder(); ConfigDefinitionDir dir = new ConfigDefinitionDir(defDir); Bundle bundle = new Bundle(new JarFile(bundleFile), bundleFile); - assertThat(defDir.listFiles().length, is(0)); - dir.addConfigDefinitionsFromBundle(bundle, new ArrayList<Bundle>()); - assertThat(defDir.listFiles().length, is(1)); + assertEquals(0, defDir.listFiles().length); + dir.addConfigDefinitionsFromBundle(bundle, new ArrayList<>()); + assertEquals(1, defDir.listFiles().length); } @@ -62,10 +61,10 @@ public class ConfigDefinitionDirTest { try { dir.addConfigDefinitionsFromBundle(bundle2, bundlesAdded); } catch (IllegalArgumentException e) { - assertThat(e.getMessage(), - is("The config definition with name 'bar.foo' contained in the bundle '" + - bundleFileName + - "' conflicts with the same config definition in the bundle 'com.yahoo.searcher1.jar'. Please choose a different name.")); + assertEquals("The config definition with name 'bar.foo' contained in the bundle '" + + bundleFileName + + "' conflicts with the same config definition in the bundle 'com.yahoo.searcher1.jar'. Please choose a different name.", + e.getMessage()); } } } diff --git a/config-application-package/src/test/java/com/yahoo/config/application/PropertiesProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/PropertiesProcessorTest.java index fe9ca4a7951..41e08e00040 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/PropertiesProcessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/PropertiesProcessorTest.java @@ -4,17 +4,12 @@ package com.yahoo.config.application; import org.custommonkey.xmlunit.XMLUnit; import org.junit.Test; import org.w3c.dom.Document; -import org.xml.sax.SAXException; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.stream.XMLStreamException; import javax.xml.transform.TransformerException; -import java.io.IOException; import java.io.StringReader; import java.util.Map; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; /** * @author hmusum @@ -44,9 +39,9 @@ public class PropertiesProcessorTest { PropertiesProcessor p = new PropertiesProcessor(); p.process(Xml.getDocument(new StringReader(input))); Map<String, String> properties = p.getProperties(); - assertThat(properties.size(), is(2)); - assertThat(properties.get("slobrok.port"), is("4099")); - assertThat(properties.get("redundancy"), is("2")); + assertEquals(2, properties.size()); + assertEquals("4099", properties.get("slobrok.port")); + assertEquals("2", properties.get("redundancy")); } @Test diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java index 44656f8f534..be4d8fdab25 100644 --- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java @@ -15,14 +15,11 @@ import org.xml.sax.SAXException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -92,7 +89,7 @@ public class FilesApplicationPackageTest { FilesApplicationPackage app = FilesApplicationPackage.fromFile(appDir); assertTrue(app.getDeployment().isPresent()); assertFalse(app.getMajorVersion().isPresent()); - assertThat(IOUtils.readAll(new FileReader(deployment)), is(IOUtils.readAll(app.getDeployment().get()))); + assertEquals(IOUtils.readAll(app.getDeployment().get()), IOUtils.readAll(new FileReader(deployment))); } @Test @@ -104,7 +101,7 @@ public class FilesApplicationPackageTest { assertTrue(app.getDeployment().isPresent()); assertTrue(app.getMajorVersion().isPresent()); assertEquals(6, (int)app.getMajorVersion().get()); - assertThat(IOUtils.readAll(new FileReader(deployment)), is(IOUtils.readAll(app.getDeployment().get()))); + assertEquals(IOUtils.readAll(app.getDeployment().get()), IOUtils.readAll(new FileReader(deployment))); } } diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepoTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepoTest.java index 0f32ff46b9f..1cfd737a857 100644 --- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepoTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepoTest.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model.application.provider; -import com.yahoo.config.model.application.provider.StaticConfigDefinitionRepo; import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.io.IOUtils; import com.yahoo.vespa.config.ConfigDefinitionKey; @@ -12,8 +11,7 @@ import org.junit.rules.TemporaryFolder; import java.io.File; import java.io.IOException; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; /** * @author Ulf Lilleengen @@ -31,7 +29,7 @@ public class StaticConfigDefinitionRepoTest { addFile(defDir, new ConfigDefinitionKey("foo", "foons"), "namespace=foons\nval int\n"); addFile(defDir, new ConfigDefinitionKey("bar", "barns"), "namespace=barns\nval string\n"); ConfigDefinitionRepo repo = new StaticConfigDefinitionRepo(defDir); - assertThat(repo.getConfigDefinitions().size(), is(2)); + assertEquals(2, repo.getConfigDefinitions().size()); } private void addFile(File defDir, ConfigDefinitionKey key, String content) throws IOException { |