aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java16
1 files changed, 7 insertions, 9 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java
index 2cb0e8f0ab1..8c564f5cd6f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java
@@ -5,15 +5,13 @@ import com.yahoo.component.ComponentId;
import com.yahoo.component.chain.model.ChainSpecification;
import com.yahoo.config.model.test.MockRoot;
import com.yahoo.search.searchchain.model.federation.FederationOptions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author Tony Vaagenes
@@ -22,14 +20,14 @@ public class SourceGroupTest {
private MockRoot root;
private SearchChains searchChains;
- @Before
+ @BeforeEach
public void setUp() {
root = new MockRoot();
searchChains = new SearchChains(root, "searchchains");
}
@Test
- public void report_error_when_no_leader() {
+ void report_error_when_no_leader() {
try {
Provider provider = createProvider("p1");
Source source = createSource("s1", Source.GroupOption.participant);
@@ -65,7 +63,7 @@ public class SourceGroupTest {
}
@Test
- public void require_that_source_and_provider_id_is_not_allowed_to_be_equal() {
+ void require_that_source_and_provider_id_is_not_allowed_to_be_equal() {
Provider provider = createProvider("sameId");
Provider provider2 = createProvider("ignoredId");
@@ -82,7 +80,7 @@ public class SourceGroupTest {
fail("Expected exception");
} catch (Exception e) {
assertEquals("Id 'sameId' is used both for a source and another search chain/provider",
- e.getMessage());
+ e.getMessage());
}
}
}