---

mziccard · mziccard · commit 45b4621ba0de · 2016-01-04T19:48:08.000+01:00
yaml --- r: 2115 b: refs/heads/pubsub-alpha c: 2d1a368 h: refs/heads/master i: 2113: ddb8225 2111: baf9e48
diff --git a/[refs] b/[refs]
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
-refs/heads/pubsub-alpha: 0fa9b51bceb2a29424851725d80be9aa799c3202
+refs/heads/pubsub-alpha: 2d1a368fd2bb455b7bec909f0cdd4f44a86ad1dc
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
 refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/branches/pubsub-alpha/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/branches/pubsub-alpha/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java
@@ -476,7 +476,7 @@ public void testInsertAll() {
   }
 
   @Test
-  public void testInsertAllWithSuffix() {
+  public void testInsertAllWithSuffix() throws InterruptedException {
     String tableName = "test_insert_all_with_suffix_table";
     BaseTableInfo tableInfo = TableInfo.of(TableId.of(DATASET, tableName), TABLE_SCHEMA);
     assertNotNull(bigquery.create(tableInfo));
@@ -505,7 +505,12 @@ public void testInsertAllWithSuffix() {
     assertFalse(response.hasErrors());
     assertEquals(0, response.insertErrors().size());
     String newTableName = tableName + "_suffix";
-    assertNotNull(bigquery.getTable(DATASET, newTableName, TableOption.fields()));
+    BaseTableInfo suffixTable = bigquery.getTable(DATASET, newTableName, TableOption.fields());
+    while (suffixTable == null) {
+      Thread.sleep(1000L);
+      suffixTable = bigquery.getTable(DATASET, newTableName, TableOption.fields());
+    }
+    assertNotNull(suffixTable);
     assertTrue(bigquery.delete(TableId.of(DATASET, tableName)));
     assertTrue(bigquery.delete(TableId.of(DATASET, newTableName)));
   }
diff --git a/branches/pubsub-alpha/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/branches/pubsub-alpha/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -42,12 +42,12 @@ public Project(ResourceManager resourceManager, ProjectInfo projectInfo) {
   /**
    * Constructs a Project object that contains project information loaded from the server.
    *
-   * @return Project object containing the project's metadata or {@code null} if not found
+   * @return Project object containing the project's metadata
    * @throws ResourceManagerException upon failure
    */
   public static Project load(ResourceManager resourceManager, String projectId) {
     ProjectInfo projectInfo = resourceManager.get(projectId);
-    return projectInfo != null ? new Project(resourceManager, projectInfo) : null;
+    return new Project(resourceManager, projectInfo);
   }
 
   /**
@@ -67,7 +67,7 @@ public ResourceManager resourceManager() {
   /**
    * Returns a Project object with updated project information.
    *
-   * @return Project object containing the project's updated metadata or {@code null} if not found
+   * @return Project object containing the project's updated metadata
    * @throws ResourceManagerException upon failure
    */
   public Project reload() {
diff --git a/branches/pubsub-alpha/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/branches/pubsub-alpha/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
@@ -21,8 +21,6 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 import com.google.common.collect.ImmutableMap;
@@ -80,24 +78,6 @@ public void testReload() {
     assertEquals(newInfo, newProject.info());
   }
 
-  @Test
-  public void testLoadNull() {
-    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
-    replay(resourceManager);
-    assertNull(Project.load(resourceManager, PROJECT_INFO.projectId()));
-  }
-
-  @Test
-  public void testReloadDeletedProject() {
-    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(PROJECT_INFO);
-    expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
-    replay(resourceManager);
-    Project loadedProject = Project.load(resourceManager, PROJECT_INFO.projectId());
-    assertNotNull(loadedProject);
-    Project reloadedProject = loadedProject.reload();
-    assertNull(reloadedProject);
-  }
-
   @Test
   public void testInfo() {
     replay(resourceManager);
