diff options
author | gjoranv <gjoranv@gmail.com> | 2021-09-24 11:02:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-24 11:02:39 +0200 |
commit | b5286c811ada6d1aacce5498b7e9fbdff6d33576 (patch) | |
tree | ce206d7dcb00bce06aca6cb202f5a5c9580410e1 /config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java | |
parent | 9dabf1ce317325a334fd5f6aac531456acea17c4 (diff) |
Revert "Revert "Install common bundles via config model [run-systemtest]" MERGEOK"
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java')
-rwxr-xr-x | config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index dd4f4c3b7d5..a66ea736a5b 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -38,8 +38,8 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; +import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasKey; -import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; @@ -383,10 +383,7 @@ public class ContainerClusterTest { cluster.getConfig(bundleBuilder); List<String> installedBundles = bundleBuilder.build().bundlePaths(); - assertEquals(expectedBundleNames.size(), installedBundles.size()); - assertThat(installedBundles, containsInAnyOrder( - expectedBundleNames.stream().map(CoreMatchers::endsWith).collect(Collectors.toList()) - )); + expectedBundleNames.forEach(b -> assertThat(installedBundles, hasItem(CoreMatchers.endsWith(b)))); } |