diff options
author | Jon Bratseth <bratseth@oath.com> | 2020-08-13 10:43:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-13 10:43:03 +0200 |
commit | 318fe9d9556d76c92cacdd6728d4a30e0d34560c (patch) | |
tree | 13116f453df9e7ee24ac0550f7e6988de3f0cee9 | |
parent | 2c78f4d6652a580e6a3a5ef7a8ab8b2d7c1a5842 (diff) | |
parent | 38285e0e1147042b519957958083e537e6d90fc9 (diff) |
Merge pull request #14035 from vespa-engine/balder/unify-tests
Minor unification of tests.
30 files changed, 190 insertions, 392 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 { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java index f776db6f942..0f9de516a4b 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java @@ -13,8 +13,7 @@ import org.junit.Test; import org.w3c.dom.Element; import static com.yahoo.collections.CollectionUtil.first; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; /** @@ -24,7 +23,7 @@ public class FilterBindingsTest extends DomBuilderTest { private static final String MY_CHAIN_BINDING = "http://*/my-chain-binding"; - private Http buildHttp(Element xml) throws Exception { + private Http buildHttp(Element xml) { Http http = new HttpBuilder().build(root.getDeployState(), root, xml); root.freezeModelTopology(); http.validate(); @@ -50,8 +49,8 @@ public class FilterBindingsTest extends DomBuilderTest { Http http = buildHttp(xml); Binding binding = first(http.getBindings()); - assertThat(binding.filterId().getName(), is("my-request-chain")); - assertThat(binding.binding(), is(MY_CHAIN_BINDING)); + assertEquals("my-request-chain", binding.filterId().getName()); + assertEquals(MY_CHAIN_BINDING, binding.binding()); Chain<Filter> myChain = http.getFilterChains().allChains().getComponent("my-request-chain"); assertNotNull("Missing chain", myChain); @@ -70,15 +69,15 @@ public class FilterBindingsTest extends DomBuilderTest { Http http = buildHttp(xml); Binding binding = first(http.getBindings()); - assertThat(binding.filterId().getName(), is("my-response-chain")); - assertThat(binding.binding(), is(MY_CHAIN_BINDING)); + assertEquals("my-response-chain", binding.filterId().getName()); + assertEquals(MY_CHAIN_BINDING, binding.binding()); Chain<Filter> myChain = http.getFilterChains().allChains().getComponent("my-response-chain"); assertNotNull("Missing chain", myChain); } @Test - public void bindings_are_added_to_config_for_all_http_servers_with_jetty() throws Exception { + public void bindings_are_added_to_config_for_all_http_servers_with_jetty() { final Element xml = parse( "<container version='1.0'>", " <http>", @@ -95,15 +94,15 @@ public class FilterBindingsTest extends DomBuilderTest { { final ServerConfig config = root.getConfig(ServerConfig.class, "container/http/jdisc-jetty/server1"); - assertThat(config.filter().size(), is(1)); - assertThat(config.filter(0).id(), is("my-request-chain")); - assertThat(config.filter(0).binding(), is(MY_CHAIN_BINDING)); + assertEquals(1, config.filter().size()); + assertEquals("my-request-chain", config.filter(0).id()); + assertEquals(MY_CHAIN_BINDING, config.filter(0).binding()); } { final ServerConfig config = root.getConfig(ServerConfig.class, "container/http/jdisc-jetty/server2"); - assertThat(config.filter().size(), is(1)); - assertThat(config.filter(0).id(), is("my-request-chain")); - assertThat(config.filter(0).binding(), is(MY_CHAIN_BINDING)); + assertEquals(1, config.filter().size()); + assertEquals("my-request-chain", config.filter(0).id()); + assertEquals(MY_CHAIN_BINDING, config.filter(0).binding()); } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java index a2d13439f4e..b2f9c805be1 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java @@ -20,11 +20,13 @@ import static com.yahoo.test.Matchers.hasItemWithMethod; import static com.yahoo.vespa.model.container.search.ContainerSearch.QUERY_PROFILE_REGISTRY_CLASS; import static com.yahoo.vespa.model.container.xml.ContainerModelBuilder.SEARCH_HANDLER_BINDING; import static com.yahoo.vespa.model.container.xml.ContainerModelBuilder.SEARCH_HANDLER_CLASS; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * @author gjoranv @@ -46,7 +48,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { createModel(root, clusterElem); String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString(); - assertThat(discBindingsConfig, containsString(GUIHandler.BINDING)); + assertTrue(discBindingsConfig.contains(GUIHandler.BINDING)); ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default"); @@ -56,7 +58,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { guiHandler = (GUIHandler) handler; } } - if (guiHandler == null) fail(); + assertNotNull(guiHandler); } @Test @@ -73,9 +75,9 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { createModel(root, clusterElem); String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString(); - assertThat(discBindingsConfig, containsString(".serverBindings[0] \"binding0\"")); - assertThat(discBindingsConfig, containsString(".serverBindings[1] \"binding1\"")); - assertThat(discBindingsConfig, not(containsString("/search/*"))); + assertTrue(discBindingsConfig.contains(".serverBindings[0] \"binding0\"")); + assertTrue(discBindingsConfig.contains(".serverBindings[1] \"binding1\"")); + assertFalse(discBindingsConfig.contains("/search/*")); } @Test @@ -91,7 +93,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { createModel(root, clusterElem); String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString(); - assertThat(discBindingsConfig, not(containsString("/search/*"))); + assertFalse(discBindingsConfig.contains("/search/*")); } @Test @@ -109,8 +111,8 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { createModel(root, clusterElem); var discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default"); - assertThat(discBindingsConfig.handlers(myHandler).serverBindings(0), is(SEARCH_HANDLER_BINDING)); - assertThat(discBindingsConfig.handlers(SEARCH_HANDLER_CLASS), is(nullValue())); + assertEquals(SEARCH_HANDLER_BINDING, discBindingsConfig.handlers(myHandler).serverBindings(0)); + assertNull(discBindingsConfig.handlers(SEARCH_HANDLER_CLASS)); } // TODO: remove test when all containers are named 'container' @@ -118,7 +120,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { public void cluster_with_only_search_gets_qrserver_as_service_name() { createClusterWithOnlyDefaultChains(); ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default"); - assertThat(cluster.getContainers().get(0).getServiceName(), is(QRSERVER.serviceName)); + assertEquals(QRSERVER.serviceName, cluster.getContainers().get(0).getServiceName()); } @Test @@ -162,7 +164,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { createModel(root, clusterElem); fail("Expected exception"); } catch (Exception e) { - assertThat(e.getMessage(), containsString("Setting up com.yahoo.search.handler.SearchHandler manually is not supported")); + assertTrue(e.getMessage().contains("Setting up com.yahoo.search.handler.SearchHandler manually is not supported")); } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java index 0a97bcc700f..27c88ad2d1f 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java @@ -40,12 +40,10 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import static com.yahoo.test.PatternMatcher.matchesPattern; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -796,7 +794,7 @@ public class ContentClusterTest extends ContentBaseTest { private static void assertPrepareRestartCommand(ContentCluster cluster) { Optional<String> command = cluster.getSearch().getSearchNodes().get(0).getPreShutdownCommand(); assertTrue(command.isPresent()); - assertThat(command.get(), matchesPattern(".*vespa-proton-cmd [0-9]+ prepareRestart")); + assertTrue(command.get().matches(".*vespa-proton-cmd [0-9]+ prepareRestart")); } private static void assertNoPreShutdownCommand(ContentCluster cluster) { 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 f9662dc9f98..e3039e88525 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 @@ -10,8 +10,6 @@ import com.yahoo.jdisc.application.UriPattern; 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.filter.SecurityRequestFilter; -import com.yahoo.jdisc.http.filter.SecurityResponseFilter; import com.yahoo.jdisc.http.server.FilterBindings; import org.hamcrest.Description; import org.hamcrest.Matcher; @@ -23,11 +21,11 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.nullValue; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; @@ -54,9 +52,9 @@ public class FilterBindingsProviderTest { final FilterBindings filterBindings = provider.get(); - assertThat(filterBindings, is(not(nullValue()))); - assertThat(filterBindings.getRequestFilters().iterator().hasNext(), is(false)); - assertThat(filterBindings.getResponseFilters().iterator().hasNext(), is(false)); + assertNotNull(filterBindings); + assertFalse(filterBindings.getRequestFilters().iterator().hasNext()); + assertFalse(filterBindings.getResponseFilters().iterator().hasNext()); } @Test @@ -93,21 +91,21 @@ public class FilterBindingsProviderTest { new ChainsConfig(new ChainsConfig.Builder()), availableRequestFilters, availableResponseFilters, - new ComponentRegistry<SecurityRequestFilter>(), - new ComponentRegistry<SecurityResponseFilter>()); + new ComponentRegistry<>(), + new ComponentRegistry<>()); // Set up the provider that we aim to test. final FilterBindingsProvider provider = new FilterBindingsProvider( new ComponentId("foo"), new ServerConfig(configBuilder), filterChainRepository, - new ComponentRegistry<SecurityRequestFilter>()); + new ComponentRegistry<>()); // Execute. final FilterBindings filterBindings = provider.get(); // Verify. - assertThat(filterBindings, is(not(nullValue()))); + assertNotNull(filterBindings); assertThat( filterBindings.getRequestFilters(), containsFilters(requestFilter1Instance, requestFilter2Instance)); @@ -150,7 +148,7 @@ public class FilterBindingsProviderTest { new ComponentRegistry<>()); fail("Dual-role filter should not be accepted"); } catch (RuntimeException e) { - assertThat(e.getMessage(), containsString("Invalid config")); + assertTrue(e.getMessage().contains("Invalid config")); } } @@ -175,7 +173,7 @@ public class FilterBindingsProviderTest { new ComponentRegistry<>()); fail("Config with unknown filter reference should not be accepted"); } catch (RuntimeException e) { - assertThat(e.getMessage(), containsString("Invalid config")); + assertTrue(e.getMessage().contains("Invalid config")); } } @@ -183,7 +181,7 @@ public class FilterBindingsProviderTest { @SuppressWarnings("varargs") private static <T> Matcher<? super BindingRepository<T>> containsFilters( final T... requiredInstances) { - return new TypeSafeMatcher<BindingRepository<T>>() { + return new TypeSafeMatcher<>() { private final Set<T> requiredFilterSet = new HashSet<>(Arrays.asList(requiredInstances)); @Override 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 6a669d9f7f9..33dd1dade2f 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 @@ -9,8 +9,7 @@ import java.lang.management.ManagementFactory; import java.time.Duration; import java.util.LinkedList; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -29,7 +28,7 @@ public class GarbageCollectionMetricsTest { Duration interval = GarbageCollectionMetrics.REPORTING_INTERVAL; GarbageCollectionMetrics garbageCollectionMetrics = new GarbageCollectionMetrics(clock); - assertThat(garbageCollectionMetrics.getGcStatistics().keySet().size(), is(garbageCollectors)); + assertEquals(garbageCollectors, garbageCollectionMetrics.getGcStatistics().keySet().size()); clock.advance(interval.minus(Duration.ofMillis(10))); garbageCollectionMetrics.emitMetrics(metric); @@ -52,7 +51,7 @@ public class GarbageCollectionMetricsTest { private static void assertWindowLengths(GarbageCollectionMetrics gcm, int count) { for(LinkedList<GarbageCollectionMetrics.GcStats> window: gcm.getGcStatistics().values()) { - assertThat(window.size(), is(count)); + assertEquals(count, window.size()); } } } diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java index 2f84f84249b..1ca6cd5662e 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java @@ -21,9 +21,8 @@ import org.mockito.ArgumentMatchers; import java.util.OptionalLong; -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; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -70,7 +69,7 @@ public class DockerImplTest { final ProcessResult result = docker.executeInContainerAsUser( new ContainerName(containerId), "root", OptionalLong.empty(), command); - assertThat(result.getExitStatus(), is(exitCode)); + assertEquals(exitCode, result.getExitStatus()); } @Test diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ProcessResultTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ProcessResultTest.java index 0f1ad8a3466..590833151f2 100644 --- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ProcessResultTest.java +++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/ProcessResultTest.java @@ -3,21 +3,22 @@ package com.yahoo.vespa.hosted.dockerapi; import org.junit.Test; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class ProcessResultTest { @Test public void testBasicProperties() { ProcessResult processResult = new ProcessResult(0, "foo", "bar"); - assertThat(processResult.getExitStatus(), is(0)); - assertThat(processResult.getOutput(), is("foo")); - assertThat(processResult.isSuccess(), is(true)); + assertEquals(0, processResult.getExitStatus()); + assertEquals("foo", processResult.getOutput()); + assertTrue(processResult.isSuccess()); } @Test public void testSuccessFails() { ProcessResult processResult = new ProcessResult(1, "foo", "bar"); - assertThat(processResult.isSuccess(), is(false)); + assertFalse(processResult.isSuccess()); } } diff --git a/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/HttpPatchTest.java b/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/HttpPatchTest.java index 8161602cdac..3270ac0141e 100644 --- a/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/HttpPatchTest.java +++ b/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/HttpPatchTest.java @@ -21,8 +21,7 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; /** * @author bakksjo @@ -57,8 +56,8 @@ public class HttpPatchTest extends JerseyTest { final Response response = target(TestResourceApi.PATH) .request() .method("PATCH", Entity.text(REQUEST_BODY)); - assertThat(testResourceSingleton.invocation.get(60, TimeUnit.SECONDS), is(REQUEST_BODY)); - assertThat(response.readEntity(String.class), is(REQUEST_BODY)); + assertEquals(REQUEST_BODY, testResourceSingleton.invocation.get(60, TimeUnit.SECONDS)); + assertEquals(REQUEST_BODY, response.readEntity(String.class)); } @Test @@ -76,8 +75,8 @@ public class HttpPatchTest extends JerseyTest { final String responseBody; responseBody = client.apply(api -> api.doPatch(REQUEST_BODY)); - assertThat(testResourceSingleton.invocation.get(60, TimeUnit.SECONDS), is(REQUEST_BODY)); - assertThat(responseBody, is(REQUEST_BODY)); + assertEquals(REQUEST_BODY, testResourceSingleton.invocation.get(60, TimeUnit.SECONDS)); + assertEquals(REQUEST_BODY, responseBody); } public interface TestResourceApi { diff --git a/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategyTest.java b/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategyTest.java index 4a78452c956..bc48ab1c5a6 100644 --- a/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategyTest.java +++ b/jaxrs_client_utils/src/test/java/com/yahoo/vespa/jaxrs/client/RetryingJaxRsStrategyTest.java @@ -20,9 +20,8 @@ import java.util.HashSet; import java.util.Set; import java.util.stream.Collectors; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeast; @@ -72,7 +71,7 @@ public class RetryingJaxRsStrategyTest { assertEquals(REST_PORT, params.uri().getPort()); assertEquals(API_PATH, params.uri().getPath()); assertEquals("http", params.uri().getScheme()); - assertThat(SERVER_HOSTS, hasItem(new HostName(params.uri().getHost()))); + assertTrue(SERVER_HOSTS.contains(new HostName(params.uri().getHost()))); } @Test diff --git a/linguistics/pom.xml b/linguistics/pom.xml index e341258c75f..3cc430dacc6 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -15,11 +15,6 @@ <version>7-SNAPSHOT</version> <dependencies> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java b/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java index 914e3817568..fb313e2d281 100644 --- a/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java @@ -7,11 +7,19 @@ import com.yahoo.language.process.Token; import com.yahoo.language.process.Tokenizer; import org.junit.Test; -import java.util.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; import static com.yahoo.language.LinguisticsCase.toLowerCase; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Test of tokenization, with stemming and accent removal @@ -136,8 +144,8 @@ public class OpenNlpTokenizationTestCase { int idx = 0; for (Token token : tokenizer.tokenize(input, Language.GERMAN, StemMode.SHORTEST, false)) { - assertThat("Token offset for token #" + idx, token.getOffset(), is(expOffset[idx])); - assertThat("Token len for token #" + idx, token.getOrig().length(), is(len[idx])); + assertEquals("Token offset for token #" + idx, expOffset[idx], token.getOffset()); + assertEquals("Token len for token #" + idx, len[idx], token.getOrig().length()); idx++; } } @@ -216,21 +224,21 @@ public class OpenNlpTokenizationTestCase { for (int comp = 0; comp < token.getNumComponents(); comp++) { Token t = token.getComponent(comp); if (t.getType().isIndexable()) { - assertThat("comp index: " + i, toLowerCase(t.getTokenString()), is(indexed.get(i++))); + assertEquals("comp index: " + i, indexed.get(i++), toLowerCase(t.getTokenString())); } } } else { if (token.getType().isIndexable()) { - assertThat("exp index: " + i, toLowerCase(token.getTokenString()), is(indexed.get(i++))); + assertEquals("exp index: " + i, indexed.get(i++), toLowerCase(token.getTokenString())); } } if (orig != null) { - assertThat("orig index: " + j, token.getOrig(), is(orig.get(j++))); + assertEquals("orig index: " + j, token.getOrig(), orig.get(j++)); } } - assertThat("indexed length", i, is(indexed.size())); + assertEquals("indexed length", indexed.size(), i); if (orig != null) { - assertThat("orig length", j, is(orig.size())); + assertEquals("orig length", orig.size(), j); } } diff --git a/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java index 72dd6f8ce58..041a27fb1fc 100644 --- a/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java @@ -5,11 +5,19 @@ import com.yahoo.language.Language; import com.yahoo.language.simple.SimpleTokenizer; import org.junit.Test; -import java.util.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; import static com.yahoo.language.LinguisticsCase.toLowerCase; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Test of tokenization, with stemming and accent removal @@ -134,8 +142,8 @@ public class TokenizationTestCase { int idx = 0; for (Token token : tokenizer.tokenize(input, Language.GERMAN, StemMode.SHORTEST, false)) { - assertThat("Token offset for token #" + idx, token.getOffset(), is(expOffset[idx])); - assertThat("Token len for token #" + idx, token.getOrig().length(), is(len[idx])); + assertEquals("Token offset for token #" + idx, expOffset[idx], token.getOffset()); + assertEquals("Token len for token #" + idx, len[idx], token.getOrig().length()); idx++; } } @@ -214,21 +222,21 @@ public class TokenizationTestCase { for (int comp = 0; comp < token.getNumComponents(); comp++) { Token t = token.getComponent(comp); if (t.getType().isIndexable()) { - assertThat("comp index: " + i, toLowerCase(t.getTokenString()), is(indexed.get(i++))); + assertEquals("comp index: " + i, indexed.get(i++), toLowerCase(t.getTokenString())); } } } else { if (token.getType().isIndexable()) { - assertThat("exp index: " + i, toLowerCase(token.getTokenString()), is(indexed.get(i++))); + assertEquals("exp index: " + i, indexed.get(i++), toLowerCase(token.getTokenString())); } } if (orig != null) { - assertThat("orig index: " + j, token.getOrig(), is(orig.get(j++))); + assertEquals("orig index: " + j, orig.get(j++), token.getOrig()); } } - assertThat("indexed length", i, is(indexed.size())); + assertEquals("indexed length", indexed.size(), i); if (orig != null) { - assertThat("orig length", j, is(orig.size())); + assertEquals("orig length", orig.size(), j); } } diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 479a76e2fc6..0a756d5913f 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -62,11 +62,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java b/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java index 1cd110d8106..9e5d2b694df 100644 --- a/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java +++ b/standalone-container/src/test/java/com/yahoo/container/standalone/CloudConfigInstallVariablesTest.java @@ -11,9 +11,8 @@ import java.util.stream.Collectors; import static com.yahoo.container.standalone.CloudConfigInstallVariables.toConfigModelsPluginDir; import static com.yahoo.container.standalone.CloudConfigInstallVariables.toConfigServer; import static com.yahoo.container.standalone.CloudConfigInstallVariables.toConfigServers; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.contains; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @author Ulf Lilleengen @@ -24,23 +23,23 @@ public class CloudConfigInstallVariablesTest { @Test public void test_configserver_parsing() { CloudConfigOptions.ConfigServer[] parsed = toConfigServers("myhost.mydomain.com"); - assertThat(parsed.length, is(1)); + assertEquals(1, parsed.length); } @Test public void port_can_be_configured() { CloudConfigOptions.ConfigServer[] parsed = toConfigServers("myhost:123"); int port = parsed[0].port.get(); - assertThat(port, is(123)); + assertEquals(123, port); } @Test public void multiple_spaces_are_supported() { CloudConfigOptions.ConfigServer[] parsed = toConfigServers("test1 test2"); - assertThat(parsed.length, is(2)); + assertEquals(2, parsed.length); List<String> hostNames = Arrays.stream(parsed).map(cs -> cs.hostName).collect(Collectors.toList()); - assertThat(hostNames, contains("test1", "test2")); + assertTrue(hostNames.containsAll(Arrays.asList("test1", "test2"))); } @Test(expected = IllegalArgumentException.class) @@ -56,12 +55,12 @@ public class CloudConfigInstallVariablesTest { @Test public void string_arrays_are_split_on_spaces() { String[] parsed = toConfigModelsPluginDir("/home/vespa/foo /home/vespa/bar "); - assertThat(parsed.length, is(2)); + assertEquals(2, parsed.length); } @Test public void string_arrays_are_split_on_comma() { String[] parsed = toConfigModelsPluginDir("/home/vespa/foo,/home/vespa/bar,"); - assertThat(parsed.length, is(2)); + assertEquals(2, parsed.length); } } diff --git a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneSubscriberTest.java b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneSubscriberTest.java index 8ca20fdf7cd..3025a641ec9 100644 --- a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneSubscriberTest.java +++ b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneSubscriberTest.java @@ -15,9 +15,8 @@ import java.util.Map; import java.util.Set; import static com.yahoo.container.standalone.StandaloneContainer.withContainerModel; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.number.OrderingComparison.greaterThan; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @author Tony Vaagenes @@ -42,15 +41,15 @@ public class StandaloneSubscriberTest { keys.add(componentsKey); Subscriber subscriber = new StandaloneSubscriberFactory(root).getSubscriber(keys); Map<ConfigKey<ConfigInstance>, ConfigInstance> config = subscriber.config(); - assertThat(config.size(), is(2)); + assertEquals(2, config.size()); PlatformBundlesConfig platformBundlesConfig = (PlatformBundlesConfig) config.get(platformBundlesKey); ApplicationBundlesConfig applicationBundlesConfig = (ApplicationBundlesConfig) config.get(applicationBundlesKey); ComponentsConfig componentsConfig = (ComponentsConfig) config.get(componentsKey); - assertThat(platformBundlesConfig.bundlePaths().size(), is(0)); - assertThat(applicationBundlesConfig.bundles().size(), is(0)); - assertThat(componentsConfig.components().size(), greaterThan(10)); + assertEquals(0, platformBundlesConfig.bundlePaths().size()); + assertEquals(0, applicationBundlesConfig.bundles().size()); + assertTrue(componentsConfig.components().size() > 10); return null; }); } diff --git a/testutil/src/main/java/com/yahoo/test/CollectionPatternMatcher.java b/testutil/src/main/java/com/yahoo/test/CollectionPatternMatcher.java deleted file mode 100644 index 609a5558027..00000000000 --- a/testutil/src/main/java/com/yahoo/test/CollectionPatternMatcher.java +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.test; - -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Factory; -import org.hamcrest.Matcher; - -import java.util.Collection; - -/** - * Checks if a collection of strings contains at least one string with the expected regex pattern. - * - * @author gjoranv - * @since 5.1.8 - */ -public class CollectionPatternMatcher extends BaseMatcher<Collection<String>> { - - private final String pattern; - - public CollectionPatternMatcher(String pattern) { - this.pattern = pattern; - } - - @Override - public void describeTo(Description description) { - description.appendText("contains a string that matches expression '" + pattern + "'"); - } - - @Override - public boolean matches(Object o) { - @SuppressWarnings("unchecked") - Collection<String> strings = (Collection<String>) o; - for (String s : strings) - if (s.matches(pattern)) - return true; - return false; - } - - @Factory - public static <T> Matcher<Collection<String>> containsStringWithPattern(String pattern) { - return new CollectionPatternMatcher(pattern); - } - -} diff --git a/testutil/src/main/java/com/yahoo/test/PartialOrderTester.java b/testutil/src/main/java/com/yahoo/test/PartialOrderTester.java index c5fa71ddc62..6152cbf5b25 100644 --- a/testutil/src/main/java/com/yahoo/test/PartialOrderTester.java +++ b/testutil/src/main/java/com/yahoo/test/PartialOrderTester.java @@ -1,10 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.test; -import static org.junit.Assert.assertThat; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.lessThanOrEqualTo; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * PartialOrderTester implements a partial order test for OrderTester @@ -16,14 +14,14 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; public class PartialOrderTester<T extends Comparable<T>> extends OrderTester<T> { protected void lessTest(T a, T b) throws AssertionError { - assertThat(a + " must be less than or equal to " + b, a.compareTo(b), lessThanOrEqualTo(0)); + assertTrue(a + " must be less than or equal to " + b, a.compareTo(b) <= 0); } protected void greaterTest(T a, T b) throws AssertionError { - assertThat(a + " must be greater than or equal to " + b, a.compareTo(b), greaterThanOrEqualTo(0)); + assertTrue(a + " must be greater than or equal to " + b, a.compareTo(b) >= 0); } protected void equalTest(T a, T b) throws AssertionError { - assertThat(a + " must be compared equal to " + b, a.compareTo(b), is(0)); + assertEquals(a + " must be compared equal to " + b, 0, a.compareTo(b)); } } diff --git a/testutil/src/main/java/com/yahoo/test/PatternMatcher.java b/testutil/src/main/java/com/yahoo/test/PatternMatcher.java deleted file mode 100644 index 0aafcf2f1be..00000000000 --- a/testutil/src/main/java/com/yahoo/test/PatternMatcher.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.test; - -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Factory; -import org.hamcrest.Matcher; - -/** - * Matches a string against an expected regex pattern. - * - * @author gjoranv - * @since 5.1.7 - */ -public class PatternMatcher extends BaseMatcher<String> { - - private final String pattern; - - public PatternMatcher(String pattern) { - this.pattern = pattern; - } - - @Override - public void describeTo(Description description) { - description.appendText("matches expression '" + pattern + "'"); - } - - @Override - public boolean matches(Object o) { - return ((String)o).matches(pattern); - } - - @Factory - public static <T> Matcher<String> matchesPattern(String pattern) { - return new PatternMatcher(pattern); - } - -} diff --git a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java index d9acd845428..05a8545d606 100644 --- a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java +++ b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java @@ -1,10 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.test; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; -import static org.hamcrest.Matchers.lessThanOrEqualTo; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * TotalOrderTester implements a total order test for OrderTester @@ -24,14 +22,14 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; public class TotalOrderTester<T extends Comparable<T>> extends OrderTester<T> { protected void lessTest(T a, T b) throws AssertionError { - assertThat(a + " must be less than " + b, a.compareTo(b), lessThanOrEqualTo(-1)); + assertTrue(a + " must be less than " + b, a.compareTo(b) <= -1); } protected void greaterTest(T a, T b) throws AssertionError { - assertThat(a + " must be greater than " + b, a.compareTo(b), greaterThanOrEqualTo(1)); + assertTrue(a + " must be greater than " + b, a.compareTo(b) >= 1); } protected void equalTest(T a, T b) throws AssertionError { - assertThat(a + " must be compared equal to " + b, a.compareTo(b), is(0)); + assertEquals(a + " must be compared equal to " + b, 0, a.compareTo(b)); } } diff --git a/testutil/src/test/java/com/yahoo/test/PatternMatchersTestCase.java b/testutil/src/test/java/com/yahoo/test/PatternMatchersTestCase.java deleted file mode 100644 index b17d5b36252..00000000000 --- a/testutil/src/test/java/com/yahoo/test/PatternMatchersTestCase.java +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.test; - -import static org.junit.Assert.*; - -import java.util.Arrays; - -import org.junit.Test; - -/** - * Check CollectionPatternMatcher, LinePatternMatcher and PatternMatcher. - * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> - */ -public class PatternMatchersTestCase { - - @Test - public final void testCollections() { - CollectionPatternMatcher cm = new CollectionPatternMatcher("a.*"); - String[] coll = new String[] {}; - assertEquals(false, cm.matches(Arrays.asList(coll))); - coll = new String[] { "ba", "ab" }; - assertEquals(true, cm.matches(Arrays.asList(coll))); - } - - @Test - public final void testLines() { - LinePatternMatcher lp = new LinePatternMatcher("a"); - assertEquals(true, lp.matches("a\nab")); - assertEquals(false, lp.matches("ab\nb")); - } - - @Test - public final void testPatterns() { - PatternMatcher m = new PatternMatcher(".*a.*"); - assertEquals(true, m.matches("ab")); - assertEquals(false, m.matches("b")); - } - -} diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/api/AthenzDomainTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/api/AthenzDomainTest.java index 2a35fe63d5c..3ce9a8b3431 100644 --- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/api/AthenzDomainTest.java +++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/api/AthenzDomainTest.java @@ -5,10 +5,8 @@ import org.junit.Test; import java.util.function.Supplier; -import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -49,7 +47,7 @@ public class AthenzDomainTest { AthenzDomain domain = domainCreator.get(); fail("Expected IllegalArgumentException for domain: " + domain.getName()); } catch (IllegalArgumentException e) { - assertThat(e.getMessage(), startsWith("Not a valid domain name")); + assertTrue(e.getMessage().startsWith("Not a valid domain name")); } } diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/utils/SiaUtilsTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/utils/SiaUtilsTest.java index 0e6aff1eeca..85ce3641226 100644 --- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/utils/SiaUtilsTest.java +++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/utils/SiaUtilsTest.java @@ -12,11 +12,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import static java.util.Collections.emptyList; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @author bjorncs @@ -29,7 +26,7 @@ public class SiaUtilsTest { @Test public void it_finds_all_identity_names_from_files_in_sia_keys_directory() throws IOException { Path siaRoot = tempDirectory.getRoot().toPath(); - assertThat(SiaUtils.findSiaServices(siaRoot), is(emptyList())); + assertTrue(SiaUtils.findSiaServices(siaRoot).isEmpty()); Files.createDirectory(siaRoot.resolve("keys")); AthenzService fooService = new AthenzService("my.domain.foo"); Files.createFile(SiaUtils.getPrivateKeyFile(siaRoot, fooService)); @@ -37,9 +34,9 @@ public class SiaUtilsTest { Files.createFile(SiaUtils.getPrivateKeyFile(siaRoot, barService)); List<AthenzIdentity> siaIdentities = SiaUtils.findSiaServices(siaRoot); - assertThat(siaIdentities.size(), equalTo(2)); - assertThat(siaIdentities, hasItem(fooService)); - assertThat(siaIdentities, hasItem(barService)); + assertEquals(2, siaIdentities.size()); + assertTrue(siaIdentities.contains(fooService)); + assertTrue(siaIdentities.contains(barService)); } } diff --git a/yolean/pom.xml b/yolean/pom.xml index 742142fe167..f994d401c60 100644 --- a/yolean/pom.xml +++ b/yolean/pom.xml @@ -19,16 +19,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/yolean/src/test/java/com/yahoo/yolean/chain/ChainBuilderTest.java b/yolean/src/test/java/com/yahoo/yolean/chain/ChainBuilderTest.java index 70bb0ab1397..84467283398 100644 --- a/yolean/src/test/java/com/yahoo/yolean/chain/ChainBuilderTest.java +++ b/yolean/src/test/java/com/yahoo/yolean/chain/ChainBuilderTest.java @@ -4,13 +4,13 @@ package com.yahoo.yolean.chain; import org.junit.Test; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import static com.yahoo.yolean.chain.Dependencies.after; import static com.yahoo.yolean.chain.Dependencies.before; import static com.yahoo.yolean.chain.Dependencies.provides; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -103,6 +103,13 @@ public class ChainBuilderTest { assertEquals("myChain", chain.id()); } + boolean equalOrder(Iterator<Filter> a, Iterator<Filter> b) { + while (a.hasNext() && b.hasNext()) { + if ( ! a.next().equals(b.next())) return false; + } + return a.hasNext() == b.hasNext(); + } + @Test public void filters_without_dependencies_are_not_reordered() { List<Filter> filters = new ArrayList<>(); @@ -114,7 +121,7 @@ public class ChainBuilderTest { chain.add(filter); } - assertThat(chain.build(), contains(filters.toArray())); + assertTrue(equalOrder(chain.build().iterator(), filters.iterator())); } @Test(expected = ChainCycleException.class) diff --git a/yolean/src/test/java/com/yahoo/yolean/chain/ContainsSameElements.java b/yolean/src/test/java/com/yahoo/yolean/chain/ContainsSameElements.java deleted file mode 100644 index d3fddeafbb3..00000000000 --- a/yolean/src/test/java/com/yahoo/yolean/chain/ContainsSameElements.java +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.yolean.chain; - -import org.hamcrest.Description; -import org.hamcrest.Matcher; -import org.hamcrest.TypeSafeMatcher; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Set; - -import static java.util.Collections.sort; - -/** - * @author Tony Vaagenes - */ -class ContainsSameElements<T> extends TypeSafeMatcher<Collection<? super T>> { - - private final Set<T> identitySet; - - public static <T> Matcher<Collection<? super T>> containsSameElements(Collection<T> collection) { - return new ContainsSameElements<>(collection); - } - - public ContainsSameElements(Collection<T> collection) { - identitySet = toIdentitySet(collection); - } - - @SuppressWarnings("SuspiciousMethodCalls") - @Override - protected boolean matchesSafely(Collection<? super T> collection2) { - for (Object elem : collection2) { - if (!identitySet.contains(elem)) { - return false; - } - } - - return collection2.size() == identitySet.size(); - } - - @Override - public void describeTo(Description description) { - description.appendText("containsSameElements "); - appendCollection(description, identitySet); - } - - private void appendCollection(Description description, Collection<?> collection) { - description.appendValueList("{", ", ", "}", elementsToStringSorted(collection)); - } - - private List<String> elementsToStringSorted(Collection<?> collection) { - List<String> result = new ArrayList<>(); - for (Object o : collection) { - result.add(o.toString()); - } - sort(result); - return result; - } - - @Override - protected void describeMismatchSafely(Collection<? super T> collection, Description description) { - description.appendText("was "); - appendCollection(description, collection); - } - - public static <T> Set<T> toIdentitySet(Collection<? extends T> collection) { - Set<T> identitySet = Collections.newSetFromMap(new IdentityHashMap<T, Boolean>()); - identitySet.addAll(collection); - return identitySet; - } -} diff --git a/yolean/src/test/java/com/yahoo/yolean/chain/EnumeratedIdentitySetTest.java b/yolean/src/test/java/com/yahoo/yolean/chain/EnumeratedIdentitySetTest.java index 5f0692e186f..30951f88162 100644 --- a/yolean/src/test/java/com/yahoo/yolean/chain/EnumeratedIdentitySetTest.java +++ b/yolean/src/test/java/com/yahoo/yolean/chain/EnumeratedIdentitySetTest.java @@ -5,17 +5,14 @@ import org.junit.Test; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; import java.util.IdentityHashMap; import java.util.Iterator; import java.util.List; import java.util.Set; -import static com.yahoo.yolean.chain.ContainsSameElements.containsSameElements; -import static com.yahoo.yolean.chain.ContainsSameElements.toIdentitySet; import static java.util.Collections.singleton; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertSame; @@ -81,6 +78,28 @@ public class EnumeratedIdentitySetTest { assertTrue(collectedElements.containsKey(element)); } } + private static boolean containsSame(Object a, Collection<?> coll) { + for (Object b : coll) { + if (a == b) return true; + } + return false; + } + private static boolean containsSubsetSame(Collection<?> subSet, Collection<?> superSet) { + for (Object a : subSet) { + if ( ! containsSame(a, superSet)) return false; + } + return true; + } + + private static boolean containsAllSame(Collection<?> a, Collection<?> b) { + return containsSubsetSame(a, b) && containsSubsetSame(b, a); + } + + private static <T> Set<T> toIdentitySet(Collection<? extends T> collection) { + Set<T> identitySet = Collections.newSetFromMap(new IdentityHashMap<>()); + identitySet.addAll(collection); + return identitySet; + } @Test public void toArray() { @@ -89,8 +108,9 @@ public class EnumeratedIdentitySetTest { Object[] array = set.toArray(); Element[] array2 = set.toArray(new Element[0]); - assertThat(Arrays.asList(array), containsSameElements(set)); - assertThat(Arrays.asList(array2), containsSameElements(set)); + assertTrue(set.containsAll(Arrays.asList(array))); + assertTrue(containsAllSame(Arrays.asList(array), set)); + assertTrue(containsAllSame(Arrays.asList(array2), set)); } @Test @@ -123,7 +143,7 @@ public class EnumeratedIdentitySetTest { EnumeratedIdentitySet<Element> set = new EnumeratedIdentitySet<>(); set.addAll(elements); - assertThat(set, containsSameElements(elements)); + assertTrue(containsAllSame(set, elements)); } @Test @@ -134,7 +154,7 @@ public class EnumeratedIdentitySetTest { boolean changed = set.retainAll(toIdentitySet(elements.subList(3, 10))); assertTrue(changed); - assertThat(set, containsSameElements(elements.subList(3, 5))); + assertTrue(containsAllSame(set, elements.subList(3, 5))); changed = set.retainAll(toIdentitySet(elements)); assertFalse(changed); @@ -144,7 +164,7 @@ public class EnumeratedIdentitySetTest { public void removeAll() { EnumeratedIdentitySet<Element> set = new EnumeratedIdentitySet<>(elements); set.removeAll(elements.subList(0, 5)); - assertThat(set, containsSameElements(elements.subList(5, 10))); + assertTrue(containsAllSame(set, elements.subList(5, 10))); } @Test @@ -157,8 +177,8 @@ public class EnumeratedIdentitySetTest { @Test public void removeNulls() { Element[] singletonArray = { null, elements.get(0), null }; - assertThat(EnumeratedIdentitySet.removeNulls(singletonArray), - containsSameElements(Arrays.asList(elements.get(0)))); + assertTrue(containsAllSame(EnumeratedIdentitySet.removeNulls(singletonArray), + Arrays.asList(elements.get(0)))); Element[] elementsWithNull = new Element[20]; @@ -168,7 +188,7 @@ public class EnumeratedIdentitySetTest { copyElementsTo(iterator, elementsWithNull, 4, 8); copyElementsTo(iterator, elementsWithNull, 19, 1); - assertThat(EnumeratedIdentitySet.removeNulls(elementsWithNull), containsSameElements(elements)); + assertTrue(containsAllSame(EnumeratedIdentitySet.removeNulls(elementsWithNull), elements)); } private void copyElementsTo(Iterator<Element> iterator, Element[] array, int startIndex, int numItems) { @@ -203,7 +223,7 @@ public class EnumeratedIdentitySetTest { } set.add(new Element()); - assertThat(set.numbers(), containsSameElements(range(0, 10))); + assertTrue(containsAllSame(set.numbers(), range(0, 10))); } @Test @@ -218,7 +238,7 @@ public class EnumeratedIdentitySetTest { assertTrue(set.numbers().isEmpty()); set.add(new Element()); - assertThat(set.numbers(), containsSameElements(singleton(0))); + assertTrue(containsAllSame(set.numbers(), singleton(0))); } private List<Integer> range(int start, int endInclusive) { |