summaryrefslogtreecommitdiff
path: root/qpid/java/perftests
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/perftests
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/perftests')
-rw-r--r--qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java6
-rw-r--r--qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java
index a013cb0a06..5508ac8aca 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java
@@ -18,9 +18,9 @@
*/
package org.apache.qpid.disttest.client;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.apache.qpid.disttest.message.ParticipantResult;
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java
index ce5f92724f..6ee42c62c6 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java
@@ -19,8 +19,8 @@
*/
package org.apache.qpid.disttest.controller.config;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.util.List;