Remove usage of old junit

4 files changed, 37 insertions, 6 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java
index 8d31814f82a..51f87538aa5 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java
@@ -4,17 +4,26 @@ package com.yahoo.search.pagetemplates.config.test;
 import com.yahoo.search.pagetemplates.PageTemplate;
 import com.yahoo.search.pagetemplates.PageTemplateRegistry;
 import com.yahoo.search.pagetemplates.config.PageTemplateXMLReader;
-import com.yahoo.search.pagetemplates.model.*;
+import com.yahoo.search.pagetemplates.model.MapChoice;
+import com.yahoo.search.pagetemplates.model.Placeholder;
+import com.yahoo.search.pagetemplates.model.Section;
+import com.yahoo.search.pagetemplates.model.Source;
+import org.junit.Test;
 
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author bratseth
  */
-public class MapPageTemplateXMLReadingTestCase extends junit.framework.TestCase {
+public class MapPageTemplateXMLReadingTestCase {
 
     private String root="src/test/java/com/yahoo/search/pagetemplates/config/test/examples/mapexamples/";
 
+    @Test
     public void testMap1() {
         PageTemplateRegistry registry=new PageTemplateXMLReader().read(root);
         assertCorrectMap1(registry.getComponent("map1"));
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
index 109e7e75885..a7f79a0ee93 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
@@ -13,17 +13,24 @@ import com.yahoo.search.pagetemplates.model.Choice;
 import com.yahoo.search.pagetemplates.model.Renderer;
 import com.yahoo.search.pagetemplates.model.Section;
 import com.yahoo.search.pagetemplates.model.Source;
+import org.junit.Test;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * @author bratseth
  */
-public class PageTemplateXMLReadingTestCase extends junit.framework.TestCase {
+public class PageTemplateXMLReadingTestCase {
 
     private String root="src/test/java/com/yahoo/search/pagetemplates/config/test/";
 
+    @Test
     public void testExamples() {
         PageTemplateRegistry registry=new PageTemplateXMLReader().read(root + "examples");
         assertCorrectSerp(registry.getComponent("serp"));
@@ -34,6 +41,7 @@ public class PageTemplateXMLReadingTestCase extends junit.framework.TestCase {
         assertCorrectGeneric(registry.getComponent("generic"));
     }
 
+    @Test
     public void testConfigReading() {
         PageTemplatesConfig config = new PageTemplatesConfig(new PageTemplatesConfig.Builder()
                 .page("<page id=\"slottingSerp\" layout=\"mainAndRight\">\n    <section layout=\"column\" region=\"main\" source=\"*\" order=\"-[rank]\"/>\n    <section layout=\"column\" region=\"right\" source=\"ads\"/>\n</page>\n")
@@ -48,6 +56,7 @@ public class PageTemplateXMLReadingTestCase extends junit.framework.TestCase {
         assertCorrectRicherSerp(registry.getComponent("richerSerp"));
     }
 
+    @Test
     public void testInvalidFilename() {
         try {
             PageTemplateRegistry registry=new PageTemplateXMLReader().read(root + "examples/invalidfilename");
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java
index 74b483bfaba..3efaf9a6132 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java
@@ -18,15 +18,22 @@ import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.text.interpretation.Interpretation;
+import org.junit.Test;
 
 import java.util.*;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * @author bratseth
  */
-@SuppressWarnings("deprecation")
-public class PageTemplateSearcherTestCase extends junit.framework.TestCase {
+public class PageTemplateSearcherTestCase {
 
+    @Test
     public void testSearcher() {
         PageTemplateSearcher s = new PageTemplateSearcher(createPageTemplateRegistry(), new FirstChoiceResolver());
         Chain<Searcher> chain = new Chain<>(s,new MockFederator());
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java
index 74891137dab..7a2d3d782a3 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java
@@ -7,14 +7,19 @@ import com.yahoo.search.pagetemplates.PageTemplateRegistry;
 import com.yahoo.search.pagetemplates.PageTemplateSearcher;
 import com.yahoo.search.pagetemplates.config.PageTemplateXMLReader;
 import com.yahoo.search.searchchain.Execution;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * @author bratseth
  */
-public class SourceParametersTestCase extends junit.framework.TestCase {
+public class SourceParametersTestCase {
 
     private static final String root="src/test/java/com/yahoo/search/pagetemplates/test/";
 
+    @Test
     public void testSourceParametersWithSourcesDeterminedByTemplate() {
         // Create the page template
         PageTemplateRegistry pageTemplateRegistry=new PageTemplateRegistry();
@@ -31,6 +36,7 @@ public class SourceParametersTestCase extends junit.framework.TestCase {
         assertEquals("We get the correct number of parameters",5,query.properties().listProperties("source").size());
     }
 
+    @Test
     public void testSourceParametersWithSourcesDeterminedByParameter() {
         // Create the page template
         PageTemplateRegistry pageTemplateRegistry=new PageTemplateRegistry();