---

mziccard · mziccard · commit 130a0927d61b · 2016-06-27T12:16:09.000+02:00
yaml --- r: 3423 b: refs/heads/master c: ce2ace0 h: refs/heads/master i: 3421: a789c89 3419: 4f29273 3415: 9aaff25 3407: 6301b27 3391: be36209
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 47c4c1c3d8138b5891472e099fed5d71d932c393
+refs/heads/master: ce2ace01ac8c6080aa3972e3fcff5b510fed48f1
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
diff --git a/trunk/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/TopicId.java b/trunk/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/TopicId.java
@@ -33,7 +33,7 @@
 public final class TopicId implements Serializable {
 
   private static final long serialVersionUID = -4913169763174877777L;
-  private static final String DELETED_TOPIC_NAME = "_deleted_topic_";
+  private static final String DELETED_TOPIC_NAME = "_deleted-topic_";
   private static final TopicId DELETED_TOPIC = new TopicId(null, DELETED_TOPIC_NAME, true);
 
   private final String project;
@@ -68,7 +68,7 @@ public String topic() {
   /**
    * Returns {@code true} if this object is the identity of a deleted topic, {@code false}
    * otherwhise. If {@code isDeleted()} is {@code true}, {@link #topic()} returns
-   * "{@code _deleted_topic_}" and {@link #project()} returns {@code null}.
+   * "{@code _deleted-topic_}" and {@link #project()} returns {@code null}.
    */
   public boolean isDeleted() {
     return isDeleted;
diff --git a/trunk/gcloud-java-pubsub/src/test/java/com/google/cloud/pubsub/SubscriptionInfoTest.java b/trunk/gcloud-java-pubsub/src/test/java/com/google/cloud/pubsub/SubscriptionInfoTest.java
@@ -113,7 +113,7 @@ public void testToAndFromPb() {
         SubscriptionInfo.fromPb(subscriptionInfo.toPb("project")));
     com.google.pubsub.v1.Subscription subscription = SUBSCRIPTION_INFO.toPb("project");
     subscriptionInfo =
-        SubscriptionInfo.fromPb(subscription.toBuilder().setTopic("_deleted_topic_").build());
+        SubscriptionInfo.fromPb(subscription.toBuilder().setTopic("_deleted-topic_").build());
     assertEquals(TopicId.deletedTopic(), subscriptionInfo.topic());
     assertEquals(NAME, subscriptionInfo.name());
     assertEquals(PUSH_CONFIG, subscriptionInfo.pushConfig());
diff --git a/trunk/gcloud-java-pubsub/src/test/java/com/google/cloud/pubsub/TopicIdTest.java b/trunk/gcloud-java-pubsub/src/test/java/com/google/cloud/pubsub/TopicIdTest.java
@@ -29,6 +29,7 @@ public class TopicIdTest {
   private static final String PROJECT = "project";
   private static final String NAME = "topic";
   private static final String TOPIC_PB = "projects/project/topics/topic";
+  private static final String DELETED_TOPIC_NAME = "_deleted-topic_";
 
   @Test
   public void testOf() {
@@ -45,7 +46,7 @@ public void testOf() {
   public void testDeletedTopic() {
     TopicId deletedTopic = TopicId.deletedTopic();
     assertNull(deletedTopic.project());
-    assertEquals("_deleted_topic_", deletedTopic.topic());
+    assertEquals(DELETED_TOPIC_NAME, deletedTopic.topic());
     assertTrue(deletedTopic.isDeleted());
     assertSame(deletedTopic, TopicId.deletedTopic());
   }
@@ -60,6 +61,7 @@ public void testToAndFromPb() {
     topicPb = topicId.toPb("otherProject");
     assertEquals("projects/otherProject/topics/topic", topicPb);
     compareTopicId(TopicId.of("otherProject", NAME), TopicId.fromPb(topicPb));
+    assertSame(TopicId.deletedTopic(), TopicId.fromPb(DELETED_TOPIC_NAME));
   }
 
   private void compareTopicId(TopicId expected, TopicId value) {
