diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-08-30 13:57:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-30 13:57:56 +0200 |
commit | 99878e078d2931db43f262496aed4becc81a8a1c (patch) | |
tree | 634f1b93f7d6281a87fb9a3b90bba2f9dd5ae13d /config-model | |
parent | 57574637c4f72cecf73055b61df3e936126fc2d6 (diff) | |
parent | d9d56eb39050388f574ee12df2280eeff640aaeb (diff) |
Merge pull request #28256 from vespa-engine/balder/upgrade-some-more-libs
- Update dependency org.jvnet.mimepull:mimepull to v1.10.0
Diffstat (limited to 'config-model')
4 files changed, 11 insertions, 21 deletions
diff --git a/config-model/pom.xml b/config-model/pom.xml index 7c6fb610bae..58df48a5763 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -52,11 +52,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> <version>${protobuf.vespa.version}</version> diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java index d5bcf1e5e49..0e98225aba5 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java @@ -17,7 +17,6 @@ import java.util.jar.JarFile; import java.util.jar.JarOutputStream; import static com.yahoo.yolean.Exceptions.uncheck; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -65,12 +64,12 @@ public class BundleValidatorTest { JarFile jarFile = createTemporaryJarFile(tempDir, "import-warnings"); validator.validateJarFile(state, jarFile); String output = buffer.toString(); - assertThat(output) + assertTrue(output .contains("JAR file 'import-warnings.jar' imports the packages [org.json] from 'org.json:json'. \n" + - "This bundle is no longer provided on Vespa 8 - see https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime."); - assertThat(output) + "This bundle is no longer provided on Vespa 8 - see https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime.")); + assertTrue(output .contains("JAR file 'import-warnings.jar' imports the packages [org.eclipse.jetty.client.api] from 'jetty'. \n" + - "The Jetty bundles are no longer provided on Vespa 8 - see https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime."); + "The Jetty bundles are no longer provided on Vespa 8 - see https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime.")); } static DeployState createDeployState(StringBuffer buffer) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/http/DefaultFilterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/http/DefaultFilterTest.java index 3e80b319e88..a52b6117482 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/http/DefaultFilterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/http/DefaultFilterTest.java @@ -11,10 +11,12 @@ import com.yahoo.vespa.model.container.xml.ContainerModelBuilder; import org.junit.jupiter.api.Test; import org.w3c.dom.Element; +import java.util.Map; import java.util.Set; +import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; -import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author bjorncs @@ -53,17 +55,12 @@ public class DefaultFilterTest extends DomBuilderTest { ChainsConfig chainsConfig = root.getConfig(ChainsConfig.class, "container/filters/chain"); Set<String> chainsIds = chainsConfig.chains().stream().map(ChainsConfig.Chains::id).collect(toSet()); - assertThat(chainsIds) - .containsExactlyInAnyOrder( - "request-chain-with-binding", "response-chain-with-binding", "my-default-request-chain", "my-default-response-chain"); + assertEquals(chainsIds, Set.of("request-chain-with-binding", "response-chain-with-binding", "my-default-request-chain", "my-default-response-chain")); } private static void assertDefaultFiltersInConfig(ServerConfig config) { - assertThat(config.defaultFilters()) - .containsExactlyInAnyOrder( - new ServerConfig.DefaultFilters(new ServerConfig.DefaultFilters.Builder() - .filterId("my-default-request-chain").localPort(8000)), - new ServerConfig.DefaultFilters(new ServerConfig.DefaultFilters.Builder() - .filterId("my-default-response-chain").localPort(8000))); + var asMap = config.defaultFilters().stream().collect(toMap(ServerConfig.DefaultFilters::filterId, ServerConfig.DefaultFilters::localPort)); + assertEquals(asMap, Map.of("my-default-request-chain", 8000, "my-default-response-chain", 8000)); + } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationTest.java index ff884d6072f..3c96edc482a 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationTest.java @@ -7,7 +7,6 @@ import org.w3c.dom.Element; import java.util.List; -import static org.assertj.core.api.Fail.fail; import static org.junit.jupiter.api.Assertions.*; /** |