diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-28 10:59:50 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-28 14:51:34 +0200 |
| commit | af6b5979aa92587016bdd98df7c570f6e4045e62 (patch) | |
| tree | 868e3b77dffbbd9f5a92e3dba6035e304cda9ad7 /clustercontroller-reindexer | |
| parent | 6b16d75894e7a33566794b82b2bd48e113fdf2e9 (diff) | |
Convert clustercontroller-reindexer to junit5
Diffstat (limited to 'clustercontroller-reindexer')
| -rw-r--r-- | clustercontroller-reindexer/pom.xml | 14 | ||||
| -rw-r--r-- | clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/clustercontroller-reindexer/pom.xml b/clustercontroller-reindexer/pom.xml index 42e746c1bae..c94b5b134fe 100644 --- a/clustercontroller-reindexer/pom.xml +++ b/clustercontroller-reindexer/pom.xml @@ -51,6 +51,20 @@ <artifactId>testutil</artifactId> <version>${project.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java index 2e3f4942b7d..b4aad7bc3ca 100644 --- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java +++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/http/ReindexingV1ApiTest.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.concurrent.Executors; import static com.yahoo.jdisc.http.HttpRequest.Method.POST; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author jonmv |