aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java/com/yahoo/vespa/model/content/GlobalDistributionValidatorTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/content/GlobalDistributionValidatorTest.java')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/content/GlobalDistributionValidatorTest.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/GlobalDistributionValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/GlobalDistributionValidatorTest.java
index a47d25ab391..4def4e0c10f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/GlobalDistributionValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/GlobalDistributionValidatorTest.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.model.content;
import com.yahoo.documentmodel.NewDocumentType;
import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.HashMap;
import java.util.HashSet;
@@ -14,8 +14,8 @@ import java.util.stream.Stream;
import static java.util.Collections.emptyMap;
import static java.util.Collections.emptySet;
import static java.util.stream.Collectors.toSet;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* @author bjorncs
@@ -23,20 +23,20 @@ import static org.junit.Assert.fail;
public class GlobalDistributionValidatorTest {
@Test
- public void validation_succeeds_on_no_documents() {
+ void validation_succeeds_on_no_documents() {
new GlobalDistributionValidator()
.validate(emptyMap(), emptySet());
}
@Test
- public void validation_succeeds_on_no_global_documents() {
+ void validation_succeeds_on_no_global_documents() {
Fixture fixture = new Fixture()
.addNonGlobalDocument(createDocumentType("foo"));
validate(fixture);
}
@Test
- public void throws_exception_if_referenced_document_not_global() {
+ void throws_exception_if_referenced_document_not_global() {
NewDocumentType parent = createDocumentType("parent");
Fixture fixture = new Fixture()
.addNonGlobalDocument(parent)
@@ -51,7 +51,7 @@ public class GlobalDistributionValidatorTest {
}
@Test
- public void validation_succeeds_if_referenced_document_is_global() {
+ void validation_succeeds_if_referenced_document_is_global() {
NewDocumentType parent = createDocumentType("parent");
Fixture fixture = new Fixture()
.addGlobalDocument(parent)
@@ -60,7 +60,7 @@ public class GlobalDistributionValidatorTest {
}
@Test
- public void throws_exception_on_unknown_document() {
+ void throws_exception_on_unknown_document() {
NewDocumentType unknown = new NewDocumentType(new NewDocumentType.Name("unknown"));
NewDocumentType child = createDocumentType("child", unknown);
Fixture fixture = new Fixture()
@@ -76,7 +76,7 @@ public class GlobalDistributionValidatorTest {
}
@Test
- public void throws_exception_if_referenced_document_not_global_end_to_end() {
+ void throws_exception_if_referenced_document_not_global_end_to_end() {
try {
new VespaModelCreatorWithFilePkg("src/test/cfg/application/validation/global_distribution_validation/").create();
fail();