Remove junit.fdramework usage

45 files changed, 302 insertions, 204 deletions

diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBaseTest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBaseTest.java
index 685ad492052..d943c8d96f0 100644
--- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBaseTest.java
+++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBaseTest.java
@@ -5,9 +5,7 @@ import com.yahoo.vespa.clustercontroller.utils.communication.async.AsyncOperatio
 import com.yahoo.vespa.clustercontroller.utils.communication.async.AsyncOperationImpl;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class AsyncHttpClientWithBaseTest {
 
@@ -46,9 +44,9 @@ public class AsyncHttpClientWithBaseTest {
 
     @Test
     public void testClientMustBeSet() {
-        try {
+        try{
             new AsyncHttpClientWithBase<>(null);
-            assertTrue(false);
+            fail();
         } catch (IllegalArgumentException e) {
         }
     }
diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResultTest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResultTest.java
index 8265247b124..fc843979d75 100644
--- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResultTest.java
+++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResultTest.java
@@ -17,12 +17,12 @@ public class JsonHttpResultTest {
     @Test
     public void testOutput() {
         assertEquals("HTTP 200/OK\n"
-                   + "\n"
-                   + "JSON: {\"foo\": 3}",
+                     + "\n"
+                     + "JSON: {\"foo\": 3}",
                      new JsonHttpResult(new HttpResult().setContent("{ \"foo\" : 3 }")).toString(true));
         assertEquals("HTTP 200/OK\n"
-                + "\n"
-                + "{ \"foo\" : }",
+                     + "\n"
+                     + "{ \"foo\" : }",
                 new JsonHttpResult(new HttpResult().setContent("{ \"foo\" : }")).toString(true));
     }
 
diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClockTest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClockTest.java
index 900be069623..47edd7ac55c 100644
--- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClockTest.java
+++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClockTest.java
@@ -1,10 +1,14 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.utils.test;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
-public class FakeClockTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
+public class FakeClockTest {
+
+    @Test
     public void testSimple() {
         FakeClock clock = new FakeClock();
             // Should not start at 0, as that is common not initialized yet value
@@ -21,9 +25,9 @@ public class FakeClockTest extends TestCase {
         assertEquals(start + 15, clock.getTimeInMillis());
     }
 
-    /**
-     * @todo This should probably throw exceptions.. However, that doesn't seem to be current behavior. I suspect some tests misuse the clock to reset things to run another test. Should probably be fixed.
-     */
+    // TODO: This should probably throw exceptions.. However, that doesn't seem to be current behavior.
+    // I suspect some tests misuse the clock to reset things to run another test. Should probably be fixed.
+    @Test
     public void testTurnTimeBack() {
         FakeClock clock = new FakeClock();
         clock.set(1000);
@@ -34,4 +38,5 @@ public class FakeClockTest extends TestCase {
         clock.adjust(-100);
         assertEquals(400, clock.getTimeInMillis());
     }
+
 }
diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneableTest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneableTest.java
index c3a428437d0..b4fa6492c6d 100644
--- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneableTest.java
+++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneableTest.java
@@ -1,9 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.utils.util;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
-public class CertainlyCloneableTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+public class CertainlyCloneableTest {
 
     private class Foo extends CertainlyCloneable<Foo> {
         protected Foo callParentClone() throws CloneNotSupportedException {
@@ -11,6 +14,7 @@ public class CertainlyCloneableTest extends TestCase {
         }
     }
 
+    @Test
     public void testSimple() {
         try{
             Foo f = new Foo();
@@ -20,4 +24,5 @@ public class CertainlyCloneableTest extends TestCase {
             assertEquals("Foo", e.getCause().getMessage());
         }
     }
+
 }
diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/ClockTest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/ClockTest.java
index fbd34297953..4d46903c090 100644
--- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/ClockTest.java
+++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/ClockTest.java
@@ -1,13 +1,17 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.utils.util;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
-public class ClockTest extends TestCase {
+import static org.junit.Assert.assertTrue;
 
+public class ClockTest {
+
+    @Test
     public void testNothingButGetCoverage() {
         long s = new Clock().getTimeInSecs();
         long ms = new Clock().getTimeInMillis();
         assertTrue(ms >= 1000 * s);
     }
+
 }
diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapperTest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapperTest.java
index 2250901e4e1..8dbdbb11c95 100644
--- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapperTest.java
+++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapperTest.java
@@ -1,10 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.utils.util;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
-public class JSONObjectWrapperTest extends TestCase {
+import static org.junit.Assert.assertEquals;
 
+public class JSONObjectWrapperTest {
+
+    @Test
     public void testExceptionWrapping() {
         JSONObjectWrapper wrapper = new JSONObjectWrapper();
         try{
@@ -13,4 +16,5 @@ public class JSONObjectWrapperTest extends TestCase {
             assertEquals("Null key.", e.getMessage());
         }
     }
+
 }
diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporterTest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporterTest.java
index 332f0a36327..d085015065a 100644
--- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporterTest.java
+++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporterTest.java
@@ -1,12 +1,15 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.utils.util;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import java.util.Map;
 import java.util.TreeMap;
 
-public class MetricReporterTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+
+public class MetricReporterTest {
+
     static class MetricReporterMock implements MetricReporter {
         StringBuilder sb = new StringBuilder();
 
@@ -30,6 +33,7 @@ public class MetricReporterTest extends TestCase {
         }
     };
 
+    @Test
     public void testNoMetricReporter() {
         NoMetricReporter reporter = new NoMetricReporter();
         reporter.add("foo", 3, null);
@@ -37,6 +41,7 @@ public class MetricReporterTest extends TestCase {
         reporter.createContext(null);
     }
 
+    @Test
     public void testPrefix() {
         MetricReporterMock mock = new MetricReporterMock();
         ComponentMetricReporter c = new ComponentMetricReporter(mock, "prefix");
@@ -51,6 +56,7 @@ public class MetricReporterTest extends TestCase {
 
     }
 
+    @Test
     public void testWithContext() {
         MetricReporterMock mock = new MetricReporterMock();
         ComponentMetricReporter c = new ComponentMetricReporter(mock, "prefix");
@@ -68,6 +74,7 @@ public class MetricReporterTest extends TestCase {
                 "set(prefixbar, 1)\n", mock.sb.toString());
     }
 
+    @Test
     public void testDefaultContext() {
         MetricReporterMock mock = new MetricReporterMock();
         ComponentMetricReporter c = new ComponentMetricReporter(mock, "prefix");
@@ -79,6 +86,7 @@ public class MetricReporterTest extends TestCase {
                 "add(prefixfoo, 2)\n", mock.sb.toString());
     }
 
+    @Test
     public void testContextOverlap() {
         MetricReporterMock mock = new MetricReporterMock();
         ComponentMetricReporter c = new ComponentMetricReporter(mock, "prefix");
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")
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java
index 55942c6abd8..70bb9e45e51 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java
@@ -5,13 +5,12 @@ import org.junit.Test;
 
 import java.util.Collections;
 
-import static junit.framework.TestCase.assertNull;
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 
 /**
  * @author hmusum
- * @since 5.1.9
  */
 public class MemoryCacheConfigClientTest {
 
@@ -26,4 +25,5 @@ public class MemoryCacheConfigClientTest {
         assertThat(client.getActiveSourceConnection(), is("N/A"));
         assertThat(client.getSourceConnections(), is(Collections.singletonList("N/A")));
     }
+
 }
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigSourceTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigSourceTest.java
index 2706cb16312..00f7d23bedf 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigSourceTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSourceTest.java
@@ -9,15 +9,14 @@ import org.junit.rules.TemporaryFolder;
 import java.io.File;
 import java.io.IOException;
 
-import static junit.framework.TestCase.fail;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 /**
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public class ConfigSourceTest {
+
     @Test(expected = IllegalArgumentException.class)
     public void require_that_FileSource_throws_exception_on_invalid_file() {
         new FileSource(new File("invalid"));
@@ -39,7 +38,9 @@ public class ConfigSourceTest {
             ConfigGetter.getConfig(SimpletypesConfig.class, "dir:" + tmpDir, dirSource);
             fail();
         } catch (IllegalArgumentException e) {
-            assertThat(e.getMessage(), is("Could not find a config file for '" + SimpletypesConfig.getDefName() + "' in '" + folder + "/'"));
+            assertEquals("Could not find a config file for '" + SimpletypesConfig.getDefName() + "' in '" + folder + "/'",
+                         e.getMessage());
         }
     }
+
 }
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java
index 780a577a8dd..586ad7857f4 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSubscriptionTest.java
@@ -15,19 +15,14 @@ import org.junit.Test;
 import java.util.Collections;
 import java.util.List;
 
-import static junit.framework.TestCase.fail;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
- * @author hmusum, lulf
- * @since 5.1
+ * @author hmusum
+ * @author Ulf Lillengen
  */
 public class ConfigSubscriptionTest {
+
     @Test
     public void testEquals() {
         ConfigSubscriber sub = new ConfigSubscriber();
@@ -38,12 +33,12 @@ public class ConfigSubscriptionTest {
                 sub, new RawSource(payload), new TimingValues());
         ConfigSubscription<SimpletypesConfig> c = ConfigSubscription.get(new ConfigKey<>(SimpletypesConfig.class, "test2"),
                 sub, new RawSource(payload), new TimingValues());
-        assertThat(a, is(b));
-        assertThat(a, is(a));
-        assertThat(b, is(b));
-        assertThat(c, is(c));
-        assertThat(a, is(not(c)));
-        assertThat(b, is(not(c)));
+        assertEquals(b, a);
+        assertEquals(a, a);
+        assertEquals(b, b);
+        assertEquals(c, c);
+        assertNotEquals(c, a);
+        assertNotEquals(c, b);
 
         ConfigSubscriber subscriber = new ConfigSubscriber();
         ConfigSet configSet = new ConfigSet();
@@ -73,12 +68,12 @@ public class ConfigSubscriptionTest {
         ConfigHandle<SimpletypesConfig> handle = sub.subscribe(SimpletypesConfig.class, "raw:boolval true", 10000);
         assertNotNull(handle);
         sub.nextConfig();
-        assertThat(handle.getConfig().boolval(), is(true));
+        assertTrue(handle.getConfig().boolval());
         //assertTrue(sub.getSource() instanceof RawSource);
     }
 
-    // Test that subscription is closed and subscriptionHandles is empty if we get an exception (only the last is possible to
-    // test right now).
+    // Test that subscription is closed and subscriptionHandles is empty if we get an exception
+    // (only the last is possible to test right now).
     @Test
     @Ignore
     public void testSubscribeWithException() {
@@ -88,7 +83,7 @@ public class ConfigSubscriptionTest {
             sub.subscribe(SimpletypesConfig.class, "configid", configSourceSet, new TimingValues().setSubscribeTimeout(100));
             fail();
         } catch (ConfigurationRuntimeException e) {
-            assertThat(sub.getSubscriptionHandles().size(), is(0));
+            assertEquals(0, sub.getSubscriptionHandles().size());
         }
     }
 
@@ -97,4 +92,5 @@ public class ConfigSubscriptionTest {
             return subscriptionHandles;
         }
     }
+
 }
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionKeyTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionKeyTest.java
index 7014460d1a6..c4024a73c97 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionKeyTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionKeyTest.java
@@ -3,11 +3,7 @@ package com.yahoo.vespa.config;
 
 import org.junit.Test;
 
-import static junit.framework.TestCase.assertFalse;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.Assert.*;
 
 /**
  * Tests ConfigDefinitionKey
@@ -21,8 +17,8 @@ public class ConfigDefinitionKeyTest {
         ConfigDefinitionKey def1 = new ConfigDefinitionKey("foo", "fuz");
         ConfigDefinitionKey def2 = new ConfigDefinitionKey("foo", "bar");
 
-        assertThat(def1.getName(), is("foo"));
-        assertThat(def1.getNamespace(), is("fuz"));
+        assertEquals("foo", def1.getName());
+        assertEquals("fuz", def1.getNamespace());
 
         assertTrue(def1.equals(def1));
         assertFalse(def1.equals(def2));
@@ -35,8 +31,8 @@ public class ConfigDefinitionKeyTest {
         ConfigKey<?> key1 = new ConfigKey<>("foo", "id", "bar");
         ConfigDefinitionKey def1 = new ConfigDefinitionKey(key1);
 
-        assertThat(def1.getName(), is(key1.getName()));
-        assertThat(def1.getNamespace(), is(key1.getNamespace()));
+        assertEquals(key1.getName(), def1.getName());
+        assertEquals(key1.getNamespace(), def1.getNamespace());
     }
 
 }
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java
index b8f08ac4233..30bf4c64275 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java
@@ -3,17 +3,13 @@ package com.yahoo.vespa.config;
 
 import org.junit.Test;
 
-import static junit.framework.TestCase.assertNull;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 
 /**
  * Class to hold config definitions and resolving requests for the correct definition
  *
  * @author hmusum
- * @since 2011-11-18
  */
 public class ConfigDefinitionSetTest {
 
@@ -29,10 +25,10 @@ public class ConfigDefinitionSetTest {
         configDefinitionSet.add(key2, def2);
         ConfigDefinitionKey key3 = new ConfigDefinitionKey(def3.getName(), def3.getNamespace());
         configDefinitionSet.add(key3, def3);
-        assertThat(configDefinitionSet.size(), is(3));
-        assertThat(configDefinitionSet.get(key1), is(def1));
-        assertThat(configDefinitionSet.get(key2), is(def2));
-        assertThat(configDefinitionSet.get(key3), is(def3));
+        assertEquals(3, configDefinitionSet.size());
+        assertEquals(def1, configDefinitionSet.get(key1));
+        assertEquals(def2, configDefinitionSet.get(key2));
+        assertEquals(def3, configDefinitionSet.get(key3));
 
         String str = configDefinitionSet.toString();
         assertTrue(str.contains("namespace1.foo"));
@@ -50,8 +46,9 @@ public class ConfigDefinitionSetTest {
         configDefinitionSet.add(new ConfigDefinitionKey(def2.getName(), def2.getNamespace()), def2);
 
         // fallback to default namespace
-        assertThat(configDefinitionSet.get(new ConfigDefinitionKey("foo", "namespace")), is(def1));
+        assertEquals(def1, configDefinitionSet.get(new ConfigDefinitionKey("foo", "namespace")));
         // Should not fallback to some other config with same name, but different namespace (not default namespace)
         assertNull(configDefinitionSet.get(new ConfigDefinitionKey("bar", "someothernamespace")));
     }
+
 }
diff --git a/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java b/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java
index 6021671cff5..0d0e0350a9e 100644
--- a/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java
@@ -11,16 +11,13 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNull;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.*;
 
 /**
  * @author hmusum
- * @since 5.1.9
+
  */
 public class RawConfigTest {
 
@@ -35,19 +32,19 @@ public class RawConfigTest {
     public void basic() {
         RawConfig config = new RawConfig(key, defMd5);
         assertEquals(config.getKey(), key);
-        assertThat(config.getDefMd5(), is(defMd5));
-        assertThat(config.getName(), is("foo"));
-        assertThat(config.getDefNamespace(), is("bar"));
-        assertThat(config.getConfigId(), is("id"));
+        assertEquals(defMd5, config.getDefMd5());
+        assertEquals("foo", config.getName());
+        assertEquals("bar", config.getDefNamespace());
+        assertEquals("id", config.getConfigId());
 
-        assertThat(config.isError(), is(false));
+        assertFalse(config.isError());
 
         // Copy constructor
         RawConfig copiedConfig = new RawConfig(config);
-        assertThat(copiedConfig, is(config));
+        assertEquals(config, copiedConfig);
 
-        assertThat(config.toString(), is("bar.foo," + defMd5 + ",id,,0,null"));
-        assertThat(config.getVespaVersion(), is(Optional.empty()));
+        assertEquals("bar.foo," + defMd5 + ",id,,0,null", config.toString());
+        assertEquals(Optional.empty(), config.getVespaVersion());
     }
 
     @Test
diff --git a/config/src/test/java/com/yahoo/vespa/config/buildergen/ConfigBuilderGeneratorTest.java b/config/src/test/java/com/yahoo/vespa/config/buildergen/ConfigBuilderGeneratorTest.java
index 525921d3052..4501768822c 100644
--- a/config/src/test/java/com/yahoo/vespa/config/buildergen/ConfigBuilderGeneratorTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/buildergen/ConfigBuilderGeneratorTest.java
@@ -11,22 +11,19 @@ import com.yahoo.vespa.config.ConfigPayloadApplier;
 import org.junit.Test;
 
 import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URISyntaxException;
 
 import static com.yahoo.config.codegen.ConfiggenUtil.createClassName;
-import static junit.framework.TestCase.assertNotNull;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 /**
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public class ConfigBuilderGeneratorTest {
+
     @Test
-    public void require_that_custom_classes_can_be_generated() throws URISyntaxException, IOException, ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException {
+    public void require_that_custom_classes_can_be_generated() throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException {
         String[] schema = new String[] {
                 "namespace=foo.bar",
                 "intval int",
@@ -46,6 +43,7 @@ public class ConfigBuilderGeneratorTest {
         String className = createClassName(key.getName());
         ConfigInstance instance = (ConfigInstance) builder.getClass().getClassLoader().loadClass("com.yahoo." + key.getNamespace() + "." + className).getConstructor(new Class<?>[]{builder.getClass()}).newInstance(builder);
         assertNotNull(instance);
-        assertThat(instance.toString(), is("intval 3\nstringval \"Hello, world\""));
+        assertEquals("intval 3\nstringval \"Hello, world\"", instance.toString());
     }
+
 }
diff --git a/container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java b/container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java
index 747cb2f83cb..ceafbc18272 100644
--- a/container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java
+++ b/container-accesslogging/src/test/java/com/yahoo/container/logging/JSONLogTestCase.java
@@ -1,13 +1,17 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.logging;
 
+import org.junit.Test;
+
 import java.net.URI;
 
+import static org.junit.Assert.assertEquals;
+
 
 /**
  * @author frodelu
  */
-public class JSONLogTestCase extends junit.framework.TestCase {
+public class JSONLogTestCase {
 
     private static String ipAddress = "152.200.54.243";
     private static final String EMPTY_REFERRER = "";
@@ -35,6 +39,7 @@ public class JSONLogTestCase extends junit.framework.TestCase {
         return URI.create("http://localhost?query=" + query);
     }
 
+    @Test
     public void test_json_log_entry() throws Exception {
         AccessLogEntry entry = newAccessLogEntry("test");
 
@@ -60,7 +65,8 @@ public class JSONLogTestCase extends junit.framework.TestCase {
         assertEquals(expectedOutput, new JSONFormatter(entry).format());
     }
 
-    public void test_with_keyvalues() throws Exception {
+    @Test
+    public void test_with_keyvalues() {
         AccessLogEntry entry = newAccessLogEntry("test");
         entry.addKeyValue("singlevalue", "value1");
         entry.addKeyValue("multivalue", "value2");
@@ -92,6 +98,7 @@ public class JSONLogTestCase extends junit.framework.TestCase {
 
     }
 
+    @Test
     public void test_with_remoteaddrport() throws Exception {
         AccessLogEntry entry = newAccessLogEntry("test");
 
@@ -147,6 +154,7 @@ public class JSONLogTestCase extends junit.framework.TestCase {
         assertEquals(expectedOutput, new JSONFormatter(entry).format());
     }
 
+    @Test
     public void test_remote_address_same_as_ip_address() throws Exception {
         AccessLogEntry entry = newAccessLogEntry("test");
         AccessLogEntry entrywithremote = newAccessLogEntry("test");
@@ -155,7 +163,8 @@ public class JSONLogTestCase extends junit.framework.TestCase {
         assertEquals(new JSONFormatter(entry).format(), new JSONFormatter(entrywithremote).format());
     }
 
-    public void test_useragent_with_quotes() throws Exception {
+    @Test
+    public void test_useragent_with_quotes() {
         final AccessLogEntry entry = new AccessLogEntry();
         entry.setRawQuery("query=test");
         entry.setRawPath("");
diff --git a/container-accesslogging/src/test/java/com/yahoo/container/logging/YApacheLogTestCase.java b/container-accesslogging/src/test/java/com/yahoo/container/logging/YApacheLogTestCase.java
index 10ab0d9c6d1..9f02e657952 100644
--- a/container-accesslogging/src/test/java/com/yahoo/container/logging/YApacheLogTestCase.java
+++ b/container-accesslogging/src/test/java/com/yahoo/container/logging/YApacheLogTestCase.java
@@ -3,6 +3,7 @@ package com.yahoo.container.logging;
 
 import com.yahoo.container.core.AccessLogConfig;
 import org.hamcrest.MatcherAssert;
+import org.junit.Test;
 
 import java.io.*;
 import java.net.InetSocketAddress;
@@ -17,18 +18,20 @@ import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author tonytv
  */
-public class YApacheLogTestCase extends junit.framework.TestCase {
+public class YApacheLogTestCase {
 
     private static String ipAddress = "152.200.54.243";
     private static final String EMPTY_REFERRER = "";
     private static final String EMPTY_USERAGENT = "";
 
+    @Test
     public void testIt() throws Exception {
         AccessLogEntry entry = new AccessLogEntry();
         addCommonEntries(entry);
@@ -83,6 +86,7 @@ public class YApacheLogTestCase extends junit.framework.TestCase {
         entry.setRemotePort(12345);
     }
 
+    @Test
     public void test_remote_address_different_from_ip_address() throws Exception {
         AccessLogEntry entry = new AccessLogEntry();
         addCommonEntries(entry);
@@ -93,6 +97,7 @@ public class YApacheLogTestCase extends junit.framework.TestCase {
                 new YApacheFormatter(entry).format());
     }
 
+    @Test
     public void test_remote_address_same_as_ip_address_does_not_cause_double_adding() throws Exception {
         AccessLogEntry entry = new AccessLogEntry();
         addCommonEntries(entry);
@@ -101,6 +106,7 @@ public class YApacheLogTestCase extends junit.framework.TestCase {
         assertThat(new YApacheFormatter(entry).format(), not(containsString(ipAddress)));
     }
 
+    @Test
     public void test_status_code_stored_as_decimal() throws Exception {
         AccessLogEntry entry = new AccessLogEntry();
         addCommonEntries(entry);
@@ -112,6 +118,7 @@ public class YApacheLogTestCase extends junit.framework.TestCase {
     /**
      * author someone-else. Please rewrite this.
      */
+    @Test
     public void testYApacheAccessLogWithDateNamingScheme() {
         AccessLogConfig.Builder builder = new AccessLogConfig.Builder().
                 fileHandler(new AccessLogConfig.FileHandler.Builder().
@@ -154,6 +161,7 @@ public class YApacheLogTestCase extends junit.framework.TestCase {
         }
     }
 
+    @Test
     public void testThatQueryWithEncodedCharactersIsLoggedInEncodedForm() {
         final String query = "%5E%3B%22";
         final AccessLogEntry entry = new AccessLogEntry();
@@ -182,6 +190,7 @@ public class YApacheLogTestCase extends junit.framework.TestCase {
     /**
      * author someone-else. Please rewrite this.
      */
+    @Test
     public void testYApacheAccessLogWithSequenceNamingScheme() throws IOException, InterruptedException {
         // try without existing files
         assertCorrectSequenceBehavior(1);
diff --git a/container-accesslogging/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java b/container-accesslogging/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java
index 2e07f9922ef..cb34818c35c 100644
--- a/container-accesslogging/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java
+++ b/container-accesslogging/src/test/java/com/yahoo/container/logging/test/LogFormatterTestCase.java
@@ -4,16 +4,16 @@ package com.yahoo.container.logging.test;
 import java.util.Date;
 
 import com.yahoo.container.logging.LogFormatter;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 /**
- * @author <a href="mailto:travisb@yahoo-inc.com">Bob Travis</a>
+ * @author Bob Travis
  */
-public class LogFormatterTestCase extends junit.framework.TestCase {
-
-    public LogFormatterTestCase(String name) {
-        super(name);
-    }
+public class LogFormatterTestCase {
 
+    @Test
     public void testIt() {
         java.util.TimeZone.setDefault(java.util.TimeZone.getTimeZone("UTC"));
         @SuppressWarnings("deprecation")
diff --git a/container-di/src/test/java/com/yahoo/component/ComponentSpecTestCase.java b/container-di/src/test/java/com/yahoo/component/ComponentSpecTestCase.java
index b22f5d60466..6fe58e99fda 100644
--- a/container-di/src/test/java/com/yahoo/component/ComponentSpecTestCase.java
+++ b/container-di/src/test/java/com/yahoo/component/ComponentSpecTestCase.java
@@ -1,13 +1,18 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.component;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
- * @author <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a>
+ * @author Arne Bergene Fossaa
  */
-public class ComponentSpecTestCase extends TestCase {
+public class ComponentSpecTestCase {
 
+    @Test
     public void testMatches() {
         ComponentId a = new ComponentId("test:1");
         ComponentId b = new ComponentId("test:1.1.1");
@@ -46,6 +51,7 @@ public class ComponentSpecTestCase extends TestCase {
 
     }
 
+    @Test
     public void testMatchesWithNamespace() {
         ComponentId namespace = new ComponentId("namespace:2");
 
@@ -61,6 +67,7 @@ public class ComponentSpecTestCase extends TestCase {
         assertFalse(spec.matches(c));
     }
 
+    @Test
     public void testStringValue() {
         assertStringValueEqualsInputSpec("a:1.0.0.alpha@namespace");
         assertStringValueEqualsInputSpec("a:1.0.0.alpha");
@@ -72,4 +79,5 @@ public class ComponentSpecTestCase extends TestCase {
         assertEquals(componentSpec,
                 new ComponentSpecification(componentSpec).stringValue());
     }
+
 }
diff --git a/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java b/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
index 2d689d6e810..0842ee4a797 100644
--- a/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
+++ b/container-di/src/test/java/com/yahoo/component/test/ComponentIdTestCase.java
@@ -2,13 +2,16 @@
 package com.yahoo.component.test;
 
 import com.yahoo.component.ComponentId;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author bratseth
  */
-public class ComponentIdTestCase extends TestCase {
+public class ComponentIdTestCase {
 
+    @Test
     public void testFileNameConversion() {
         assertFileNameEquals("a","a");
         assertFileNameEquals("a-1","a-1");
@@ -28,6 +31,7 @@ public class ComponentIdTestCase extends TestCase {
                      expected,ComponentId.fromFileName(initial).toFileName());
     }
 
+    @Test
     public void testCompareWithNameSpace() {
         ComponentId withNS = ComponentId.fromString("foo@ns");
         ComponentId withoutNS = ComponentId.fromString("foo"); // Should be less than withNs
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java
index 90e7d78acaf..b07363d7df2 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/HexByteIteratorTestCase.java
@@ -3,15 +3,20 @@ package com.yahoo.fs4.test;
 
 import java.nio.ByteBuffer;
 
-import junit.framework.TestCase;
-
 import com.yahoo.fs4.HexByteIterator;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test of HexByteIterator
+ *
  * @author tonytv
  */
-public class HexByteIteratorTestCase extends TestCase {
+public class HexByteIteratorTestCase {
+
+    @Test
     public void testHexByteIterator() {
         int[] numbers = { 0x00, 0x01, 0xDE, 0xAD, 0xBE, 0xEF, 0xFF };
 
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java
index dc052be727f..d2bdf2327ff 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java
@@ -11,7 +11,7 @@ import org.junit.Test;
 
 import java.nio.ByteBuffer;
 
-import static junit.framework.TestCase.*;
+import static org.junit.Assert.*;
 
 
 /**
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java
index 05e5997c8fb..bc086517264 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java
@@ -6,19 +6,16 @@ import java.nio.charset.StandardCharsets;
 
 import com.yahoo.fs4.*;
 import com.yahoo.search.Query;
-import org.junit.Ignore;
 import org.junit.Test;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.TestCase.*;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.Assert.*;
 
 /**
  * Tests the Packet class.  Specifically made this unit test suite
  * for checking that queries that are too large for the buffer
  * are handled gracefully.
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author Bjorn Borud
  */
 public class PacketTestCase {
 
@@ -222,4 +219,5 @@ public class PacketTestCase {
         buffer.flip();
         new MyBasicPacket().decode(buffer);
     }
+
 }
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
index a5712f625e1..edf117b1195 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
@@ -6,25 +6,28 @@ import com.yahoo.fs4.BasicPacket;
 import com.yahoo.fs4.DocumentInfo;
 import com.yahoo.fs4.PacketDecoder;
 import com.yahoo.fs4.QueryResultPacket;
+import org.junit.Test;
 
 import java.nio.ByteBuffer;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests encoding of query packages
  *
  * @author bratseth
  */
-public class QueryResultTestCase extends junit.framework.TestCase {
+public class QueryResultTestCase {
 
-    public QueryResultTestCase(String name) {
-        super(name);
-    }
+    private static final double delta = 0.00000001;
 
     private static GlobalId gid1 = new GlobalId(new byte[] {1,1,1,1,1,1,1,1,1,1,1,1});
     private static GlobalId gid2 = new GlobalId(new byte[] {2,2,2,2,2,2,2,2,2,2,2,2});
 
+    @Test
     public void testDecodeQueryResultX() {
-         byte[] packetData=new byte[] {
+         byte[] packetData = new byte[] {
                  0,0,0,100,
                  0,0,0,217-256,
                  0,0,0,1,
@@ -41,38 +44,39 @@ public class QueryResultTestCase extends junit.framework.TestCase {
                  1,1,1,1,1,1,1,1,1,1,1,1, 0x40,0x37,0,0,0,0,0,0, 0,0,0,7, 0,0,0,36,
                  2,2,2,2,2,2,2,2,2,2,2,2, 0x40,0x35,0,0,0,0,0,0, 0,0,0,8, 0,0,0,37
          };
-        ByteBuffer buffer=ByteBuffer.allocate(200);
+        ByteBuffer buffer = ByteBuffer.allocate(200);
         buffer.put(packetData);
         buffer.flip();
-        BasicPacket packet=PacketDecoder.decode(buffer);
+        BasicPacket packet = PacketDecoder.decode(buffer);
         assertTrue(packet instanceof QueryResultPacket);
-        QueryResultPacket result=(QueryResultPacket)packet;
+        QueryResultPacket result = (QueryResultPacket)packet;
 
         assertTrue(result.getMldFeature());
 
-        assertEquals(5,result.getTotalDocumentCount());
-        assertEquals(25,result.getMaxRank());
-        assertEquals(111,result.getDocstamp());
+        assertEquals(5, result.getTotalDocumentCount());
+        assertEquals(25, result.getMaxRank());
+        assertEquals(111, result.getDocstamp());
         assertEquals(89, result.getCoverageDocs());
         assertEquals(90, result.getActiveDocs());
         assertEquals(91, result.getSoonActiveDocs());
         assertEquals(1, result.getDegradedReason());
 
-        assertEquals(2,result.getDocuments().size());
-        DocumentInfo document1= result.getDocuments().get(0);
-        assertEquals(gid1,document1.getGlobalId());
-        assertEquals(23.0,document1.getMetric());
-        assertEquals(7,document1.getPartId());
-        assertEquals(36,document1.getDistributionKey());
-        DocumentInfo document2= result.getDocuments().get(1);
-        assertEquals(gid2,document2.getGlobalId());
-        assertEquals(21.0,document2.getMetric());
-        assertEquals(8,document2.getPartId());
-        assertEquals(37,document2.getDistributionKey());
+        assertEquals(2, result.getDocuments().size());
+        DocumentInfo document1 = result.getDocuments().get(0);
+        assertEquals(gid1, document1.getGlobalId());
+        assertEquals(23.0, document1.getMetric(), delta);
+        assertEquals(7, document1.getPartId());
+        assertEquals(36, document1.getDistributionKey());
+        DocumentInfo document2 = result.getDocuments().get(1);
+        assertEquals(gid2, document2.getGlobalId());
+        assertEquals(21.0, document2.getMetric(), delta);
+        assertEquals(8, document2.getPartId());
+        assertEquals(37, document2.getDistributionKey());
     }
 
+    @Test
     public void testDecodeQueryResultMoreHits() {
-         byte[] packetData=new byte[] {
+         byte[] packetData = new byte[] {
                  0,0,0,100,
                  0,0,0,217-256,
                  0,0,0,1,
@@ -90,19 +94,20 @@ public class QueryResultTestCase extends junit.framework.TestCase {
                  1,1,1,1,1,1,1,1,1,1,1,1, 0x40,0x37,0,0,0,0,0,0, 0,0,0,7, 0,0,0,36,
                  2,2,2,2,2,2,2,2,2,2,2,2, 0x40,0x35,0,0,0,0,0,0, 0,0,0,8, 0,0,0,37
          };
-        ByteBuffer buffer=ByteBuffer.allocate(200);
+        ByteBuffer buffer = ByteBuffer.allocate(200);
         buffer.put(packetData);
         buffer.flip();
-        BasicPacket packet=PacketDecoder.decode(buffer);
+        BasicPacket packet = PacketDecoder.decode(buffer);
         assertTrue(packet instanceof QueryResultPacket);
-        QueryResultPacket result=(QueryResultPacket)packet;
+        QueryResultPacket result = (QueryResultPacket)packet;
 
-        assertEquals(2,result.getDocuments().size());
-        DocumentInfo document1= result.getDocuments().get(0);
-        assertEquals(gid1,document1.getGlobalId());
-        DocumentInfo document2= result.getDocuments().get(1);
-        assertEquals(gid2,document2.getGlobalId());
+        assertEquals(2, result.getDocuments().size());
+        DocumentInfo document1 = result.getDocuments().get(0);
+        assertEquals(gid1, document1.getGlobalId());
+        DocumentInfo document2 = result.getDocuments().get(1);
+        assertEquals(gid2, document2.getGlobalId());
         assertEquals(6, result.getNodesQueried());
         assertEquals(5, result.getNodesReplied());
     }
+
 }
diff --git a/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java
index 67f3586ac38..30e87a17704 100644
--- a/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/cache/test/CacheTestCase.java
@@ -1,17 +1,18 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.cache.test;
 
-import junit.framework.TestCase;
-
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.statistics.Statistics;
 import com.yahoo.prelude.cache.Cache;
 import com.yahoo.prelude.cache.QueryCacheKey;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
-public class CacheTestCase extends TestCase {
+public class CacheTestCase {
 
     private Result getSomeResult(Query q, String id) {
         Result r = new Result(q);
@@ -19,6 +20,7 @@ public class CacheTestCase extends TestCase {
         return r;
     }
 
+    @Test
     public void testBasicGet() {
         Cache<QueryCacheKey, Result> cache=new Cache<>(100*1024,3600, 100000, Statistics.nullImplementation);
         Query q = new Query("/std_xmls_a00?hits=5&offset=5&query=flowers+shop&tracelevel=4&objid=ffffffffffffffff");
@@ -37,6 +39,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(cache.get(qk), r2);
     }
 
+    @Test
     public void testPutTooLarge() {
         byte[] tenKB = new byte[10*1024];
         for (int i = 0 ; i <10*1024 ; i++) {
@@ -52,6 +55,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(cache.get("foo"), sevenKB);
     }
 
+    @Test
     public void testInvalidate() {
         byte[] tenKB = new byte[10*1024];
         for (int i = 0 ; i <10*1024 ; i++) {
@@ -68,6 +72,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(cache.get("bar"), tenKB);
     }
 
+    @Test
     public void testInvalidateLRU() {
         Cache cache=new Cache(10*1024,3600, 100*1024, Statistics.nullImplementation); // 10 MB
         byte[] fiveKB = new byte[5*1024];
@@ -103,6 +108,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(cache.get("four"), fourKB);
     }
 
+    @Test
     public void testPutSameKey() {
         Cache cache=new Cache(10*1024,3600, 100*1024, Statistics.nullImplementation); // 10 MB
         byte[] fiveKB = new byte[5*1024];
@@ -128,6 +134,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(cache.get("two"), twoKB);
     }
 
+    @Test
     public void testExpire() throws InterruptedException {
         Cache cache=new Cache(10*1024,50, 10000, Statistics.nullImplementation); // 10 KB, 50ms expire
         boolean success = false;
@@ -151,6 +158,7 @@ public class CacheTestCase extends TestCase {
         assertNull(cache.get("hey"));
     }
 
+    @Test
     public void testInsertSame() {
         Cache cache=new Cache(100*1024,500, 100000, Statistics.nullImplementation); // 100 KB, .5 sec expire
         Query q =  new Query("/std_xmls_a00?hits=5&offset=5&query=flowers+shop&tracelevel=4&objid=ffffffffffffffff");
@@ -164,6 +172,7 @@ public class CacheTestCase extends TestCase {
         assertEquals(1, cache.size());
     }
 
+    @Test
     public void testMaxSize() {
         Cache cache=new Cache(20*1024,500, 3*1024, Statistics.nullImplementation);
         byte[] fourKB = new byte[4*1024];