QPID-5702: upgrade JUnit dependency from version 3.8.1 to 4.11, change imports etc to remove deprecation notices

Patch Supplied by Andrew MacBean <andymacbean@gmail.com>.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589144 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 23 insertions, 23 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
index 3ac0872814..fedb88d008 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
@@ -21,7 +21,7 @@
 
 package org.apache.qpid.server.queue;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.client.AMQConnection;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
index 87a060766b..882e0b60a2 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.systest.rest;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
index 9a5d833d01..ca024c2ac6 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
@@ -49,7 +49,7 @@ import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManagerFactory;
 import javax.servlet.http.HttpServletResponse;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
 import org.codehaus.jackson.JsonGenerationException;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
index 7ba0bd17f3..99afe0015d 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
@@ -18,10 +18,10 @@
  */
 package org.apache.qpid.test.client;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
+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 java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
index 38fb1622b3..d945301bbe 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.test.client.message;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
index 01f4cdbb05..b545f610d1 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
@@ -19,7 +19,7 @@
  */
 package org.apache.qpid.test.unit.basic;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
index 3f998938d9..1b9c9fcb17 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.test.unit.basic;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -549,7 +549,7 @@ public class MapMessageTest extends QpidBrokerTestCase implements MessageListene
             // normal execution
         }
 
-        Assert.assertEquals(Double.MAX_VALUE, m.getDouble("double"));
+        Assert.assertEquals(Double.MAX_VALUE, m.getDouble("double"), 0d);
 
         // Try bad reads
         try
@@ -630,9 +630,9 @@ public class MapMessageTest extends QpidBrokerTestCase implements MessageListene
             // normal execution
         }
 
-        Assert.assertEquals(Float.MAX_VALUE, m.getFloat("float"));
+        Assert.assertEquals(Float.MAX_VALUE, m.getFloat("float"), 0f);
 
-        Assert.assertEquals(_smallfloat, (float) m.getDouble("smallfloat"));
+        Assert.assertEquals(_smallfloat, m.getDouble("smallfloat"), 0f);
 
         // Try bad reads
         try
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
index 10d53b7487..4b5922902d 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
@@ -19,7 +19,7 @@
  */
 package org.apache.qpid.test.unit.basic;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index dc963da680..c7ff564beb 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -39,7 +39,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQQueue;
@@ -274,13 +274,13 @@ public class PropertyValueTest extends QpidBrokerTestCase implements MessageList
             // Check Properties
 
             Assert.assertEquals("Check Boolean properties are correctly transported", true, m.getBooleanProperty("Bool"));
-            Assert.assertEquals("Check Byte properties are correctly transported", (byte) Byte.MAX_VALUE,
+            Assert.assertEquals("Check Byte properties are correctly transported", Byte.MAX_VALUE,
                 m.getByteProperty("Byte"));
-            Assert.assertEquals("Check Double properties are correctly transported", (double) Double.MAX_VALUE,
-                m.getDoubleProperty("Double"));
-            Assert.assertEquals("Check Float properties are correctly transported", (float) Float.MAX_VALUE,
-                m.getFloatProperty("Float"));
-            Assert.assertEquals("Check Int properties are correctly transported", (int) Integer.MAX_VALUE,
+            Assert.assertEquals("Check Double properties are correctly transported", Double.MAX_VALUE,
+                m.getDoubleProperty("Double"), 0d);
+            Assert.assertEquals("Check Float properties are correctly transported", Float.MAX_VALUE,
+                m.getFloatProperty("Float"), 0f);
+            Assert.assertEquals("Check Int properties are correctly transported", Integer.MAX_VALUE,
                 m.getIntProperty("Int"));
             Assert.assertEquals("Check CorrelationID properties are correctly transported", "Correlation",
                 m.getJMSCorrelationID());
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
index 57b689a291..d4081817ee 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
@@ -20,7 +20,7 @@
  */
 package org.apache.qpid.test.unit.basic;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;