1 files changed, 12 insertions, 15 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationSearcherTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationSearcherTest.java
index 3f95fb99087..89319877d03 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationSearcherTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/FederationSearcherTest.java
@@ -12,8 +12,7 @@ import com.yahoo.search.searchchain.model.federation.FederationSearcherModel;
 import com.yahoo.search.searchchain.model.federation.FederationSearcherModel.TargetSpec;
 import com.yahoo.vespa.model.ConfigProducer;
 import com.yahoo.vespa.model.container.search.searchchain.Source.GroupOption;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -25,9 +24,7 @@ import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author Tony Vaagenes
@@ -71,7 +68,7 @@ public class FederationSearcherTest {
     }
 
     @Test
-    public void default_providers_are_inherited_when_inheritDefaultSources_is_true() throws Exception {
+    void default_providers_are_inherited_when_inheritDefaultSources_is_true() throws Exception {
         FederationFixture f = new FederationFixture();
 
         final String providerId = "providerId";
@@ -83,27 +80,27 @@ public class FederationSearcherTest {
         FederationConfig.Target target = federationConfig.target(0);
 
         assertSame(providerId, target.id()); // by identity
-        assertTrue("Not used by default", target.searchChain(0).useByDefault());
+        assertTrue(target.searchChain(0).useByDefault(), "Not used by default");
     }
 
     @Test
-    public void source_groups_are_inherited_when_inheritDefaultSources_is_true() throws Exception {
+    void source_groups_are_inherited_when_inheritDefaultSources_is_true() throws Exception {
         FederationFixture f = new ProvidersWithSourceFixture();
 
         FederationConfig federationConfig = getConfig(f.federationSearchWithDefaultSources);
-        Assert.assertEquals(1, federationConfig.target().size());
+        assertEquals(1, federationConfig.target().size());
 
         FederationConfig.Target target = federationConfig.target(0);
         assertEquals(target.id(), "source");
-        assertTrue("Not used by default", target.useByDefault());
+        assertTrue(target.useByDefault(), "Not used by default");
         assertEquals(2, target.searchChain().size());
         assertTrue(target.searchChain().stream()
-                        .map(FederationConfig.Target.SearchChain::providerId)
-                        .collect(toList()).containsAll(List.of("provider1", "provider2")));
+                .map(FederationConfig.Target.SearchChain::providerId)
+                .collect(toList()).containsAll(List.of("provider1", "provider2")));
     }
 
     @Test
-    public void source_groups_are_not_inherited_when_inheritDefaultSources_is_false() throws Exception {
+    void source_groups_are_not_inherited_when_inheritDefaultSources_is_false() throws Exception {
         FederationFixture f = new ProvidersWithSourceFixture();
 
         FederationSearcher federationSearcherWithoutDefaultSources = newFederationSearcher(false, emptyList());
@@ -114,7 +111,7 @@ public class FederationSearcherTest {
     }
 
     @Test
-    public void leaders_must_be_the_first_search_chain_in_a_target() throws Exception {
+    void leaders_must_be_the_first_search_chain_in_a_target() throws Exception {
         FederationFixture f = new ProvidersWithSourceFixture();
 
         FederationConfig federationConfig = getConfig(f.federationSearchWithDefaultSources);
@@ -125,7 +122,7 @@ public class FederationSearcherTest {
     }
 
     @Test
-    public void manually_specified_targets_overrides_inherited_targets() throws Exception {
+    void manually_specified_targets_overrides_inherited_targets() throws Exception {
         FederationFixture f = new FederationFixture();
 
         f.registerProviderWithSources(createProvider(ComponentId.fromString("provider1")));