Split integration tests for TopicSnippets

mziccard · mziccard · commit 26ee6d923adf · 2016-09-16T21:41:06.000+02:00
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicSnippets.java
@@ -76,18 +76,31 @@ public void testTopic() throws ExecutionException, InterruptedException {
     assertEquals(2, topicSnippets.publishMessageListAsync().size());
     assertEquals(2, topicSnippets.publishMessages().size());
     assertEquals(2, topicSnippets.publishMessagesAsync().size());
+  }
+
+  @Test
+  public void testTopicSubscriptions() throws ExecutionException, InterruptedException {
+    TopicSnippets topicSnippets = new TopicSnippets(topic);
     pubsub.create(SubscriptionInfo.of(TOPIC, SUBSCRIPTION));
-    Page<SubscriptionId> subscriptions = topicSnippets.listSubscriptionsForTopic();
-    while (Iterators.size(subscriptions.values().iterator()) < 1) {
-      subscriptions = topicSnippets.listSubscriptionsForTopic();
-    }
-    assertEquals(SUBSCRIPTION, subscriptions.values().iterator().next().subscription());
-    subscriptions = topicSnippets.listSubscriptionsForTopicAsync();
-    while (Iterators.size(subscriptions.values().iterator()) < 1) {
-      subscriptions = topicSnippets.listSubscriptionsForTopic();
+    try {
+      Page<SubscriptionId> subscriptions = topicSnippets.listSubscriptionsForTopic();
+      while (Iterators.size(subscriptions.values().iterator()) < 1) {
+        subscriptions = topicSnippets.listSubscriptionsForTopic();
+      }
+      assertEquals(SUBSCRIPTION, subscriptions.values().iterator().next().subscription());
+      subscriptions = topicSnippets.listSubscriptionsForTopicAsync();
+      while (Iterators.size(subscriptions.values().iterator()) < 1) {
+        subscriptions = topicSnippets.listSubscriptionsForTopic();
+      }
+      assertEquals(SUBSCRIPTION, subscriptions.values().iterator().next().subscription());
+    } finally {
+      pubsub.deleteSubscription(SUBSCRIPTION);
     }
-    assertEquals(SUBSCRIPTION, subscriptions.values().iterator().next().subscription());
-    pubsub.deleteSubscription(SUBSCRIPTION);
+  }
+
+  @Test
+  public void testPolicy() throws ExecutionException, InterruptedException {
+    TopicSnippets topicSnippets = new TopicSnippets(topic);
     Policy policy = topicSnippets.getPolicy();
     assertNotNull(policy);
     assertEquals(policy, topicSnippets.getPolicyAsync());
