Skip to content

Commit 18f3279

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 3575 b: refs/heads/pubsub-alpha c: 71ac555 h: refs/heads/master i: 3573: 59ac7b1 3571: 77a99bd 3567: ec8a809
1 parent f34c5ed commit 18f3279

3 files changed

Lines changed: 56 additions & 17 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 36a62ef856d199f8efd09501b5ba65c422c01f23
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: 7406918e071dd2c5677a638ae2a06e7592b6542c
5-
refs/heads/pubsub-alpha: 257e764c002f638c81cf9e3902ca0a5f167a896c
5+
refs/heads/pubsub-alpha: 71ac555a9f0160c6295c1508c91f68a4159317c6
66
refs/heads/update-datastore: 47aae517c2cb33f1dccd909adaced73ec9d0f4df
77
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
88
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd

branches/pubsub-alpha/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/ITBigQueryTest.java renamed to branches/pubsub-alpha/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/it/ITBigQueryTest.java

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.gcloud.bigquery;
18-
19-
import static com.google.gcloud.bigquery.BigQuery.DatasetField;
20-
import static com.google.gcloud.bigquery.BigQuery.JobField;
21-
import static com.google.gcloud.bigquery.BigQuery.JobListOption;
22-
import static com.google.gcloud.bigquery.BigQuery.JobOption;
23-
import static com.google.gcloud.bigquery.BigQuery.TableField;
24-
import static com.google.gcloud.bigquery.BigQuery.TableOption;
17+
package com.google.gcloud.bigquery.it;
18+
2519
import static org.junit.Assert.assertEquals;
2620
import static org.junit.Assert.assertFalse;
2721
import static org.junit.Assert.assertNotNull;
@@ -32,7 +26,42 @@
3226
import com.google.common.collect.ImmutableList;
3327
import com.google.common.collect.ImmutableMap;
3428
import com.google.gcloud.Page;
29+
import com.google.gcloud.WriteChannel;
30+
import com.google.gcloud.bigquery.BigQuery;
31+
import com.google.gcloud.bigquery.BigQuery.DatasetField;
3532
import com.google.gcloud.bigquery.BigQuery.DatasetOption;
33+
import com.google.gcloud.bigquery.BigQuery.JobField;
34+
import com.google.gcloud.bigquery.BigQuery.JobListOption;
35+
import com.google.gcloud.bigquery.BigQuery.JobOption;
36+
import com.google.gcloud.bigquery.BigQuery.TableField;
37+
import com.google.gcloud.bigquery.BigQuery.TableOption;
38+
import com.google.gcloud.bigquery.BigQueryError;
39+
import com.google.gcloud.bigquery.BigQueryException;
40+
import com.google.gcloud.bigquery.CopyJobConfiguration;
41+
import com.google.gcloud.bigquery.Dataset;
42+
import com.google.gcloud.bigquery.DatasetId;
43+
import com.google.gcloud.bigquery.DatasetInfo;
44+
import com.google.gcloud.bigquery.ExternalTableDefinition;
45+
import com.google.gcloud.bigquery.ExtractJobConfiguration;
46+
import com.google.gcloud.bigquery.Field;
47+
import com.google.gcloud.bigquery.FieldValue;
48+
import com.google.gcloud.bigquery.FormatOptions;
49+
import com.google.gcloud.bigquery.InsertAllRequest;
50+
import com.google.gcloud.bigquery.InsertAllResponse;
51+
import com.google.gcloud.bigquery.Job;
52+
import com.google.gcloud.bigquery.JobInfo;
53+
import com.google.gcloud.bigquery.LoadJobConfiguration;
54+
import com.google.gcloud.bigquery.QueryJobConfiguration;
55+
import com.google.gcloud.bigquery.QueryRequest;
56+
import com.google.gcloud.bigquery.QueryResponse;
57+
import com.google.gcloud.bigquery.Schema;
58+
import com.google.gcloud.bigquery.StandardTableDefinition;
59+
import com.google.gcloud.bigquery.Table;
60+
import com.google.gcloud.bigquery.TableDefinition;
61+
import com.google.gcloud.bigquery.TableId;
62+
import com.google.gcloud.bigquery.TableInfo;
63+
import com.google.gcloud.bigquery.ViewDefinition;
64+
import com.google.gcloud.bigquery.WriteChannelConfiguration;
3665
import com.google.gcloud.bigquery.testing.RemoteBigQueryHelper;
3766
import com.google.gcloud.storage.BlobInfo;
3867
import com.google.gcloud.storage.BucketInfo;
@@ -45,7 +74,6 @@
4574
import org.junit.Test;
4675
import org.junit.rules.Timeout;
4776

48-
import java.io.FileNotFoundException;
4977
import java.io.IOException;
5078
import java.nio.ByteBuffer;
5179
import java.nio.charset.StandardCharsets;
@@ -140,7 +168,7 @@ public class ITBigQueryTest {
140168
public Timeout globalTimeout = Timeout.seconds(300);
141169

142170
@BeforeClass
143-
public static void beforeClass() throws IOException, InterruptedException {
171+
public static void beforeClass() throws InterruptedException {
144172
RemoteBigQueryHelper bigqueryHelper = RemoteBigQueryHelper.create();
145173
RemoteGcsHelper gcsHelper = RemoteGcsHelper.create();
146174
bigquery = bigqueryHelper.options().service();
@@ -685,7 +713,7 @@ public void testListJobsWithSelectedFields() {
685713
}
686714

687715
@Test
688-
public void testCreateAndGetJob() throws InterruptedException {
716+
public void testCreateAndGetJob() {
689717
String sourceTableName = "test_create_and_get_job_source_table";
690718
String destinationTableName = "test_create_and_get_job_destination_table";
691719
TableId sourceTable = TableId.of(DATASET, sourceTableName);
@@ -717,7 +745,7 @@ public void testCreateAndGetJob() throws InterruptedException {
717745
}
718746

719747
@Test
720-
public void testCreateAndGetJobWithSelectedFields() throws InterruptedException {
748+
public void testCreateAndGetJobWithSelectedFields() {
721749
String sourceTableName = "test_create_and_get_job_with_selected_fields_source_table";
722750
String destinationTableName = "test_create_and_get_job_with_selected_fields_destination_table";
723751
TableId sourceTable = TableId.of(DATASET, sourceTableName);
@@ -874,20 +902,20 @@ public void testCancelJob() throws InterruptedException {
874902
}
875903

876904
@Test
877-
public void testCancelNonExistingJob() throws InterruptedException {
905+
public void testCancelNonExistingJob() {
878906
assertFalse(bigquery.cancel("test_cancel_non_existing_job"));
879907
}
880908

881909
@Test
882-
public void testInsertFromFile() throws InterruptedException, FileNotFoundException {
910+
public void testInsertFromFile() throws InterruptedException {
883911
String destinationTableName = "test_insert_from_file_table";
884912
TableId tableId = TableId.of(DATASET, destinationTableName);
885913
WriteChannelConfiguration configuration = WriteChannelConfiguration.builder(tableId)
886914
.formatOptions(FormatOptions.json())
887915
.createDisposition(JobInfo.CreateDisposition.CREATE_IF_NEEDED)
888916
.schema(TABLE_SCHEMA)
889917
.build();
890-
try (TableDataWriteChannel channel = bigquery.writer(configuration)) {
918+
try (WriteChannel channel = bigquery.writer(configuration)) {
891919
channel.write(ByteBuffer.wrap(JSON_CONTENT.getBytes(StandardCharsets.UTF_8)));
892920
} catch (IOException e) {
893921
fail("IOException was not expected");

branches/pubsub-alpha/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java renamed to branches/pubsub-alpha/gcloud-java-storage/src/test/java/com/google/gcloud/storage/it/ITStorageTest.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.gcloud.storage;
17+
package com.google.gcloud.storage.it;
1818

1919
import static java.nio.charset.StandardCharsets.UTF_8;
2020
import static org.junit.Assert.assertArrayEquals;
@@ -32,8 +32,19 @@
3232
import com.google.gcloud.ReadChannel;
3333
import com.google.gcloud.RestorableState;
3434
import com.google.gcloud.WriteChannel;
35+
import com.google.gcloud.storage.BatchRequest;
36+
import com.google.gcloud.storage.BatchResponse;
37+
import com.google.gcloud.storage.Blob;
38+
import com.google.gcloud.storage.BlobId;
39+
import com.google.gcloud.storage.BlobInfo;
40+
import com.google.gcloud.storage.Bucket;
41+
import com.google.gcloud.storage.BucketInfo;
42+
import com.google.gcloud.storage.CopyWriter;
43+
import com.google.gcloud.storage.HttpMethod;
44+
import com.google.gcloud.storage.Storage;
3545
import com.google.gcloud.storage.Storage.BlobField;
3646
import com.google.gcloud.storage.Storage.BucketField;
47+
import com.google.gcloud.storage.StorageException;
3748
import com.google.gcloud.storage.testing.RemoteGcsHelper;
3849

3950
import org.junit.AfterClass;

0 commit comments

Comments
 (0)