convert tests to junit3

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

3 files changed, 12 insertions, 20 deletions

diff --git a/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java b/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
index 447e9a498d..76b1da8754 100644
--- a/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
+++ b/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
@@ -20,13 +20,11 @@
  */
 package org.apache.qpid.server.cluster;
 
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import junit.framework.TestCase;
 
-public class ClusterCapabilityTest
+public class ClusterCapabilityTest extends TestCase
 {
-    @Test
-    public void startWithNull()
+    public void testStartWithNull()
     {
         MemberHandle peer = new SimpleMemberHandle("myhost:9999");
         String c = ClusterCapability.add(null, peer);
@@ -34,8 +32,7 @@ public class ClusterCapabilityTest
         assertTrue(peer.matches(ClusterCapability.getPeer(c)));
     }
 
-    @Test
-    public void startWithText()
+    public void testStartWithText()
     {
         MemberHandle peer = new SimpleMemberHandle("myhost:9999");
         String c = ClusterCapability.add("existing text", peer);
diff --git a/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java b/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
index 2a10a8c959..c427285f4a 100644
--- a/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
+++ b/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid.server.cluster;
 
-import org.junit.Test;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.url.URLSyntaxException;
 import org.apache.qpid.client.AMQConnection;
@@ -28,10 +27,11 @@ import org.apache.qpid.client.AMQSession;
 
 import javax.jms.JMSException;
 
-public class SimpleClusterTest
+import junit.framework.TestCase;
+
+public class SimpleClusterTest extends TestCase
 {
-    @Test
-    public void declareExchange() throws AMQException, JMSException, URLSyntaxException
+    public void testDeclareExchange() throws AMQException, JMSException, URLSyntaxException
     {
         AMQConnection con = new AMQConnection("localhost:9000", "guest", "guest", "test", "/test");
         AMQSession session = (AMQSession) con.createSession(false, AMQSession.NO_ACKNOWLEDGE);
diff --git a/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java b/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java
index bc7a8e5453..8ff8357377 100644
--- a/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java
+++ b/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java
@@ -20,23 +20,18 @@
  */
 package org.apache.qpid.server.cluster;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import junit.framework.TestCase;
 
-public class SimpleMemberHandleTest
+public class SimpleMemberHandleTest extends TestCase
 {
-    @Test
-    public void matches()
+    public void testMatches()
     {
         assertMatch(new SimpleMemberHandle("localhost", 8888), new SimpleMemberHandle("localhost", 8888));
         assertNoMatch(new SimpleMemberHandle("localhost", 8889), new SimpleMemberHandle("localhost", 8888));
         assertNoMatch(new SimpleMemberHandle("localhost", 8888), new SimpleMemberHandle("localhost2", 8888));
     }
 
-
-    @Test
-    public void resolve()
+    public void testResolve()
     {
         assertEquivalent(new SimpleMemberHandle("WGLAIBD8XGR0J:9000"), new SimpleMemberHandle("localhost:9000"));
     }