diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-12-21 15:18:14 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-12-21 15:43:26 +0100 |
| commit | e0fb5474ac171436e263a4950d72a2a405d379a2 (patch) | |
| tree | 0b754bd09a06ef419a56f9df586446b386106669 | |
| parent | 28ae61202ad963955cf92719bab9b9d97181d5dd (diff) | |
GC use of deprecated junit assertThat and unify
97 files changed, 805 insertions, 926 deletions
diff --git a/application/pom.xml b/application/pom.xml index af25bda0f07..2496b8becc5 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -74,11 +74,6 @@ </exclusions> </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/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java b/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java index 215b0961509..800c30ac8b8 100644 --- a/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java +++ b/application/src/test/java/com/yahoo/application/ApplicationBuilderTest.java @@ -8,7 +8,6 @@ import org.junit.rules.ExpectedException; import java.nio.file.Files; -import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertTrue; /** @@ -49,6 +48,7 @@ public class ApplicationBuilderTest { }); } + @SuppressWarnings("deprecation") @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -56,7 +56,7 @@ public class ApplicationBuilderTest { @SuppressWarnings("try") // application unreferenced inside try public void builder_cannot_be_reused() throws Exception { expectedException.expect(RuntimeException.class); - expectedException.expectMessage(containsString("build method")); + expectedException.expectMessage("build method"); ApplicationBuilder builder = new ApplicationBuilder(); builder.servicesXml("<container version=\"1.0\" />"); diff --git a/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java b/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java index 855a56293d0..7c786d35fab 100644 --- a/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java +++ b/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java @@ -16,10 +16,8 @@ import com.yahoo.processing.execution.chain.ChainRegistry; import org.junit.Before; import org.junit.Test; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.sameInstance; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; /** @@ -75,13 +73,13 @@ public class ContainerDocprocTest { processing = com.yahoo.docproc.Processing.of(put); progress = docProc.process(ComponentSpecification.fromString(CHAIN_NAME), processing); - assertThat(progress, sameInstance(DocumentProcessor.Progress.DONE)); - assertThat(doc.getFieldValue("title").toString(), equalTo("Terng Nyohz!")); + assertSame(progress, DocumentProcessor.Progress.DONE); + assertEquals("Terng Nyohz!", doc.getFieldValue("title").toString()); processing = com.yahoo.docproc.Processing.of(put); progress = docProc.process(ComponentSpecification.fromString(CHAIN_NAME), processing); - assertThat(progress, sameInstance(DocumentProcessor.Progress.DONE)); - assertThat(doc.getFieldValue("title").toString(), equalTo("Great Album!")); + assertSame(progress, DocumentProcessor.Progress.DONE); + assertEquals("Great Album!", doc.getFieldValue("title").toString()); } } @@ -107,16 +105,16 @@ public class ContainerDocprocTest { processing = com.yahoo.docproc.Processing.of(put); progress = docProc.processOnce(ComponentSpecification.fromString(CHAIN_NAME), processing); - assertThat(progress, instanceOf(DocumentProcessor.LaterProgress.class)); - assertThat(doc.getFieldValue("title").toString(), equalTo("Great Album!")); + assertTrue(progress instanceof DocumentProcessor.LaterProgress); + assertEquals("Great Album!", doc.getFieldValue("title").toString()); progress = docProc.processOnce(ComponentSpecification.fromString(CHAIN_NAME), processing); - assertThat(progress, instanceOf(DocumentProcessor.LaterProgress.class)); - assertThat(doc.getFieldValue("title").toString(), equalTo("Great Album!")); + assertTrue(progress instanceof DocumentProcessor.LaterProgress); + assertEquals("Great Album!", doc.getFieldValue("title").toString()); progress = docProc.processOnce(ComponentSpecification.fromString(CHAIN_NAME), processing); - assertThat(progress, sameInstance(DocumentProcessor.Progress.DONE)); - assertThat(doc.getFieldValue("title").toString(), equalTo("Terng Nyohz!")); + assertSame(progress, DocumentProcessor.Progress.DONE); + assertEquals("Terng Nyohz!", doc.getFieldValue("title").toString()); } } diff --git a/application/src/test/java/com/yahoo/application/container/ContainerProcessingTest.java b/application/src/test/java/com/yahoo/application/container/ContainerProcessingTest.java index e0385543022..e5019d6b54f 100644 --- a/application/src/test/java/com/yahoo/application/container/ContainerProcessingTest.java +++ b/application/src/test/java/com/yahoo/application/container/ContainerProcessingTest.java @@ -10,10 +10,10 @@ import com.yahoo.processing.Response; import org.junit.Before; import org.junit.Test; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertThat; +import java.nio.charset.StandardCharsets; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @author Einar M R Rosenvinge @@ -50,7 +50,7 @@ public class ContainerProcessingTest { req.properties().set("title", "Good day!"); Response response = processing.process(ComponentSpecification.fromString("foo"), req); - assertThat(response.data().get(0).toString(), equalTo("Tbbq qnl!")); + assertEquals("Tbbq qnl!", response.data().get(0).toString()); } } @@ -69,7 +69,7 @@ public class ContainerProcessingTest { container.handleRequest( new com.yahoo.application.container.handler.Request("http://foo/processing/?chain=foo&title=" + foo.toString())); - assertThat(response.getBody().length, is(SIZE+26)); + assertEquals(SIZE+26, response.getBody().length); } } } @@ -84,9 +84,9 @@ public class ContainerProcessingTest { byte[] rendered = processing.processAndRender(ComponentSpecification.fromString("foo"), ComponentSpecification.fromString("default"), req); - String renderedAsString = new String(rendered, "utf-8"); + String renderedAsString = new String(rendered, StandardCharsets.UTF_8); - assertThat(renderedAsString, containsString("Tbbq qnl!")); + assertTrue(renderedAsString.contains("Tbbq qnl!")); } } diff --git a/application/src/test/java/com/yahoo/application/container/ContainerRequestTest.java b/application/src/test/java/com/yahoo/application/container/ContainerRequestTest.java index 98f35d5ed6c..911d57a7d6e 100644 --- a/application/src/test/java/com/yahoo/application/container/ContainerRequestTest.java +++ b/application/src/test/java/com/yahoo/application/container/ContainerRequestTest.java @@ -15,9 +15,8 @@ import org.junit.Test; import java.nio.charset.CharacterCodingException; -import static org.hamcrest.CoreMatchers.equalTo; -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 Einar M R Rosenvinge @@ -44,7 +43,7 @@ public class ContainerRequestTest { try (JDisc container = JDisc.fromServicesXml(getXML(EchoRequestHandler.class.getCanonicalName(), "http://*/echo"), Networking.disable)) { Response response = container.handleRequest(req); - assertThat(response.getBodyAsString(), equalTo(DATA)); + assertEquals(DATA, response.getBodyAsString()); req.toString(); response.toString(); } @@ -57,7 +56,7 @@ public class ContainerRequestTest { try (JDisc container = JDisc.fromServicesXml(getXML(HeaderEchoRequestHandler.class.getCanonicalName(), "http://*/echo"), Networking.disable)) { Response response = container.handleRequest(req); - assertThat(response.getHeaders().contains("X-Foo", "Bar"), is(true)); + assertTrue(response.getHeaders().contains("X-Foo", "Bar")); req.toString(); response.toString(); } diff --git a/application/src/test/java/com/yahoo/application/container/ContainerSchemaTest.java b/application/src/test/java/com/yahoo/application/container/ContainerSchemaTest.java index 40bdf023c63..e1e520bccc9 100644 --- a/application/src/test/java/com/yahoo/application/container/ContainerSchemaTest.java +++ b/application/src/test/java/com/yahoo/application/container/ContainerSchemaTest.java @@ -10,9 +10,8 @@ import org.junit.Test; import java.nio.charset.StandardCharsets; -import static org.hamcrest.CoreMatchers.containsString; -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 gjoranv @@ -28,7 +27,7 @@ public class ContainerSchemaTest { byte[] rendered = container.search().processAndRender(ComponentSpecification.fromString("mychain"), ComponentSpecification.fromString("XmlRenderer"), new Query("")); String renderedAsString = new String(rendered, StandardCharsets.UTF_8); - assertThat(renderedAsString, containsString(searcherId)); + assertTrue(renderedAsString.contains(searcherId)); } } @@ -40,7 +39,7 @@ public class ContainerSchemaTest { Search searching = container.search(); Result result = searching.process(ComponentSpecification.fromString("mychain"), new Query("")); String hitTitle = result.hits().get(0).getField("title").toString(); - assertThat(hitTitle, is(searcherId)); + assertEquals(searcherId, hitTitle); } } diff --git a/application/src/test/java/com/yahoo/application/container/ContainerTest.java b/application/src/test/java/com/yahoo/application/container/ContainerTest.java index a46ae6e1ef5..f36237066b5 100644 --- a/application/src/test/java/com/yahoo/application/container/ContainerTest.java +++ b/application/src/test/java/com/yahoo/application/container/ContainerTest.java @@ -8,9 +8,6 @@ import com.yahoo.application.container.handler.Request; import com.yahoo.application.container.handler.Response; import com.yahoo.application.container.handlers.TestHandler; import com.yahoo.component.ComponentSpecification; -import com.yahoo.container.Container; -import com.yahoo.jdisc.http.server.jetty.JettyHttpServer; -import com.yahoo.jdisc.service.ServerProvider; import com.yahoo.search.Query; import com.yahoo.search.Result; import org.junit.Ignore; @@ -20,11 +17,9 @@ import java.nio.charset.CharacterCodingException; import java.nio.file.FileSystems; import static com.yahoo.application.container.JDisc.fromServicesXml; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** @@ -73,7 +68,7 @@ public class ContainerTest { "</services>", Networking.disable)) { fail("expected exception"); } catch (Exception e) { - assertThat(e.getMessage(), containsString("container id='id1', container id='', jdisc id=''")); + assertTrue(e.getMessage().contains("container id='id1', container id='', jdisc id=''")); } } @@ -87,7 +82,7 @@ public class ContainerTest { "</container>", Networking.disable)) { Response response = container.handleRequest(new Request("http://foo/TestHandler")); try { - assertThat(response.getBodyAsString(), is(TestHandler.RESPONSE)); + assertEquals(TestHandler.RESPONSE, response.getBodyAsString()); } catch (CharacterCodingException e) { throw new RuntimeException(e); } @@ -100,7 +95,7 @@ public class ContainerTest { Networking.disable)) { Result result = container.search().process(ComponentSpecification.fromString("default"), new Query("?query=ignored")); - assertThat(result.hits().get(0).getField("title").toString(), is("Heal the World!")); + assertEquals("Heal the World!", result.hits().get(0).getField("title").toString()); } } @@ -110,7 +105,7 @@ public class ContainerTest { .servicesXml(CONTAINER_WITH_DOCUMENT_PROCESSING).build()) { JDisc container = application.getJDisc("container"); DocumentProcessing processing = container.documentProcessing(); - assertThat(processing.getDocumentTypes().keySet(), hasItem("example")); + assertTrue(processing.getDocumentTypes().containsKey("example")); } } @@ -123,7 +118,7 @@ public class ContainerTest { servicesXml(CONTAINER_WITH_DOCUMENT_PROCESSING).build()) { JDisc container = application.getJDisc("container"); DocumentProcessing processing = container.documentProcessing(); - assertThat(processing.getAnnotationTypes().keySet(), hasItem("exampleAnnotation")); + assertTrue(processing.getAnnotationTypes().containsKey("exampleAnnotation")); } } @@ -138,7 +133,7 @@ public class ContainerTest { private void sendRequest(JDisc jdisc) throws CharacterCodingException { Response response = jdisc.handleRequest(new Request("http://foo/TestHandler")); - assertThat(response.getBodyAsString(), is(TestHandler.RESPONSE)); + assertEquals(TestHandler.RESPONSE, response.getBodyAsString()); } public static final String CONTAINER_WITH_DOCUMENT_PROCESSING = // @@ -169,13 +164,4 @@ public class ContainerTest { return JDisc.fromServicesXml(xml, Networking.disable); } - public static int getListenPort() { - for (ServerProvider server : Container.get().getServerProviderRegistry().allComponents()) { - if (null != server && server instanceof JettyHttpServer) { - return ((JettyHttpServer) server).getListenPort(); - } - } - throw new RuntimeException("No http server found"); - } - } diff --git a/application/src/test/java/com/yahoo/application/container/handler/ResponseTestCase.java b/application/src/test/java/com/yahoo/application/container/handler/ResponseTestCase.java index 315ccb9d708..edd2acb630d 100644 --- a/application/src/test/java/com/yahoo/application/container/handler/ResponseTestCase.java +++ b/application/src/test/java/com/yahoo/application/container/handler/ResponseTestCase.java @@ -3,10 +3,8 @@ package com.yahoo.application.container.handler; import org.junit.Test; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @author Einar M R Rosenvinge @@ -15,16 +13,16 @@ public class ResponseTestCase { @Test public void requireThatCharsetParsingWorks() { - assertThat(Response.charset("text/foobar").toString().toLowerCase(), equalTo("utf-8")); - assertThat(Response.charset("adsf").toString().toLowerCase(), equalTo("utf-8")); - assertThat(Response.charset("").toString().toLowerCase(), equalTo("utf-8")); - assertThat(Response.charset(null).toString().toLowerCase(), equalTo("utf-8")); + assertEquals("utf-8", Response.charset("text/foobar").toString().toLowerCase()); + assertEquals("utf-8", Response.charset("adsf").toString().toLowerCase()); + assertEquals("utf-8", Response.charset("").toString().toLowerCase()); + assertEquals("utf-8", Response.charset(null).toString().toLowerCase()); - assertThat(Response.charset("something; charset=US-ASCII").toString().toLowerCase(), equalTo("us-ascii")); - assertThat(Response.charset("something; charset=iso-8859-1").toString().toLowerCase(), equalTo("iso-8859-1")); + assertEquals("us-ascii", Response.charset("something; charset=US-ASCII").toString().toLowerCase()); + assertEquals("iso-8859-1", Response.charset("something; charset=iso-8859-1").toString().toLowerCase()); - assertThat(Response.charset("something; charset=").toString().toLowerCase(), equalTo("utf-8")); - assertThat(Response.charset("something; charset=bananarama").toString().toLowerCase(), equalTo("utf-8")); + assertEquals("utf-8", Response.charset("something; charset=").toString().toLowerCase()); + assertEquals("utf-8", Response.charset("something; charset=bananarama").toString().toLowerCase()); } @Test @@ -32,9 +30,9 @@ public class ResponseTestCase { Response res1 = new Response(); Response res2 = new Response(new byte[0]); - assertThat(res1.getBody(), notNullValue()); - assertThat(res1.getBody().length, is(0)); - assertThat(res2.getBody(), notNullValue()); - assertThat(res2.getBody().length, is(0)); + assertNotNull(res1.getBody()); + assertEquals(0, res1.getBody().length); + assertNotNull(res2.getBody()); + assertEquals(0, res2.getBody().length); } } diff --git a/config-model/src/test/java/com/yahoo/config/model/ConfigModelContextTest.java b/config-model/src/test/java/com/yahoo/config/model/ConfigModelContextTest.java index efa1ca5949a..532c446ec6f 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ConfigModelContextTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/ConfigModelContextTest.java @@ -9,9 +9,8 @@ import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.config.model.test.MockRoot; import org.junit.Test; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; /** * @author Ulf Lilleengen @@ -28,18 +27,18 @@ public class ConfigModelContextTest { DeployState deployState = DeployState.createTestState(pkg); DeployLogger logger = deployState.getDeployLogger(); ConfigModelContext ctx = ConfigModelContext.create(deployState, null, null, root, id); - assertThat(ctx.getApplicationPackage(), is(pkg)); - assertThat(ctx.getProducerId(), is(id)); - assertThat(ctx.getParentProducer(), is(root)); - assertThat(ctx.getDeployLogger(), is(logger)); + assertEquals(pkg, ctx.getApplicationPackage()); + assertEquals(id, ctx.getProducerId()); + assertEquals(root, ctx.getParentProducer()); + assertEquals(logger, ctx.getDeployLogger()); ctx = ConfigModelContext.create(root.getDeployState(), null, null, root, id); - assertThat(ctx.getProducerId(), is(id)); - assertThat(ctx.getParentProducer(), is(root)); + assertEquals(id, ctx.getProducerId()); + assertEquals(root, ctx.getParentProducer()); AbstractConfigProducer newRoot = new MockRoot("bar"); ctx = ctx.withParent(newRoot); - assertThat(ctx.getProducerId(), is(id)); - assertThat(ctx.getParentProducer(), is(not(root))); - assertThat(ctx.getParentProducer(), is(newRoot)); + assertEquals(id, ctx.getProducerId()); + assertNotEquals(root, ctx.getParentProducer()); + assertEquals(newRoot, ctx.getParentProducer()); } } diff --git a/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java b/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java index 0127129ba0b..325361e0127 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java @@ -7,8 +7,7 @@ import org.junit.Test; import java.io.File; import java.util.List; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; /** @@ -22,38 +21,38 @@ public class ConfigModelUtilsTest { @Test public void all_def_files_in_correct_directory_are_handled_and_files_outside_are_ignored() { List<Bundle> bundles = Bundle.getBundles(new File(VALID_TEST_BUNDLE)); - assertThat(bundles.size(), is(1)); - assertThat(bundles.get(0).getDefEntries().size(), is(5)); + assertEquals(1, bundles.size()); + assertEquals(5, bundles.get(0).getDefEntries().size()); } @Test public void def_file_with_namespace_is_handled() { Bundle.DefEntry defEntry = getDefEntry("test-namespace"); - assertThat(defEntry.defNamespace, is("config")); + assertEquals("config", defEntry.defNamespace); } @Test public void def_file_with_namespace_and_namespace_in_filename_is_handled() { Bundle.DefEntry defEntry = getDefEntry("namespace-in-filename"); - assertThat(defEntry.defNamespace, is("a.b")); + assertEquals("a.b", defEntry.defNamespace); } @Test public void def_file_with_package_is_handled() { Bundle.DefEntry defEntry = getDefEntry("test-package"); - assertThat(defEntry.defNamespace, is("com.mydomain.mypackage")); + assertEquals("com.mydomain.mypackage", defEntry.defNamespace); } @Test public void def_file_with_package_and_pacakage_in_filename_is_handled() { Bundle.DefEntry defEntry = getDefEntry("package-in-filename"); - assertThat(defEntry.defNamespace, is("com.mydomain.mypackage")); + assertEquals("com.mydomain.mypackage", defEntry.defNamespace); } @Test public void def_file_with_both_package_and_namespace_gets_package_as_namespace() { Bundle.DefEntry defEntry = getDefEntry("namespace-and-package"); - assertThat(defEntry.defNamespace, is("com.mydomain.mypackage")); + assertEquals("com.mydomain.mypackage", defEntry.defNamespace); } private static Bundle.DefEntry getDefEntry(String defName) { @@ -72,7 +71,7 @@ public class ConfigModelUtilsTest { Bundle.getBundles(new File(INVALID_TEST_BUNDLE)); fail(); } catch (IllegalArgumentException e) { - assertThat(e.getMessage(), is("Error opening jar file 'invalid.jar'. Please check that this is a valid jar file")); + assertEquals("Error opening jar file 'invalid.jar'. Please check that this is a valid jar file", e.getMessage()); } } diff --git a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java index 06cce8f0be9..a06da645e17 100644 --- a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java @@ -9,8 +9,7 @@ import org.junit.Test; import java.util.List; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; /** * Tests that qrserver is assigned port Defaults.getDefaults().vespaWebServicePort() even if there is a HTTP gateway configured earlier in @@ -26,8 +25,8 @@ public class QrserverAndGatewayPortAllocationTest { VespaModelCreatorWithFilePkg creator = new VespaModelCreatorWithFilePkg(appDir); VespaModel vespaModel = creator.create(); List<ApplicationContainer> qrservers = vespaModel.getContainerClusters().get("container").getContainers(); - assertThat(qrservers.size(), is(1)); - assertThat(qrservers.get(0).getSearchPort(), is(Container.BASEPORT)); + assertEquals(1, qrservers.size()); + assertEquals(Container.BASEPORT, qrservers.get(0).getSearchPort()); } } diff --git a/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java b/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java index f0425d20af5..1bf8c834586 100644 --- a/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java @@ -2,12 +2,10 @@ package com.yahoo.config.model.application.provider; import com.yahoo.component.Version; -import com.yahoo.io.IOUtils; import com.yahoo.vespa.config.VespaVersion; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.xml.sax.InputSource; import java.io.File; import java.io.IOException; @@ -43,6 +41,7 @@ public class SchemaValidatorTest { " </admin>\n" + "</services>\n"; + @SuppressWarnings("deprecation") @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/config/model/builder/xml/ConfigModelIdTest.java b/config-model/src/test/java/com/yahoo/config/model/builder/xml/ConfigModelIdTest.java index 9874c249175..931768b6fd9 100644 --- a/config-model/src/test/java/com/yahoo/config/model/builder/xml/ConfigModelIdTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/builder/xml/ConfigModelIdTest.java @@ -4,8 +4,10 @@ package com.yahoo.config.model.builder.xml; import com.yahoo.component.Version; import org.junit.Test; -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.assertNotEquals; +import static org.junit.Assert.assertTrue; /** * @author Ulf Lilleengen @@ -16,21 +18,21 @@ public class ConfigModelIdTest { @Test public void require_that_element_gets_correct_name() { ConfigModelId id = ConfigModelId.fromName("foo"); - assertThat(id.getName(), is("foo")); - assertThat(id.getVersion(), is(Version.fromString("1"))); + assertEquals("foo", id.getName()); + assertEquals(Version.fromString("1"), id.getVersion()); id = ConfigModelId.fromNameAndVersion("bar", "2.2"); - assertThat(id.getName(), is("bar")); - assertThat(id.getVersion(), is(Version.fromString("2.2"))); + assertEquals("bar", id.getName()); + assertEquals(Version.fromString("2.2"), id.getVersion()); } @Test public void test_toString() { ConfigModelId id = ConfigModelId.fromNameAndVersion("bar", "1.0"); - assertThat(id.toString(), is("bar.1")); + assertEquals("bar.1", id.toString()); id = ConfigModelId.fromNameAndVersion("foo", "1.1.3"); - assertThat(id.toString(), is("foo.1.1.3")); + assertEquals("foo.1.1.3", id.toString()); id = ConfigModelId.fromNameAndVersion("bar", "1"); - assertThat(id.toString(), is("bar.1")); + assertEquals("bar.1", id.toString()); } @Test @@ -38,15 +40,15 @@ public class ConfigModelIdTest { ConfigModelId a1 = ConfigModelId.fromName("a"); ConfigModelId a2 = ConfigModelId.fromName("a"); ConfigModelId b = ConfigModelId.fromName("b"); - assertTrue(a1.equals(a2)); - assertTrue(a2.equals(a1)); - assertFalse(a1.equals(b)); - assertFalse(a2.equals(b)); - assertFalse(b.equals(a1)); - assertFalse(b.equals(a2)); - assertTrue(a1.equals(a1)); - assertTrue(a2.equals(a2)); - assertTrue(b.equals(b)); + assertEquals(a1, a2); + assertEquals(a2, a1); + assertNotEquals(a1, b); + assertNotEquals(a2, b); + assertNotEquals(b, a1); + assertNotEquals(b, a2); + assertEquals(a1, a1); + assertEquals(a2, a2); + assertEquals(b, b); } @Test diff --git a/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java b/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java index 031f25306d5..64870ff8e49 100644 --- a/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java @@ -25,10 +25,8 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -42,7 +40,7 @@ public class DeployStateTest { HostProvisioner provisioner = new InMemoryProvisioner(true, false, "foo.yahoo.com"); builder.modelHostProvisioner(provisioner); DeployState state = builder.build(); - assertThat(state.getProvisioner(), is(provisioner)); + assertEquals(provisioner, state.getProvisioner()); } @Test @@ -51,28 +49,28 @@ public class DeployStateTest { ApplicationPackage app = MockApplicationPackage.createEmpty(); builder.permanentApplicationPackage(Optional.of(app)); DeployState state = builder.build(); - assertThat(state.getPermanentApplicationPackage().get(), is(app)); + assertEquals(app, state.getPermanentApplicationPackage().get()); } @Test public void testPreviousModelIsProvided() throws IOException, SAXException { VespaModel prevModel = new VespaModel(MockApplicationPackage.createEmpty()); DeployState.Builder builder = new DeployState.Builder(); - assertThat(builder.previousModel(prevModel).build().getPreviousModel().get(), is(prevModel)); + assertEquals(prevModel, builder.previousModel(prevModel).build().getPreviousModel().get()); } @Test public void testProperties() { DeployState.Builder builder = new DeployState.Builder(); DeployState state = builder.build(); - assertThat(state.getProperties().applicationId(), is(ApplicationId.defaultId())); + assertEquals(ApplicationId.defaultId(), state.getProperties().applicationId()); ApplicationId customId = new ApplicationId.Builder() .tenant("bar") .applicationName("foo").instanceName("quux").build(); ModelContext.Properties properties = new TestProperties().setApplicationId(customId); builder.properties(properties); state = builder.build(); - assertThat(state.getProperties().applicationId(), is(customId)); + assertEquals(customId, state.getProperties().applicationId()); } @Test @@ -89,7 +87,7 @@ public class DeployStateTest { assertNotNull(overridden); Double defaultValue = overridden.getDoubleDefs().get("doubleVal").getDefVal(); assertNotNull(defaultValue); - assertThat(defaultValue.intValue(), is(0)); + assertEquals(0, defaultValue.intValue()); } @Test @@ -105,8 +103,8 @@ public class DeployStateTest { ConfigDefinition test1 = state.getConfigDefinition(new ConfigDefinitionKey("test2", "a.b")).get(); assertNotNull(test1); - assertThat(test1.getName(), is("test2")); - assertThat(test1.getNamespace(), is("a.b")); + assertEquals("test2", test1.getName()); + assertEquals("a.b", test1.getNamespace()); } @Test diff --git a/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java b/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java index 8736f85e41b..66cbfbd537f 100644 --- a/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java +++ b/config-model/src/test/java/com/yahoo/config/model/deploy/SystemModelTestCase.java @@ -8,7 +8,10 @@ import com.yahoo.config.model.ConfigModelRegistry; import com.yahoo.config.model.MapConfigModelRegistry; import com.yahoo.config.model.ApplicationConfigProducerRoot; import com.yahoo.net.HostName; -import com.yahoo.vespa.model.*; +import com.yahoo.vespa.model.ConfigProducer; +import com.yahoo.vespa.model.HostResource; +import com.yahoo.vespa.model.HostSystem; +import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.test.ApiConfigModel; import com.yahoo.vespa.model.test.SimpleConfigModel; import com.yahoo.vespa.model.test.SimpleService; @@ -19,8 +22,10 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * @author bratseth @@ -52,7 +57,7 @@ public class SystemModelTestCase { VespaModel vespaModel = getVespaModelDoNotValidateXml(TESTDIR + "metricsconfig"); SimpleService service0 = (SimpleService)vespaModel.getConfigProducer("simple/simpleservice.0").get(); vespaModel.getConfigProducer("simple/simpleservice.1"); - assertThat(service0.getDefaultMetricDimensions().get("clustername"), is("testClusterName")); + assertEquals("testClusterName", service0.getDefaultMetricDimensions().get("clustername")); } @Test @@ -144,8 +149,8 @@ public class SystemModelTestCase { ApplicationConfigProducerRoot root = vespaModel.getVespa(); assertEquals(5, vespaModel.configModelRepo().asMap().size()); - assertTrue(vespaModel.configModelRepo().asMap().keySet().contains("simple")); - assertTrue(vespaModel.configModelRepo().asMap().keySet().contains("api")); + assertTrue(vespaModel.configModelRepo().asMap().containsKey("simple")); + assertTrue(vespaModel.configModelRepo().asMap().containsKey("api")); assertTrue(root.getConfigIds().contains("simple/simpleservice.0")); assertTrue(root.getConfigIds().contains("simple/simpleservice.1")); assertTrue(root.getConfigIds().contains("api/apiservice.0")); @@ -176,7 +181,7 @@ public class SystemModelTestCase { getVespaModelDoNotValidateXml(TESTDIR + "doubleconfig"); fail("No exception upon two plugins with the same name"); } catch (RuntimeException expected) { - assertThat(expected.getMessage(), is("Could not resolve tag <simpleplugin version=\"1.0\"> to a config model component")); + assertEquals("Could not resolve tag <simpleplugin version=\"1.0\"> to a config model component", expected.getMessage()); } } diff --git a/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java b/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java index 1d078c132fc..da8ce7fd425 100644 --- a/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/graph/ModelGraphTest.java @@ -9,8 +9,10 @@ import org.junit.rules.ExpectedException; import java.util.List; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; /** * @author Ulf Lilleengen @@ -24,7 +26,7 @@ public class ModelGraphTest { for (ModelNode<?> node : sortedEntries) { sb.append(node.builder.getModelClass().getSimpleName()); } - assertThat(sb.toString(), is(expectedOrdering)); + assertEquals(expectedOrdering, sb.toString()); } @Test @@ -33,7 +35,7 @@ public class ModelGraphTest { builder.addBuilder(new GraphMock.BC()).addBuilder(new GraphMock.BB()).addBuilder(new GraphMock.BA()); ModelGraph graph = builder.build(); List<ModelNode> nodes = graph.getNodes(); - assertThat(graph.getNodes().size(), is(3)); + assertEquals(3, graph.getNodes().size()); assertTrue(nodes.get(0).hasDependencies()); assertTrue(nodes.get(1).hasDependencies()); assertFalse(nodes.get(2).hasDependencies()); @@ -51,7 +53,7 @@ public class ModelGraphTest { @Test(expected = IllegalArgumentException.class) public void require_that_cycles_are_detected() { ModelGraph graph = new ModelGraphBuilder().addBuilder(new GraphMock.BD()).addBuilder(new GraphMock.BE()).build(); - assertThat(graph.getNodes().size(), is(2)); + assertEquals(2, graph.getNodes().size()); assertTrue(graph.getNodes().get(0).dependsOn(graph.getNodes().get(1))); assertTrue(graph.getNodes().get(1).dependsOn(graph.getNodes().get(0))); graph.topologicalSort(); @@ -70,17 +72,18 @@ public class ModelGraphTest { assertNotNull(b); assertNotNull(b2); assertNotNull(c); - assertThat(a.getId(), is("first")); - assertThat(b.getId(), is("second")); - assertThat(b2.getId(), is("second2")); - assertThat(c.getId(), is("third")); - assertThat(b.a, is(a)); + assertEquals("first", a.getId()); + assertEquals("second", b.getId()); + assertEquals("second2", b2.getId()); + assertEquals("third", c.getId()); + assertEquals(a, b.a); assertNotNull(c.b); - assertThat(c.b.size(), is(2)); + assertEquals(2, c.b.size()); assertTrue(c.b.contains(b)); assertTrue(c.b.contains(b2)); } + @SuppressWarnings("deprecation") @Rule public ExpectedException expectedEx = ExpectedException.none(); @@ -109,7 +112,7 @@ public class ModelGraphTest { MockRoot root = new MockRoot(); GraphMock.A a = (GraphMock.A) nodes.get(0).createModel(ConfigModelContext.create(root.getDeployState(), null, null, root, "first")); GraphMock.C c = (GraphMock.C) nodes.get(1).createModel(ConfigModelContext.create(root.getDeployState(), null, null, root, "second")); - assertThat(c.a, is(a)); + assertEquals(a, c.a); assertTrue(c.b.isEmpty()); } diff --git a/config-model/src/test/java/com/yahoo/config/model/producer/AbstractConfigProducerTest.java b/config-model/src/test/java/com/yahoo/config/model/producer/AbstractConfigProducerTest.java index 68868ae1a06..5d62abcc4df 100644 --- a/config-model/src/test/java/com/yahoo/config/model/producer/AbstractConfigProducerTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/producer/AbstractConfigProducerTest.java @@ -4,9 +4,8 @@ package com.yahoo.config.model.producer; import com.yahoo.cloud.config.log.LogdConfig; import org.junit.Test; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; /** * Verifies some of the logic in the abstract config producer that is not tested in other classes. @@ -25,8 +24,8 @@ public class AbstractConfigProducerTest { LogdConfig.Builder builder = (LogdConfig.Builder) clazz.getDeclaredConstructor().newInstance(); producer.getConfig(builder); LogdConfig config = new LogdConfig(builder); - assertThat(config.logserver().host(), is("bar")); - assertThat(config.logserver().port(), is(1338)); + assertEquals("bar", config.logserver().host()); + assertEquals(1338, config.logserver().port()); } @Test @@ -38,8 +37,8 @@ public class AbstractConfigProducerTest { LogdConfig.Builder builder = (LogdConfig.Builder) clazz.getDeclaredConstructor().newInstance(); producer.getConfig(builder); LogdConfig config = new LogdConfig(builder); - assertThat(config.logserver().host(), is("foo")); - assertThat(config.logserver().port(), is(1337)); + assertEquals("foo", config.logserver().host()); + assertEquals(1337, config.logserver().port()); } private static class MockLogdProducer extends AbstractConfigProducer implements LogdConfig.Producer { diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index 912161019fe..5fdd2974643 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -29,6 +29,7 @@ import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.Container; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.content.ContentSearchCluster; +import com.yahoo.vespa.model.content.StorageGroup; import com.yahoo.vespa.model.content.StorageNode; import com.yahoo.vespa.model.content.cluster.ContentCluster; import com.yahoo.vespa.model.content.storagecluster.StorageCluster; @@ -51,12 +52,10 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults; import static com.yahoo.vespa.model.search.NodeResourcesTuning.GB; import static com.yahoo.vespa.model.search.NodeResourcesTuning.reservedMemoryGb; import static com.yahoo.vespa.model.test.utils.ApplicationPackageUtils.generateSchemas; -import static org.hamcrest.CoreMatchers.is; 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; @@ -540,58 +539,60 @@ public class ModelProvisioningTest { // Check content clusters ContentCluster cluster = model.getContentClusters().get("bar"); + List<StorageGroup> subGroups = cluster.getRootGroup().getSubgroups(); assertEquals(0, cluster.getRootGroup().getNodes().size()); - assertEquals(9, cluster.getRootGroup().getSubgroups().size()); - assertEquals("0", cluster.getRootGroup().getSubgroups().get(0).getIndex()); - assertEquals(3, cluster.getRootGroup().getSubgroups().get(0).getNodes().size()); - assertEquals(0, cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey()); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("bar/storage/0")); - assertEquals("node-1-3-10-57", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName()); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getDistributionKey(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getConfigId(), is("bar/storage/1")); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(2).getDistributionKey(), is(2)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(2).getConfigId(), is("bar/storage/2")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getIndex(), is("1")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(3)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(3)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("bar/storage/3")); - assertEquals("node-1-3-10-54", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName()); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(1).getDistributionKey(), is(4)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(1).getConfigId(), is("bar/storage/4")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(2).getDistributionKey(), is(5)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(2).getConfigId(), is("bar/storage/5")); + assertEquals(9, subGroups.size()); + assertEquals("0", subGroups.get(0).getIndex()); + assertEquals(3, subGroups.get(0).getNodes().size()); + assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/0", subGroups.get(0).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-57", subGroups.get(0).getNodes().get(0).getHostName()); + assertEquals(1, subGroups.get(0).getNodes().get(1).getDistributionKey()); + assertEquals("bar/storage/1", subGroups.get(0).getNodes().get(1).getConfigId()); + assertEquals(2, subGroups.get(0).getNodes().get(2).getDistributionKey()); + assertEquals("bar/storage/2", subGroups.get(0).getNodes().get(2).getConfigId()); + assertEquals("1", subGroups.get(1).getIndex()); + assertEquals(3, subGroups.get(1).getNodes().size()); + assertEquals(3, subGroups.get(1).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/3", subGroups.get(1).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-54", subGroups.get(1).getNodes().get(0).getHostName()); + assertEquals(4, subGroups.get(1).getNodes().get(1).getDistributionKey()); + assertEquals("bar/storage/4", subGroups.get(1).getNodes().get(1).getConfigId()); + assertEquals(5, subGroups.get(1).getNodes().get(2).getDistributionKey()); + assertEquals("bar/storage/5", subGroups.get(1).getNodes().get(2).getConfigId()); // ... - assertEquals("node-1-3-10-51", cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getHostName()); + assertEquals("node-1-3-10-51", subGroups.get(2).getNodes().get(0).getHostName()); // ... - assertThat(cluster.getRootGroup().getSubgroups().get(8).getIndex(), is("8")); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().size(), is(3)); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(0).getDistributionKey(), is(24)); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(0).getConfigId(), is("bar/storage/24")); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(1).getDistributionKey(), is(25)); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(1).getConfigId(), is("bar/storage/25")); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(2).getDistributionKey(), is(26)); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(2).getConfigId(), is("bar/storage/26")); + assertEquals("8", subGroups.get(8).getIndex()); + assertEquals(3, subGroups.get(8).getNodes().size()); + assertEquals(24, subGroups.get(8).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/24", subGroups.get(8).getNodes().get(0).getConfigId()); + assertEquals(25, subGroups.get(8).getNodes().get(1).getDistributionKey()); + assertEquals("bar/storage/25", subGroups.get(8).getNodes().get(1).getConfigId()); + assertEquals(26, subGroups.get(8).getNodes().get(2).getDistributionKey()); + assertEquals("bar/storage/26", subGroups.get(8).getNodes().get(2).getConfigId()); cluster = model.getContentClusters().get("baz"); + subGroups = cluster.getRootGroup().getSubgroups(); assertEquals(0, cluster.getRootGroup().getNodes().size()); - assertEquals(27, cluster.getRootGroup().getSubgroups().size()); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("0")); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey(), is(0)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("baz/storage/0")); - assertEquals("node-1-3-10-27", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName()); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getIndex(), is("1")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("baz/storage/1")); - assertEquals("node-1-3-10-26", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName()); + assertEquals(27, subGroups.size()); + assertEquals("0", subGroups.get(0).getIndex()); + assertEquals(1, subGroups.get(0).getNodes().size()); + assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey()); + assertEquals("baz/storage/0", subGroups.get(0).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-27", subGroups.get(0).getNodes().get(0).getHostName()); + assertEquals("1", subGroups.get(1).getIndex()); + assertEquals(1, subGroups.get(1).getNodes().size()); + assertEquals(1, subGroups.get(1).getNodes().get(0).getDistributionKey()); + assertEquals("baz/storage/1", subGroups.get(1).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-26", subGroups.get(1).getNodes().get(0).getHostName()); // ... - assertEquals("node-1-3-10-25", cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getHostName()); + assertEquals("node-1-3-10-25", subGroups.get(2).getNodes().get(0).getHostName()); // ... - assertThat(cluster.getRootGroup().getSubgroups().get(26).getIndex(), is("26")); - assertThat(cluster.getRootGroup().getSubgroups().get(26).getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(26).getNodes().get(0).getDistributionKey(), is(26)); - assertThat(cluster.getRootGroup().getSubgroups().get(26).getNodes().get(0).getConfigId(), is("baz/storage/26")); + assertEquals("26", subGroups.get(26).getIndex()); + assertEquals(1, subGroups.get(26).getNodes().size()); + assertEquals(26, subGroups.get(26).getNodes().get(0).getDistributionKey()); + assertEquals("baz/storage/26", subGroups.get(26).getNodes().get(0).getConfigId()); } @Test @@ -679,58 +680,60 @@ public class ModelProvisioningTest { // Check content clusters ContentCluster cluster = model.getContentClusters().get("bar"); + List<StorageGroup> subGroups = cluster.getRootGroup().getSubgroups(); assertEquals(0, cluster.getRootGroup().getNodes().size()); - assertEquals(9, cluster.getRootGroup().getSubgroups().size()); - assertEquals("0", cluster.getRootGroup().getSubgroups().get(0).getIndex()); - assertEquals(3, cluster.getRootGroup().getSubgroups().get(0).getNodes().size()); - assertEquals(0, cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey()); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("bar/storage/0")); - assertEquals("node-1-3-10-57", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName()); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getDistributionKey(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getConfigId(), is("bar/storage/1")); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(2).getDistributionKey(), is(2)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(2).getConfigId(), is("bar/storage/2")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getIndex(), is("1")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(3)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(3)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("bar/storage/3")); - assertEquals("node-1-3-10-54", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName()); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(1).getDistributionKey(), is(4)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(1).getConfigId(), is("bar/storage/4")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(2).getDistributionKey(), is(5)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(2).getConfigId(), is("bar/storage/5")); + assertEquals(9, subGroups.size()); + assertEquals("0", subGroups.get(0).getIndex()); + assertEquals(3, subGroups.get(0).getNodes().size()); + assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/0", subGroups.get(0).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-57", subGroups.get(0).getNodes().get(0).getHostName()); + assertEquals(1, subGroups.get(0).getNodes().get(1).getDistributionKey()); + assertEquals("bar/storage/1", subGroups.get(0).getNodes().get(1).getConfigId()); + assertEquals(2, subGroups.get(0).getNodes().get(2).getDistributionKey()); + assertEquals("bar/storage/2", subGroups.get(0).getNodes().get(2).getConfigId()); + assertEquals("1", subGroups.get(1).getIndex()); + assertEquals(3, subGroups.get(1).getNodes().size()); + assertEquals(3, subGroups.get(1).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/3", subGroups.get(1).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-54", subGroups.get(1).getNodes().get(0).getHostName()); + assertEquals(4, subGroups.get(1).getNodes().get(1).getDistributionKey()); + assertEquals("bar/storage/4", subGroups.get(1).getNodes().get(1).getConfigId()); + assertEquals(5, subGroups.get(1).getNodes().get(2).getDistributionKey()); + assertEquals("bar/storage/5", subGroups.get(1).getNodes().get(2).getConfigId()); // ... - assertEquals("node-1-3-10-51", cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getHostName()); + assertEquals("node-1-3-10-51", subGroups.get(2).getNodes().get(0).getHostName()); // ... - assertThat(cluster.getRootGroup().getSubgroups().get(8).getIndex(), is("8")); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().size(), is(3)); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(0).getDistributionKey(), is(24)); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(0).getConfigId(), is("bar/storage/24")); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(1).getDistributionKey(), is(25)); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(1).getConfigId(), is("bar/storage/25")); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(2).getDistributionKey(), is(26)); - assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(2).getConfigId(), is("bar/storage/26")); + assertEquals("8", subGroups.get(8).getIndex()); + assertEquals(3, subGroups.get(8).getNodes().size()); + assertEquals(24, subGroups.get(8).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/24", subGroups.get(8).getNodes().get(0).getConfigId()); + assertEquals(25, subGroups.get(8).getNodes().get(1).getDistributionKey()); + assertEquals("bar/storage/25", subGroups.get(8).getNodes().get(1).getConfigId()); + assertEquals(26, subGroups.get(8).getNodes().get(2).getDistributionKey()); + assertEquals("bar/storage/26", subGroups.get(8).getNodes().get(2).getConfigId()); cluster = model.getContentClusters().get("baz"); + subGroups = cluster.getRootGroup().getSubgroups(); assertEquals(0, cluster.getRootGroup().getNodes().size()); - assertEquals(27, cluster.getRootGroup().getSubgroups().size()); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("0")); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey(), is(0)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("baz/storage/0")); - assertEquals("node-1-3-10-27", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName()); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getIndex(), is("1")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("baz/storage/1")); - assertEquals("node-1-3-10-26", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName()); + assertEquals(27, subGroups.size()); + assertEquals("0", subGroups.get(0).getIndex()); + assertEquals(1, subGroups.get(0).getNodes().size()); + assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey()); + assertEquals("baz/storage/0", subGroups.get(0).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-27", subGroups.get(0).getNodes().get(0).getHostName()); + assertEquals("1", subGroups.get(1).getIndex()); + assertEquals(1, subGroups.get(1).getNodes().size()); + assertEquals(1, subGroups.get(1).getNodes().get(0).getDistributionKey()); + assertEquals("baz/storage/1", subGroups.get(1).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-26", subGroups.get(1).getNodes().get(0).getHostName()); // ... - assertEquals("node-1-3-10-25", cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getHostName()); + assertEquals("node-1-3-10-25", subGroups.get(2).getNodes().get(0).getHostName()); // ... - assertThat(cluster.getRootGroup().getSubgroups().get(26).getIndex(), is("26")); - assertThat(cluster.getRootGroup().getSubgroups().get(26).getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(26).getNodes().get(0).getDistributionKey(), is(26)); - assertThat(cluster.getRootGroup().getSubgroups().get(26).getNodes().get(0).getConfigId(), is("baz/storage/26")); + assertEquals("26", subGroups.get(26).getIndex()); + assertEquals(1, subGroups.get(26).getNodes().size()); + assertEquals(26, subGroups.get(26).getNodes().get(0).getDistributionKey()); + assertEquals("baz/storage/26", subGroups.get(26).getNodes().get(0).getConfigId()); } @Test @@ -755,7 +758,7 @@ public class ModelProvisioningTest { VespaModelTester tester = new VespaModelTester(); tester.addHosts(numberOfHosts); VespaModel model = tester.createModel(services, true); - assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts)); + assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size()); ClusterControllerContainerCluster clusterControllers = model.getAdmin().getClusterControllers(); assertEquals(3, clusterControllers.getContainers().size()); @@ -766,27 +769,28 @@ public class ModelProvisioningTest { // Check content cluster ContentCluster cluster = model.getContentClusters().get("bar"); + List<StorageGroup> subGroups = cluster.getRootGroup().getSubgroups(); assertEquals(0, cluster.getRootGroup().getNodes().size()); - assertEquals(8, cluster.getRootGroup().getSubgroups().size()); + assertEquals(8, subGroups.size()); assertEquals(8, cluster.distributionBits()); // first group - assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("0")); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey(), is(0)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("bar/storage/0")); - assertEquals("node-1-3-10-11", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName()); + assertEquals("0", subGroups.get(0).getIndex()); + assertEquals(1, subGroups.get(0).getNodes().size()); + assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/0", subGroups.get(0).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-11", subGroups.get(0).getNodes().get(0).getHostName()); // second group - assertThat(cluster.getRootGroup().getSubgroups().get(1).getIndex(), is("1")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("bar/storage/1")); - assertEquals("node-1-3-10-10", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName()); + assertEquals("1", subGroups.get(1).getIndex()); + assertEquals(1, subGroups.get(1).getNodes().size()); + assertEquals(1, subGroups.get(1).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/1", subGroups.get(1).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-10", subGroups.get(1).getNodes().get(0).getHostName()); // ... last group - assertThat(cluster.getRootGroup().getSubgroups().get(7).getIndex(), is("7")); - assertThat(cluster.getRootGroup().getSubgroups().get(7).getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(7).getNodes().get(0).getDistributionKey(), is(7)); - assertThat(cluster.getRootGroup().getSubgroups().get(7).getNodes().get(0).getConfigId(), is("bar/storage/7")); - assertEquals("node-1-3-10-04", cluster.getRootGroup().getSubgroups().get(7).getNodes().get(0).getHostName()); + assertEquals("7", subGroups.get(7).getIndex()); + assertEquals(1, subGroups.get(7).getNodes().size()); + assertEquals(7, subGroups.get(7).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/7", subGroups.get(7).getNodes().get(0).getConfigId()); + assertEquals("node-1-3-10-04", subGroups.get(7).getNodes().get(0).getHostName()); } @Test @@ -804,7 +808,7 @@ public class ModelProvisioningTest { VespaModelTester tester = new VespaModelTester(); tester.addHosts(numberOfHosts); VespaModel model = tester.createModel(services, true, "node-1-3-10-09"); - assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts)); + assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size()); // Check slobroks clusters assertEquals("Includes retired node", 1+3, model.getAdmin().getSlobroks().size()); @@ -858,7 +862,7 @@ public class ModelProvisioningTest { VespaModelTester tester = new VespaModelTester(); tester.addHosts(numberOfHosts); VespaModel model = tester.createModel(services, true, "node-1-3-10-15", "node-1-3-10-05", "node-1-3-10-04"); - assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts)); + assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size()); // Check slobroks clusters // ... from cluster default @@ -950,7 +954,7 @@ public class ModelProvisioningTest { tester.addHosts(numberOfHosts+1); VespaModel model = tester.createModel(Zone.defaultZone(), services, true); - assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts)); + assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size()); Admin admin = model.getAdmin(); Logserver logserver = admin.getLogserver(); @@ -961,7 +965,7 @@ public class ModelProvisioningTest { assertNull(hostResource.getService("logforwarder")); var clist = model.getContainerClusters().get("foo").getContainers(); - assertThat(clist.size(), is(1)); + assertEquals(1, clist.size()); hostResource = clist.get(0).getHostResource(); assertNull(hostResource.getService("logserver")); assertNotNull(hostResource.getService("container")); @@ -969,7 +973,7 @@ public class ModelProvisioningTest { var lfs = hostResource.getService("logforwarder"); String shutdown = lfs.getPreShutdownCommand().orElse("<none>"); - assertThat(shutdown, is("/usr/bin/env SPLUNK_HOME=/opt/splunkforwarder /opt/splunkforwarder/bin/splunk stop")); + assertEquals("/usr/bin/env SPLUNK_HOME=/opt/splunkforwarder /opt/splunkforwarder/bin/splunk stop", shutdown); } @@ -996,7 +1000,7 @@ public class ModelProvisioningTest { tester.addHosts(numberOfHosts+1); VespaModel model = tester.createModel(Zone.defaultZone(), services, true); - assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts)); + assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size()); Admin admin = model.getAdmin(); Logserver logserver = admin.getLogserver(); @@ -1007,7 +1011,7 @@ public class ModelProvisioningTest { assertNotNull(hostResource.getService("logforwarder")); var clist = model.getContainerClusters().get("foo").getContainers(); - assertThat(clist.size(), is(1)); + assertEquals(1, clist.size()); hostResource = clist.get(0).getHostResource(); assertNull(hostResource.getService("logserver")); assertNotNull(hostResource.getService("container")); @@ -1052,30 +1056,31 @@ public class ModelProvisioningTest { assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size()); ContentCluster cluster = model.getContentClusters().get("bar"); + List<StorageGroup> subGroups = cluster.getRootGroup().getSubgroups(); assertEquals(2*3, cluster.redundancy().effectiveInitialRedundancy()); // Reduced from 3*3 assertEquals(2*3, cluster.redundancy().effectiveFinalRedundancy()); // Reduced from 3*4 assertEquals(2*3, cluster.redundancy().effectiveReadyCopies()); // Reduced from 3*3 assertEquals("2|2|*", cluster.getRootGroup().getPartitions().get()); // Reduced from 4|4|* assertEquals(0, cluster.getRootGroup().getNodes().size()); - assertEquals(3, cluster.getRootGroup().getSubgroups().size()); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("0")); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().size(), is(2)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getDistributionKey(), is(0)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getConfigId(), is("bar/storage/0")); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getDistributionKey(), is(1)); - assertThat(cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getConfigId(), is("bar/storage/1")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getIndex(), is("1")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().size(), is(2)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getDistributionKey(), is(2)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getConfigId(), is("bar/storage/2")); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(1).getDistributionKey(), is(3)); - assertThat(cluster.getRootGroup().getSubgroups().get(1).getNodes().get(1).getConfigId(), is("bar/storage/3")); - assertThat(cluster.getRootGroup().getSubgroups().get(2).getIndex(), is("2")); - assertThat(cluster.getRootGroup().getSubgroups().get(2).getNodes().size(), is(2)); - assertThat(cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getDistributionKey(), is(4)); - assertThat(cluster.getRootGroup().getSubgroups().get(2).getNodes().get(0).getConfigId(), is("bar/storage/4")); - assertThat(cluster.getRootGroup().getSubgroups().get(2).getNodes().get(1).getDistributionKey(), is(5)); - assertThat(cluster.getRootGroup().getSubgroups().get(2).getNodes().get(1).getConfigId(), is("bar/storage/5")); + assertEquals(3, subGroups.size()); + assertEquals("0", subGroups.get(0).getIndex()); + assertEquals(2, subGroups.get(0).getNodes().size()); + assertEquals(0, subGroups.get(0).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/0", subGroups.get(0).getNodes().get(0).getConfigId()); + assertEquals(1, subGroups.get(0).getNodes().get(1).getDistributionKey()); + assertEquals("bar/storage/1", subGroups.get(0).getNodes().get(1).getConfigId()); + assertEquals("1", subGroups.get(1).getIndex()); + assertEquals(2, subGroups.get(1).getNodes().size()); + assertEquals(2, subGroups.get(1).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/2", subGroups.get(1).getNodes().get(0).getConfigId()); + assertEquals(3, subGroups.get(1).getNodes().get(1).getDistributionKey()); + assertEquals("bar/storage/3", subGroups.get(1).getNodes().get(1).getConfigId()); + assertEquals("2", subGroups.get(2).getIndex()); + assertEquals(2, subGroups.get(2).getNodes().size()); + assertEquals(4, subGroups.get(2).getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/4", subGroups.get(2).getNodes().get(0).getConfigId()); + assertEquals(5, subGroups.get(2).getNodes().get(1).getDistributionKey()); + assertEquals("bar/storage/5", subGroups.get(2).getNodes().get(1).getConfigId()); } @Test @@ -1192,7 +1197,7 @@ public class ModelProvisioningTest { VespaModelTester tester = new VespaModelTester(); tester.addHosts(numberOfHosts); VespaModel model = tester.createModel(services, false); - assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts)); + assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size()); ContentCluster cluster = model.getContentClusters().get("bar"); assertEquals(4, cluster.redundancy().effectiveInitialRedundancy()); @@ -1203,15 +1208,15 @@ public class ModelProvisioningTest { assertFalse(cluster.getRootGroup().getPartitions().isPresent()); assertEquals(4, cluster.getRootGroup().getNodes().size()); assertEquals(0, cluster.getRootGroup().getSubgroups().size()); - assertThat(cluster.getRootGroup().getNodes().size(), is(4)); - assertThat(cluster.getRootGroup().getNodes().get(0).getDistributionKey(), is(0)); - assertThat(cluster.getRootGroup().getNodes().get(0).getConfigId(), is("bar/storage/0")); - assertThat(cluster.getRootGroup().getNodes().get(1).getDistributionKey(), is(1)); - assertThat(cluster.getRootGroup().getNodes().get(1).getConfigId(), is("bar/storage/1")); - assertThat(cluster.getRootGroup().getNodes().get(2).getDistributionKey(), is(2)); - assertThat(cluster.getRootGroup().getNodes().get(2).getConfigId(), is("bar/storage/2")); - assertThat(cluster.getRootGroup().getNodes().get(3).getDistributionKey(), is(3)); - assertThat(cluster.getRootGroup().getNodes().get(3).getConfigId(), is("bar/storage/3")); + assertEquals(4, cluster.getRootGroup().getNodes().size()); + assertEquals(0, cluster.getRootGroup().getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/0", cluster.getRootGroup().getNodes().get(0).getConfigId()); + assertEquals(1, cluster.getRootGroup().getNodes().get(1).getDistributionKey()); + assertEquals("bar/storage/1", cluster.getRootGroup().getNodes().get(1).getConfigId()); + assertEquals(2, cluster.getRootGroup().getNodes().get(2).getDistributionKey()); + assertEquals("bar/storage/2", cluster.getRootGroup().getNodes().get(2).getConfigId()); + assertEquals(3, cluster.getRootGroup().getNodes().get(3).getDistributionKey()); + assertEquals("bar/storage/3", cluster.getRootGroup().getNodes().get(3).getConfigId()); } @Test @@ -1236,7 +1241,7 @@ public class ModelProvisioningTest { VespaModelTester tester = new VespaModelTester(); tester.addHosts(numberOfHosts); VespaModel model = tester.createModel(services, false); - assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts)); + assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size()); ContentCluster cluster = model.getContentClusters().get("bar"); assertEquals(1, cluster.redundancy().effectiveInitialRedundancy()); // Reduced from 3*3 @@ -1245,9 +1250,9 @@ public class ModelProvisioningTest { assertFalse(cluster.getRootGroup().getPartitions().isPresent()); // 1 group - > flattened -> no distribution assertEquals(1, cluster.getRootGroup().getNodes().size()); assertEquals(0, cluster.getRootGroup().getSubgroups().size()); - assertThat(cluster.getRootGroup().getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getNodes().get(0).getDistributionKey(), is(0)); - assertThat(cluster.getRootGroup().getNodes().get(0).getConfigId(), is("bar/storage/0")); + assertEquals(1, cluster.getRootGroup().getNodes().size()); + assertEquals(0, cluster.getRootGroup().getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/0", cluster.getRootGroup().getNodes().get(0).getConfigId()); } @Test(expected = IllegalArgumentException.class) @@ -1337,7 +1342,7 @@ public class ModelProvisioningTest { VespaModelTester tester = new VespaModelTester(); tester.addHosts(numberOfHosts); VespaModel model = tester.createModel(services, false); - assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts)); + assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size()); ContentCluster cluster = model.getContentClusters().get("bar"); assertEquals(1, cluster.redundancy().effectiveInitialRedundancy()); @@ -1348,9 +1353,9 @@ public class ModelProvisioningTest { assertFalse(cluster.getRootGroup().getPartitions().isPresent()); assertEquals(1, cluster.getRootGroup().getNodes().size()); assertEquals(0, cluster.getRootGroup().getSubgroups().size()); - assertThat(cluster.getRootGroup().getNodes().size(), is(1)); - assertThat(cluster.getRootGroup().getNodes().get(0).getDistributionKey(), is(0)); - assertThat(cluster.getRootGroup().getNodes().get(0).getConfigId(), is("bar/storage/0")); + assertEquals(1, cluster.getRootGroup().getNodes().size()); + assertEquals(0, cluster.getRootGroup().getNodes().get(0).getDistributionKey()); + assertEquals("bar/storage/0", cluster.getRootGroup().getNodes().get(0).getConfigId()); } @Test @@ -1850,7 +1855,7 @@ public class ModelProvisioningTest { "</services>"; VespaModel model = createNonProvisionedMultitenantModel(services); - assertThat(model.getRoot().hostSystem().getHosts().size(), is(1)); + assertEquals(1, model.getRoot().hostSystem().getHosts().size()); ContentCluster content = model.getContentClusters().get("storage"); assertEquals(1, content.getRootGroup().getNodes().size()); ContainerCluster<?> controller = model.getAdmin().getClusterControllers(); @@ -2178,7 +2183,7 @@ public class ModelProvisioningTest { tester.addHosts(numberOfHosts); VespaModel model = tester.createModel(Zone.defaultZone(), services, true); - assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts)); + assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size()); Admin admin = model.getAdmin(); Logserver logserver = admin.getLogserver(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java index 8656e740333..e4de0aef622 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java @@ -10,15 +10,16 @@ import com.yahoo.searchdefinition.parser.ParseException; import com.yahoo.tensor.TensorType; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.configdefinition.IlscriptsConfig; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import java.io.IOException; import java.util.Optional; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Attribute settings @@ -27,9 +28,6 @@ import static org.junit.Assert.*; */ public class AttributeSettingsTestCase extends AbstractSchemaTestCase { - @Rule - public final ExpectedException exceptionRule = ExpectedException.none(); - @Test public void testAttributeSettings() throws IOException, ParseException { Schema schema = SchemaBuilder.buildFromFile("src/test/examples/attributesettings.sd"); @@ -37,8 +35,8 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase { SDField f1=(SDField) schema.getDocument().getField("f1"); assertEquals(1, f1.getAttributes().size()); Attribute a1 = f1.getAttributes().get(f1.getName()); - assertThat(a1.getType(), is(Attribute.Type.LONG)); - assertThat(a1.getCollectionType(), is(Attribute.CollectionType.SINGLE)); + assertEquals(Attribute.Type.LONG, a1.getType()); + assertEquals(Attribute.CollectionType.SINGLE, a1.getCollectionType()); assertTrue(a1.isHuge()); assertFalse(a1.isFastSearch()); assertFalse(a1.isFastAccess()); @@ -48,21 +46,21 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase { SDField f2=(SDField) schema.getDocument().getField("f2"); assertEquals(1, f2.getAttributes().size()); Attribute a2 = f2.getAttributes().get(f2.getName()); - assertThat(a2.getType(), is(Attribute.Type.LONG)); - assertThat(a2.getCollectionType(), is(Attribute.CollectionType.SINGLE)); + assertEquals(Attribute.Type.LONG, a2.getType()); + assertEquals(Attribute.CollectionType.SINGLE, a2.getCollectionType()); assertFalse(a2.isHuge()); assertTrue(a2.isFastSearch()); assertFalse(a2.isFastAccess()); assertFalse(a2.isRemoveIfZero()); assertFalse(a2.isCreateIfNonExistent()); - assertThat(f2.getAliasToName().get("f2alias"), is("f2")); + assertEquals("f2", f2.getAliasToName().get("f2alias")); SDField f3=(SDField) schema.getDocument().getField("f3"); assertEquals(1, f3.getAttributes().size()); - assertThat(f3.getAliasToName().get("f3alias"), is("f3")); + assertEquals("f3", f3.getAliasToName().get("f3alias")); Attribute a3 = f3.getAttributes().get(f3.getName()); - assertThat(a3.getType(), is(Attribute.Type.LONG)); - assertThat(a3.getCollectionType(), is(Attribute.CollectionType.SINGLE)); + assertEquals(Attribute.Type.LONG, a3.getType()); + assertEquals(Attribute.CollectionType.SINGLE, a3.getCollectionType()); assertFalse(a3.isHuge()); assertFalse(a3.isFastSearch()); assertFalse(a3.isFastAccess()); @@ -82,13 +80,13 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase { SDField f4 = (SDField) schema.getDocument().getField(name); assertEquals(1, f4.getAttributes().size()); Attribute a4 = f4.getAttributes().get(f4.getName()); - assertThat(a4.getType(), is(Attribute.Type.STRING)); - assertThat(a4.getCollectionType(), is(Attribute.CollectionType.WEIGHTEDSET)); + assertEquals(Attribute.Type.STRING, a4.getType()); + assertEquals(Attribute.CollectionType.WEIGHTEDSET, a4.getCollectionType()); assertFalse(a4.isHuge()); assertFalse(a4.isFastSearch()); assertFalse(a4.isFastAccess()); - assertThat(removeIfZero, is(a4.isRemoveIfZero())); - assertThat(createIfNonExistent, is(a4.isCreateIfNonExistent())); + assertEquals(a4.isRemoveIfZero(), removeIfZero); + assertEquals(a4.isCreateIfNonExistent(), createIfNonExistent); } @Test @@ -154,9 +152,8 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase { @Test public void requireThatMutableCanNotbeSetInDocument() throws ParseException { - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("Field 'f' in 'test' can not be marked mutable as it is inside the document clause."); - getSearch("search test {\n" + + try { + getSearch("search test {\n" + " document test {\n" + " field f type int {\n" + " indexing: attribute\n" + @@ -164,6 +161,10 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase { " }\n" + " }\n" + "}\n"); + fail(); + } catch (IllegalArgumentException e) { + assertEquals("Field 'f' in 'test' can not be marked mutable as it is inside the document clause.", e.getMessage()); + } } @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java index 30cda8b5f42..fb552f5cfb0 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentGraphValidatorTest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.fail; */ public class DocumentGraphValidatorTest { + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java index 19964700dd0..cc45a2aaec0 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/DocumentReferenceResolverTest.java @@ -25,6 +25,7 @@ public class DocumentReferenceResolverTest { private static final String BAR = "bar"; private static final String FOO = "foo"; + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java index a3dd45a629f..456a236f293 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/PredicateDataTypeTestCase.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition; -import static org.junit.Assert.*; - import com.yahoo.searchdefinition.document.ImmutableSDField; import org.junit.Rule; import org.junit.Test; @@ -11,6 +9,11 @@ import org.junit.rules.ExpectedException; import com.yahoo.document.DataType; import com.yahoo.searchdefinition.parser.ParseException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Lester Solbakken */ @@ -49,6 +52,7 @@ public class PredicateDataTypeTestCase { return "upper-bound: " + bound + "\n"; } + @SuppressWarnings("deprecation") @Rule public ExpectedException exception = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java index 7951962a8bd..1925b7e77b9 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingConstantTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.fail; */ public class RankingConstantTest { + @SuppressWarnings("deprecation") @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StructInheritanceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/StructInheritanceTestCase.java index 19bd8305fa5..b2c2a54ce5e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StructInheritanceTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/StructInheritanceTestCase.java @@ -1,29 +1,18 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition.derived; -import com.yahoo.document.DataType; -import com.yahoo.document.config.DocumentmanagerConfig; -import com.yahoo.searchdefinition.Index; -import com.yahoo.searchdefinition.Schema; + import com.yahoo.searchdefinition.SchemaBuilder; -import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; + import com.yahoo.searchdefinition.parser.ParseException; -import com.yahoo.vespa.configmodel.producers.DocumentManager; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import java.io.File; import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import org.junit.rules.TemporaryFolder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import org.junit.rules.TemporaryFolder; /** * Tests struct inheritance @@ -35,6 +24,7 @@ public class StructInheritanceTestCase extends AbstractExportingTestCase { @Rule public TemporaryFolder tmpDir = new TemporaryFolder(); + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/document/HnswIndexParamsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/document/HnswIndexParamsTestCase.java index 7b46e9899e2..d6ff8fa1067 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/document/HnswIndexParamsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/document/HnswIndexParamsTestCase.java @@ -6,9 +6,7 @@ import java.util.Optional; import org.junit.Test; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.MatcherAssert.assertThat; public class HnswIndexParamsTestCase { diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java index 3b5add5b3d8..5d2590a420d 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java @@ -86,6 +86,7 @@ public class AdjustPositionSummaryFieldsTestCase { model.assertSummaryField("pos.distance", DataType.INT, SummaryTransform.DISTANCE, "pos_zcurve"); } + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java index 00f67c80084..dd958fb34cd 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/FastAccessValidatorTest.java @@ -14,6 +14,7 @@ import org.junit.rules.ExpectedException; */ public class FastAccessValidatorTest { + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java index 522d4dc2b15..324010f9e83 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertSame; */ public class ImportedFieldsResolverTestCase { + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java index 0ece6d57fe1..6eab1dddc79 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java @@ -38,6 +38,7 @@ public class ImportedFieldsTestCase { assertSearchContainsImportedField("my_name", "person_ref", "person", "name", schema); } + @SuppressWarnings("deprecation") @Rule public ExpectedException exception = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java index 4fb1bd50e3f..7eea2fca0e6 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/MatchedElementsOnlyResolverTestCase.java @@ -19,6 +19,7 @@ import static org.junit.Assert.assertEquals; */ public class MatchedElementsOnlyResolverTestCase { + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java index e8564d0875d..c9437761e0d 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java @@ -13,16 +13,16 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; /** * @author bjorncs */ public class ReferenceFieldTestCase { + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); @@ -83,7 +83,7 @@ public class ReferenceFieldTestCase { Field field = documentType.getDocumentType().getField(expectedFieldname); assertNotNull("Field does not exist in document type: " + expectedFieldname, field); DataType dataType = field.getDataType(); - assertThat(dataType, instanceOf(ReferenceDataType.class)); + assertTrue(dataType instanceof ReferenceDataType); ReferenceDataType refField = (ReferenceDataType) dataType; assertEquals(referencedDocType, refField.getTargetType().getName()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java index 08c123b5578..fe9d19310a9 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ValidateFieldTypesTest.java @@ -31,6 +31,7 @@ public class ValidateFieldTypesTest { private static final String IMPORTED_FIELD_NAME = "imported_myfield"; private static final String DOCUMENT_NAME = "my_doc"; + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidatorTest.java index 09e9ec9904b..86d4c527670 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidatorTest.java @@ -7,13 +7,14 @@ import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.config.model.test.ModelBuilderAddingAccessControlFilter; import com.yahoo.vespa.model.VespaModel; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.xml.sax.SAXException; import java.io.IOException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * @author bjorncs */ @@ -31,17 +32,18 @@ public class AccessControlFilterValidatorTest { " </container>", "</services>"); - @Rule - public ExpectedException exceptionRule = ExpectedException.none(); @Test public void validator_fails_with_empty_access_control_filter_chain() throws IOException, SAXException { DeployState deployState = createDeployState(); VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState); - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("The 'access-control' feature is not available in open-source Vespa."); - new AccessControlFilterValidator().validate(model, deployState); + try { + new AccessControlFilterValidator().validate(model, deployState); + fail(); + } catch (IllegalArgumentException e) { + assertEquals("The 'access-control' feature is not available in open-source Vespa.", e.getMessage()); + } } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlValidatorTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlValidatorTestBase.java index 5cdddcfba31..107ee8aef72 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlValidatorTestBase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlValidatorTestBase.java @@ -8,9 +8,7 @@ import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.model.VespaModel; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.xml.sax.SAXException; import java.io.IOException; @@ -21,9 +19,9 @@ import java.time.format.DateTimeFormatter; import static com.yahoo.config.model.test.TestUtil.joinLines; import static com.yahoo.config.provision.Environment.prod; -import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * @author gjoranv @@ -33,9 +31,6 @@ public abstract class AccessControlValidatorTestBase { protected Validator validator; protected Zone zone; - @Rule - public final ExpectedException exceptionRule = ExpectedException.none(); - private static String servicesXml(boolean addHandler, boolean protection) { return joinLines("<services version='1.0'>", " <container id='default' version='1.0'>", @@ -83,22 +78,20 @@ public abstract class AccessControlValidatorTestBase { @Test public void cluster_with_handler_fails_validation_without_protection() throws IOException, SAXException{ - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage(containsString("Access-control must be enabled")); - exceptionRule.expectMessage(containsString("production zones: [default]")); - DeployState deployState = deployState(servicesXml(true, false)); VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState); - validator.validate(model, deployState); + try { + validator.validate(model, deployState); + fail(); + } catch (IllegalArgumentException e) { + assertTrue(e.getMessage().contains("Access-control must be enabled")); + assertTrue(e.getMessage().contains("production zones: [default]")); + } } @Test public void no_http_element_has_same_effect_as_no_write_protection() throws IOException, SAXException{ - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage(containsString("Access-control must be enabled")); - exceptionRule.expectMessage(containsString("production zones: [default]")); - String servicesXml = joinLines("<services version='1.0'>", " <container id='default' version='1.0'>", httpHandlerXml, @@ -107,7 +100,13 @@ public abstract class AccessControlValidatorTestBase { DeployState deployState = deployState(servicesXml); VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState); - validator.validate(model, deployState); + try { + validator.validate(model, deployState); + fail(); + } catch (IllegalArgumentException e) { + assertTrue(e.getMessage().contains("Access-control must be enabled")); + assertTrue(e.getMessage().contains("production zones: [default]")); + } } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/CloudWatchValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/CloudWatchValidatorTest.java index 2fb2ed15521..92aa3151d91 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/CloudWatchValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/CloudWatchValidatorTest.java @@ -11,9 +11,7 @@ import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.model.VespaModel; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.xml.sax.SAXException; import java.io.IOException; @@ -21,6 +19,7 @@ import java.io.IOException; import static com.yahoo.config.provision.Environment.prod; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** @@ -28,9 +27,6 @@ import static org.junit.Assert.assertTrue; */ public class CloudWatchValidatorTest { - @Rule - public final ExpectedException exceptionRule = ExpectedException.none(); - @Test public void cloudwatch_in_public_zones_passes_validation() throws IOException, SAXException { DeployState deployState = deployState(servicesWithCloudwatch(), true, true); @@ -49,14 +45,16 @@ public class CloudWatchValidatorTest { @Test public void cloudwatch_in_non_public_zones_fails_validation() throws IOException, SAXException { - exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage( - "CloudWatch cannot be set up for non-public hosted Vespa and must be removed for consumers: [cloudwatch-consumer]"); - DeployState deployState = deployState(servicesWithCloudwatch(), true, false); VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState); - new CloudWatchValidator().validate(model, deployState); + try { + new CloudWatchValidator().validate(model, deployState); + fail(); + } catch (IllegalArgumentException e) { + assertEquals("CloudWatch cannot be set up for non-public hosted Vespa and must be removed for consumers: [cloudwatch-consumer]", + e.getMessage()); + } } private static DeployState deployState(String servicesXml, boolean isHosted, boolean isPublic) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java index 6f459b2d427..689f1c70b6e 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ComplexAttributeFieldsValidatorTestCase.java @@ -24,6 +24,7 @@ import static com.yahoo.config.model.test.TestUtil.joinLines; */ public class ComplexAttributeFieldsValidatorTestCase { + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java index ea457e043fb..90d5c0b27a4 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java @@ -22,6 +22,7 @@ public class ConstantTensorJsonValidatorTest { new ConstantTensorJsonValidator().validate("dummy.json", tensorType, jsonTensorReader); } + @SuppressWarnings("deprecation") @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/EndpointCertificateSecretsValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/EndpointCertificateSecretsValidatorTest.java index 0bbb2353316..51aa6cb6e42 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/EndpointCertificateSecretsValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/EndpointCertificateSecretsValidatorTest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue; * @author andreer */ public class EndpointCertificateSecretsValidatorTest { + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidatorTest.java index 6a88fa80070..b1847e5d134 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidatorTest.java @@ -2,17 +2,14 @@ package com.yahoo.vespa.model.application.validation; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import static com.yahoo.vespa.model.application.validation.RankingConstantsValidator.TensorValidationFailed; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class RankingConstantsValidatorTest { - @Rule - public ExpectedException expectedException = ExpectedException.none(); - @Test public void ensure_that_valid_ranking_constants_do_not_fail() { new VespaModelCreatorWithFilePkg("src/test/cfg/application/validation/ranking_constants_ok/").create(); @@ -20,12 +17,14 @@ public class RankingConstantsValidatorTest { @Test public void ensure_that_failing_ranking_constants_fails() { - expectedException.expect(TensorValidationFailed.class); - expectedException.expectMessage("Ranking constant 'constant_tensor_2' (tensors/constant_tensor_2.json): Tensor label is not a string (VALUE_NUMBER_INT)"); - expectedException.expectMessage("Ranking constant 'constant_tensor_3' (tensors/constant_tensor_3.json): Tensor dimension 'cd' does not exist"); - expectedException.expectMessage("Ranking constant 'constant_tensor_4' (tensors/constant_tensor_4.json): Tensor dimension 'z' does not exist"); - - new VespaModelCreatorWithFilePkg("src/test/cfg/application/validation/ranking_constants_fail/").create(); + try { + new VespaModelCreatorWithFilePkg("src/test/cfg/application/validation/ranking_constants_fail/").create(); + fail(); + } catch (TensorValidationFailed e) { + assertTrue(e.getMessage().contains("Ranking constant 'constant_tensor_2' (tensors/constant_tensor_2.json): Tensor label is not a string (VALUE_NUMBER_INT)")); + assertTrue(e.getMessage().contains("Ranking constant 'constant_tensor_3' (tensors/constant_tensor_3.json): Tensor dimension 'cd' does not exist")); + assertTrue(e.getMessage().contains("Ranking constant 'constant_tensor_4' (tensors/constant_tensor_4.json): Tensor dimension 'z' does not exist")); + } } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SecretStoreValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SecretStoreValidatorTest.java index 7ea8d9b1175..d30de06c459 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SecretStoreValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/SecretStoreValidatorTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue; * @author gjoranv */ public class SecretStoreValidatorTest { + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/StreamingValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/StreamingValidatorTest.java index 5d1893a4826..30a77779347 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/StreamingValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/StreamingValidatorTest.java @@ -10,6 +10,7 @@ import org.junit.rules.ExpectedException; * @author bjorncs */ public class StreamingValidatorTest { + @SuppressWarnings("deprecation") @Rule public final ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java index 525df099c1e..d106120073d 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java @@ -19,6 +19,7 @@ import java.io.IOException; */ public class UriBindingsValidatorTest { + @SuppressWarnings("deprecation") @Rule public ExpectedException exceptionRule = ExpectedException.none(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java index e3605115d05..bb3a0f26ee9 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java @@ -21,10 +21,9 @@ import java.io.Reader; import java.io.StringReader; import java.util.Optional; -import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; /** * @author Ulf Lilleengen @@ -46,8 +45,8 @@ public class UserConfigBuilderTest { ConfigDefinitionKey key = new ConfigDefinitionKey("simpletypes", "test"); assertNotNull(map.get(key)); SimpletypesConfig config = createConfig(SimpletypesConfig.class, map.get(key)); - assertThat(config.intval(), is(13)); - assertThat(config.stringval(), is("foolio")); + assertEquals(13, config.intval()); + assertEquals("foolio", config.stringval()); } private static <ConfigType extends ConfigInstance> ConfigType createConfig(Class<ConfigType> clazz, ConfigPayloadBuilder builder) { @@ -66,10 +65,10 @@ public class UserConfigBuilderTest { ConfigDefinitionKey key = new ConfigDefinitionKey("arraytypes", "test"); assertNotNull(map.get(key)); ArraytypesConfig config = createConfig(ArraytypesConfig.class, map.get(key)); - assertThat(config.intarr().size(), is(3)); - assertThat(config.intarr(0), is(13)); - assertThat(config.intarr(1), is(10)); - assertThat(config.intarr(2), is(1337)); + assertEquals(3, config.intarr().size()); + assertEquals(13, config.intarr(0)); + assertEquals(10, config.intarr(1)); + assertEquals(1337, config.intarr(2)); } @Test @@ -93,10 +92,10 @@ public class UserConfigBuilderTest { ConfigDefinitionKey key = new ConfigDefinitionKey(SpecialtokensConfig.CONFIG_DEF_NAME, SpecialtokensConfig.CONFIG_DEF_NAMESPACE); assertNotNull(map.get(key)); SpecialtokensConfig config = createConfig(SpecialtokensConfig.class, map.get(key)); - assertThat(config.tokenlist().size(), is(1)); - assertThat(config.tokenlist().get(0).name(), is("default")); - assertThat(config.tokenlist().get(0).tokens().size(), is(1)); - assertThat(config.tokenlist().get(0).tokens().get(0).token(), is("dvd+-r")); + assertEquals(1, config.tokenlist().size()); + assertEquals("default", config.tokenlist().get(0).name()); + assertEquals(1, config.tokenlist().get(0).tokens().size()); + assertEquals("dvd+-r", config.tokenlist().get(0).tokens().get(0).token()); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java index 68c623ec9a3..a27b6786800 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java @@ -35,13 +35,11 @@ import java.util.List; import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERCONTROLLER_CONTAINER; import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER; import static com.yahoo.vespa.config.search.core.ProtonConfig.Feeding.Shared_field_writer_executor; -import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.containsString; 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; @@ -50,6 +48,7 @@ import static org.junit.Assert.fail; */ public class ContentBuilderTest extends DomBuilderTest { + @SuppressWarnings("deprecation") @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -328,7 +327,7 @@ public class ContentBuilderTest extends DomBuilderTest { assertTrue(b.getRootGroup().getMmapNoCoreLimit().isPresent()); assertEquals(200000, b.getRootGroup().getMmapNoCoreLimit().get().longValue()); - assertThat(s.getSearchNodes().size(), is(2)); + assertEquals(2, s.getSearchNodes().size()); assertEquals(200000, s.getSearchNodes().get(0).getMMapNoCoreLimit()); assertEquals(200000, s.getSearchNodes().get(1).getMMapNoCoreLimit()); assertEquals("VESPA_MMAP_NOCORE_LIMIT=200000 ", s.getSearchNodes().get(0).getMMapNoCoreEnvVariable()); @@ -357,7 +356,7 @@ public class ContentBuilderTest extends DomBuilderTest { assertTrue(b.getRootGroup().getCoreOnOOM().isPresent()); assertTrue(b.getRootGroup().getCoreOnOOM().get()); - assertThat(s.getSearchNodes().size(), is(2)); + assertEquals(2, s.getSearchNodes().size()); assertTrue(s.getSearchNodes().get(0).getCoreOnOOM()); assertTrue(s.getSearchNodes().get(1).getCoreOnOOM()); assertEquals("", s.getSearchNodes().get(0).getCoreOnOOMEnvVariable()); @@ -383,7 +382,7 @@ public class ContentBuilderTest extends DomBuilderTest { assertEquals(2, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getCoreOnOOM().isPresent()); - assertThat(s.getSearchNodes().size(), is(2)); + assertEquals(2, s.getSearchNodes().size()); assertFalse(s.getSearchNodes().get(0).getCoreOnOOM()); assertFalse(s.getSearchNodes().get(1).getCoreOnOOM()); assertEquals("VESPA_SILENCE_CORE_ON_OOM=true ", s.getSearchNodes().get(0).getCoreOnOOMEnvVariable()); @@ -409,7 +408,7 @@ public class ContentBuilderTest extends DomBuilderTest { assertEquals(2, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getMmapNoCoreLimit().isPresent()); - assertThat(s.getSearchNodes().size(), is(2)); + assertEquals(2, s.getSearchNodes().size()); assertEquals(200000, s.getSearchNodes().get(0).getMMapNoCoreLimit()); assertEquals(-1, s.getSearchNodes().get(1).getMMapNoCoreLimit()); assertEquals("VESPA_MMAP_NOCORE_LIMIT=200000 ", s.getSearchNodes().get(0).getMMapNoCoreEnvVariable()); @@ -435,7 +434,7 @@ public class ContentBuilderTest extends DomBuilderTest { assertEquals(2, b.getStorageCluster().getChildren().size()); assertFalse(b.getRootGroup().getCoreOnOOM().isPresent()); - assertThat(s.getSearchNodes().size(), is(2)); + assertEquals(2, s.getSearchNodes().size()); assertTrue(s.getSearchNodes().get(0).getCoreOnOOM()); assertFalse(s.getSearchNodes().get(1).getCoreOnOOM()); assertEquals("", s.getSearchNodes().get(0).getCoreOnOOMEnvVariable()); @@ -470,7 +469,7 @@ public class ContentBuilderTest extends DomBuilderTest { assertTrue(b.getRootGroup().getVespaMallocDebugStackTrace().isPresent()); assertEquals("all", b.getRootGroup().getVespaMallocDebugStackTrace().get()); - assertThat(s.getSearchNodes().size(), is(4)); + assertEquals(4, s.getSearchNodes().size()); for (SearchNode n : s.getSearchNodes()) { assertEquals("proton", n.getNoVespaMalloc()); assertEquals("VESPA_USE_NO_VESPAMALLOC=\"proton\" ", n.getNoVespaMallocEnvVariable()); @@ -508,7 +507,7 @@ public class ContentBuilderTest extends DomBuilderTest { assertFalse(b.getRootGroup().getVespaMallocDebug().isPresent()); assertFalse(b.getRootGroup().getVespaMallocDebugStackTrace().isPresent()); - assertThat(s.getSearchNodes().size(), is(4)); + assertEquals(4, s.getSearchNodes().size()); assertEquals("VESPA_SILENCE_CORE_ON_OOM=true OMP_NUM_THREADS=1 VESPA_USE_NO_VESPAMALLOC=\"proton\" ", s.getSearchNodes().get(0).getEnvVariables()); assertEquals("VESPA_SILENCE_CORE_ON_OOM=true OMP_NUM_THREADS=1 VESPA_USE_VESPAMALLOC_D=\"distributord\" ", s.getSearchNodes().get(1).getEnvVariables()); assertEquals("VESPA_SILENCE_CORE_ON_OOM=true OMP_NUM_THREADS=1 VESPA_USE_VESPAMALLOC_DST=\"all\" ", s.getSearchNodes().get(2).getEnvVariables()); @@ -535,15 +534,15 @@ public class ContentBuilderTest extends DomBuilderTest { assertNotNull(s.getIndexed()); assertEquals(2, b.getStorageCluster().getChildren().size()); assertTrue(b.getStorageCluster().getChildren().get("0").getAffinity().isPresent()); - assertThat(b.getStorageCluster().getChildren().get("0").getAffinity().get().cpuSocket(), is(0)); + assertEquals(0, b.getStorageCluster().getChildren().get("0").getAffinity().get().cpuSocket()); assertTrue(b.getStorageCluster().getChildren().get("1").getAffinity().isPresent()); - assertThat(b.getStorageCluster().getChildren().get("1").getAffinity().get().cpuSocket(), is(1)); + assertEquals(1, b.getStorageCluster().getChildren().get("1").getAffinity().get().cpuSocket()); - assertThat(s.getSearchNodes().size(), is(2)); + assertEquals(2, s.getSearchNodes().size()); assertTrue(s.getSearchNodes().get(0).getAffinity().isPresent()); - assertThat(s.getSearchNodes().get(0).getAffinity().get().cpuSocket(), is(0)); + assertEquals(0, s.getSearchNodes().get(0).getAffinity().get().cpuSocket()); assertTrue(s.getSearchNodes().get(1).getAffinity().isPresent()); - assertThat(s.getSearchNodes().get(1).getAffinity().get().cpuSocket(), is(1)); + assertEquals(1, s.getSearchNodes().get(1).getAffinity().get().cpuSocket()); } @Test @@ -571,19 +570,19 @@ public class ContentBuilderTest extends DomBuilderTest { assertEquals(6, b.getStorageCluster().getChildren().size()); assertTrue(b.getRootGroup().useCpuSocketAffinity()); - assertThat(s.getSearchNodes().size(), is(6)); + assertEquals(6, s.getSearchNodes().size()); assertTrue(s.getSearchNodes().get(0).getAffinity().isPresent()); assertTrue(s.getSearchNodes().get(1).getAffinity().isPresent()); assertTrue(s.getSearchNodes().get(2).getAffinity().isPresent()); assertTrue(s.getSearchNodes().get(3).getAffinity().isPresent()); assertTrue(s.getSearchNodes().get(4).getAffinity().isPresent()); assertTrue(s.getSearchNodes().get(5).getAffinity().isPresent()); - assertThat(s.getSearchNodes().get(0).getAffinity().get().cpuSocket(),is (0)); - assertThat(s.getSearchNodes().get(1).getAffinity().get().cpuSocket(),is (1)); - assertThat(s.getSearchNodes().get(2).getAffinity().get().cpuSocket(),is (2)); - assertThat(s.getSearchNodes().get(3).getAffinity().get().cpuSocket(),is (0)); - assertThat(s.getSearchNodes().get(4).getAffinity().get().cpuSocket(),is (1)); - assertThat(s.getSearchNodes().get(5).getAffinity().get().cpuSocket(),is (0)); + assertEquals(0, s.getSearchNodes().get(0).getAffinity().get().cpuSocket()); + assertEquals(1, s.getSearchNodes().get(1).getAffinity().get().cpuSocket()); + assertEquals(2, s.getSearchNodes().get(2).getAffinity().get().cpuSocket()); + assertEquals(0, s.getSearchNodes().get(3).getAffinity().get().cpuSocket()); + assertEquals(1, s.getSearchNodes().get(4).getAffinity().get().cpuSocket()); + assertEquals(0, s.getSearchNodes().get(5).getAffinity().get().cpuSocket()); // TODO: Only needed for the search nodes anyway? assertFalse(b.getStorageCluster().getChildren().get("0").getAffinity().isPresent()); @@ -592,12 +591,12 @@ public class ContentBuilderTest extends DomBuilderTest { assertFalse(b.getStorageCluster().getChildren().get("3").getAffinity().isPresent()); assertFalse(b.getStorageCluster().getChildren().get("4").getAffinity().isPresent()); assertFalse(b.getStorageCluster().getChildren().get("5").getAffinity().isPresent()); - //assertThat(b.getStorageNodes().getChildren().get("0").getAffinity().get().cpuSocket(), is(0)); - //assertThat(b.getStorageNodes().getChildren().get("1").getAffinity().get().cpuSocket(), is(1)); - //assertThat(b.getStorageNodes().getChildren().get("2").getAffinity().get().cpuSocket(), is(2)); - //assertThat(b.getStorageNodes().getChildren().get("3").getAffinity().get().cpuSocket(), is(0)); - //assertThat(b.getStorageNodes().getChildren().get("4").getAffinity().get().cpuSocket(), is(1)); - //assertThat(b.getStorageNodes().getChildren().get("5").getAffinity().get().cpuSocket(), is(0)); + //assertEquals(0, b.getStorageNodes().getChildren().get("0").getAffinity().get().cpuSocket()); + //assertEquals(1, b.getStorageNodes().getChildren().get("1").getAffinity().get().cpuSocket()); + //assertEquals(2, b.getStorageNodes().getChildren().get("2").getAffinity().get().cpuSocket()); + //assertEquals(0, b.getStorageNodes().getChildren().get("3").getAffinity().get().cpuSocket()); + //assertEquals(1, b.getStorageNodes().getChildren().get("4").getAffinity().get().cpuSocket()); + //assertEquals(0, b.getStorageNodes().getChildren().get("5").getAffinity().get().cpuSocket()); } @@ -666,10 +665,10 @@ public class ContentBuilderTest extends DomBuilderTest { a.getSearch().getConfig(pb); List<String> serialize = ConfigInstance.serialize(new ProtonConfig(pb)); String cfg = StringUtilities.implode(serialize.toArray(new String[serialize.size()]), "\n"); - assertThat(cfg, containsString("summary.cache.maxbytes 8192")); - assertThat(cfg, containsString("summary.cache.compression.level 8")); - assertThat(cfg, containsString("summary.cache.compression.type LZ4")); - assertThat(cfg, containsString("summary.read.io DIRECTIO")); + assertTrue(cfg.contains("summary.cache.maxbytes 8192")); + assertTrue(cfg.contains("summary.cache.compression.level 8")); + assertTrue(cfg.contains("summary.cache.compression.type LZ4")); + assertTrue(cfg.contains("summary.read.io DIRECTIO")); } @Test @@ -716,8 +715,8 @@ public class ContentBuilderTest extends DomBuilderTest { content.getSearch().getIndexed().getSearchNode(0).cascadeConfig(builder); content.getSearch().getIndexed().getSearchNode(0).addUserConfig(builder); ProtonConfig config = new ProtonConfig(builder); - assertThat(config.search().mmap().options().size(), is(1)); - assertThat(config.search().mmap().options(0), is(ProtonConfig.Search.Mmap.Options.POPULATE)); + assertEquals(1, config.search().mmap().options().size()); + assertEquals(ProtonConfig.Search.Mmap.Options.POPULATE, config.search().mmap().options(0)); } private String singleNodeContentXml() { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSchemaChainsBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSchemaChainsBuilderTest.java index d052d4dd1f2..6006b52cf02 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSchemaChainsBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSchemaChainsBuilderTest.java @@ -27,9 +27,9 @@ import java.util.List; import static com.yahoo.container.core.ChainsConfig.Chains; import static com.yahoo.container.core.ChainsConfig.Components; import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -112,7 +112,7 @@ public class DomSchemaChainsBuilderTest extends DomBuilderTest { } private Matcher<ChainedComponent<?>> searcherWithId(final String componentId) { - return new BaseMatcher<ChainedComponent<?>>() { + return new BaseMatcher<>() { @Override public boolean matches(Object o) { return o instanceof ChainedComponent && @@ -130,7 +130,7 @@ public class DomSchemaChainsBuilderTest extends DomBuilderTest { public void checkProviderFederationOptions() { FederationOptions options = getProvider().federationOptions(); - assertEquals(true, options.getOptional()); + assertTrue(options.getOptional()); assertEquals(2300, options.getTimeoutInMilliseconds()); } @@ -138,7 +138,7 @@ public class DomSchemaChainsBuilderTest extends DomBuilderTest { public void checkSourceFederationOptions() { FederationOptions options = getSource().federationOptions(); - assertEquals(true, options.getOptional()); //inherited + assertTrue(options.getOptional()); //inherited assertEquals(12, options.getTimeoutInMilliseconds()); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java index 9d85b0ed4d1..f6a5bc14ab5 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java @@ -22,16 +22,8 @@ import java.util.Set; import java.util.stream.Collectors; import static com.yahoo.vespa.defaults.Defaults.getDefaults; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItems; -import static org.hamcrest.Matchers.not; 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; @@ -106,7 +98,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { " </http>"); Set<String> actualBindings = getFilterBindings(http, AccessControl.ACCESS_CONTROL_EXCLUDED_CHAIN_ID); - assertThat(actualBindings, containsInAnyOrder( + assertTrue(actualBindings.containsAll(List.of( "http://*:4443/ApplicationStatus", "http://*:4443/status.html", "http://*:4443/state/v1", @@ -115,7 +107,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { "http://*:4443/prometheus/v1/*", "http://*:4443/metrics/v2", "http://*:4443/metrics/v2/*", - "http://*:4443/")); + "http://*:4443/"))); } @Test @@ -131,7 +123,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { Set<String> excludedBindings = getFilterBindings(http, AccessControl.ACCESS_CONTROL_EXCLUDED_CHAIN_ID); for (String binding : bindings) { - assertThat(excludedBindings, not(hasItem(binding))); + assertFalse(excludedBindings.contains(binding)); } } @@ -154,7 +146,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { " </http>"); Set<String> actualBindings = getFilterBindings(http, AccessControl.ACCESS_CONTROL_EXCLUDED_CHAIN_ID); - assertThat(actualBindings, hasItems("http://*:4443/custom-handler/*", "http://*:4443/search/*", "http://*:4443/status.html")); + assertTrue(actualBindings.containsAll(List.of("http://*:4443/custom-handler/*", "http://*:4443/search/*", "http://*:4443/status.html"))); } @Test @@ -167,7 +159,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { " </http>"); Set<String> actualBindings = getFilterBindings(http, AccessControl.ACCESS_CONTROL_CHAIN_ID); - assertThat(actualBindings, empty()); + assertTrue(actualBindings.isEmpty()); HostedSslConnectorFactory hostedConnectorFactory = (HostedSslConnectorFactory)http.getHttpServer().get().getConnectorFactories().stream() .filter(connectorFactory -> connectorFactory instanceof HostedSslConnectorFactory) @@ -182,12 +174,12 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { public void access_control_is_implicitly_added_for_hosted_apps() { Http http = createModelAndGetHttp("<container version='1.0'/>"); Optional<AccessControl> maybeAccessControl = http.getAccessControl(); - assertThat(maybeAccessControl.isPresent(), is(true)); + assertTrue(maybeAccessControl.isPresent()); AccessControl accessControl = maybeAccessControl.get(); - assertThat(accessControl.writeEnabled, is(false)); - assertThat(accessControl.readEnabled, is(false)); - assertThat(accessControl.clientAuthentication, is(AccessControl.ClientAuthentication.need)); - assertThat(accessControl.domain, equalTo("my-tenant-domain")); + assertFalse(accessControl.writeEnabled); + assertFalse(accessControl.readEnabled); + assertEquals(AccessControl.ClientAuthentication.need, accessControl.clientAuthentication); + assertEquals("my-tenant-domain", accessControl.domain); } @Test @@ -202,9 +194,9 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { " </request-chain>", " </filtering>", " </http>"); - assertThat(http.getAccessControl().isPresent(), is(true)); - assertThat(http.getFilterChains().hasChain(AccessControl.ACCESS_CONTROL_CHAIN_ID), is(true)); - assertThat(http.getFilterChains().hasChain(ComponentId.fromString("myChain")), is(true)); + assertTrue(http.getAccessControl().isPresent()); + assertTrue(http.getFilterChains().hasChain(AccessControl.ACCESS_CONTROL_CHAIN_ID)); + assertTrue(http.getFilterChains().hasChain(ComponentId.fromString("myChain"))); } @Test @@ -226,7 +218,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { " </http>"); Set<String> actualExcludeBindings = getFilterBindings(http, AccessControl.ACCESS_CONTROL_EXCLUDED_CHAIN_ID); - assertThat(actualExcludeBindings, containsInAnyOrder( + assertTrue(actualExcludeBindings.containsAll(List.of( "http://*:4443/ApplicationStatus", "http://*:4443/status.html", "http://*:4443/state/v1", @@ -234,10 +226,10 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { "http://*:4443/prometheus/v1", "http://*:4443/prometheus/v1/*", "http://*:4443/metrics/v2", - "http://*:4443/metrics/v2/*")); + "http://*:4443/metrics/v2/*"))); Set<String> actualCustomChainBindings = getFilterBindings(http, ComponentId.fromString("my-custom-request-chain")); - assertThat(actualCustomChainBindings, containsInAnyOrder("http://*/custom-handler/*", "http://*/")); + assertTrue(actualCustomChainBindings.containsAll(List.of("http://*/custom-handler/*", "http://*/"))); } @Test @@ -261,7 +253,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { " </http>"); Set<String> actualExcludeBindings = getFilterBindings(http, AccessControl.ACCESS_CONTROL_EXCLUDED_CHAIN_ID); - assertThat(actualExcludeBindings, containsInAnyOrder( + assertTrue(actualExcludeBindings.containsAll(List.of( "http://*:4443/ApplicationStatus", "http://*:4443/status.html", "http://*:4443/state/v1", @@ -271,10 +263,10 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { "http://*:4443/metrics/v2", "http://*:4443/metrics/v2/*", "http://*:4443/", - "http://*:4443/custom-handler/*")); + "http://*:4443/custom-handler/*"))); Set<String> actualCustomChainBindings = getFilterBindings(http, ComponentId.fromString("my-custom-response-chain")); - assertThat(actualCustomChainBindings, containsInAnyOrder("http://*/custom-handler/*")); + assertTrue(actualCustomChainBindings.contains("http://*/custom-handler/*")); } @Test @@ -341,7 +333,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { " </http>"); Set<String> actualBindings = getFilterBindings(http, AccessControl.DEFAULT_CONNECTOR_HOSTED_REQUEST_CHAIN_ID); - assertThat(actualBindings, empty()); + assertTrue(actualBindings.isEmpty()); ConnectorFactory connectorFactory = http.getHttpServer().get().getConnectorFactories().stream() .filter(cf -> cf.getListenPort() == Defaults.getDefaults().vespaWebServicePort()) diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java index 5221139ceaa..49c1783c187 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java @@ -23,12 +23,8 @@ import java.io.StringReader; import java.util.List; import java.util.Optional; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; /** @@ -54,8 +50,8 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas ); createModel(root, clusterElem); ConnectorConfig cfg = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/bananarama"); - assertThat(cfg.requestHeaderSize(), is(300000)); - assertThat(cfg.headerCacheSize(), is(300000)); + assertEquals(300000, cfg.requestHeaderSize()); + assertEquals(300000, cfg.headerCacheSize()); } @Test @@ -92,15 +88,15 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas final ComponentsConfig.Components jettyHttpServerComponent = extractComponentByClassName( containerComponentsConfig(), com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName()); - assertThat(jettyHttpServerComponent, is(not(nullValue()))); + assertNotNull(jettyHttpServerComponent); final ComponentsConfig.Components filterBindingsProviderComponent = extractComponentByClassName( containerComponentsConfig(), FilterBindingsProvider.class.getName()); - assertThat(filterBindingsProviderComponent, is(not(nullValue()))); + assertNotNull(filterBindingsProviderComponent); final ComponentsConfig.Components.Inject filterBindingsProviderInjection = extractInjectionById( jettyHttpServerComponent, filterBindingsProviderComponent.id()); - assertThat(filterBindingsProviderInjection, is(not(nullValue()))); + assertNotNull(filterBindingsProviderInjection); } @Test @@ -116,15 +112,15 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas final ComponentsConfig.Components jettyHttpServerComponent = extractComponentByClassName( clusterComponentsConfig(), com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName()); - assertThat(jettyHttpServerComponent, is(not(nullValue()))); + assertNotNull(jettyHttpServerComponent); final ComponentsConfig.Components filterBindingsProviderComponent = extractComponentByClassName( clusterComponentsConfig(), FilterBindingsProvider.class.getName()); - assertThat(filterBindingsProviderComponent, is(not(nullValue()))); + assertNotNull(filterBindingsProviderComponent); final ComponentsConfig.Components.Inject filterBindingsProviderInjection = extractInjectionById( jettyHttpServerComponent, filterBindingsProviderComponent.id()); - assertThat(filterBindingsProviderInjection, is(not(nullValue()))); + assertNotNull(filterBindingsProviderInjection); } @Test @@ -168,31 +164,31 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas createModel(root, clusterElem); ConnectorConfig minimalCfg = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/minimal/configured-ssl-provider@minimal"); assertTrue(minimalCfg.ssl().enabled()); - assertThat(minimalCfg.ssl().privateKeyFile(), is(equalTo("/foo/key"))); - assertThat(minimalCfg.ssl().certificateFile(), is(equalTo("/foo/cert"))); - assertThat(minimalCfg.ssl().caCertificateFile(), is(equalTo(""))); - assertThat(minimalCfg.ssl().clientAuth(), is(equalTo(ConnectorConfig.Ssl.ClientAuth.Enum.DISABLED))); + assertEquals("/foo/key", minimalCfg.ssl().privateKeyFile()); + assertEquals("/foo/cert", minimalCfg.ssl().certificateFile()); + assertTrue(minimalCfg.ssl().caCertificateFile().isEmpty()); + assertEquals(ConnectorConfig.Ssl.ClientAuth.Enum.DISABLED, minimalCfg.ssl().clientAuth()); ConnectorConfig withCaCerts = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/with-cacerts/configured-ssl-provider@with-cacerts"); assertTrue(withCaCerts.ssl().enabled()); - assertThat(withCaCerts.ssl().privateKeyFile(), is(equalTo("/foo/key"))); - assertThat(withCaCerts.ssl().certificateFile(), is(equalTo("/foo/cert"))); - assertThat(withCaCerts.ssl().caCertificateFile(), is(equalTo("/foo/cacerts"))); - assertThat(withCaCerts.ssl().clientAuth(), is(equalTo(ConnectorConfig.Ssl.ClientAuth.Enum.DISABLED))); + assertEquals("/foo/key", withCaCerts.ssl().privateKeyFile()); + assertEquals("/foo/cert", withCaCerts.ssl().certificateFile()); + assertEquals("/foo/cacerts", withCaCerts.ssl().caCertificateFile()); + assertEquals(ConnectorConfig.Ssl.ClientAuth.Enum.DISABLED, withCaCerts.ssl().clientAuth()); ConnectorConfig needClientAuth = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/need-client-auth/configured-ssl-provider@need-client-auth"); assertTrue(needClientAuth.ssl().enabled()); - assertThat(needClientAuth.ssl().privateKeyFile(), is(equalTo("/foo/key"))); - assertThat(needClientAuth.ssl().certificateFile(), is(equalTo("/foo/cert"))); - assertThat(needClientAuth.ssl().caCertificateFile(), is(equalTo(""))); - assertThat(needClientAuth.ssl().clientAuth(), is(equalTo(ConnectorConfig.Ssl.ClientAuth.Enum.NEED_AUTH))); + assertEquals("/foo/key", needClientAuth.ssl().privateKeyFile()); + assertEquals("/foo/cert", needClientAuth.ssl().certificateFile()); + assertTrue(needClientAuth.ssl().caCertificateFile().isEmpty()); + assertEquals(ConnectorConfig.Ssl.ClientAuth.Enum.NEED_AUTH, needClientAuth.ssl().clientAuth()); ConnectorConfig withCiphersAndProtocols = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/with-ciphers-and-protocols/configured-ssl-provider@with-ciphers-and-protocols"); assertTrue(withCiphersAndProtocols.ssl().enabled()); - assertThat(withCiphersAndProtocols.ssl().privateKeyFile(), is(equalTo("/foo/key"))); - assertThat(withCiphersAndProtocols.ssl().certificateFile(), is(equalTo("/foo/cert"))); - assertThat(withCiphersAndProtocols.ssl().enabledCipherSuites(), is(equalTo(List.of("TLS_AES_128_GCM_SHA256", "TLS_AES_256_GCM_SHA384")))); - assertThat(withCiphersAndProtocols.ssl().enabledProtocols(), is(equalTo(List.of("TLSv1.3")))); + assertEquals("/foo/key", withCiphersAndProtocols.ssl().privateKeyFile()); + assertEquals("/foo/cert", withCiphersAndProtocols.ssl().certificateFile()); + assertEquals(List.of("TLS_AES_128_GCM_SHA256", "TLS_AES_256_GCM_SHA384"), withCiphersAndProtocols.ssl().enabledCipherSuites()); + assertEquals(List.of("TLSv1.3"), withCiphersAndProtocols.ssl().enabledProtocols()); ContainerCluster<?> cluster = (ContainerCluster<?>) root.getChildren().get("default"); List<ConnectorFactory> connectorFactories = cluster.getChildrenByTypeRecursive(ConnectorFactory.class); @@ -303,20 +299,18 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas ContainerCluster<?> cluster = (ContainerCluster<?>) root.getChildren().get("default"); List<JettyHttpServer> jettyServers = cluster.getChildrenByTypeRecursive(JettyHttpServer.class); - assertThat(jettyServers.size(), is(1)); + assertEquals(1, jettyServers.size()); JettyHttpServer server = jettyServers.get(0); - assertThat(server.model.bundleInstantiationSpec.classId.toString(), - is(com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName())); - assertThat(server.model.bundleInstantiationSpec.bundle.toString(), - is(com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName())); - assertThat(server.getConnectorFactories().size(), is(1)); - - assertThat( - extractComponentByClassName( - containerComponentsConfig(), - com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName()), - is(not(nullValue()))); + assertEquals(com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName(), + server.model.bundleInstantiationSpec.classId.toString()); + assertEquals(com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName(), + server.model.bundleInstantiationSpec.bundle.toString()); + assertEquals(1, server.getConnectorFactories().size()); + + assertNotNull(extractComponentByClassName( + containerComponentsConfig(), + com.yahoo.jdisc.http.server.jetty.JettyHttpServer.class.getName())); } private static ComponentsConfig.Components extractComponentByClassName( diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SchemaBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SchemaBuilderTest.java index 050a2254c9b..b50261b7568 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SchemaBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SchemaBuilderTest.java @@ -19,12 +19,12 @@ import org.w3c.dom.Element; import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER; import static com.yahoo.test.Matchers.hasItemWithMethod; import static com.yahoo.vespa.model.container.search.ContainerSearch.QUERY_PROFILE_REGISTRY_CLASS; +import static org.hamcrest.MatcherAssert.assertThat; 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; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java index 63c569fb17a..d3dfae3a6be 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java @@ -49,7 +49,6 @@ import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.curator.mock.MockCurator; import com.yahoo.vespa.flags.InMemoryFlagSource; import com.yahoo.vespa.model.VespaModelFactory; -import org.hamcrest.core.Is; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -73,14 +72,11 @@ import java.util.Map; import java.util.Optional; import java.util.stream.IntStream; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; 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; @@ -111,6 +107,7 @@ public class ApplicationRepositoryTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @SuppressWarnings("deprecation") @Rule public ExpectedException exceptionRule = ExpectedException.none(); @@ -553,13 +550,13 @@ public class ApplicationRepositoryTest { AllocatedHosts info = session.getAllocatedHosts(); assertNotNull(info); - assertThat(info.getHosts().size(), is(1)); + assertEquals(1, info.getHosts().size()); assertTrue(info.getHosts().contains(new HostSpec("mytesthost2", Collections.emptyList(), Optional.empty()))); Optional<NetworkPorts> portsCopy = info.getHosts().iterator().next().networkPorts(); assertTrue(portsCopy.isPresent()); - assertThat(portsCopy.get().allocations(), is(list)); + assertEquals(list, portsCopy.get().allocations()); } @Test @@ -571,7 +568,7 @@ public class ApplicationRepositoryTest { TimeoutBudget timeoutBudget = new TimeoutBudget(clock, Duration.ofSeconds(10)); long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, testAppJdiscOnly); exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage(containsString("tenant:test1 Session 3 is not prepared")); + exceptionRule.expectMessage("tenant:test1 Session 3 is not prepared"); applicationRepository.activate(applicationRepository.getTenant(applicationId()), sessionId, timeoutBudget, false); Session activeSession = applicationRepository.getActiveSession(applicationId()); @@ -588,7 +585,7 @@ public class ApplicationRepositoryTest { long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, testAppJdiscOnly); applicationRepository.prepare(sessionId, prepareParams()); exceptionRule.expect(RuntimeException.class); - exceptionRule.expectMessage(containsString("Timeout exceeded when trying to activate 'test1.testapp'")); + exceptionRule.expectMessage("Timeout exceeded when trying to activate 'test1.testapp'"); applicationRepository.activate(applicationRepository.getTenant(applicationId()), sessionId, new TimeoutBudget(clock, Duration.ofSeconds(0)), false); Session activeSession = applicationRepository.getActiveSession(applicationId()); @@ -610,7 +607,7 @@ public class ApplicationRepositoryTest { applicationRepository.prepare(sessionId2, prepareParams()); exceptionRule.expect(ActivationConflictException.class); - exceptionRule.expectMessage(containsString("app:test1.testapp.default Cannot activate session 3 because the currently active session (4) has changed since session 3 was created (was 2 at creation time)")); + exceptionRule.expectMessage("app:test1.testapp.default Cannot activate session 3 because the currently active session (4) has changed since session 3 was created (was 2 at creation time)"); applicationRepository.activate(applicationRepository.getTenant(applicationId()), sessionId2, timeoutBudget, false); } @@ -620,11 +617,11 @@ public class ApplicationRepositoryTest { long sessionId = result.sessionId(); exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage(containsString("Session is active: 2")); + exceptionRule.expectMessage("Session is active: 2"); applicationRepository.prepare(sessionId, prepareParams()); exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage(containsString("app:test1.testapp.default Session 2 is already active")); + exceptionRule.expectMessage("app:test1.testapp.default Session 2 is already active"); applicationRepository.activate(applicationRepository.getTenant(applicationId()), sessionId, timeoutBudget, false); } @@ -679,9 +676,8 @@ public class ApplicationRepositoryTest { assertTrue(requestHandler.hasApplication(applicationId(), Optional.of(vespaVersion))); assertNull(requestHandler.resolveApplicationId("doesnotexist")); - assertThat(requestHandler.resolveApplicationId("mytesthost"), Is.is(new ApplicationId.Builder() - .tenant(tenant1) - .applicationName("testapp").build())); // Host set in application package. + assertEquals(new ApplicationId.Builder().tenant(tenant1).applicationName("testapp").build(), + requestHandler.resolveApplicationId("mytesthost")); // Host set in application package. } @Test @@ -698,7 +694,7 @@ public class ApplicationRepositoryTest { // TODO: Revisit this test, I cannot see that we create a model for version 3.2.1 config = resolve(SimpletypesConfig.class, requestHandler, applicationId(), new Version(3, 2, 1)); - assertThat(config.intval(), Is.is(1337)); + assertEquals(1337, config.intval()); } @Test @@ -716,7 +712,7 @@ public class ApplicationRepositoryTest { applicationRepository.delete(applicationId()); exceptionRule.expect(com.yahoo.vespa.config.server.NotFoundException.class); - exceptionRule.expectMessage(containsString("No such application id: test1.testapp")); + exceptionRule.expectMessage("No such application id: test1.testapp"); resolve(SimpletypesConfig.class, requestHandler, applicationId(), vespaVersion); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerDBTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerDBTest.java index b51c30cb991..41289357fab 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerDBTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerDBTest.java @@ -12,7 +12,7 @@ import java.io.File; import java.io.IOException; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** * @author Ulf Lilleengen diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java index 0e8c69327e2..659bc771ac7 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java @@ -26,12 +26,9 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -88,13 +85,13 @@ public class ModelContextImplTest { assertFalse(context.previousModel().isPresent()); assertTrue(context.getFileRegistry() instanceof MockFileRegistry); assertTrue(context.configDefinitionRepo() instanceof StaticConfigDefinitionRepo); - assertThat(context.properties().applicationId(), is(ApplicationId.defaultId())); + assertEquals(ApplicationId.defaultId(), context.properties().applicationId()); assertTrue(context.properties().configServerSpecs().isEmpty()); assertTrue(context.properties().multitenant()); assertNotNull(context.properties().zone()); assertFalse(context.properties().hostedVespa()); - assertThat(context.properties().endpoints(), equalTo(endpoints)); - assertThat(context.properties().isFirstTimeDeployment(), equalTo(false)); + assertEquals(endpoints, context.properties().endpoints()); + assertFalse(context.properties().isFirstTimeDeployment()); assertEquals(Optional.empty(), context.wantedDockerImageRepo()); assertEquals(new Version(7), context.modelVespaVersion()); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java index 1eb44c633f6..6bb904a89fa 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelFactoryRegistryTest.java @@ -16,8 +16,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** @@ -44,10 +43,10 @@ public class ModelFactoryRegistryTest { List<ModelFactory> randomOrder = Arrays.asList(a, b, c, d); Collections.shuffle(randomOrder); ModelFactoryRegistry registry = new ModelFactoryRegistry(randomOrder); - assertThat(registry.getFactory(versionA), is(a)); - assertThat(registry.getFactory(versionB), is(b)); - assertThat(registry.getFactory(versionC), is(c)); - assertThat(registry.getFactory(versionD), is(d)); + assertEquals(a, registry.getFactory(versionA)); + assertEquals(b, registry.getFactory(versionB)); + assertEquals(c, registry.getFactory(versionC)); + assertEquals(d, registry.getFactory(versionD)); } } @@ -58,7 +57,7 @@ public class ModelFactoryRegistryTest { TestFactory c = new TestFactory(new Version(5, 48, 44)); TestFactory d = new TestFactory(new Version(5, 18, 44)); ModelFactoryRegistry registry = new ModelFactoryRegistry(Arrays.asList(a, b, c, d)); - assertThat(registry.getFactories().size(), is(4)); + assertEquals(4, registry.getFactories().size()); assertTrue(registry.getFactories().contains(a)); assertTrue(registry.getFactories().contains(b)); assertTrue(registry.getFactories().contains(c)); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java index 5016107c411..2c738e2d519 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java @@ -37,8 +37,7 @@ import java.util.Optional; import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER; import static com.yahoo.vespa.config.protocol.JRTClientConfigRequestV3.createWithParams; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** @@ -65,8 +64,8 @@ public class SuperModelControllerTest { LbServicesConfig.Builder lb = new LbServicesConfig.Builder(); handler.getSuperModel().getConfig(lb); LbServicesConfig lbc = new LbServicesConfig(lb); - assertThat(lbc.tenants().size(), is(1)); - assertThat(lbc.tenants("a").applications().size(), is(1)); + assertEquals(1, lbc.tenants().size()); + assertEquals(1, lbc.tenants("a").applications().size()); Applications app = lbc.tenants("a").applications("foo:prod:default:default"); assertTrue(app.hosts().size() > 0); } @@ -105,10 +104,10 @@ public class SuperModelControllerTest { LbServicesConfig.Builder lb = new LbServicesConfig.Builder(); han.getSuperModel().getConfig(lb); LbServicesConfig lbc = new LbServicesConfig(lb); - assertThat(lbc.tenants().size(), is(2)); - assertThat(lbc.tenants("t1").applications().size(), is(2)); - assertThat(lbc.tenants("t2").applications().size(), is(1)); - assertThat(lbc.tenants("t2").applications("minetooadvancedapp:prod:default:default").hosts().size(), is(1)); + assertEquals(2, lbc.tenants().size()); + assertEquals(2, lbc.tenants("t1").applications().size()); + assertEquals(1, lbc.tenants("t2").applications().size()); + assertEquals(1, lbc.tenants("t2").applications("minetooadvancedapp:prod:default:default").hosts().size()); assertQrServer(lbc.tenants("t2").applications("minetooadvancedapp:prod:default:default")); } @@ -119,14 +118,14 @@ public class SuperModelControllerTest { private void assertQrServer(Applications app) { String host = app.hosts().keySet().iterator().next(); Applications.Hosts hosts = app.hosts(host); - assertThat(hosts.hostname(), is(host)); + assertEquals(host, hosts.hostname()); for (Map.Entry<String, Applications.Hosts.Services> e : app.hosts(host).services().entrySet()) { if (QRSERVER.serviceName.equals(e.getKey())) { Applications.Hosts.Services s = e.getValue(); - assertThat(s.type(), is("qrserver")); - assertThat(s.ports().size(), is(4)); - assertThat(s.ports().get(0).number(), is(8000)); - assertThat(s.index(), is(0)); + assertEquals("qrserver", s.type()); + assertEquals(4, s.ports().size()); + assertEquals(8000, s.ports().get(0).number()); + assertEquals(0, s.index()); return; } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java index a390d6793b4..3f329894cef 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java @@ -22,13 +22,12 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.Optional; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -61,13 +60,13 @@ public class SuperModelRequestHandlerTest { long gen = counter.get(); controller.reloadConfig(createApp(foo, 3L)); assertNotNull(controller.getHandler()); - assertThat(controller.getHandler().getGeneration(), is(gen + 1)); + assertEquals(gen + 1, controller.getHandler().getGeneration()); controller.reloadConfig(createApp(foo, 4L)); - assertThat(controller.getHandler().getGeneration(), is(gen + 2)); + assertEquals(gen + 2, controller.getHandler().getGeneration()); // Test that a new app is used when there already exist an application with the same id - assertThat(controller.getHandler().getSuperModel().applicationModels().get(foo).getGeneration(), is(4L)); + assertEquals(4, controller.getHandler().getSuperModel().applicationModels().get(foo).getGeneration()); controller.reloadConfig(createApp(bar, 2L)); - assertThat(controller.getHandler().getGeneration(), is(gen + 3)); + assertEquals(gen + 3, controller.getHandler().getGeneration()); } @Test @@ -80,17 +79,17 @@ public class SuperModelRequestHandlerTest { controller.reloadConfig(createApp(foo, 3L)); controller.reloadConfig(createApp(bar, 30L)); controller.reloadConfig(createApp(baz, 9L)); - assertThat(controller.getHandler().getGeneration(), is(gen + 3)); - assertThat(controller.getHandler().getSuperModel().applicationModels().size(), is(3)); - assertEquals(Arrays.asList(foo, bar, baz), new ArrayList<>(controller.getHandler().getSuperModel().applicationModels().keySet())); + assertEquals(gen + 3, controller.getHandler().getGeneration()); + assertEquals(3, controller.getHandler().getSuperModel().applicationModels().size()); + assertTrue(controller.getHandler().getSuperModel().applicationModels().keySet().containsAll(List.of(foo, bar, baz))); controller.removeApplication(new ApplicationId.Builder().tenant("a").applicationName("unknown").build()); - assertThat(controller.getHandler().getGeneration(), is(gen + 4)); - assertThat(controller.getHandler().getSuperModel().applicationModels().size(), is(3)); - assertEquals(Arrays.asList(foo, bar, baz), new ArrayList<>(controller.getHandler().getSuperModel().applicationModels().keySet())); + assertEquals(gen + 4, controller.getHandler().getGeneration()); + assertEquals(3, controller.getHandler().getSuperModel().applicationModels().size()); + assertTrue(controller.getHandler().getSuperModel().applicationModels().keySet().containsAll(List.of(foo, bar, baz))); controller.removeApplication(bar); - assertThat(controller.getHandler().getSuperModel().applicationModels().size(), is(2)); + assertEquals(2, controller.getHandler().getSuperModel().applicationModels().size()); assertEquals(Arrays.asList(foo, baz), new ArrayList<>(controller.getHandler().getSuperModel().applicationModels().keySet())); - assertThat(controller.getHandler().getGeneration(), is(gen + 5)); + assertEquals(gen + 5, controller.getHandler().getGeneration()); } @Test @@ -103,7 +102,7 @@ public class SuperModelRequestHandlerTest { long gen = counter.get(); controller.reloadConfig(createApp(foo, 3L)); - assertThat(controller.getHandler().getGeneration(), is(masterGen + gen + 1)); + assertEquals(masterGen + gen + 1, controller.getHandler().getGeneration()); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TimeoutBudgetTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TimeoutBudgetTest.java index e93d7113d99..e7666dff7f6 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/TimeoutBudgetTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TimeoutBudgetTest.java @@ -8,7 +8,7 @@ import java.time.Duration; import java.time.Instant; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** * @author Ulf Lilleengen diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java index 92af4a75e51..0acdab7aec4 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationTest.java @@ -41,10 +41,9 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Optional; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; /** @@ -59,12 +58,12 @@ public class ApplicationTest { ServerCache cache = new ServerCache(); Version vespaVersion = new Version(1, 2, 3); Application app = new Application(new ModelStub(), cache, 1337L, vespaVersion, MetricUpdater.createTestUpdater(), appId); - assertThat(app.getApplicationGeneration(), is(1337L)); + assertEquals(1337L, app.getApplicationGeneration().longValue()); assertNotNull(app.getModel()); - assertThat(app.getCache(), is(cache)); - assertThat(app.getId().application().value(), is("foobar")); - assertThat(app.getVespaVersion(), is(vespaVersion)); - assertThat(app.toString(), is("application 'foobar', generation 1337, vespa version 1.2.3")); + assertEquals(cache, app.getCache()); + assertEquals("foobar", app.getId().application().value()); + assertEquals(vespaVersion, app.getVespaVersion()); + assertEquals("application 'foobar', generation 1337, vespa version 1.2.3", app.toString()); } private static final String[] emptySchema = new String[0]; @@ -145,7 +144,7 @@ public class ApplicationTest { assertNotNull(response); ConfigResponse cached_response = handler.resolveConfig(createRequest(ModelConfig.CONFIG_DEF_NAME, ModelConfig.CONFIG_DEF_NAMESPACE, ModelConfig.CONFIG_DEF_SCHEMA)); assertNotNull(cached_response); - assertTrue(response == cached_response); + assertSame(response, cached_response); } private static GetConfigRequest createRequest(String name, String namespace, String[] schema) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java index d5eebb4d617..23444ac53d6 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.application; -import com.google.common.collect.ImmutableList; import com.google.common.io.ByteStreams; import org.apache.commons.compress.archivers.ArchiveOutputStream; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; @@ -19,10 +18,8 @@ import java.util.List; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** @@ -60,8 +57,8 @@ public class CompressedApplicationInputStreamTest { private void assertTestApp(File outApp) { String [] files = outApp.list(); assertNotNull(files); - assertThat(files.length, is(3)); - assertThat(Arrays.asList(files), containsInAnyOrder(ImmutableList.of(is("hosts.xml"), is("services.xml"), is("deployment.xml")))); + assertEquals(3, files.length); + assertTrue(List.of(files).containsAll(List.of("hosts.xml", "services.xml", "deployment.xml"))); } @Test @@ -96,7 +93,7 @@ public class CompressedApplicationInputStreamTest { CompressedApplicationInputStream unpacked = CompressedApplicationInputStream.createFromCompressedStream(new TarArchiveInputStream(new GZIPInputStream(new FileInputStream(outFile)))); File outApp = unpacked.decompress(); - assertThat(outApp.getName(), is("application")); // gets the name of the subdir + assertEquals("application", outApp.getName()); // gets the name of the subdir assertTestApp(outApp); } @@ -137,7 +134,7 @@ public class CompressedApplicationInputStreamTest { new TarArchiveInputStream(new GZIPInputStream(new FileInputStream(gzFile)))); File outApp = unpacked.decompress(); List<File> files = Arrays.asList(outApp.listFiles()); - assertThat(files.size(), is(5)); + assertEquals(5, files.size()); assertTrue(files.contains(new File(outApp, "services.xml"))); assertTrue(files.contains(new File(outApp, "hosts.xml"))); assertTrue(files.contains(new File(outApp, "deployment.xml"))); @@ -145,26 +142,26 @@ public class CompressedApplicationInputStreamTest { assertTrue(files.contains(new File(outApp, "external"))); File sd = files.get(files.indexOf(new File(outApp, "schemas"))); assertTrue(sd.isDirectory()); - assertThat(sd.listFiles().length, is(1)); - assertThat(sd.listFiles()[0].getAbsolutePath(), is(new File(sd, "keyvalue.sd").getAbsolutePath())); + assertEquals(1, sd.listFiles().length); + assertEquals(new File(sd, "keyvalue.sd").getAbsolutePath(), sd.listFiles()[0].getAbsolutePath()); File ext = files.get(files.indexOf(new File(outApp, "external"))); assertTrue(ext.isDirectory()); - assertThat(ext.listFiles().length, is(1)); - assertThat(ext.listFiles()[0].getAbsolutePath(), is(new File(ext, "foo").getAbsolutePath())); + assertEquals(1, ext.listFiles().length); + assertEquals(new File(ext, "foo").getAbsolutePath(), ext.listFiles()[0].getAbsolutePath()); files = Arrays.asList(ext.listFiles()); File foo = files.get(files.indexOf(new File(ext, "foo"))); assertTrue(foo.isDirectory()); - assertThat(foo.listFiles().length, is(1)); - assertThat(foo.listFiles()[0].getAbsolutePath(), is(new File(foo, "bar").getAbsolutePath())); + assertEquals(1, foo.listFiles().length); + assertEquals(new File(foo, "bar").getAbsolutePath(), foo.listFiles()[0].getAbsolutePath()); files = Arrays.asList(foo.listFiles()); File bar = files.get(files.indexOf(new File(foo, "bar"))); assertTrue(bar.isDirectory()); - assertThat(bar.listFiles().length, is(1)); + assertEquals(1, bar.listFiles().length); assertTrue(bar.listFiles()[0].isFile()); - assertThat(bar.listFiles()[0].getAbsolutePath(), is(new File(bar, "lol").getAbsolutePath())); + assertEquals(new File(bar, "lol").getAbsolutePath(), bar.listFiles()[0].getAbsolutePath()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java index 02cc2e603d6..5afcd62a25c 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java @@ -50,11 +50,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; import static com.yahoo.vespa.config.server.application.TenantApplications.RemoveApplicationWaiter; -import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -99,11 +97,11 @@ public class TenantApplicationsTest { writeApplicationData(createApplicationId("bar"), 4L); TenantApplications repo = createZKAppRepo(); List<ApplicationId> applications = repo.activeApplications(); - assertThat(applications.size(), is(2)); - assertThat(applications.get(0).application().value(), is("bar")); - assertThat(applications.get(1).application().value(), is("foo")); - assertThat(repo.requireActiveSessionOf(applications.get(0)), is(4L)); - assertThat(repo.requireActiveSessionOf(applications.get(1)), is(3L)); + assertEquals(2, applications.size()); + assertEquals("bar", applications.get(0).application().value()); + assertEquals("foo", applications.get(1).application().value()); + assertEquals(4, repo.requireActiveSessionOf(applications.get(0))); + assertEquals(3, repo.requireActiveSessionOf(applications.get(1))); } @Test(expected = IllegalArgumentException.class) @@ -130,10 +128,10 @@ public class TenantApplicationsTest { repo.createPutTransaction(myapp, 3).commit(); String path = TenantRepository.getApplicationsPath(tenantName).append(myapp.serializedForm()).getAbsolute(); assertNotNull(curatorFramework.checkExists().forPath(path)); - assertThat(Utf8.toString(curatorFramework.getData().forPath(path)), is("3")); + assertEquals("3", Utf8.toString(curatorFramework.getData().forPath(path))); repo.createPutTransaction(myapp, 5).commit(); assertNotNull(curatorFramework.checkExists().forPath(path)); - assertThat(Utf8.toString(curatorFramework.getData().forPath(path)), is("5")); + assertEquals("5", Utf8.toString(curatorFramework.getData().forPath(path))); } @Test @@ -145,11 +143,11 @@ public class TenantApplicationsTest { repo.createApplication(id2); repo.createPutTransaction(id1, 1).commit(); repo.createPutTransaction(id2, 1).commit(); - assertThat(repo.activeApplications().size(), is(2)); + assertEquals(2, repo.activeApplications().size()); repo.createDeleteTransaction(id1).commit(); - assertThat(repo.activeApplications().size(), is(1)); + assertEquals(1, repo.activeApplications().size()); repo.createDeleteTransaction(id2).commit(); - assertThat(repo.activeApplications().size(), is(0)); + assertEquals(0, repo.activeApplications().size()); } public static class MockReloadListener implements ReloadListener { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java index f54fb272ed8..e72da13aee6 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RefeedActionsTest.java @@ -8,7 +8,7 @@ import org.junit.Test; import java.util.List; import java.util.stream.Collectors; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static com.yahoo.vespa.config.server.configchange.Utils.*; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsFormatterTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsFormatterTest.java index c18035589f2..783f1e19df0 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsFormatterTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsFormatterTest.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.config.server.configchange; import org.junit.Test; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.equalTo; import static com.yahoo.vespa.config.server.configchange.Utils.*; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsTest.java index 31ccd2b8f84..6d5646c79e0 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/RestartActionsTest.java @@ -9,7 +9,7 @@ import java.util.Set; import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static com.yahoo.vespa.config.server.configchange.Utils.*; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java index 016041cb032..41ac081f68b 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java @@ -36,9 +36,7 @@ import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.DEFCONFIGS_Z import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.META_ZK_PATH; import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.USERAPP_ZK_SUBPATH; import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.USER_DEFCONFIGS_ZK_SUBPATH; -import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -92,11 +90,11 @@ public class ZooKeeperClientTest { ZooKeeperClient zooKeeperClient = new ZooKeeperClient(zk, logger, Path.fromString("/1")); zooKeeperClient.initialize(); Path appPath = Path.fromString("/"); - assertThat(zk.getChildren(appPath).size(), is(1)); + assertEquals(1, zk.getChildren(appPath).size()); Path currentAppPath = appPath.append(String.valueOf(generation)); assertTrue(zk.exists(currentAppPath)); assertTrue(zk.exists(currentAppPath.append(DEFCONFIGS_ZK_SUBPATH.replaceFirst("/", "")))); - assertThat(zk.getChildren(currentAppPath).size(), is(4)); + assertEquals(4, zk.getChildren(currentAppPath).size()); } @Test @@ -106,14 +104,14 @@ public class ZooKeeperClientTest { List<String> children = zk.getChildren(defsPath); assertEquals(defsPath + " children", 1, children.size()); Collections.sort(children); - assertThat(children.get(0), is("a.b.test2")); + assertEquals("a.b.test2", children.get(0)); assertTrue(zk.exists(appPath.append(USER_DEFCONFIGS_ZK_SUBPATH.replaceFirst("/", "")))); Path userDefsPath = appPath.append(USER_DEFCONFIGS_ZK_SUBPATH); children = zk.getChildren(userDefsPath); - assertThat(children.size(), is(1)); + assertEquals(1, children.size()); Collections.sort(children); - assertThat(children.get(0), is("a.b.test2")); + assertEquals("a.b.test2", children.get(0)); } @Test @@ -123,11 +121,11 @@ public class ZooKeeperClientTest { Utf8.toString(zk.getData(appPath.append(META_ZK_PATH)).get())); assertTrue(metaData.getChecksum().length() > 0); assertTrue(metaData.isInternalRedeploy()); - assertThat(metaData.getDeployedByUser(), is("foo")); - assertThat(metaData.getDeployPath(), is("/bar/baz")); - assertThat(metaData.getDeployTimestamp(), is(1345L)); - assertThat(metaData.getGeneration(), is(3L)); - assertThat(metaData.getPreviousActiveGeneration(), is(2L)); + assertEquals("foo", metaData.getDeployedByUser()); + assertEquals("/bar/baz", metaData.getDeployPath()); + assertEquals(1345, metaData.getDeployTimestamp().longValue()); + assertEquals(3, metaData.getGeneration().longValue()); + assertEquals(2, metaData.getPreviousActiveGeneration()); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/host/HostRegistryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/host/HostRegistryTest.java index f7d55a34e33..df00d28134f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/host/HostRegistryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/host/HostRegistryTest.java @@ -8,11 +8,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.hamcrest.collection.IsIterableContainingInOrder.contains; -import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @author Ulf Lilleengen @@ -30,16 +29,16 @@ public class HostRegistryTest { assertGetKey(reg, "foo.com", foo); assertGetKey(reg, "bar.com", foo); assertGetKey(reg, "baz.com", foo); - assertThat(reg.getAllHosts().size(), is(3)); + assertEquals(3, reg.getAllHosts().size()); reg.update(foo, List.of("bar.com", "baz.com")); assertNull(reg.getKeyForHost("foo.com")); assertGetKey(reg, "bar.com", foo); assertGetKey(reg, "baz.com", foo); - assertThat(reg.getAllHosts().size(), is(2)); - assertThat(reg.getAllHosts(), contains("bar.com", "baz.com")); + assertEquals(2, reg.getAllHosts().size()); + assertTrue(reg.getAllHosts().containsAll(List.of("bar.com", "baz.com"))); reg.removeHostsForKey(foo); - assertThat(reg.getAllHosts().size(), is(0)); + assertTrue(reg.getAllHosts().isEmpty()); assertNull(reg.getKeyForHost("foo.com")); assertNull(reg.getKeyForHost("bar.com")); } @@ -67,7 +66,7 @@ public class HostRegistryTest { HostRegistry reg = new HostRegistry(); reg.update(foo, List.of("foo.com", "bar.com")); reg.update(bar, List.of("baz.com", "quux.com")); - assertThat(reg.getAllHosts().size(), is(4)); + assertEquals(4, reg.getAllHosts().size()); } @Test @@ -75,9 +74,9 @@ public class HostRegistryTest { HostRegistry reg = new HostRegistry(); List<String> hosts = new ArrayList<>(List.of("foo.com", "bar.com", "baz.com")); reg.update(foo, hosts); - assertThat(reg.getHostsForKey(foo).size(), is(3)); + assertEquals(3, reg.getHostsForKey(foo).size()); hosts.remove(2); - assertThat(reg.getHostsForKey(foo).size(), is(3)); + assertEquals(3, reg.getHostsForKey(foo).size()); } @Test @@ -85,14 +84,14 @@ public class HostRegistryTest { HostRegistry reg = new HostRegistry(); reg.update(foo, List.of("foo.com", "bar.com", "baz.com")); Collection<String> hosts = reg.getAllHosts(); - assertThat(hosts.size(), is(3)); + assertEquals(3, hosts.size()); reg.update(foo, List.of("foo.com")); - assertThat(hosts.size(), is(3)); + assertEquals(3, hosts.size()); } private void assertGetKey(HostRegistry reg, String host, ApplicationId expectedKey) { assertNotNull(reg.getKeyForHost(host)); - assertThat(reg.getKeyForHost(host), is(expectedKey)); + assertEquals(expectedKey, reg.getKeyForHost(host)); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java index 3c9940679b9..f77d7331dea 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/ContentHandlerTestBase.java @@ -14,9 +14,8 @@ import java.util.Collection; import static com.yahoo.jdisc.Response.Status.BAD_REQUEST; import static com.yahoo.jdisc.Response.Status.NOT_FOUND; import static com.yahoo.jdisc.Response.Status.OK; -import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; public abstract class ContentHandlerTestBase extends SessionHandlerTest { protected String baseUrl = "http://foo:1337/application/v2/tenant/default/session/1/content/"; @@ -39,7 +38,7 @@ public abstract class ContentHandlerTestBase extends SessionHandlerTest { public void require_that_nonexistant_file_returns_not_found() { HttpResponse response = doRequest(HttpRequest.Method.GET, "/test2.txt"); assertNotNull(response); - assertThat(response.getStatus(), is(NOT_FOUND)); + assertEquals(NOT_FOUND, response.getStatus()); } @Test @@ -50,7 +49,7 @@ public abstract class ContentHandlerTestBase extends SessionHandlerTest { @Test public void require_that_illegal_return_property_fails() { HttpResponse response = doRequest(HttpRequest.Method.GET, "/test.txt?return=foo"); - assertThat(response.getStatus(), is(BAD_REQUEST)); + assertEquals(BAD_REQUEST, response.getStatus()); } @Test @@ -77,17 +76,17 @@ public abstract class ContentHandlerTestBase extends SessionHandlerTest { HttpResponse response = doRequest(HttpRequest.Method.GET, path); assertNotNull(response); final String renderedString = SessionHandlerTest.getRenderedString(response); - assertThat(renderedString, response.getStatus(), is(OK)); - assertThat(renderedString, is(expectedContent)); - assertThat(response.getContentType(), is(expectedContentType)); + assertEquals(renderedString, OK, response.getStatus()); + assertEquals(expectedContent, renderedString); + assertEquals(expectedContentType, response.getContentType()); } protected void assertStatus(String path, String expectedContent) throws IOException { HttpResponse response = doRequest(HttpRequest.Method.GET, path); assertNotNull(response); final String renderedString = SessionHandlerTest.getRenderedString(response); - assertThat(renderedString, response.getStatus(), is(OK)); - assertThat(renderedString, is(expectedContent)); + assertEquals(renderedString, OK, response.getStatus()); + assertEquals(expectedContent, renderedString); } protected abstract HttpResponse doRequest(HttpRequest.Method method, String path); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java index f681dbbc152..69caf86729f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HandlerTest.java @@ -5,9 +5,9 @@ import com.yahoo.container.jdisc.HttpResponse; import java.io.IOException; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Base class for handler tests @@ -27,14 +27,14 @@ public class HandlerTest { if (renderedString == null) { renderedString = "assert failed"; } - assertThat(renderedString, response.getStatus(), is(statusCode)); + assertEquals(renderedString, statusCode, response.getStatus()); if (errorCode != null) { - assertThat(renderedString, containsString(errorCode.name())); + assertTrue(renderedString.contains(errorCode.name())); } if (contentType != null) { - assertThat(renderedString, response.getContentType(), is(contentType)); + assertEquals(renderedString, contentType, response.getContentType()); } - assertThat(renderedString, containsString(message)); + assertTrue(renderedString.contains(message)); } public static void assertHttpStatusCodeErrorCodeAndMessage(HttpResponse response, int statusCode, HttpErrorResponse.ErrorCode errorCode, String message) throws IOException { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigRequestTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigRequestTest.java index 96a1c123da5..f1be638468e 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigRequestTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigRequestTest.java @@ -6,11 +6,8 @@ import com.yahoo.vespa.config.ConfigKey; import org.junit.Test; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; - import static com.yahoo.jdisc.http.HttpRequest.Method.GET; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** @@ -23,7 +20,7 @@ public class HttpConfigRequestTest { HttpConfigRequest request = HttpConfigRequest.createFromRequestV1(HttpRequest.createTestRequest("http://example.yahoo.com:8080/config/v1/" + configKey.getNamespace() + "." + configKey.getName() + "/" + configKey.getConfigId(), GET)); - assertThat(request.getConfigKey(), is(configKey)); + assertEquals(configKey, request.getConfigKey()); assertTrue(request.getDefContent().isEmpty()); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigResponseTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigResponseTest.java index f81c3577298..452d05c85ec 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigResponseTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpConfigResponseTest.java @@ -10,8 +10,7 @@ import org.junit.Test; 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 @@ -26,6 +25,6 @@ public class HttpConfigResponseTest { false, PayloadChecksums.from("", "595f44fec1e92a71d")); HttpConfigResponse response = HttpConfigResponse.createFromConfig(configResponse); - assertThat(SessionHandlerTest.getRenderedString(response), is("{\"boolval\":false,\"doubleval\":0.0,\"enumval\":\"VAL1\",\"intval\":0,\"longval\":0,\"stringval\":\"s\"}")); + assertEquals(SessionHandlerTest.getRenderedString(response), "{\"boolval\":false,\"doubleval\":0.0,\"enumval\":\"VAL1\",\"intval\":0,\"longval\":0,\"stringval\":\"s\"}"); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpErrorResponseTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpErrorResponseTest.java index 0023e4dc701..f5c430152f3 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpErrorResponseTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpErrorResponseTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import java.io.IOException; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static com.yahoo.jdisc.http.HttpResponse.Status.*; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java index e055473a245..8f092ec9d54 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpHandlerTest.java @@ -13,9 +13,7 @@ import java.io.IOException; import java.time.Duration; import java.util.Collections; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; /** * @author Ulf Lilleengen @@ -27,12 +25,12 @@ public class HttpHandlerTest { final String message = "failed"; HttpHandler httpHandler = new HttpTestHandler(new InvalidApplicationException(message)); HttpResponse response = httpHandler.handle(HttpRequest.createTestRequest("foo", com.yahoo.jdisc.http.HttpRequest.Method.GET)); - assertThat(response.getStatus(), is(Response.Status.BAD_REQUEST)); + assertEquals(Response.Status.BAD_REQUEST, response.getStatus()); ByteArrayOutputStream baos = new ByteArrayOutputStream(); response.render(baos); Slime data = SlimeUtils.jsonToSlime(baos.toByteArray()); - assertThat(data.get().field("error-code").asString(), is(HttpErrorResponse.ErrorCode.INVALID_APPLICATION_PACKAGE.name())); - assertThat(data.get().field("message").asString(), is(message)); + assertEquals(HttpErrorResponse.ErrorCode.INVALID_APPLICATION_PACKAGE.name(), data.get().field("error-code").asString()); + assertEquals(message, data.get().field("message").asString()); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java index 00135a0a11e..322a2b924bd 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java @@ -25,9 +25,8 @@ import org.junit.rules.TemporaryFolder; import java.io.File; import java.io.IOException; -import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; /** * @author Ulf Lilleengen @@ -108,13 +107,13 @@ public class ApplicationContentHandlerTest extends ContentHandlerTestBase { Tenant tenant1 = applicationRepository.getTenant(appId1); Session session = applicationRepository.getActiveLocalSession(tenant1, appId1); assertContent("/test.txt", "foo\n"); - assertThat(session.getStatus(), is(Session.Status.ACTIVATE)); + assertEquals(Session.Status.ACTIVATE, session.getStatus()); } private void assertNotFound(HttpRequest request) { HttpResponse response = handler.handle(request); assertNotNull(response); - assertThat(response.getStatus(), is(Response.Status.NOT_FOUND)); + assertEquals(Response.Status.NOT_FOUND, response.getStatus()); } @Override diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java index c59375a6085..3d207f9f64a 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java @@ -31,9 +31,7 @@ import java.util.Collections; import static com.yahoo.jdisc.Response.Status.BAD_REQUEST; import static com.yahoo.jdisc.Response.Status.NOT_FOUND; import static com.yahoo.jdisc.http.HttpRequest.Method.GET; -import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -97,9 +95,9 @@ public class HttpGetConfigHandlerTest { String uriLongAppId = "http://foo.com:8080/config/v2/tenant/bill/application/sookie/environment/dev/region/bellefleur/instance/sam/foo.bar/myid"; HttpRequest r = HttpRequest.createTestRequest(uriLongAppId, GET); HttpConfigRequest req = HttpConfigRequest.createFromRequestV2(r); - assertThat(req.getApplicationId().tenant().value(), is("bill")); - assertThat(req.getApplicationId().application().value(), is("sookie")); - assertThat(req.getApplicationId().instance().value(), is("sam")); + assertEquals("bill", req.getApplicationId().tenant().value()); + assertEquals("sookie", req.getApplicationId().application().value()); + assertEquals("sam", req.getApplicationId().instance().value()); } @Test @@ -107,9 +105,9 @@ public class HttpGetConfigHandlerTest { String uriShortAppId = "http://foo.com:8080/config/v2/tenant/jason/application/alcide/foo.bar/myid"; HttpRequest r = HttpRequest.createTestRequest(uriShortAppId, GET); HttpConfigRequest req = HttpConfigRequest.createFromRequestV2(r); - assertThat(req.getApplicationId().tenant().value(), is("jason")); - assertThat(req.getApplicationId().application().value(), is("alcide")); - assertThat(req.getApplicationId().instance().value(), is("default")); + assertEquals("jason", req.getApplicationId().tenant().value()); + assertEquals("alcide", req.getApplicationId().application().value()); + assertEquals("default", req.getApplicationId().instance().value()); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java index 26346cd8ffe..e2ad65786a4 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java @@ -26,9 +26,8 @@ import static com.yahoo.jdisc.http.HttpRequest.Method.DELETE; import static com.yahoo.jdisc.http.HttpRequest.Method.GET; import static com.yahoo.jdisc.http.HttpRequest.Method.POST; import static com.yahoo.jdisc.http.HttpRequest.Method.PUT; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; /** * @author Ulf Lilleengen @@ -122,7 +121,7 @@ public class ListApplicationsHandlerTest { static void assertResponse(ListApplicationsHandler handler, String url, int expectedStatus, String expectedResponse, Method method) throws IOException { HttpResponse response = handler.handle(HttpRequest.createTestRequest(url, method)); assertNotNull(response); - assertThat(response.getStatus(), is(expectedStatus)); - assertThat(SessionHandlerTest.getRenderedString(response), is(expectedResponse)); + assertEquals(expectedStatus, response.getStatus()); + assertEquals(expectedResponse, SessionHandlerTest.getRenderedString(response)); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java index cb0d2129112..c6f84c2d6ae 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java @@ -24,7 +24,6 @@ import com.yahoo.vespa.config.server.tenant.Tenant; import com.yahoo.vespa.config.server.tenant.TenantRepository; import com.yahoo.vespa.config.server.tenant.TestTenantRepository; import com.yahoo.vespa.model.VespaModelFactory; -import org.hamcrest.core.Is; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -43,10 +42,7 @@ import static com.yahoo.jdisc.Response.Status.OK; import static com.yahoo.vespa.config.server.http.SessionHandlerTest.Cmd; import static com.yahoo.vespa.config.server.http.SessionHandlerTest.createTestRequest; import static com.yahoo.vespa.config.server.http.SessionHandlerTest.getRenderedString; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; public class SessionActiveHandlerTest { @@ -150,21 +146,21 @@ public class SessionActiveHandlerTest { activateRequest.invoke(); HttpResponse actResponse = activateRequest.getActResponse(); String message = getRenderedString(actResponse); - assertThat(message, actResponse.getStatus(), Is.is(OK)); + assertEquals(message, OK, actResponse.getStatus()); assertActivationMessageOK(activateRequest, message); } private void assertActivationMessageOK(ActivateRequest activateRequest, String message) throws IOException { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); new JsonFormat(true).encode(byteArrayOutputStream, activateRequest.getMetaData().getSlime()); - assertThat(message, containsString("\"tenant\":\"" + tenantName + "\",\"message\":\"Session " + activateRequest.getSessionId() + activatedMessage)); - assertThat(message, containsString("/application/v2/tenant/" + tenantName + + assertTrue(message.contains("\"tenant\":\"" + tenantName + "\",\"message\":\"Session " + activateRequest.getSessionId() + activatedMessage)); + assertTrue(message.contains("/application/v2/tenant/" + tenantName + "/application/" + appName + "/environment/" + "prod" + "/region/" + "default" + "/instance/" + "default")); assertTrue(provisioner.activated()); - assertThat(provisioner.lastHosts().size(), is(1)); + assertEquals(1, provisioner.lastHosts().size()); } private SessionActiveHandler createHandler() { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java index 7b14579d79c..f13ec6cd5c8 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionContentHandlerTest.java @@ -31,9 +31,8 @@ import java.io.IOException; import java.io.InputStream; import java.time.Clock; -import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; /** * @author Ulf Lilleengen @@ -92,14 +91,14 @@ public class SessionContentHandlerTest extends ContentHandlerTestBase { public void require_that_mkdir_with_body_is_illegal(){ HttpResponse response = put("/foobio/", "foo"); assertNotNull(response); - assertThat(response.getStatus(), is(Response.Status.BAD_REQUEST)); + assertEquals(Response.Status.BAD_REQUEST, response.getStatus()); } @Test public void require_that_nonexistent_session_returns_not_found() { HttpResponse response = doRequest(HttpRequest.Method.GET, "/test.txt", 9999); assertNotNull(response); - assertThat(response.getStatus(), is(Response.Status.NOT_FOUND)); + assertEquals(Response.Status.NOT_FOUND, response.getStatus()); } protected HttpResponse put(String path, String content) { @@ -111,7 +110,7 @@ public class SessionContentHandlerTest extends ContentHandlerTestBase { public void require_that_file_write_without_body_is_illegal() { HttpResponse response = doRequest(HttpRequest.Method.PUT, "/foobio.txt"); assertNotNull(response); - assertThat(response.getStatus(), is(Response.Status.BAD_REQUEST)); + assertEquals(Response.Status.BAD_REQUEST, response.getStatus()); } @Test @@ -146,10 +145,9 @@ public class SessionContentHandlerTest extends ContentHandlerTestBase { private void assertWriteFile(String path, String content) throws IOException { HttpResponse response = put(path, content); assertNotNull(response); - assertThat(response.getStatus(), is(Response.Status.OK)); + assertEquals(Response.Status.OK, response.getStatus()); assertContent(path, content); - assertThat(SessionHandlerTest.getRenderedString(response), - is("{\"prepared\":\"http://foo:1337" + pathPrefix + sessionId + "/prepared\"}")); + assertEquals("{\"prepared\":\"http://foo:1337" + pathPrefix + sessionId + "/prepared\"}", SessionHandlerTest.getRenderedString(response)); } private void assertDeleteFile(int statusCode, String filePath) throws IOException { @@ -159,16 +157,16 @@ public class SessionContentHandlerTest extends ContentHandlerTestBase { private void assertDeleteFile(int statusCode, String filePath, String expectedResponse) throws IOException { HttpResponse response = doRequest(HttpRequest.Method.DELETE, filePath); assertNotNull(response); - assertThat(response.getStatus(), is(statusCode)); - assertThat(SessionHandlerTest.getRenderedString(response), is(expectedResponse)); + assertEquals(statusCode, response.getStatus()); + assertEquals(expectedResponse, SessionHandlerTest.getRenderedString(response)); } private void assertMkdir(String path) throws IOException { HttpResponse response = doRequest(HttpRequest.Method.PUT, path); assertNotNull(response); - assertThat(response.getStatus(), is(Response.Status.OK)); - assertThat(SessionHandlerTest.getRenderedString(response), - is("{\"prepared\":\"http://foo:1337" + pathPrefix + sessionId + "/prepared\"}")); + assertEquals(Response.Status.OK, response.getStatus()); + assertEquals("{\"prepared\":\"http://foo:1337" + pathPrefix + sessionId + "/prepared\"}", + SessionHandlerTest.getRenderedString(response)); } protected HttpResponse doRequest(HttpRequest.Method method, String path) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java index fced32251ad..4cb69ce5d20 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java @@ -43,10 +43,8 @@ import static com.yahoo.jdisc.Response.Status.OK; import static com.yahoo.jdisc.http.HttpRequest.Method.GET; import static com.yahoo.jdisc.http.HttpRequest.Method.POST; import static com.yahoo.vespa.config.server.http.HandlerTest.assertHttpStatusCodeErrorCodeAndMessage; -import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -128,11 +126,11 @@ public class SessionCreateHandlerTest extends SessionHandlerTest { Map<String, String> parameters = Collections.singletonMap("name", "foo"); HttpResponse response = createHandler().handle(post(outFile, postHeaders, parameters)); assertNotNull(response); - assertThat(response.getStatus(), is(OK)); - assertThat(SessionHandlerTest.getRenderedString(response), - is("{\"log\":[]" + tenantMessage + ",\"session-id\":\"2\",\"prepared\":\"http://" + + assertEquals(OK, response.getStatus()); + assertEquals(SessionHandlerTest.getRenderedString(response), + "{\"log\":[]" + tenantMessage + ",\"session-id\":\"2\",\"prepared\":\"http://" + hostname + ":" + port + pathPrefix + "2/prepared\",\"content\":\"http://" + - hostname + ":" + port + pathPrefix + "2/content/\",\"message\":\"Session 2" + createdMessage + "}")); + hostname + ":" + port + pathPrefix + "2/content/\",\"message\":\"Session 2" + createdMessage + "}"); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java index 0afe742f345..3c762b7c2e5 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java @@ -42,12 +42,10 @@ import static com.yahoo.jdisc.Response.Status.METHOD_NOT_ALLOWED; import static com.yahoo.jdisc.Response.Status.NOT_FOUND; import static com.yahoo.jdisc.Response.Status.OK; import static com.yahoo.vespa.config.server.http.HandlerTest.assertHttpStatusCodeErrorCodeAndMessage; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; /** * @author hmusum @@ -128,7 +126,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app); HttpResponse response = request(HttpRequest.Method.PUT, sessionId); assertNotNull(response); - assertThat(response.getStatus(), is(OK)); + assertEquals(OK, response.getStatus()); assertResponseContains(response, "\"activate\":\"http://foo:1337" + pathPrefix + sessionId + "/active\",\"message\":\"Session " + sessionId + preparedMessage); } @@ -137,8 +135,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { public void require_debug() throws Exception { HttpResponse response = createHandler().handle( createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, 9999L, "?debug=true")); - assertThat(response.getStatus(), is(NOT_FOUND)); - assertThat(SessionHandlerTest.getRenderedString(response), containsString("NotFoundException")); + assertEquals(NOT_FOUND, response.getStatus()); + assertTrue(SessionHandlerTest.getRenderedString(response).contains("NotFoundException")); } @Test @@ -147,8 +145,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { HttpResponse response = createHandler().handle( createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, sessionId, "?verbose=true")); System.out.println(getRenderedString(response)); - assertThat(response.getStatus(), is(OK)); - assertThat(getRenderedString(response), containsString("Created application ")); + assertEquals(OK, response.getStatus()); + assertTrue(getRenderedString(response).contains("Created application ")); } @Test @@ -191,7 +189,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app); HttpResponse response = request(HttpRequest.Method.PUT, sessionId); assertNotNull(response); - assertThat(response.getStatus(), is(OK)); + assertEquals(OK, response.getStatus()); assertResponseContains(response, tenantMessage); } @@ -207,7 +205,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { pathPrefix = "/application/v2/tenant/" + defaultTenant + "/session/"; HttpResponse response = request(HttpRequest.Method.PUT, sessionId); assertNotNull(response); - assertThat(SessionHandlerTest.getRenderedString(response), response.getStatus(), is(OK)); + assertEquals(SessionHandlerTest.getRenderedString(response), OK, response.getStatus()); String applicationName = "myapp"; ApplicationId applicationId2 = ApplicationId.from(tenant.value(), applicationName, "default"); @@ -218,7 +216,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { "/prepared?applicationName=" + applicationName; response = handler.handle(SessionHandlerTest.createTestRequest(pathPrefix)); assertNotNull(response); - assertThat(SessionHandlerTest.getRenderedString(response), response.getStatus(), is(OK)); + assertEquals(SessionHandlerTest.getRenderedString(response), OK, response.getStatus()); ApplicationId applicationId3 = ApplicationId.from(tenant.value(), applicationName, "quux"); long sessionId3 = applicationRepository.createSession(applicationId3, timeoutBudget, app); @@ -226,7 +224,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { "/prepared?applicationName=" + applicationName + "&instance=quux"; response = handler.handle(SessionHandlerTest.createTestRequest(pathPrefix)); assertNotNull(response); - assertThat(SessionHandlerTest.getRenderedString(response), response.getStatus(), is(OK)); + assertEquals(SessionHandlerTest.getRenderedString(response), OK, response.getStatus()); } @Test @@ -256,8 +254,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { HttpResponse response = handler.handle(createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, sessionId)); assertEquals(400, response.getStatus()); Slime data = getData(response); - assertThat(data.get().field("error-code").asString(), is(HttpErrorResponse.ErrorCode.OUT_OF_CAPACITY.name())); - assertThat(data.get().field("message").asString(), is(exceptionMessage)); + assertEquals(HttpErrorResponse.ErrorCode.OUT_OF_CAPACITY.name(), data.get().field("error-code").asString()); + assertEquals(exceptionMessage, data.get().field("message").asString()); } @Test @@ -271,8 +269,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { HttpResponse response = handler.handle(createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, sessionId)); assertEquals(500, response.getStatus()); Slime data = getData(response); - assertThat(data.get().field("error-code").asString(), is(HttpErrorResponse.ErrorCode.INTERNAL_SERVER_ERROR.name())); - assertThat(data.get().field("message").asString(), is(exceptionMessage)); + assertEquals(HttpErrorResponse.ErrorCode.INTERNAL_SERVER_ERROR.name(), data.get().field("error-code").asString()); + assertEquals(exceptionMessage, data.get().field("message").asString()); } @Test @@ -286,8 +284,8 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { HttpResponse response = handler.handle(createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, sessionId)); assertEquals(500, response.getStatus()); Slime data = getData(response); - assertThat(data.get().field("error-code").asString(), is(HttpErrorResponse.ErrorCode.APPLICATION_LOCK_FAILURE.name())); - assertThat(data.get().field("message").asString(), is(exceptionMessage)); + assertEquals(HttpErrorResponse.ErrorCode.APPLICATION_LOCK_FAILURE.name(), data.get().field("error-code").asString()); + assertEquals(exceptionMessage, data.get().field("message").asString()); } @Test @@ -308,11 +306,11 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest { } private static void assertResponseContains(HttpResponse response, String string) throws IOException { - assertThat(SessionHandlerTest.getRenderedString(response), containsString(string)); + assertTrue(SessionHandlerTest.getRenderedString(response).contains(string)); } private static void assertResponseNotContains(HttpResponse response, String string) throws IOException { - assertThat(SessionHandlerTest.getRenderedString(response), not(containsString(string))); + assertFalse(SessionHandlerTest.getRenderedString(response).contains(string)); } private SessionHandler createHandler() { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java index fb5fb27cd7a..402e2576591 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java @@ -44,14 +44,9 @@ import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpo import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpoints.Scope.Enum.global; import static com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications.Endpoints.Scope.Enum.zone; import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; @@ -101,12 +96,12 @@ public class LbServicesProducerTest { LbServicesConfig conf = getLbServicesConfig(Zone.defaultZone(), testModel); LbServicesConfig.Tenants.Applications.Hosts.Services services = conf.tenants("foo").applications("foo:prod:default:default").hosts("foo.foo.yahoo.com").services(QRSERVER.serviceName); - assertThat(services.servicealiases().size(), is(1)); - assertThat(services.endpointaliases().size(), is(2)); + assertEquals(1, services.servicealiases().size()); + assertEquals(2, services.endpointaliases().size()); - assertThat(services.servicealiases(0), is("service1")); - assertThat(services.endpointaliases(0), is("foo1.bar1.com")); - assertThat(services.endpointaliases(1), is("foo2.bar2.com")); + assertEquals("service1", services.servicealiases(0)); + assertEquals("foo1.bar1.com", services.endpointaliases(0)); + assertEquals("foo2.bar2.com", services.endpointaliases(1)); } @Test @@ -164,30 +159,30 @@ public class LbServicesProducerTest { .hosts("foo.foo.yahoo.com") .services(QRSERVER.serviceName); - assertThat(services.servicealiases(), contains("service1")); - assertThat("Missing endpoints in list: " + services.endpointaliases(), services.endpointaliases(), containsInAnyOrder("foo1.bar1.com", "foo2.bar2.com", rotation1, rotation2)); + assertTrue(services.servicealiases().contains("service1")); + assertTrue("Missing endpoints in list: " + services.endpointaliases(), services.endpointaliases().containsAll(List.of("foo1.bar1.com", "foo2.bar2.com", rotation1, rotation2))); List<Endpoints> endpointList = config.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").endpoints(); // Expect 4 zone endpoints (2 suffixes), 2 global endpoints and 1 application endpoint assertEquals(7, endpointList.size()); List<Endpoints> zoneEndpoints = endpointList.stream().filter(e -> e.scope() == zone).collect(Collectors.toList()); assertEquals(4, zoneEndpoints.size()); - assertThat(zoneEndpoints.stream() + assertTrue(zoneEndpoints.stream() .filter(e -> e.routingMethod() == sharedLayer4) - .map(Endpoints::dnsName).collect(Collectors.toList()), - containsInAnyOrder("mydisc.foo.foo.endpoint1.suffix", "mydisc.foo.foo.endpoint2.suffix")); + .map(Endpoints::dnsName).collect(Collectors.toList()) + .containsAll(List.of("mydisc.foo.foo.endpoint1.suffix", "mydisc.foo.foo.endpoint2.suffix"))); assertContainsEndpoint(zoneEndpoints, "mydisc.foo.foo.endpoint1.suffix", "mydisc", zone, sharedLayer4, 1, List.of("foo.foo.yahoo.com")); assertContainsEndpoint(zoneEndpoints, "mydisc.foo.foo.endpoint2.suffix", "mydisc", zone, sharedLayer4, 1, List.of("foo.foo.yahoo.com")); List<Endpoints> globalEndpoints = endpointList.stream().filter(e -> e.scope() == global).collect(Collectors.toList()); assertEquals(2, globalEndpoints.size()); - assertThat(globalEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()), containsInAnyOrder("rotation-1", "rotation-2")); + assertTrue(globalEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()).containsAll(List.of("rotation-1", "rotation-2"))); assertContainsEndpoint(globalEndpoints, "rotation-1", "mydisc", global, sharedLayer4, 1, List.of("foo.foo.yahoo.com")); assertContainsEndpoint(globalEndpoints, "rotation-2", "mydisc", global, sharedLayer4, 1, List.of("foo.foo.yahoo.com")); List<Endpoints> applicationEndpoints = endpointList.stream().filter(e -> e.scope() == application).collect(Collectors.toList()); assertEquals(1, applicationEndpoints.size()); - assertThat(applicationEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()), containsInAnyOrder("app-endpoint")); + assertTrue(applicationEndpoints.stream().map(Endpoints::dnsName).collect(Collectors.toList()).contains("app-endpoint")); assertContainsEndpoint(applicationEndpoints, "app-endpoint", "mydisc", application, sharedLayer4, 1, List.of("foo.foo.yahoo.com")); } @@ -199,8 +194,8 @@ public class LbServicesProducerTest { Map<TenantName, Set<ApplicationInfo>> testModel = createTestModel(new DeployState.Builder()); LbServicesConfig conf = getLbServicesConfig(Zone.defaultZone(), testModel); LbServicesConfig.Tenants.Applications.Hosts.Services services = conf.tenants("foo").applications("foo:prod:default:default").hosts("foo.foo.yahoo.com").services(QRSERVER.serviceName); - assertThat(services.servicealiases().size(), is(1)); - assertThat(services.endpointaliases().size(), is(2)); + assertEquals(1, services.servicealiases().size()); + assertEquals(2, services.endpointaliases().size()); // No config for tester application assertNull(getLbServicesConfig(Zone.defaultZone(), testModel) @@ -209,7 +204,7 @@ public class LbServicesProducerTest { } private void assertContainsEndpoint(List<Endpoints> endpoints, String dnsName, String clusterId, Endpoints.Scope.Enum scope, Endpoints.RoutingMethod.Enum routingMethod, int weight, List<String> hosts) { - assertThat(endpoints, hasItem(new Endpoints.Builder() + assertTrue(endpoints.contains(new Endpoints.Builder() .dnsName(dnsName) .clusterId(clusterId) .scope(scope) @@ -316,8 +311,8 @@ public class LbServicesProducerTest { private void assertConfig(LbServicesConfig expected, LbServicesConfig actual) { assertFalse(expected.toString().isEmpty()); assertFalse(actual.toString().isEmpty()); - assertThat(expected.toString(), is(actual.toString())); - assertThat(ConfigPayload.fromInstance(expected).toString(true), is(ConfigPayload.fromInstance(actual).toString(true))); + assertEquals(actual.toString(), expected.toString()); + assertEquals(ConfigPayload.fromInstance(expected).toString(true), ConfigPayload.fromInstance(actual).toString(true)); } private TestProperties getTestproperties(ApplicationId applicationId) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java index 21e1c1f3448..04882fcfa26 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponseTest.java @@ -22,9 +22,8 @@ import java.util.List; import java.util.Optional; import static com.yahoo.vespa.config.protocol.JRTClientConfigRequestV3.createWithParams; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** @@ -40,17 +39,17 @@ public class DelayedConfigResponseTest { MockRpcServer rpc = new MockRpcServer(13337, temporaryFolder.newFolder()); DelayedConfigResponses responses = new DelayedConfigResponses(rpc, 1, false); - assertThat(responses.size(), is(0)); + assertEquals(0, responses.size()); JRTServerConfigRequest req = createRequest("foo", "myid", 3, 1000000, "bar"); req.setDelayedResponse(true); GetConfigContext context = GetConfigContext.testContext(ApplicationId.defaultId()); responses.delayResponse(req, context); - assertThat(responses.size(), is(0)); + assertEquals(0, responses.size()); req.setDelayedResponse(false); responses.delayResponse(req, context); responses.delayResponse(createRequest("foolio", "myid", 3, 100000, "bar"), context); - assertThat(responses.size(), is(2)); + assertEquals(2, responses.size()); assertTrue(req.isDelayedResponse()); List<DelayedConfigResponses.DelayedConfigResponse> it = responses.allDelayedResponses(); assertFalse(it.isEmpty()); @@ -62,21 +61,21 @@ public class DelayedConfigResponseTest { MockRpcServer rpc = new MockRpcServer(13337, temporaryFolder.newFolder()); DelayedConfigResponses responses = new DelayedConfigResponses(rpc, 1, false); responses.delayResponse(createRequest("foolio", "myid", 3, 100000, "bar"), context); - assertThat(responses.size(), is(1)); + assertEquals(1, responses.size()); responses.allDelayedResponses().get(0).cancelAndRemove(); - assertThat(responses.size(), is(0)); + assertEquals(0, responses.size()); } @Test public void testDelayedConfigResponse() throws IOException { MockRpcServer rpc = new MockRpcServer(13337, temporaryFolder.newFolder()); DelayedConfigResponses responses = new DelayedConfigResponses(rpc, 1, false); - assertThat(responses.size(), is(0)); - assertThat(responses.toString(), is("DelayedConfigResponses. Average Size=0")); + assertEquals(0, responses.size()); + assertEquals("DelayedConfigResponses. Average Size=0", responses.toString()); JRTServerConfigRequest req = createRequest("foo", "myid", 3, 100, "bar"); responses.delayResponse(req, GetConfigContext.testContext(ApplicationId.defaultId())); rpc.waitUntilSet(Duration.ofSeconds(5)); - assertThat(rpc.latestRequest, is(req)); + assertEquals(req, rpc.latestRequest); } private JRTServerConfigRequest createRequest(String configName, String configId, long generation, long timeout, String namespace) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java index 1b8a7ca2ad6..7ad237e45ed 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java @@ -37,11 +37,9 @@ import java.io.File; import java.io.IOException; import java.util.Optional; -import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -74,7 +72,7 @@ public class RpcServerTest { JRTClientConfigRequest clientReq = createSimpleRequest(); tester.performRequest(clientReq.getRequest()); assertFalse(clientReq.validateResponse()); - assertThat(clientReq.errorCode(), is(ErrorCode.APPLICATION_NOT_LOADED)); + assertEquals(ErrorCode.APPLICATION_NOT_LOADED, clientReq.errorCode()); } @Test @@ -127,7 +125,7 @@ public class RpcServerTest { assertTrue(clientReq.validateParameters()); tester.performRequest(clientReq.getRequest()); assertFalse(clientReq.validateResponse()); - assertThat(clientReq.errorCode(), is(ErrorCode.APPLICATION_NOT_LOADED)); + assertEquals(ErrorCode.APPLICATION_NOT_LOADED, clientReq.errorCode()); tester.rpcServer().onTenantsLoaded(); clientReq = createRequest(new RawConfig(key, LbServicesConfig.getDefMd5())); @@ -135,7 +133,7 @@ public class RpcServerTest { tester.performRequest(clientReq.getRequest()); boolean validResponse = clientReq.validateResponse(); assertTrue(clientReq.errorMessage(), validResponse); - assertThat(clientReq.errorCode(), is(0)); + assertEquals(0, clientReq.errorCode()); } private void testGetConfig(RpcTester tester) { @@ -143,20 +141,20 @@ public class RpcServerTest { JRTClientConfigRequest req = createRequest(new RawConfig(key, SimpletypesConfig.getDefMd5())); assertTrue(req.validateParameters()); tester.performRequest(req.getRequest()); - assertThat(req.errorCode(), is(0)); + assertEquals(0, req.errorCode()); assertTrue(req.validateResponse()); ConfigPayload payload = ConfigPayload.fromUtf8Array(req.getNewPayload().getData()); assertNotNull(payload); SimpletypesConfig.Builder builder = new SimpletypesConfig.Builder(); new ConfigPayloadApplier<>(builder).applyPayload(payload); SimpletypesConfig config = new SimpletypesConfig(builder); - assertThat(config.intval(), is(0)); + assertEquals(0, config.intval()); } private void testPrintStatistics(RpcTester tester) { Request req = new Request("printStatistics"); tester.performRequest(req); - assertThat(req.returnValues().get(0).asString(), is("Delayed responses queue size: 0")); + assertEquals("Delayed responses queue size: 0", req.returnValues().get(0).asString()); } private JRTClientConfigRequest createRequest(RawConfig config) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java index e8749334448..40ed20b7969 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java @@ -38,10 +38,8 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; -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; /** @@ -163,7 +161,7 @@ public class RpcTester implements AutoCloseable { } assertFalse(req.isError()); assertTrue(req.returnValues().size() > 0); - assertThat(req.returnValues().get(0).asInt32(), is(0)); + assertEquals(0, req.returnValues().get(0).asInt32()); } void performRequest(Request req) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java index f34b59dbc9f..854abee91f5 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java @@ -59,6 +59,7 @@ public class MultiTenantRpcAuthorizerTest { private static final HostName HOSTNAME = HostName.from("myhostname"); private static final FileReference FILE_REFERENCE = new FileReference("myfilereference"); + @SuppressWarnings("deprecation") @Rule public ExpectedException exceptionRule = ExpectedException.none(); @@ -269,7 +270,7 @@ public class MultiTenantRpcAuthorizerTest { request.setString("clientHostname", hostname); try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { new JsonFormat(false).encode(out, data); - return new String(out.toByteArray()); + return out.toString(); } catch (IOException e) { throw new UncheckedIOException(e); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java index cd824967fc3..46c31533598 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java @@ -2,55 +2,36 @@ package com.yahoo.vespa.config.server.session; import com.yahoo.config.model.api.ApplicationClusterEndpoint; -import com.yahoo.config.model.api.ApplicationRoles; import com.yahoo.config.model.api.ContainerEndpoint; import com.yahoo.config.model.api.EndpointCertificateMetadata; import com.yahoo.config.model.api.TenantSecretStore; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.TenantName; import com.yahoo.container.jdisc.HttpRequest; -import com.yahoo.security.KeyAlgorithm; -import com.yahoo.security.KeyUtils; -import com.yahoo.security.SignatureAlgorithm; -import com.yahoo.security.X509CertificateBuilder; + import com.yahoo.security.X509CertificateUtils; -import com.yahoo.security.X509CertificateWithKey; -import com.yahoo.slime.ArrayInserter; + import com.yahoo.slime.Cursor; import com.yahoo.slime.Injector; -import com.yahoo.slime.Inspector; import com.yahoo.slime.ObjectInserter; -import com.yahoo.slime.ObjectSymbolInserter; import com.yahoo.slime.Slime; -import com.yahoo.slime.SlimeInserter; import com.yahoo.slime.SlimeUtils; import com.yahoo.vespa.config.server.tenant.ContainerEndpointSerializer; import com.yahoo.vespa.config.server.tenant.EndpointCertificateMetadataSerializer; import com.yahoo.vespa.config.server.tenant.TenantSecretStoreSerializer; import org.junit.Test; -import javax.security.auth.x500.X500Principal; import java.io.IOException; -import java.math.BigInteger; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.security.KeyPair; import java.security.cert.X509Certificate; import java.time.Duration; -import java.time.Instant; -import java.time.temporal.ChronoUnit; import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; import java.util.OptionalInt; -import java.util.OptionalLong; -import java.util.stream.Collectors; +; -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; /** @@ -79,13 +60,13 @@ public class PrepareParamsTest { public void testCorrectParsing() { PrepareParams prepareParams = createParams("http://foo:19071/application/v2/", TenantName.defaultName()); - assertThat(prepareParams.getApplicationId(), is(ApplicationId.defaultId())); + assertEquals(ApplicationId.defaultId(), prepareParams.getApplicationId()); assertFalse(prepareParams.isDryRun()); assertFalse(prepareParams.isVerbose()); assertFalse(prepareParams.ignoreValidationErrors()); - assertThat(prepareParams.vespaVersion(), is(Optional.<String>empty())); + assertTrue(prepareParams.vespaVersion().isEmpty()); assertTrue(prepareParams.getTimeoutBudget().hasTimeLeft()); - assertThat(prepareParams.containerEndpoints().size(), is(0)); + assertTrue(prepareParams.containerEndpoints().isEmpty()); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java index 79632b8446b..72d7311ed9a 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java @@ -69,10 +69,8 @@ import java.util.logging.Level; import static com.yahoo.vespa.config.server.session.SessionPreparer.PrepareResult; import static com.yahoo.vespa.config.server.session.SessionZooKeeperClient.APPLICATION_PACKAGE_REFERENCE_PATH; -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; /** @@ -97,6 +95,7 @@ public class SessionPreparerTest { @Rule public TemporaryFolder folder = new TemporaryFolder(); + @SuppressWarnings("deprecation") @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -216,7 +215,7 @@ public class SessionPreparerTest { PrepareParams params = new PrepareParams.Builder().applicationId(applicationId()).build(); int sessionId = 1; prepare(testApp, params); - assertThat(createSessionZooKeeperClient(sessionId).readApplicationId().get(), is(applicationId())); + assertEquals(applicationId(), createSessionZooKeeperClient(sessionId).readApplicationId().get()); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java index feae135a508..150df8e303f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java @@ -52,12 +52,10 @@ import java.util.List; import java.util.Optional; import java.util.function.LongPredicate; -import static org.hamcrest.CoreMatchers.is; 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; /** @@ -79,6 +77,7 @@ public class SessionRepositoryTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @SuppressWarnings("deprecation") @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -193,7 +192,7 @@ public class SessionRepositoryTest { expectedException.expectMessage("Could not load remote session " + sessionIdString); expectedException.expect(RuntimeException.class); sessionRepository.loadSessions(new InThreadExecutorService()); - assertThat(sessionRepository.getRemoteSessionsFromZooKeeper().size(), is(0)); + assertTrue(sessionRepository.getRemoteSessionsFromZooKeeper().isEmpty()); } @Test(expected = InvalidApplicationException.class) @@ -302,11 +301,6 @@ public class SessionRepositoryTest { assertRemoteSessionStatus(sessionId, status); } - private void assertSessionRemoved(long sessionId) { - waitFor(p -> sessionRepository.getRemoteSession(sessionId) == null, sessionId); - assertNull(sessionRepository.getRemoteSession(sessionId)); - } - private void assertRemoteSessionExists(long sessionId) { assertRemoteSessionStatus(sessionId, Session.Status.NEW); } @@ -315,7 +309,7 @@ public class SessionRepositoryTest { waitFor(p -> sessionRepository.getRemoteSession(sessionId) != null && sessionRepository.getRemoteSession(sessionId).getStatus() == status, sessionId); assertNotNull(sessionRepository.getRemoteSession(sessionId)); - assertThat(sessionRepository.getRemoteSession(sessionId).getStatus(), is(status)); + assertEquals(status, sessionRepository.getRemoteSession(sessionId).getStatus()); } private void waitFor(LongPredicate predicate, long sessionId) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java index 814c99bd2fb..2f6e6a19651 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClientTest.java @@ -22,9 +22,7 @@ import java.util.List; import java.util.Optional; import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.SESSIONSTATE_ZK_SUBPATH; -import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** @@ -36,6 +34,7 @@ public class SessionZooKeeperClientTest { private Curator curator; + @SuppressWarnings("deprecation") @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -49,16 +48,16 @@ public class SessionZooKeeperClientTest { public void require_that_status_can_be_updated() { SessionZooKeeperClient zkc = createSessionZKClient(1); zkc.writeStatus(Session.Status.NEW); - assertThat(zkc.readStatus(), is(Session.Status.NEW)); + assertEquals(Session.Status.NEW, zkc.readStatus()); zkc.writeStatus(Session.Status.PREPARE); - assertThat(zkc.readStatus(), is(Session.Status.PREPARE)); + assertEquals(Session.Status.PREPARE, zkc.readStatus()); zkc.writeStatus(Session.Status.ACTIVATE); - assertThat(zkc.readStatus(), is(Session.Status.ACTIVATE)); + assertEquals(Session.Status.ACTIVATE, zkc.readStatus()); zkc.writeStatus(Session.Status.DEACTIVATE); - assertThat(zkc.readStatus(), is(Session.Status.DEACTIVATE)); + assertEquals(Session.Status.DEACTIVATE, zkc.readStatus()); } @Test @@ -68,7 +67,7 @@ public class SessionZooKeeperClientTest { zkc.writeStatus(Session.Status.NEW); Path path = sessionPath(sessionId).append(SESSIONSTATE_ZK_SUBPATH); assertTrue(curator.exists(path)); - assertThat(Utf8.toString(curator.getData(path).get()), is("NEW")); + assertEquals("NEW", Utf8.toString(curator.getData(path).get())); } @Test @@ -76,7 +75,7 @@ public class SessionZooKeeperClientTest { int sessionId = 3; SessionZooKeeperClient zkc = createSessionZKClient(sessionId); curator.set(sessionPath(sessionId).append(SESSIONSTATE_ZK_SUBPATH), Utf8.toBytes("PREPARE")); - assertThat(zkc.readStatus(), is(Session.Status.PREPARE)); + assertEquals(Session.Status.PREPARE, zkc.readStatus()); } @Test @@ -91,7 +90,7 @@ public class SessionZooKeeperClientTest { zkc.writeApplicationId(id); Path path = sessionPath(sessionId).append(SessionZooKeeperClient.APPLICATION_ID_PATH); assertTrue(curator.exists(path)); - assertThat(Utf8.toString(curator.getData(path).get()), is(id.serializedForm())); + assertEquals(id.serializedForm(), Utf8.toString(curator.getData(path).get())); } @Test @@ -125,11 +124,11 @@ public class SessionZooKeeperClientTest { int sessionId = 3; SessionZooKeeperClient zkc = createSessionZKClient(sessionId); curator.delete(sessionPath(sessionId)); - assertThat(zkc.readCreateTime(), is(Instant.EPOCH)); + assertEquals(Instant.EPOCH, zkc.readCreateTime()); Instant now = Instant.now(); zkc.createNewSession(now); // resolution is in seconds, so need to go back use that when comparing - assertThat(zkc.readCreateTime(), is(Instant.ofEpochSecond(now.getEpochSecond()))); + assertEquals(Instant.ofEpochSecond(now.getEpochSecond()), zkc.readCreateTime()); } @Test @@ -137,7 +136,7 @@ public class SessionZooKeeperClientTest { final FileReference testRef = new FileReference("test-ref"); SessionZooKeeperClient zkc = createSessionZKClient(3); zkc.writeApplicationPackageReference(Optional.of(testRef)); - assertThat(zkc.readApplicationPackageReference(), is(testRef)); + assertEquals(testRef, zkc.readApplicationPackageReference()); } @Test @@ -164,7 +163,7 @@ public class SessionZooKeeperClientTest { Path path = sessionPath(sessionId).append(SessionZooKeeperClient.APPLICATION_ID_PATH); curator.set(path, Utf8.toBytes(idString)); ApplicationId applicationId = zkc.readApplicationId().get(); - assertThat(applicationId.serializedForm(), is(expectedIdString)); + assertEquals(expectedIdString, applicationId.serializedForm()); } private SessionZooKeeperClient createSessionZKClient(long sessionId) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java index 4c99264c805..1a394bbb8cd 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java @@ -64,6 +64,7 @@ public class TenantRepositoryTest { private Curator curator; private ConfigserverConfig configserverConfig; + @SuppressWarnings("deprecation") @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java index 52d45d9ff5c..a0bd0e1f130 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java @@ -11,9 +11,8 @@ import org.junit.rules.TemporaryFolder; import java.io.IOException; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; /** * @author Ulf Lilleengen @@ -60,9 +59,9 @@ public class TenantTest { @Test public void hashcode() { - assertThat(t1.hashCode(), is(t2.hashCode())); - assertThat(t1.hashCode(), is(not(t3.hashCode()))); - assertThat(t1.hashCode(), is(not(t4.hashCode()))); + assertEquals(t1.hashCode(), t2.hashCode()); + assertNotEquals(t1.hashCode(), t3.hashCode()); + assertNotEquals(t1.hashCode(), t4.hashCode()); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/version/VersionStateTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/version/VersionStateTest.java index ccd330c0193..1f49d496f70 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/version/VersionStateTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/version/VersionStateTest.java @@ -13,9 +13,8 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; -import static org.hamcrest.Matchers.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; /** @@ -32,32 +31,32 @@ public class VersionStateTest { Version unknownVersion = new Version(0, 0, 0); VersionState state = createVersionState(); - assertThat(state.storedVersion(), is(unknownVersion)); + assertEquals(unknownVersion, state.storedVersion()); assertTrue(state.isUpgraded()); state.saveNewVersion(); assertFalse(state.isUpgraded()); state.saveNewVersion("badversion"); - assertThat(state.storedVersion(), is(unknownVersion)); + assertEquals(unknownVersion, state.storedVersion()); assertTrue(state.isUpgraded()); state.saveNewVersion("5.0.0"); - assertThat(state.storedVersion(), is(new Version(5, 0, 0))); + assertEquals(new Version(5, 0, 0), state.storedVersion()); assertTrue(state.isUpgraded()); // Remove zk node, should find version in ZooKeeper curator.delete(VersionState.versionPath); - assertThat(state.storedVersion(), is(new Version(5, 0, 0))); + assertEquals(new Version(5, 0, 0), state.storedVersion()); assertTrue(state.isUpgraded()); // Save new version, remove version in file, should find version in ZooKeeper state.saveNewVersion("6.0.0"); Files.delete(state.versionFile().toPath()); - assertThat(state.storedVersion(), is(new Version(6, 0, 0))); + assertEquals(new Version(6, 0, 0), state.storedVersion()); assertTrue(state.isUpgraded()); state.saveNewVersion(); - assertThat(state.currentVersion(), is(state.storedVersion())); + assertEquals(state.currentVersion(), state.storedVersion()); assertFalse(state.isUpgraded()); } @@ -69,7 +68,7 @@ public class VersionStateTest { File versionFile = new File(dbDir, "vespa_version"); assertTrue(versionFile.exists()); Version stored = Version.fromString(IOUtils.readFile(versionFile)); - assertThat(stored, is(state.currentVersion())); + assertEquals(stored, state.currentVersion()); } private VersionState createVersionState() throws IOException { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounterTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounterTest.java index d2c29a7577f..5c87f5bfc52 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounterTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/InitializedCounterTest.java @@ -6,8 +6,7 @@ import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.curator.mock.MockCurator; import org.junit.Test; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertEquals; /** * @author Ulf Lilleengen @@ -22,7 +21,7 @@ public class InitializedCounterTest { curator.create(Path.fromString("/sessions/2")); InitializedCounter counter = new InitializedCounter(curator, Path.fromString("/counter"), Path.fromString("/sessions")); - assertThat(counter.counter.get(), is(2L)); + assertEquals(2, counter.counter.get()); } } diff --git a/container-core/src/test/java/com/yahoo/processing/handler/ProcessingHandlerTestCase.java b/container-core/src/test/java/com/yahoo/processing/handler/ProcessingHandlerTestCase.java index 3ff3f6e2d27..baed2ccdcc8 100644 --- a/container-core/src/test/java/com/yahoo/processing/handler/ProcessingHandlerTestCase.java +++ b/container-core/src/test/java/com/yahoo/processing/handler/ProcessingHandlerTestCase.java @@ -686,6 +686,7 @@ public class ProcessingHandlerTestCase { this.stringDataPrefix = stringDataPrefix; } + @SuppressWarnings("unchecked") @Override public com.yahoo.processing.Response process(com.yahoo.processing.Request request, Execution execution) { try { diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java index d1df9b095d5..e4c46cfed1a 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java @@ -56,6 +56,7 @@ public class SystemFlagsDataArchiveTest { @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder(); + @SuppressWarnings("deprecation") @Rule public final ExpectedException expectedException = ExpectedException.none(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java index 9d80dd25ec0..8542530628c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java @@ -17,17 +17,18 @@ import static org.junit.Assert.assertEquals; */ public class ProxyRequestTest { + @SuppressWarnings("deprecation") @Rule public final ExpectedException exception = ExpectedException.none(); @Test - public void testBadUri() throws Exception { + public void testBadUri() { exception.expectMessage("Request path '/path' does not end with proxy path '/zone/v2/'"); testRequest("http://domain.tld/path", "/zone/v2/"); } @Test - public void testUris() throws Exception { + public void testUris() { { // Root request ProxyRequest request = testRequest("http://controller.domain.tld/my/path", ""); diff --git a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java index b6a79f3c60a..4e522af527f 100644 --- a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java @@ -21,9 +21,9 @@ public class DataTypeTestCase { public void testWeightedSetTypes() { DataType stringDefault = DataType.getWeightedSet(DataType.STRING); DataType stringTag=DataType.getWeightedSet(DataType.STRING,true,true); - assertTrue(stringDefault.equals(stringDefault)); - assertTrue(stringTag.equals(stringTag)); - assertFalse(stringDefault.equals(stringTag)); + assertEquals(stringDefault, stringDefault); + assertEquals(stringTag, stringTag); + assertNotEquals(stringDefault, stringTag); assertEquals("WeightedSet<string>",stringDefault.getName()); assertEquals(18, stringTag.getCode()); //assertEquals("WeightedSet<string>;Add;Remove",stringTag.getName()); @@ -55,6 +55,7 @@ public class DataTypeTestCase { assertEquals(PredicateFieldValue.class, DataType.PREDICATE.createFieldValue().getClass()); } + @SuppressWarnings("unchecked") @Test public void testCreateFieldValueWithArg() { { diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java index 3c5af5d1447..eba8d3d4d66 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java @@ -51,12 +51,8 @@ import java.util.Set; import static com.yahoo.vespa.orchestrator.status.ApplicationInstanceStatus.ALLOWED_TO_BE_DOWN; import static com.yahoo.vespa.orchestrator.status.ApplicationInstanceStatus.NO_REMARKS; -import static org.hamcrest.collection.IsEmptyCollection.empty; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsCollectionContaining.hasItem; 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; import static org.mockito.ArgumentMatchers.any; @@ -123,44 +119,44 @@ public class OrchestratorImplTest { @Test public void application_has_initially_no_remarks() throws Exception { - assertThat(orchestrator.getApplicationInstanceStatus(app1), is(NO_REMARKS)); + assertEquals(NO_REMARKS, orchestrator.getApplicationInstanceStatus(app1)); } @Test public void application_can_be_set_in_suspend() throws Exception { orchestrator.suspend(app1); - assertThat(orchestrator.getApplicationInstanceStatus(app1), is(ALLOWED_TO_BE_DOWN)); + assertEquals(ALLOWED_TO_BE_DOWN, orchestrator.getApplicationInstanceStatus(app1)); } @Test public void application_can_be_removed_from_suspend() throws Exception { orchestrator.suspend(app1); orchestrator.resume(app1); - assertThat(orchestrator.getApplicationInstanceStatus(app1), is(NO_REMARKS)); + assertEquals(NO_REMARKS, orchestrator.getApplicationInstanceStatus(app1)); } @Test public void appliations_list_returns_empty_initially() { - assertThat(orchestrator.getAllSuspendedApplications(), is(empty())); + assertTrue(orchestrator.getAllSuspendedApplications().isEmpty()); } @Test public void appliations_list_returns_suspended_apps() throws Exception { // One suspended app orchestrator.suspend(app1); - assertThat(orchestrator.getAllSuspendedApplications().size(), is(1)); - assertThat(orchestrator.getAllSuspendedApplications(), hasItem(app1)); + assertEquals(1, orchestrator.getAllSuspendedApplications().size()); + assertTrue(orchestrator.getAllSuspendedApplications().contains(app1)); // Two suspended apps orchestrator.suspend(app2); - assertThat(orchestrator.getAllSuspendedApplications().size(), is(2)); - assertThat(orchestrator.getAllSuspendedApplications(), hasItem(app1)); - assertThat(orchestrator.getAllSuspendedApplications(), hasItem(app2)); + assertEquals(2, orchestrator.getAllSuspendedApplications().size()); + assertTrue(orchestrator.getAllSuspendedApplications().contains(app1)); + assertTrue(orchestrator.getAllSuspendedApplications().contains(app2)); // Back to one when resetting one app to no_remarks orchestrator.resume(app1); - assertThat(orchestrator.getAllSuspendedApplications().size(), is(1)); - assertThat(orchestrator.getAllSuspendedApplications(), hasItem(app2)); + assertEquals(1, orchestrator.getAllSuspendedApplications().size()); + assertTrue(orchestrator.getAllSuspendedApplications().contains(app2)); } @@ -169,23 +165,23 @@ public class OrchestratorImplTest { // Two suspends orchestrator.suspend(app1); orchestrator.suspend(app1); - assertThat(orchestrator.getApplicationInstanceStatus(app1), is(ALLOWED_TO_BE_DOWN)); - assertThat(orchestrator.getApplicationInstanceStatus(app2), is(NO_REMARKS)); + assertEquals(ALLOWED_TO_BE_DOWN, orchestrator.getApplicationInstanceStatus(app1)); + assertEquals(NO_REMARKS, orchestrator.getApplicationInstanceStatus(app2)); // Three no_remarks orchestrator.resume(app1); orchestrator.resume(app1); orchestrator.resume(app1); - assertThat(orchestrator.getApplicationInstanceStatus(app1), is(NO_REMARKS)); - assertThat(orchestrator.getApplicationInstanceStatus(app2), is(NO_REMARKS)); + assertEquals(NO_REMARKS, orchestrator.getApplicationInstanceStatus(app1)); + assertEquals(NO_REMARKS, orchestrator.getApplicationInstanceStatus(app2)); // Two suspends and two on two applications interleaved orchestrator.suspend(app2); orchestrator.resume(app1); orchestrator.suspend(app2); orchestrator.resume(app1); - assertThat(orchestrator.getApplicationInstanceStatus(app1), is(NO_REMARKS)); - assertThat(orchestrator.getApplicationInstanceStatus(app2), is(ALLOWED_TO_BE_DOWN)); + assertEquals(NO_REMARKS, orchestrator.getApplicationInstanceStatus(app1)); + assertEquals(ALLOWED_TO_BE_DOWN, orchestrator.getApplicationInstanceStatus(app2)); } @Test @@ -274,7 +270,7 @@ public class OrchestratorImplTest { } @Test - public void suspendAllWorks() throws Exception { + public void suspendAllWorks() { // A spy is preferential because suspendAll() relies on delegating the hard work to suspend() and resume(). OrchestratorImpl orchestrator = spy(this.orchestrator); @@ -307,7 +303,7 @@ public class OrchestratorImplTest { } @Test - public void whenSuspendAllFails() throws Exception { + public void whenSuspendAllFails() { // A spy is preferential because suspendAll() relies on delegating the hard work to suspend() and resume(). OrchestratorImpl orchestrator = spy(this.orchestrator); @@ -340,7 +336,7 @@ public class OrchestratorImplTest { } @Test - public void testLargeLocks() throws Exception { + public void testLargeLocks() { var tenantId = new TenantId("tenant"); var applicationInstanceId = new ApplicationInstanceId("app:dev:us-east-1:default"); var applicationInstanceReference = new ApplicationInstanceReference(tenantId, applicationInstanceId); @@ -480,7 +476,7 @@ public class OrchestratorImplTest { } @Test - public void testGetHost() throws Exception { + public void testGetHost() { ClusterControllerClientFactory clusterControllerClientFactory = new ClusterControllerClientFactoryMock(); StatusService statusService = new ZkStatusService( new MockCurator(), diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java index 5951a3b0e21..698c7b544b3 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java @@ -32,8 +32,7 @@ import org.junit.Test; import java.util.List; import java.util.Map; -import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -101,8 +100,8 @@ public class OrchestratorTest { orchestrator.acquirePermissionToRemove(toApplicationModelHostName(cfg2)); fail(); } catch (HostStateChangeDeniedException e) { - assertThat(e.getMessage(), containsString("Changing the state of cfg2 would violate enough-services-up")); - assertThat(e.getMessage(), containsString("[cfg1] are suspended.")); + assertTrue(e.getMessage().contains("Changing the state of cfg2 would violate enough-services-up")); + assertTrue(e.getMessage().contains("[cfg1] are suspended.")); } // cfg1 is removed from the application @@ -113,8 +112,8 @@ public class OrchestratorTest { orchestrator.acquirePermissionToRemove(toApplicationModelHostName(cfg2)); fail(); } catch (HostStateChangeDeniedException e) { - assertThat(e.getMessage(), containsString("Changing the state of cfg2 would violate enough-services-up")); - assertThat(e.getMessage(), containsString("[1 missing config server] are down.")); + assertTrue(e.getMessage().contains("Changing the state of cfg2 would violate enough-services-up")); + assertTrue(e.getMessage().contains("[1 missing config server] are down.")); } // cfg1 is reprovisioned, added to the node repo, and activated @@ -128,8 +127,8 @@ public class OrchestratorTest { orchestrator.acquirePermissionToRemove(toApplicationModelHostName(cfg1)); fail(); } catch (HostStateChangeDeniedException e) { - assertThat(e.getMessage(), containsString("Changing the state of cfg1 would violate enough-services-up")); - assertThat(e.getMessage(), containsString("[cfg2] are suspended")); + assertTrue(e.getMessage().contains("Changing the state of cfg1 would violate enough-services-up")); + assertTrue(e.getMessage().contains("[cfg2] are suspended")); } // etc (should be the same as for cfg1) diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java index babfa666577..1563a54a029 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java @@ -36,10 +36,8 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.hamcrest.core.StringContains.containsString; 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; import static org.mockito.Mockito.mock; @@ -180,9 +178,8 @@ public class ClusterApiImplTest { policy.verifyGroupGoingDownIsFine(clusterApi); fail(); } catch (HostStateChangeDeniedException e) { - assertThat(e.getMessage(), - containsString("Changing the state of cfg1 would violate enough-services-up: 33% of the config " + - "servers are down or suspended already: [1 missing config server] are down.")); + assertTrue(e.getMessage().contains("Changing the state of cfg1 would violate enough-services-up: 33% of the config " + + "servers are down or suspended already: [1 missing config server] are down.")); } } @@ -200,9 +197,8 @@ public class ClusterApiImplTest { policy.verifyGroupGoingDownIsFine(clusterApi); fail(); } catch (HostStateChangeDeniedException e) { - assertThat(e.getMessage(), - containsString("Changing the state of cfg1 would violate enough-services-up: 33% of the config " + - "server hosts are down or suspended already: [1 missing config server host] are down.")); + assertTrue(e.getMessage().contains("Changing the state of cfg1 would violate enough-services-up: 33% of the config " + + "server hosts are down or suspended already: [1 missing config server host] are down.")); } } @@ -216,9 +212,8 @@ public class ClusterApiImplTest { policy.verifyGroupGoingDownIsFine(clusterApi); fail(); } catch (HostStateChangeDeniedException e) { - assertThat(e.getMessage(), - containsString("Changing the state of cfg1 would violate enough-services-up: 33% of the config " + - "servers are down or suspended already: [1 missing config server] are down.")); + assertTrue(e.getMessage().contains("Changing the state of cfg1 would violate enough-services-up: 33% of the config " + + "servers are down or suspended already: [1 missing config server] are down.")); } } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java index 874b3d32325..c5ce69bb648 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java @@ -10,7 +10,6 @@ import com.yahoo.test.ManualClock; import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.curator.Curator; -import com.yahoo.vespa.flags.InMemoryFlagSource; import com.yahoo.vespa.orchestrator.OrchestratorContext; import com.yahoo.vespa.orchestrator.OrchestratorUtil; import com.yahoo.vespa.orchestrator.TestIds; @@ -51,11 +50,10 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsCollectionContaining.hasItem; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -108,14 +106,13 @@ public class ZkStatusServiceTest { } @Test - public void host_state_for_unknown_hosts_is_no_remarks() throws Exception { - assertThat( - statusService.getHostInfo(TestIds.APPLICATION_INSTANCE_REFERENCE, TestIds.HOST_NAME1).status(), - is(HostStatus.NO_REMARKS)); + public void host_state_for_unknown_hosts_is_no_remarks() { + assertEquals(HostStatus.NO_REMARKS, + statusService.getHostInfo(TestIds.APPLICATION_INSTANCE_REFERENCE, TestIds.HOST_NAME1).status()); } @Test - public void setting_host_state_is_idempotent() throws Exception { + public void setting_host_state_is_idempotent() { when(timer.currentTime()).thenReturn( Instant.ofEpochMilli((1)), Instant.ofEpochMilli((3)), @@ -128,8 +125,7 @@ public class ZkStatusServiceTest { for (int i = 0; i < 2; i++) { lock.setHostState(TestIds.HOST_NAME1, hostStatus); - assertThat(lock.getHostInfos().getOrNoRemarks(TestIds.HOST_NAME1).status(), - is(hostStatus)); + assertEquals(hostStatus, lock.getHostInfos().getOrNoRemarks(TestIds.HOST_NAME1).status()); } } } @@ -238,13 +234,11 @@ public class ZkStatusServiceTest { } @Test - public void suspend_and_resume_application_works_and_is_symmetric() throws Exception { + public void suspend_and_resume_application_works_and_is_symmetric() { // Initial state is NO_REMARK - assertThat( - statusService - .getApplicationInstanceStatus(TestIds.APPLICATION_INSTANCE_REFERENCE), - is(ApplicationInstanceStatus.NO_REMARKS)); + assertEquals(ApplicationInstanceStatus.NO_REMARKS, + statusService.getApplicationInstanceStatus(TestIds.APPLICATION_INSTANCE_REFERENCE)); // Suspend try (ApplicationLock lock = statusService @@ -252,10 +246,8 @@ public class ZkStatusServiceTest { lock.setApplicationInstanceStatus(ApplicationInstanceStatus.ALLOWED_TO_BE_DOWN); } - assertThat( - statusService - .getApplicationInstanceStatus(TestIds.APPLICATION_INSTANCE_REFERENCE), - is(ApplicationInstanceStatus.ALLOWED_TO_BE_DOWN)); + assertEquals(ApplicationInstanceStatus.ALLOWED_TO_BE_DOWN, + statusService.getApplicationInstanceStatus(TestIds.APPLICATION_INSTANCE_REFERENCE)); // Resume try (ApplicationLock lock = statusService @@ -263,16 +255,14 @@ public class ZkStatusServiceTest { lock.setApplicationInstanceStatus(ApplicationInstanceStatus.NO_REMARKS); } - assertThat( - statusService - .getApplicationInstanceStatus(TestIds.APPLICATION_INSTANCE_REFERENCE), - is(ApplicationInstanceStatus.NO_REMARKS)); + assertEquals(ApplicationInstanceStatus.NO_REMARKS, + statusService.getApplicationInstanceStatus(TestIds.APPLICATION_INSTANCE_REFERENCE)); } @Test - public void suspending_two_applications_returns_two_applications() throws Exception { + public void suspending_two_applications_returns_two_applications() { Set<ApplicationInstanceReference> suspendedApps = statusService.getAllSuspendedApplications(); - assertThat(suspendedApps.size(), is(0)); + assertEquals(0, suspendedApps.size()); try (ApplicationLock statusRegistry = statusService .lockApplication(context, TestIds.APPLICATION_INSTANCE_REFERENCE)) { @@ -285,13 +275,13 @@ public class ZkStatusServiceTest { } suspendedApps = statusService.getAllSuspendedApplications(); - assertThat(suspendedApps.size(), is(2)); - assertThat(suspendedApps, hasItem(TestIds.APPLICATION_INSTANCE_REFERENCE)); - assertThat(suspendedApps, hasItem(TestIds.APPLICATION_INSTANCE_REFERENCE2)); + assertEquals(2, suspendedApps.size()); + assertTrue(suspendedApps.contains(TestIds.APPLICATION_INSTANCE_REFERENCE)); + assertTrue(suspendedApps.contains(TestIds.APPLICATION_INSTANCE_REFERENCE2)); } @Test - public void zookeeper_cleanup() throws Exception { + public void zookeeper_cleanup() { HostName strayHostname = new HostName("stray1.com"); verify(antiServiceMonitor, times(0)).disallowDuperModelLockAcquisition(any()); |