diff options
Diffstat (limited to 'config-model')
40 files changed, 439 insertions, 441 deletions
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; |