renaming and minor refactoring

Author: Matthew Sackman

test/src/com/rabbitmq/client/test/ssl/SSLTests.java

@@ -37,8 +37,8 @@
 public class SSLTests extends TestCase {
     public static TestSuite suite() {
         TestSuite suite = new TestSuite("ssl");
-        suite.addTestSuite(Bug19356Test.class);
-        suite.addTestSuite(Bug19356KeystoreTest.class);
+        suite.addTestSuite(UnverifiedConnection.class);
+        suite.addTestSuite(VerifiedConnection.class);
         return suite;
     }
 }

test/src/com/rabbitmq/client/test/ssl/Bug19356Test.java renamed to test/src/com/rabbitmq/client/test/ssl/UnverifiedConnection.java

@@ -41,7 +41,7 @@
  * Test for bug 19356 - SSL Support in rabbitmq
  *
  */
-public class Bug19356Test extends BrokerTestCase {
+public class UnverifiedConnection extends BrokerTestCase {
 
     public Exception caughtException = null;
     public boolean completed = false;
@@ -72,8 +72,7 @@ protected void releaseResources()
         }
     }
 
-    public void testBug19356()
-        throws IOException
+    public void testSSL() throws IOException
     {
         channel.queueDeclare("Bug19356Test", false, false, true, true, null);
         channel.basicPublish("", "Bug19356Test", null, "SSL".getBytes());

test/src/com/rabbitmq/client/test/ssl/Bug19356KeystoreTest.java renamed to test/src/com/rabbitmq/client/test/ssl/VerifiedConnection.java

@@ -44,18 +44,12 @@
 import javax.net.ssl.TrustManagerFactory;
 
 import com.rabbitmq.client.ConnectionFactory;
-import com.rabbitmq.client.GetResponse;
-import com.rabbitmq.client.test.functional.BrokerTestCase;
 
 /**
  * Test for bug 19356 - SSL Support in rabbitmq
  *
  */
-public class Bug19356KeystoreTest extends BrokerTestCase {
-
-    public Exception caughtException = null;
-    public boolean completed = false;
-    public boolean created = false;
+public class VerifiedConnection extends UnverifiedConnection {
 
     public void openConnection()
         throws IOException
@@ -97,25 +91,4 @@ public void openConnection()
             connection = connectionFactory.newConnection("localhost", 5671);
         }
     }
-
-    protected void releaseResources()
-        throws IOException
-    {
-        if (created) {
-            channel.queueDelete("Bug19356Test");
-        }
-    }
-
-    public void testBug19356Keystore()
-        throws IOException, NoSuchAlgorithmException, CertificateException,
-            KeyStoreException, UnrecoverableKeyException, KeyManagementException
-    {
-        channel.queueDeclare("Bug19356Test", false, false, true, true, null);
-        channel.basicPublish("", "Bug19356Test", null, "SSLKeystore".getBytes());
-
-        GetResponse chResponse = channel.basicGet("Bug19356Test", false);
-            
-        byte[] body = chResponse.getBody();
-        assertEquals("SSLKeystore", new String(body));
-    }
 }