diff --git a/asset/src/test/java/com/example/asset/QuickStartIT.java b/asset/src/test/java/com/example/asset/QuickStartIT.java index 92c718e015d..7947ac5ebb4 100644 --- a/asset/src/test/java/com/example/asset/QuickStartIT.java +++ b/asset/src/test/java/com/example/asset/QuickStartIT.java @@ -22,8 +22,8 @@ import com.google.cloud.asset.v1.ContentType; import com.google.cloud.bigquery.BigQuery; import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption; +import com.google.cloud.bigquery.BigQueryException; import com.google.cloud.bigquery.BigQueryOptions; -import com.google.cloud.bigquery.Dataset; import com.google.cloud.bigquery.DatasetId; import com.google.cloud.bigquery.DatasetInfo; import com.google.cloud.bigquery.testing.RemoteBigQueryHelper; @@ -31,12 +31,16 @@ import com.google.cloud.storage.Storage; import com.google.cloud.storage.Storage.BlobListOption; import com.google.cloud.storage.StorageOptions; +import com.google.cloud.testing.junit4.MultipleAttemptsRule; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.UUID; +import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -44,6 +48,9 @@ @RunWith(JUnit4.class) @SuppressWarnings("checkstyle:abbreviationaswordinname") public class QuickStartIT { + @Rule public final Timeout testTimeout = new Timeout(10, TimeUnit.MINUTES); + @Rule public final MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3); + private static final String bucketName = "java-docs-samples-testing"; private static final String path = UUID.randomUUID().toString(); private static final String datasetName = RemoteBigQueryHelper.generateDatasetName(); @@ -69,9 +76,6 @@ private static final void deleteObjects() { @Before public void setUp() { bigquery = BigQueryOptions.getDefaultInstance().getService(); - if (bigquery.getDataset(datasetName) == null) { - Dataset dataset = bigquery.create(DatasetInfo.newBuilder(datasetName).build()); - } bout = new ByteArrayOutputStream(); out = new PrintStream(bout); originalPrintStream = System.out; @@ -98,8 +102,7 @@ public void testExportAssetExample() throws Exception { @Test public void testExportAssetBigqueryPerTypeExample() throws Exception { - String dataset = - String.format("projects/%s/datasets/%s", ServiceOptions.getDefaultProjectId(), datasetName); + String dataset = getDataset(); String table = "java_test_per_type"; ExportAssetsBigqueryExample.exportBigQuery( dataset, table, ContentType.RESOURCE, /*perType*/ true); @@ -109,8 +112,7 @@ public void testExportAssetBigqueryPerTypeExample() throws Exception { @Test public void testExportAssetBigqueryExample() throws Exception { - String dataset = - String.format("projects/%s/datasets/%s", ServiceOptions.getDefaultProjectId(), datasetName); + String dataset = getDataset(); String table = "java_test"; ExportAssetsBigqueryExample.exportBigQuery( dataset, table, ContentType.RESOURCE, /*perType*/ false); @@ -127,4 +129,13 @@ public void testBatchGetAssetsHistory() throws Exception { assertThat(got).contains(bucketAssetName); } } + + protected String getDataset() throws BigQueryException { + if (bigquery.getDataset(datasetName) == null) { + bigquery.create(DatasetInfo.newBuilder(datasetName).build()); + } + return String.format( + "projects/%s/datasets/%s", ServiceOptions.getDefaultProjectId(), datasetName); + + } } diff --git a/automl/src/test/java/beta/automl/TablesCreateModelTest.java b/automl/src/test/java/beta/automl/TablesCreateModelTest.java index 996daae231f..967113bff77 100644 --- a/automl/src/test/java/beta/automl/TablesCreateModelTest.java +++ b/automl/src/test/java/beta/automl/TablesCreateModelTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; +import com.google.cloud.testing.junit4.MultipleAttemptsRule; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -27,6 +28,7 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -34,6 +36,7 @@ @RunWith(JUnit4.class) @SuppressWarnings("checkstyle:abbreviationaswordinname") public class TablesCreateModelTest { + @Rule public final MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3); private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); private static final String DATASET_ID = "TBL00000000000000000000"; diff --git a/automl/src/test/java/beta/automl/TablesPredictTest.java b/automl/src/test/java/beta/automl/TablesPredictTest.java index 0abb04b2e8d..8eab88447b6 100644 --- a/automl/src/test/java/beta/automl/TablesPredictTest.java +++ b/automl/src/test/java/beta/automl/TablesPredictTest.java @@ -23,6 +23,7 @@ import com.google.cloud.automl.v1.DeployModelRequest; import com.google.cloud.automl.v1.Model; import com.google.cloud.automl.v1.ModelName; +import com.google.cloud.testing.junit4.MultipleAttemptsRule; import com.google.protobuf.Value; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -33,6 +34,7 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -40,6 +42,7 @@ @RunWith(JUnit4.class) @SuppressWarnings("checkstyle:abbreviationaswordinname") public class TablesPredictTest { + @Rule public final MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3); private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); private static final String MODEL_ID = "TBL7972827093840953344"; diff --git a/automl/src/test/java/com/example/automl/LanguageTextClassificationCreateModelTest.java b/automl/src/test/java/com/example/automl/LanguageTextClassificationCreateModelTest.java index 14bd5098d4c..73050d35335 100644 --- a/automl/src/test/java/com/example/automl/LanguageTextClassificationCreateModelTest.java +++ b/automl/src/test/java/com/example/automl/LanguageTextClassificationCreateModelTest.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; +import com.google.cloud.testing.junit4.MultipleAttemptsRule; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -27,6 +28,7 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -34,6 +36,7 @@ @RunWith(JUnit4.class) @SuppressWarnings("checkstyle:abbreviationaswordinname") public class LanguageTextClassificationCreateModelTest { + @Rule public final MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3); private static final String PROJECT_ID = System.getenv("AUTOML_PROJECT_ID"); private static final String DATASET_ID = "TCN00000000000000000000";