---

mziccard · mziccard · commit 9610820d2115 · 2016-01-04T19:48:08.000+01:00
yaml --- r: 6693 b: refs/heads/tswast-patch-1 c: 2d1a368 h: refs/heads/master i: 6691: 93017bf
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 0fa9b51bceb2a29424851725d80be9aa799c3202
+refs/heads/tswast-patch-1: 2d1a368fd2bb455b7bec909f0cdd4f44a86ad1dc
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java b/branches/tswast-patch-1/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/tswast-patch-1/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/branches/tswast-patch-1/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/tswast-patch-1/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/branches/tswast-patch-1/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);
