Remove junit.fdramework usage

21 files changed, 97 insertions, 55 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java b/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java
index 883e63a9c7e..20e0e54103c 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java
@@ -7,13 +7,12 @@ import org.junit.Test;
 import java.io.File;
 import java.util.List;
 
-import static junit.framework.TestCase.fail;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
 
 /**
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public class ConfigModelUtilsTest {
 
@@ -76,4 +75,5 @@ public class ConfigModelUtilsTest {
             assertThat(e.getMessage(), is("Error opening jar file 'invalid.jar'. Please check that this is a valid jar file"));
         }
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
index 43f26c94de7..7256c9ccdb0 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
@@ -6,12 +6,19 @@ import com.yahoo.vespa.model.container.Container;
 import org.junit.Test;
 
 import java.io.StringReader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
-import static junit.framework.TestCase.assertTrue;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author hmusum
@@ -126,3 +133,4 @@ public class HostsXmlProvisionerTest {
         assertThat(hostSpec.hostname(), is("test1.yahoo.com"));
     }
 }
+
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java
index fcda8a27d8b..62c12fcfa6a 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/SingleNodeProvisionerTest.java
@@ -10,16 +10,24 @@ import org.junit.Test;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
-import static junit.framework.TestCase.assertTrue;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author hmusum
  */
 public class SingleNodeProvisionerTest {
+
     @Test
     public void require_basic_works() {
         SingleNodeProvisioner hostProvisioner = new SingleNodeProvisioner();
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SDDocumentTypeOrdererTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SDDocumentTypeOrdererTestCase.java
index 555d6460f3a..60b185d08e2 100755
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SDDocumentTypeOrdererTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SDDocumentTypeOrdererTestCase.java
@@ -13,12 +13,13 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class SDDocumentTypeOrdererTestCase {
+
     @Test
     public void testOrder() {
         List<SDDocumentType> types = new ArrayList<>();
@@ -73,4 +74,5 @@ public class SDDocumentTypeOrdererTestCase {
         assertEquals(f, app.processingOrder.get(5));
         assertEquals(g, app.processingOrder.get(6));
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/UrlFieldValidationTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/UrlFieldValidationTestCase.java
index a3a740c8c2a..4e19955999d 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/UrlFieldValidationTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/UrlFieldValidationTestCase.java
@@ -5,8 +5,8 @@ import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.yolean.Exceptions;
 import org.junit.Test;
 
-import static junit.framework.TestCase.fail;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 /**
  * @author bratseth
diff --git a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java
index 637e5142da1..e9a7a6ed33e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderReferenceTypeTestCase.java
@@ -15,7 +15,7 @@ import org.junit.Test;
 import java.io.IOException;
 
 import static com.yahoo.config.model.test.TestUtil.joinLines;
-import static junit.framework.TestCase.assertSame;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author geirst
@@ -57,7 +57,7 @@ public class DocumentModelBuilderReferenceTypeTestCase extends SearchDefinitionT
         NewDocumentType campaignType = model.getDocumentManager().getDocumentType("campaign");
         NewDocumentType adType = model.getDocumentManager().getDocumentType("ad");
         ReferenceDataType campaignRefType = (ReferenceDataType) adType.getField("campaign_ref").getDataType();
-        assertSame(campaignRefType.getTargetType(), campaignType);
+        assertEquals(campaignRefType.getTargetType(), campaignType);
     }
 
     private static String TEST_FOLDER = "src/test/configmodel/types/references/";
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/RecentLogFilterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/RecentLogFilterTest.java
index a1c98a156a5..6891eb16e18 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/RecentLogFilterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/RecentLogFilterTest.java
@@ -8,9 +8,8 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
-
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author hmusum
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilderTest.java
index 17d9bc01a23..b59d4239034 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilderTest.java
@@ -11,15 +11,13 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertTrue;
 import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 
 /**
  * Test of DomFederationSearcherBuilder.
+ *
  * @author tonytv
  */
 public class DomFederationSearcherBuilderTest extends DomBuilderTest {
@@ -74,4 +72,5 @@ public class DomFederationSearcherBuilderTest extends DomBuilderTest {
         searcher.getConfig(builder);
         assertThat(new FederationConfig(builder).targetSelector(), is(targetSelectorId));
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainsBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainsBuilderTest.java
index f57a0e316c3..a443969496c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainsBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearchChainsBuilderTest.java
@@ -22,19 +22,18 @@ import java.util.List;
 
 import static com.yahoo.container.core.ChainsConfig.Chains;
 import static com.yahoo.container.core.ChainsConfig.Components;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
 import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.*;
 
 /**
  * Test of Search chains builder.
+ *
  * @author tonytv
  */
 public class DomSearchChainsBuilderTest extends DomBuilderTest {
+
     private SearchChains searchChains;
 
     private static final Element element = parse(
@@ -201,4 +200,5 @@ public class DomSearchChainsBuilderTest extends DomBuilderTest {
     private SearchChain getSearchChain(String componentSpecification) {
         return searchChains.allChains().getComponent(new ComponentSpecification(componentSpecification));
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearcherBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearcherBuilderTest.java
index db04cd6d4eb..f0c3861ecaa 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearcherBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomSearcherBuilderTest.java
@@ -7,13 +7,13 @@ import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.vespa.model.container.component.chain.ChainedComponent;
 import org.junit.Test;
 
-import static junit.framework.TestCase.assertEquals;
-
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author tonytv
  */
 public class DomSearcherBuilderTest extends DomBuilderTest {
+
     @Test
     public void ensureCorrectModel() {
         ChainedComponent<ChainedComponentModel> searcher = new DomSearcherBuilder().doBuild(root, parse(
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/clients/test/SpoolerTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/clients/test/SpoolerTestCase.java
index 7198658dd1b..7e0c31dd998 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/clients/test/SpoolerTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/clients/test/SpoolerTestCase.java
@@ -5,14 +5,18 @@ import com.yahoo.vespa.config.content.spooler.SpoolerConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.test.utils.CommonVespaModelSetup;
 import com.yahoo.vespaclient.config.FeederConfig;
+import org.junit.Test;
 
 import java.util.*;
 
+import static org.junit.Assert.assertEquals;
+
 /**
- * @author <a href="mailto:thomasg@yahoo-inc.com">Thomas Gundersen</a>
+ * @author Thomas Gundersen
  */
-public class SpoolerTestCase extends junit.framework.TestCase {
+public class SpoolerTestCase {
 
+    @Test
     public void testSimple() throws Exception {
         VespaModel model = createModel("src/test/cfg/clients/simpleconfig.v2.docprocv3");
 
@@ -38,6 +42,7 @@ public class SpoolerTestCase extends junit.framework.TestCase {
         testFeederConfigBuilder(model, spoolerIndex, feederBuilder);
     }
 
+    @Test
     public void testAdvanced() throws Exception {
         VespaModel model = createModel("src/test/cfg/clients/advancedconfig.v2");
 
@@ -117,7 +122,7 @@ public class SpoolerTestCase extends junit.framework.TestCase {
         SpoolerConfig.Builder b = new SpoolerConfig.Builder();
         model.getConfig(b, id);
         SpoolerConfig config = new SpoolerConfig(b);
-        final SpoolerConfig expectedConfig = new SpoolerConfig(expected);
+        SpoolerConfig expectedConfig = new SpoolerConfig(expected);
         assertEquals(expectedConfig, config);
     }
 
@@ -129,11 +134,12 @@ public class SpoolerTestCase extends junit.framework.TestCase {
         FeederConfig.Builder b = new FeederConfig.Builder();
         model.getConfig(b, id);
         FeederConfig config = new FeederConfig(b);
-        final FeederConfig expectedConfig = new FeederConfig(expected);
+        FeederConfig expectedConfig = new FeederConfig(expected);
         assertEquals(expectedConfig, config);
     }
 
     private VespaModel createModel(String configFile) throws Exception {
         return CommonVespaModelSetup.createVespaModelWithMusic(configFile);
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/processing/test/ProcessingChainsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/processing/test/ProcessingChainsTest.java
index d32d0dee6c1..36425aabaf0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/processing/test/ProcessingChainsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/processing/test/ProcessingChainsTest.java
@@ -13,9 +13,7 @@ import org.w3c.dom.Element;
 
 import java.util.Collection;
 
-import static junit.framework.TestCase.assertEquals;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author bratseth
@@ -51,7 +49,7 @@ public class ProcessingChainsTest extends DomBuilderTest {
         assertEquals(1, defaultChain.getInnerComponents().size());
 
         Collection<ChainedComponent<?>> outerProcessors = processingChains.getComponentGroup().getComponents();
-        assertThat(outerProcessors.size(), is(1));
+        assertEquals(1, outerProcessors.size());
         assertEquals("processor1", outerProcessors.iterator().next().getComponentId().toString());
 
         Collection<Processor> innerProcessors = defaultChain.getInnerComponents();
@@ -61,12 +59,11 @@ public class ProcessingChainsTest extends DomBuilderTest {
     @Test
     public void require_that_processors_have_correct_class() {
         ChainedComponent<?> processor1 = processingChains.getComponentGroup().getComponents().iterator().next();
-        assertThat(processor1.model.bundleInstantiationSpec.classId.stringValue(),
-                   is("com.yahoo.test.Processor1"));
+        assertEquals("com.yahoo.test.Processor1", processor1.model.bundleInstantiationSpec.classId.stringValue());
 
         ProcessingChain defaultChain = processingChains.allChains().getComponent("default");
         Processor processor2 = defaultChain.getInnerComponents().iterator().next();
-        assertThat(processor2.model.bundleInstantiationSpec.classId.stringValue(),
-                   is("com.yahoo.test.Processor2"));
+        assertEquals("com.yahoo.test.Processor2", processor2.model.bundleInstantiationSpec.classId.stringValue());
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/PageTemplatesTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/PageTemplatesTestCase.java
index ab442ac4e3e..3df3a40515a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/PageTemplatesTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/PageTemplatesTestCase.java
@@ -6,18 +6,23 @@ import com.yahoo.io.IOUtils;
 import com.yahoo.io.reader.NamedReader;
 import com.yahoo.text.StringUtilities;
 import com.yahoo.vespa.model.container.search.PageTemplates;
+import org.junit.Test;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * @author bratseth
  */
-public class PageTemplatesTestCase extends junit.framework.TestCase {
+public class PageTemplatesTestCase {
 
     private final static String root="src/test/java/com/yahoo/vespa/model/container/search/test/pages";
 
+    @Test
     public void testExport() throws IOException {
         List<NamedReader> pageFiles=new ArrayList<>(2);
         pageFiles.add(new NamedReader(root + "/slottingSerp.xml", IOUtils.createReader(root + "/slottingSerp.xml")));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfileVariantsTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfileVariantsTestCase.java
index 5ff2ceffb91..5833bc79ebf 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfileVariantsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfileVariantsTestCase.java
@@ -5,41 +5,49 @@ import com.yahoo.search.query.profile.QueryProfile;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.search.query.profile.config.QueryProfileXMLReader;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
+import org.junit.Test;
+
 import java.io.IOException;
 
 import static helpers.CompareConfigTestHelper.assertSerializedConfigFileEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author bratseth
  */
-public class QueryProfileVariantsTestCase extends junit.framework.TestCase {
+public class QueryProfileVariantsTestCase {
 
     private final String root = "src/test/java/com/yahoo/vespa/model/container/search/test/";
 
+    @Test
     public void testConfigCreation() throws IOException {
         QueryProfileRegistry registry = new QueryProfileXMLReader().read(root + "queryprofilevariants");
         QueryProfiles profiles = new QueryProfiles(registry);
         assertSerializedConfigFileEquals(root + "query-profile-variants-configuration.cfg", profiles.getConfig().toString());
     }
 
+    @Test
     public void testConfigCreation2() throws IOException {
         QueryProfileRegistry registry = new QueryProfileXMLReader().read("src/test/java/com/yahoo/vespa/model/container/search/test/queryprofilevariants2");
         QueryProfiles profiles = new QueryProfiles(registry);
         assertSerializedConfigFileEquals(root + "query-profile-variants2-configuration.cfg", profiles.getConfig().toString());
     }
 
+    @Test
     public void testConfigCreationNewsBESimple() throws IOException {
         QueryProfileRegistry registry = new QueryProfileXMLReader().read(root + "newsbesimple");
         QueryProfiles profiles = new QueryProfiles(registry);
         assertSerializedConfigFileEquals(root + "newsbe-query-profiles-simple.cfg", profiles.getConfig().toString());
     }
 
+    @Test
     public void testConfigCreationNewsFESimple() throws IOException {
         QueryProfileRegistry registry = new QueryProfileXMLReader().read(root + "newsfesimple");
         QueryProfiles profiles = new QueryProfiles(registry);
         assertSerializedConfigFileEquals(root + "newsfe-query-profiles-simple.cfg", profiles.getConfig().toString());
     }
 
+    @Test
     public void testVariantsOfExplicitCompound() throws IOException {
         QueryProfileRegistry registry = new QueryProfileRegistry();
 
@@ -59,6 +67,7 @@ public class QueryProfileVariantsTestCase extends junit.framework.TestCase {
         assertSerializedConfigFileEquals(root + "variants-of-explicit-compound.cfg", profiles.getConfig().toString());
     }
 
+    @Test
     public void testVariantsOfExplicitCompoundWithVariantReference() throws IOException {
         QueryProfileRegistry registry = new QueryProfileRegistry();
 
@@ -84,6 +93,7 @@ public class QueryProfileVariantsTestCase extends junit.framework.TestCase {
     }
 
     /** For comparison with the above */
+    @Test
     public void testExplicitReferenceOverride() throws IOException {
         QueryProfileRegistry registry = new QueryProfileRegistry();
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java
index f92775d60e9..8c725ecc43c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java
@@ -17,21 +17,25 @@ import org.junit.Test;
 import java.io.IOException;
 
 import static helpers.CompareConfigTestHelper.assertSerializedConfigFileEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests generation of config from query profiles (XML reading is tested elsewhere)
  *
  * @author bratseth
  */
-public class QueryProfilesTestCase extends junit.framework.TestCase {
+public class QueryProfilesTestCase {
 
     private final static String root="src/test/java/com/yahoo/vespa/model/container/search/test/";
 
+    @Test
     public void testEmpty() throws IOException {
         QueryProfileRegistry reg = new QueryProfileRegistry();
         assertConfig("empty.cfg", reg);
     }
 
+    @Test
     public void testQueryProfiles() throws IOException {
         final boolean mandatory=true;
         final boolean overridable=true;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java
index 0c41b8ecc0b..80d0b20791e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java
@@ -31,7 +31,6 @@ import org.junit.rules.ExpectedException;
 
 import java.util.List;
 
-import static junit.framework.TestCase.assertEquals;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java
index 870d37bf4e2..89492572873 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSearchClusterTest.java
@@ -17,9 +17,9 @@ import java.util.List;
 import static com.yahoo.config.model.test.TestUtil.joinLines;
 import static com.yahoo.vespa.model.content.utils.ContentClusterUtils.createCluster;
 import static com.yahoo.vespa.model.content.utils.SearchDefinitionBuilder.createSearchDefinitions;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for content search cluster.
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java
index 45a36eb3391..8f7c7614981 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java
@@ -18,15 +18,12 @@ import java.util.List;
 import java.util.Optional;
 
 import static com.yahoo.config.model.test.TestUtil.joinLines;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static com.yahoo.vespa.model.content.utils.ContentClusterUtils.createCluster;
 import static com.yahoo.vespa.model.content.utils.ContentClusterUtils.createClusterXml;
 import static com.yahoo.vespa.model.search.utils.DispatchUtils.assertEngine;
 import static com.yahoo.vespa.model.search.utils.DispatchUtils.getDataset;
+import static org.junit.Assert.*;
 
 
 /**
@@ -296,4 +293,5 @@ public class IndexedHierarchicDistributionTest {
         // The active one should be indexed anyhow. Setting up no ready copies
         getTwoGroupsCluster(4, 0, "2|*");
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSearchNodeNamingTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSearchNodeNamingTest.java
index 81e84223976..721a1dcd7e4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSearchNodeNamingTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedSearchNodeNamingTest.java
@@ -12,10 +12,11 @@ import java.util.List;
 import static com.yahoo.config.model.test.TestUtil.joinLines;
 import static com.yahoo.vespa.model.content.utils.ContentClusterUtils.createCluster;
 import static com.yahoo.vespa.model.content.utils.ContentClusterUtils.createClusterXml;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Unit tests for the naming of search nodes base dir and config ids in an indexed content cluster.
+ *
  * @author geirst
  */
 public class IndexedSearchNodeNamingTest {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchNodeTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchNodeTest.java
index 385e28fa404..66cad9195e4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchNodeTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchNodeTest.java
@@ -16,10 +16,9 @@ import org.junit.Test;
 
 import java.util.Optional;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for search node.
@@ -79,4 +78,5 @@ public class SearchNodeTest {
         Assert.assertThat(node.getPreShutdownCommand().get(),
                 CoreMatchers.containsString("vespa-proton-cmd " + node.getRpcPort() + " prepareRestart"));
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java
index 0a6b9bf884a..2fc5d545797 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java
@@ -2,14 +2,18 @@
 package com.yahoo.vespa.model.test;
 
 import com.yahoo.vespa.model.PortsMeta;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * Tests proper functioning of the PortsMeta.
  *
- *
  * @author Vidar Larsen
  */
-public class PortsMetaTestCase extends junit.framework.TestCase {
+public class PortsMetaTestCase {
+
+    @Test
     public void testRegister() throws Exception {
         PortsMeta pm = new PortsMeta();
         pm.on(0).tag("foo");
@@ -22,6 +26,8 @@ public class PortsMetaTestCase extends junit.framework.TestCase {
         assertFalse(pm.contains(0, "bar"));
         assertFalse(pm.contains(2, "anything"));
     }
+
+    @Test
     public void testAdminStatusApi() throws Exception {
         PortsMeta pm = new PortsMeta()
                 .on(0).tag("rpc").tag("nc").tag("admin").tag("status")