Remove usage of junit.framework

3 files changed, 65 insertions, 47 deletions

diff --git a/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java b/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
index 5ee1955a066..9c4d4de47dc 100644
--- a/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
@@ -5,19 +5,26 @@ import com.yahoo.component.chain.Chain;
 import com.yahoo.processing.Processor;
 import com.yahoo.processing.execution.Execution;
 import com.yahoo.processing.test.ProcessorLibrary;
+import org.junit.Test;
 
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 /**
- * @author  bratseth
+ * @author bratseth
  */
-public class ExecutionContextTestCase extends junit.framework.TestCase  {
+public class ExecutionContextTestCase {
 
-    private Chain<Processor> chain=new Chain<Processor>(new ProcessorLibrary.DataSource());
+    private final Chain<Processor> chain = new Chain<Processor>(new ProcessorLibrary.DataSource());
 
     /** Tests combined use of trace messages, context values and access log entries */
+    @Test
     public void testtrace() {
         Execution execution1=Execution.createRoot(chain,2,Execution.Environment.createEmpty());
         execution1.trace().setProperty("a","a1");
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java b/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java
index 334c7afb076..70f4a7720ee 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/request/test/ErrorMessageTestCase.java
@@ -1,14 +1,16 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.processing.request.test;
 
-import com.yahoo.processing.Request;
 import com.yahoo.processing.request.ErrorMessage;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
 /**
  * @author  bratseth
  */
-public class ErrorMessageTestCase extends junit.framework.TestCase {
+public class ErrorMessageTestCase {
 
     @Test
     public void testToString() {
@@ -44,11 +46,16 @@ public class ErrorMessageTestCase extends junit.framework.TestCase {
                      new ErrorMessage("message"));
         assertEquals(new ErrorMessage("message",new Exception()),
                      new ErrorMessage("message"));
-        assertFalse(new ErrorMessage("message").equals(new ErrorMessage("message","detail")));
-        assertFalse(new ErrorMessage(37,"message").equals(new ErrorMessage("message")));
-        assertFalse(new ErrorMessage(37,"message").equals(new ErrorMessage(38,"message")));
-        assertFalse(new ErrorMessage("message","detail1").equals(new ErrorMessage("message","detail2")));
-        assertFalse(new ErrorMessage("message1").equals(new ErrorMessage("message2")));
+        assertNotEquals(new ErrorMessage("message"),
+                        new ErrorMessage("message","detail"));
+        assertNotEquals(new ErrorMessage(37,"message"),
+                        new ErrorMessage("message"));
+        assertNotEquals(new ErrorMessage(37,"message"),
+                        new ErrorMessage(38,"message"));
+        assertNotEquals(new ErrorMessage("message","detail1"),
+                        new ErrorMessage("message","detail2"));
+        assertNotEquals(new ErrorMessage("message1"),
+                        new ErrorMessage("message2"));
     }
 
 }
diff --git a/processing/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java b/processing/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java
index 100e4f3781f..032fdd71f88 100644
--- a/processing/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java
+++ b/processing/src/test/java/com/yahoo/processing/request/test/RequestTestCase.java
@@ -8,12 +8,17 @@ import com.yahoo.processing.request.Properties;
 import com.yahoo.processing.request.properties.PropertyMap;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 /**
  * Tests using requests
  *
  * @author bratseth
  */
-public class RequestTestCase extends junit.framework.TestCase {
+public class RequestTestCase {
+
+    private static final double delta = 0.0000000001;
 
     @Test
     public void testProperties() {
@@ -33,53 +38,53 @@ public class RequestTestCase extends junit.framework.TestCase {
         assertEquals("default", r.properties().get(new CompoundName("c"), "default"));
         assertNull(r.properties().get(new CompoundName("c")));
 
-        assertEquals("b1",r.properties().getString("b"));
-        assertEquals("b1",r.properties().getString("b","default"));
-        assertEquals("default",r.properties().getString("c","default"));
-        assertEquals(null,r.properties().getString("c"));
-        assertEquals("b1",r.properties().getString(new CompoundName("b")));
-        assertEquals("b1",r.properties().getString(new CompoundName("b"),"default"));
-        assertEquals("default",r.properties().getString(new CompoundName("c"),"default"));
-        assertEquals(null,r.properties().getString(new CompoundName("c")));
+        assertEquals("b1", r.properties().getString("b"));
+        assertEquals("b1", r.properties().getString("b","default"));
+        assertEquals("default", r.properties().getString("c","default"));
+        assertEquals(null, r.properties().getString("c"));
+        assertEquals("b1", r.properties().getString(new CompoundName("b")));
+        assertEquals("b1", r.properties().getString(new CompoundName("b"),"default"));
+        assertEquals("default", r.properties().getString(new CompoundName("c"),"default"));
+        assertEquals(null, r.properties().getString(new CompoundName("c")));
 
         r.properties().set("i",7);
-        assertEquals(7,(int)r.properties().getInteger("i"));
-        assertEquals(7,(int)r.properties().getInteger("i",3));
-        assertEquals(3,(int)r.properties().getInteger("n",3));
+        assertEquals(7, (int)r.properties().getInteger("i"));
+        assertEquals(7, (int)r.properties().getInteger("i",3));
+        assertEquals(3, (int)r.properties().getInteger("n",3));
         assertNull(r.properties().getInteger("n"));
-        assertEquals(7,(int)r.properties().getInteger(new CompoundName("i")));
-        assertEquals(7,(int)r.properties().getInteger(new CompoundName("i"),3));
-        assertEquals(3,(int)r.properties().getInteger(new CompoundName("n"),3));
+        assertEquals(7, (int)r.properties().getInteger(new CompoundName("i")));
+        assertEquals(7, (int)r.properties().getInteger(new CompoundName("i"),3));
+        assertEquals(3, (int)r.properties().getInteger(new CompoundName("n"),3));
         assertNull(r.properties().getInteger("n"));
 
-        r.properties().set(new CompoundName("l"),7);
+        r.properties().set(new CompoundName("l"), 7);
         assertEquals(7, (long) r.properties().getLong("l"));
-        assertEquals(7,(long)r.properties().getLong("l",3l));
-        assertEquals(3,(long)r.properties().getLong("m",3l));
+        assertEquals(7, (long)r.properties().getLong("l",3l));
+        assertEquals(3, (long)r.properties().getLong("m",3l));
         assertNull(r.properties().getInteger("m"));
-        assertEquals(7,(long)r.properties().getLong(new CompoundName("l")));
-        assertEquals(7,(long)r.properties().getLong(new CompoundName("l"),3l));
-        assertEquals(3,(long)r.properties().getLong(new CompoundName("m"),3l));
+        assertEquals(7, (long)r.properties().getLong(new CompoundName("l")));
+        assertEquals(7, (long)r.properties().getLong(new CompoundName("l"),3l));
+        assertEquals(3, (long)r.properties().getLong(new CompoundName("m"),3l));
         assertNull(r.properties().getInteger("m"));
 
-        r.properties().set("d",7.3);
-        assertEquals(7.3,r.properties().getDouble("d"));
-        assertEquals(7.3,r.properties().getDouble("d",3.4d));
-        assertEquals(3.4,r.properties().getDouble("f",3.4d));
+        r.properties().set("d", 7.3);
+        assertEquals(7.3, r.properties().getDouble("d"), delta);
+        assertEquals(7.3, r.properties().getDouble("d",3.4d), delta);
+        assertEquals(3.4, r.properties().getDouble("f",3.4d), delta);
         assertNull(r.properties().getDouble("f"));
-        assertEquals(7.3,r.properties().getDouble(new CompoundName("d")));
-        assertEquals(7.3,r.properties().getDouble(new CompoundName("d"),3.4d));
-        assertEquals(3.4,r.properties().getDouble(new CompoundName("f"),3.4d));
+        assertEquals(7.3, r.properties().getDouble(new CompoundName("d")), delta);
+        assertEquals(7.3, r.properties().getDouble(new CompoundName("d"),3.4d), delta);
+        assertEquals(3.4, r.properties().getDouble(new CompoundName("f"),3.4d), delta);
         assertNull(r.properties().getDouble("f"));
 
         r.properties().set("o",true);
-        assertEquals(true,r.properties().getBoolean("o"));
-        assertEquals(true,r.properties().getBoolean("o",true));
-        assertEquals(true,r.properties().getBoolean("g",true));
+        assertEquals(true, r.properties().getBoolean("o"));
+        assertEquals(true, r.properties().getBoolean("o",true));
+        assertEquals(true, r.properties().getBoolean("g",true));
         assertEquals(false, r.properties().getBoolean("g"));
-        assertEquals(true,r.properties().getBoolean(new CompoundName("o")));
-        assertEquals(true,r.properties().getBoolean(new CompoundName("o"),true));
-        assertEquals(true,r.properties().getBoolean(new CompoundName("g"),true));
+        assertEquals(true, r.properties().getBoolean(new CompoundName("o")));
+        assertEquals(true, r.properties().getBoolean(new CompoundName("o"),true));
+        assertEquals(true, r.properties().getBoolean(new CompoundName("g"),true));
         assertEquals(false, r.properties().getBoolean("g"));
 
         r.properties().set(new CompoundName("x.y"), "x1.y1");
@@ -99,9 +104,8 @@ public class RequestTestCase extends junit.framework.TestCase {
         r.errors().add(new ErrorMessage("foo"));
         r.errors().add(new ErrorMessage("bar"));
         assertEquals(2,r.errors().size());
-        assertEquals("foo",r.errors().get(0).getMessage());
-        assertEquals("bar",r.errors().get(1).getMessage());
-
+        assertEquals("foo", r.errors().get(0).getMessage());
+        assertEquals("bar", r.errors().get(1).getMessage());
     }
 
     @Test