Merge pull request #14 from christav/sb-test-cleanup-118

Clean up service bus assets created as part of test at the end.

microsoft-azure-api/src/test/java/com/microsoft/windowsazure/services/serviceBus/IntegrationTestBase.java

@@ -16,6 +16,7 @@
 
 import static com.microsoft.windowsazure.services.serviceBus.Util.*;
 
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
@@ -54,14 +55,32 @@ public void initialize() throws Exception {
         for (TopicInfo topic : iterateTopics(service)) {
             String topicName = topic.getPath();
             if (topicName.startsWith("Test") || topicName.startsWith("test")) {
-                service.deleteQueue(topicName);
+                service.deleteTopic(topicName);
             }
         }
         if (!testAlphaExists) {
             service.createQueue(new QueueInfo("TestAlpha"));
         }
     }
 
+    @AfterClass
+    public static void cleanUpTestArtifacts() throws Exception {
+        Configuration config = createConfiguration();
+        ServiceBusContract service = ServiceBusService.create(config);
+        for (QueueInfo queue : iterateQueues(service)) {
+            String queueName = queue.getPath();
+            if (queueName.startsWith("Test") || queueName.startsWith("test")) {
+                service.deleteQueue(queueName);
+            }
+        }
+        for (TopicInfo topic : iterateTopics(service)) {
+            String topicName = topic.getPath();
+            if (topicName.startsWith("Test") || topicName.startsWith("test")) {
+                service.deleteTopic(topicName);
+            }
+        }
+    }
+
     protected static Configuration createConfiguration() throws Exception {
         Configuration config = Configuration.load();
         overrideWithEnv(config, ServiceBusConfiguration.CONNECTION_STRING);