summaryrefslogtreecommitdiff
path: root/qpid/java/broker-core
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2014-04-22 14:50:53 +0000
committerRobert Gemmell <robbie@apache.org>2014-04-22 14:50:53 +0000
commit92a68d0cd2bfd2d0b2e079c2b04b1dcd2e2e043a (patch)
treebdbdd6fdbe8942690324d171077c7ca25fbbbb1e /qpid/java/broker-core
parent264c8ac9af8b925307644402452dc4334942f1c8 (diff)
downloadqpid-python-92a68d0cd2bfd2d0b2e079c2b04b1dcd2e2e043a.tar.gz
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
Diffstat (limited to 'qpid/java/broker-core')
-rw-r--r--qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java2
-rw-r--r--qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java2
-rw-r--r--qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
index a6930a9acd..5dc96a1ac9 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.message.InstanceProperties;
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java
index 42462d75c4..ffd91ba093 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java
@@ -19,7 +19,7 @@
*/
package org.apache.qpid.server.queue;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.queue.SortedQueueEntry.Colour;
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java
index e9d8d16fce..1b1d3af790 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* Helper class for testing that sets of principals contain {@link AuthenticatedPrincipal}'s that wrap