BigQuery:Fix deprecated warnings removed (#5240)

abhinav-qlogic · sduskis · commit 2000afbd914a · 2019-05-30T12:53:41.000-04:00
* deprecated warnings removed

* it test case change
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
@@ -979,7 +979,7 @@ public void testDeleteTable() {
     EasyMock.expect(bigqueryRpcMock.deleteTable(PROJECT, DATASET, TABLE)).andReturn(true);
     EasyMock.replay(bigqueryRpcMock);
     bigquery = options.getService();
-    assertTrue(bigquery.delete(DATASET, TABLE));
+    assertTrue(bigquery.delete(TABLE_ID));
   }
 
   @Test
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java
@@ -297,7 +297,7 @@ public Iterable<FieldValueList> getValues() {
 
     replay(status, bigquery, mockOptions);
     initializeJob(jobInfo);
-    assertThat(job.waitFor(TEST_RETRY_OPTIONS)).isSameAs(completedJob);
+    assertThat(job.waitFor(TEST_RETRY_OPTIONS)).isSameInstanceAs(completedJob);
     assertThat(job.getQueryResults().iterateAll()).isEmpty();
     verify(status, mockOptions);
   }
@@ -345,7 +345,7 @@ public void testWaitForAndGetQueryResultsEmptyWithSchema() throws InterruptedExc
 
     replay(status, bigquery, mockOptions);
     initializeJob(jobInfo);
-    assertThat(job.waitFor(TEST_RETRY_OPTIONS)).isSameAs(completedJob);
+    assertThat(job.waitFor(TEST_RETRY_OPTIONS)).isSameInstanceAs(completedJob);
     assertThat(job.getQueryResults().getSchema())
         .isEqualTo(Schema.of(Field.of("field1", LegacySQLTypeName.BOOLEAN)));
     verify(status, mockOptions);
@@ -424,7 +424,7 @@ public Iterable<FieldValueList> getValues() {
 
     replay(status, bigquery, mockOptions);
     initializeJob(jobInfo);
-    assertThat(job.waitFor(TEST_RETRY_OPTIONS)).isSameAs(completedJob);
+    assertThat(job.waitFor(TEST_RETRY_OPTIONS)).isSameInstanceAs(completedJob);
     assertThat(job.getQueryResults().iterateAll()).hasSize(0);
     verify(status, mockOptions);
   }
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
@@ -676,7 +676,7 @@ public void testListPartitions() throws InterruptedException {
       List<String> partitions = bigquery.listPartitions(TableId.of(DATASET, tableName));
       assertEquals(1, partitions.size());
     } finally {
-      bigquery.delete(DATASET, tableName);
+      bigquery.delete(tableId);
     }
   }
 
@@ -806,7 +806,7 @@ public void testUpdateNonExistingTable() {
 
   @Test
   public void testDeleteNonExistingTable() {
-    assertFalse(bigquery.delete(DATASET, "test_delete_non_existing_table"));
+    assertFalse(bigquery.delete("test_delete_non_existing_table"));
   }
 
   @Test
@@ -1280,7 +1280,7 @@ public void testCreateAndGetJob() throws InterruptedException, TimeoutException
 
     assertNotNull(completedJob);
     assertNull(completedJob.getStatus().getError());
-    assertTrue(bigquery.delete(DATASET, destinationTableName));
+    assertTrue(bigquery.delete(destinationTable));
   }
 
   @Test
@@ -1330,7 +1330,7 @@ public void testCreateAndGetJobWithSelectedFields()
             RetryOption.totalTimeout(Duration.ofMinutes(1)));
     assertNotNull(completedJob);
     assertNull(completedJob.getStatus().getError());
-    assertTrue(bigquery.delete(DATASET, destinationTableName));
+    assertTrue(bigquery.delete(destinationTable));
   }
 
   @Test
@@ -1388,7 +1388,7 @@ public void testQueryJob() throws InterruptedException, TimeoutException {
       rowCount++;
     }
     assertEquals(2, rowCount);
-    assertTrue(bigquery.delete(DATASET, tableName));
+    assertTrue(bigquery.delete(destinationTable));
     Job queryJob = bigquery.getJob(remoteJob.getJobId());
     JobStatistics.QueryStatistics statistics = queryJob.getStatistics();
     assertNotNull(statistics.getQueryPlan());
@@ -1435,7 +1435,7 @@ public void testExtractJob() throws InterruptedException, TimeoutException {
         new String(storage.readAllBytes(BUCKET, EXTRACT_FILE), StandardCharsets.UTF_8);
     assertEquals(
         Sets.newHashSet(CSV_CONTENT.split("\n")), Sets.newHashSet(extractedCsv.split("\n")));
-    assertTrue(bigquery.delete(DATASET, tableName));
+    assertTrue(bigquery.delete(destinationTable));
   }
 
   @Test
@@ -1532,7 +1532,7 @@ public void testInsertFromFile() throws InterruptedException, IOException, Timeo
       rowCount++;
     }
     assertEquals(2, rowCount);
-    assertTrue(bigquery.delete(DATASET, destinationTableName));
+    assertTrue(bigquery.delete(tableId));
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,7 @@ public void testDeleteTable() {`
`979`	`979`	`EasyMock.expect(bigqueryRpcMock.deleteTable(PROJECT, DATASET, TABLE)).andReturn(true);`
`980`	`980`	`EasyMock.replay(bigqueryRpcMock);`
`981`	`981`	`bigquery = options.getService();`
`982`		`- assertTrue(bigquery.delete(DATASET, TABLE));`
	`982`	`+ assertTrue(bigquery.delete(TABLE_ID));`
`983`	`983`	`}`
`984`	`984`
`985`	`985`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -676,7 +676,7 @@ public void testListPartitions() throws InterruptedException {`
`676`	`676`	`List<String> partitions = bigquery.listPartitions(TableId.of(DATASET, tableName));`
`677`	`677`	`assertEquals(1, partitions.size());`
`678`	`678`	`} finally {`
`679`		`- bigquery.delete(DATASET, tableName);`
	`679`	`+ bigquery.delete(tableId);`
`680`	`680`	`}`
`681`	`681`	`}`
`682`	`682`
`@@ -806,7 +806,7 @@ public void testUpdateNonExistingTable() {`
`806`	`806`
`807`	`807`	`@Test`
`808`	`808`	`public void testDeleteNonExistingTable() {`
`809`		`- assertFalse(bigquery.delete(DATASET, "test_delete_non_existing_table"));`
	`809`	`+ assertFalse(bigquery.delete("test_delete_non_existing_table"));`
`810`	`810`	`}`
`811`	`811`
`812`	`812`	`@Test`
`@@ -1280,7 +1280,7 @@ public void testCreateAndGetJob() throws InterruptedException, TimeoutException`
`1280`	`1280`
`1281`	`1281`	`assertNotNull(completedJob);`
`1282`	`1282`	`assertNull(completedJob.getStatus().getError());`
`1283`		`- assertTrue(bigquery.delete(DATASET, destinationTableName));`
	`1283`	`+ assertTrue(bigquery.delete(destinationTable));`
`1284`	`1284`	`}`
`1285`	`1285`
`1286`	`1286`	`@Test`
`@@ -1330,7 +1330,7 @@ public void testCreateAndGetJobWithSelectedFields()`
`1330`	`1330`	`RetryOption.totalTimeout(Duration.ofMinutes(1)));`
`1331`	`1331`	`assertNotNull(completedJob);`
`1332`	`1332`	`assertNull(completedJob.getStatus().getError());`
`1333`		`- assertTrue(bigquery.delete(DATASET, destinationTableName));`
	`1333`	`+ assertTrue(bigquery.delete(destinationTable));`
`1334`	`1334`	`}`
`1335`	`1335`
`1336`	`1336`	`@Test`
`@@ -1388,7 +1388,7 @@ public void testQueryJob() throws InterruptedException, TimeoutException {`
`1388`	`1388`	`rowCount++;`
`1389`	`1389`	`}`
`1390`	`1390`	`assertEquals(2, rowCount);`
`1391`		`- assertTrue(bigquery.delete(DATASET, tableName));`
	`1391`	`+ assertTrue(bigquery.delete(destinationTable));`
`1392`	`1392`	`Job queryJob = bigquery.getJob(remoteJob.getJobId());`
`1393`	`1393`	`JobStatistics.QueryStatistics statistics = queryJob.getStatistics();`
`1394`	`1394`	`assertNotNull(statistics.getQueryPlan());`
`@@ -1435,7 +1435,7 @@ public void testExtractJob() throws InterruptedException, TimeoutException {`
`1435`	`1435`	`new String(storage.readAllBytes(BUCKET, EXTRACT_FILE), StandardCharsets.UTF_8);`
`1436`	`1436`	`assertEquals(`
`1437`	`1437`	`Sets.newHashSet(CSV_CONTENT.split("\n")), Sets.newHashSet(extractedCsv.split("\n")));`
`1438`		`- assertTrue(bigquery.delete(DATASET, tableName));`
	`1438`	`+ assertTrue(bigquery.delete(destinationTable));`
`1439`	`1439`	`}`
`1440`	`1440`
`1441`	`1441`	`@Test`
`@@ -1532,7 +1532,7 @@ public void testInsertFromFile() throws InterruptedException, IOException, Timeo`
`1532`	`1532`	`rowCount++;`
`1533`	`1533`	`}`
`1534`	`1534`	`assertEquals(2, rowCount);`
`1535`		`- assertTrue(bigquery.delete(DATASET, destinationTableName));`
	`1535`	`+ assertTrue(bigquery.delete(tableId));`
`1536`	`1536`	`}`
`1537`	`1537`
`1538`	`1538`	`@Test`