diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh index 44c53f5ca1d..8035afe15b9 100755 --- a/.kokoro/tests/run_tests.sh +++ b/.kokoro/tests/run_tests.sh @@ -56,8 +56,11 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then # Setup required env variables export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-acct.json + # For Tasks samples export QUEUE_ID=my-appengine-queue export LOCATION_ID=us-east1 + # For Datalabeling samples to hit the testing endpoint + export DATALABELING_ENDPOINT="test-datalabeling.sandbox.googleapis.com:443" source "${KOKORO_GFILE_DIR}/aws-secrets.sh" source "${KOKORO_GFILE_DIR}/storage-hmac-credentials.sh" source "${KOKORO_GFILE_DIR}/dlp_secrets.txt" diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java index 28626466ef8..1564fdf509c 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateAnnotationSpecSet.java @@ -21,6 +21,7 @@ import com.google.cloud.datalabeling.v1beta1.AnnotationSpecSet; import com.google.cloud.datalabeling.v1beta1.CreateAnnotationSpecSetRequest; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.ProjectName; import java.io.IOException; import java.util.ArrayList; @@ -32,36 +33,52 @@ class CreateAnnotationSpecSet { // Create an annotation spec set. - static void createAnnotationSpecSet(String projectId) { + static void createAnnotationSpecSet(String projectId) throws IOException { // String projectId = "YOUR_PROJECT_ID"; Map annotationLabels = new HashMap<>(); annotationLabels.put("label_1", "label_1_description"); annotationLabels.put("label_2", "label_2_description"); - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + // [END datalabeling_create_annotation_spec_set_beta] + String endpoint = System.getenv("DATALABELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + // [START datalabeling_create_annotation_spec_set_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_create_annotation_spec_set_beta] + .setEndpoint(endpoint) + // [START datalabeling_create_annotation_spec_set_beta] + .build(); + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(settings)) { ProjectName projectName = ProjectName.of(projectId); List annotationSpecs = new ArrayList<>(); for (Entry entry : annotationLabels.entrySet()) { - AnnotationSpec annotationSpec = AnnotationSpec.newBuilder() - .setDisplayName(entry.getKey()) - .setDescription(entry.getValue()) - .build(); + AnnotationSpec annotationSpec = + AnnotationSpec.newBuilder() + .setDisplayName(entry.getKey()) + .setDescription(entry.getValue()) + .build(); annotationSpecs.add(annotationSpec); } - AnnotationSpecSet annotationSpecSet = AnnotationSpecSet.newBuilder() - .setDisplayName("YOUR_ANNOTATION_SPEC_SET_DISPLAY_NAME") - .setDescription("YOUR_DESCRIPTION") - .addAllAnnotationSpecs(annotationSpecs) - .build(); + AnnotationSpecSet annotationSpecSet = + AnnotationSpecSet.newBuilder() + .setDisplayName("YOUR_ANNOTATION_SPEC_SET_DISPLAY_NAME") + .setDescription("YOUR_DESCRIPTION") + .addAllAnnotationSpecs(annotationSpecs) + .build(); - CreateAnnotationSpecSetRequest request = CreateAnnotationSpecSetRequest.newBuilder() - .setAnnotationSpecSet(annotationSpecSet) - .setParent(projectName.toString()) - .build(); + CreateAnnotationSpecSetRequest request = + CreateAnnotationSpecSetRequest.newBuilder() + .setAnnotationSpecSet(annotationSpecSet) + .setParent(projectName.toString()) + .build(); AnnotationSpecSet result = dataLabelingServiceClient.createAnnotationSpecSet(request); diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java index b8eceb820e1..b3c13bc5ec8 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateDataset.java @@ -19,6 +19,7 @@ // [START datalabeling_create_dataset_beta] import com.google.cloud.datalabeling.v1beta1.CreateDatasetRequest; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.Dataset; import com.google.cloud.datalabeling.v1beta1.ProjectName; import java.io.IOException; @@ -26,22 +27,38 @@ class CreateDataset { // Create a dataset that is initially empty. - static void createDataset(String projectId, String datasetName) { + static void createDataset(String projectId, String datasetName) throws IOException { // String projectId = "YOUR_PROJECT_ID"; // String datasetName = "YOUR_DATASET_DISPLAY_NAME"; - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + // [END datalabeling_create_dataset_beta] + String endpoint = System.getenv("DATALABELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + // [START datalabeling_create_dataset_beta] + + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_create_dataset_beta] + .setEndpoint(endpoint) + // [START datalabeling_create_dataset_beta] + .build(); + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(settings)) { ProjectName projectName = ProjectName.of(projectId); - Dataset dataset = Dataset.newBuilder() - .setDisplayName(datasetName) - .setDescription("YOUR_DESCRIPTION") - .build(); + Dataset dataset = + Dataset.newBuilder() + .setDisplayName(datasetName) + .setDescription("YOUR_DESCRIPTION") + .build(); - CreateDatasetRequest createDatasetRequest = CreateDatasetRequest.newBuilder() - .setParent(projectName.toString()) - .setDataset(dataset) - .build(); + CreateDatasetRequest createDatasetRequest = + CreateDatasetRequest.newBuilder() + .setParent(projectName.toString()) + .setDataset(dataset) + .build(); Dataset createdDataset = dataLabelingServiceClient.createDataset(createDatasetRequest); diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java index ab56b3eeed0..ac06bd3786d 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/CreateInstruction.java @@ -21,6 +21,7 @@ import com.google.cloud.datalabeling.v1beta1.CreateInstructionMetadata; import com.google.cloud.datalabeling.v1beta1.CreateInstructionRequest; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.DataType; import com.google.cloud.datalabeling.v1beta1.Instruction; import com.google.cloud.datalabeling.v1beta1.PdfInstruction; @@ -31,12 +32,25 @@ class CreateInstruction { // Create a instruction for a dataset. - static void createInstruction(String projectId, String pdfUri) { + static void createInstruction(String projectId, String pdfUri) throws IOException { // String projectId = "YOUR_PROJECT_ID"; // String pdfUri = "gs://YOUR_BUCKET_ID/path_to_pdf_or_csv"; - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + // [END datalabeling_create_instruction_beta] + String endpoint = System.getenv("DATALABELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + // [START datalabeling_create_instruction_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_create_instruction_beta] + .setEndpoint(endpoint) + // [START datalabeling_create_instruction_beta] + .build(); + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(settings)) { ProjectName projectName = ProjectName.of(projectId); // There are two types of instructions: CSV (CsvInstruction) or PDF (PdfInstruction) diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java index 9b73085cc0e..d38c5c71617 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ExportData.java @@ -19,6 +19,7 @@ // [START datalabeling_export_data_beta] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.ExportDataOperationMetadata; import com.google.cloud.datalabeling.v1beta1.ExportDataOperationResponse; import com.google.cloud.datalabeling.v1beta1.ExportDataRequest; @@ -33,7 +34,8 @@ class ExportData { // Export data from an annotated dataset. - static void exportData(String datasetName, String annotatedDatasetName, String gcsOutputUri) { + static void exportData(String datasetName, String annotatedDatasetName, String gcsOutputUri) + throws IOException { // String datasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASETS_UUID"); // String annotatedDatasetName = DataLabelingServiceClient.formatAnnotatedDatasetName( @@ -42,7 +44,21 @@ static void exportData(String datasetName, String annotatedDatasetName, String g // "YOUR_ANNOTATED_DATASET_UUID"); // String gcsOutputUri = "gs://YOUR_BUCKET_ID/export_path"; - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + // [END datalabeling_export_data_beta] + String endpoint = System.getenv("DATALABELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + // [START datalabeling_export_data_beta] + + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_export_data_beta] + .setEndpoint(endpoint) + // [START datalabeling_export_data_beta] + .build(); + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(settings)) { GcsDestination gcsDestination = GcsDestination.newBuilder() .setOutputUri(gcsOutputUri) .setMimeType("text/csv") @@ -75,4 +91,4 @@ static void exportData(String datasetName, String annotatedDatasetName, String g } } } -// [END datalabeling_export_data_beta] \ No newline at end of file +// [END datalabeling_export_data_beta] diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java index f0e8c46dc13..ec1b36fbe9e 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/ImportData.java @@ -19,6 +19,7 @@ // [START datalabeling_import_data_beta] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.DataType; import com.google.cloud.datalabeling.v1beta1.GcsSource; import com.google.cloud.datalabeling.v1beta1.ImportDataOperationMetadata; @@ -31,12 +32,26 @@ class ImportData { // Import data to an existing dataset. - static void importData(String datasetName, String gcsSourceUri) { + static void importData(String datasetName, String gcsSourceUri) throws IOException { // String datasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASETS_UUID"); // String gcsSourceUri = "gs://YOUR_BUCKET_ID/path_to_data"; - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + // [END datalabeling_import_data_beta] + String endpoint = System.getenv("DATALABELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + // [START datalabeling_import_data_beta] + + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_import_data_beta] + .setEndpoint(endpoint) + // [START datalabeling_import_data_beta] + .build(); + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(settings)) { GcsSource gcsSource = GcsSource.newBuilder() .setInputUri(gcsSourceUri) .setMimeType("text/csv") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java index 35f2503d1d8..e00c9805162 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelImage.java @@ -20,6 +20,7 @@ import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.datalabeling.v1beta1.AnnotatedDataset; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.HumanAnnotationConfig; import com.google.cloud.datalabeling.v1beta1.ImageClassificationConfig; import com.google.cloud.datalabeling.v1beta1.LabelImageRequest; @@ -35,7 +36,7 @@ class LabelImage { static void labelImage( String formattedInstructionName, String formattedAnnotationSpecSetName, - String formattedDatasetName) { + String formattedDatasetName) throws IOException { // String formattedInstructionName = DataLabelingServiceClient.formatInstructionName( // "YOUR_PROJECT_ID", "YOUR_INSTRUCTION_UUID"); // String formattedAnnotationSpecSetName = @@ -44,8 +45,21 @@ static void labelImage( // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + // [END datalabeling_label_image_beta] + String endpoint = System.getenv("DATALABELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + // [START datalabeling_label_image_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_label_image_beta] + .setEndpoint(endpoint) + // [START datalabeling_label_image_beta] + .build(); + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(settings)) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java index 2ff411f0dd8..2ebcfee575e 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelText.java @@ -20,6 +20,7 @@ import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.datalabeling.v1beta1.AnnotatedDataset; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.HumanAnnotationConfig; import com.google.cloud.datalabeling.v1beta1.LabelOperationMetadata; import com.google.cloud.datalabeling.v1beta1.LabelTextRequest; @@ -35,7 +36,7 @@ class LabelText { static void labelText( String formattedInstructionName, String formattedAnnotationSpecSetName, - String formattedDatasetName) { + String formattedDatasetName) throws IOException { // String formattedInstructionName = DataLabelingServiceClient.formatInstructionName( // "YOUR_PROJECT_ID", "YOUR_INSTRUCTION_UUID"); // String formattedAnnotationSpecSetName = @@ -44,8 +45,21 @@ static void labelText( // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + // [END datalabeling_label_text_beta] + String endpoint = System.getenv("DATALABELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + // [START datalabeling_label_text_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_label_text_beta] + .setEndpoint(endpoint) + // [START datalabeling_label_text_beta] + .build(); + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(settings)) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") diff --git a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java index b5705cf32fb..a84b0bf1ed2 100644 --- a/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java +++ b/datalabeling/beta/cloud-client/src/main/java/com/example/datalabeling/LabelVideo.java @@ -20,6 +20,7 @@ import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.datalabeling.v1beta1.AnnotatedDataset; import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceClient; +import com.google.cloud.datalabeling.v1beta1.DataLabelingServiceSettings; import com.google.cloud.datalabeling.v1beta1.HumanAnnotationConfig; import com.google.cloud.datalabeling.v1beta1.LabelOperationMetadata; import com.google.cloud.datalabeling.v1beta1.LabelVideoRequest; @@ -33,7 +34,7 @@ class LabelVideo { // Start a Video Labeling Task static void labelVideo(String formattedInstructionName, String formattedAnnotationSpecSetName, - String formattedDatasetName) { + String formattedDatasetName) throws IOException { // String formattedInstructionName = DataLabelingServiceClient.formatInstructionName( // "YOUR_PROJECT_ID", "YOUR_INSTRUCTION_UUID"); // String formattedAnnotationSpecSetName = @@ -42,8 +43,21 @@ static void labelVideo(String formattedInstructionName, String formattedAnnotati // String formattedDatasetName = DataLabelingServiceClient.formatDatasetName( // "YOUR_PROJECT_ID", "YOUR_DATASET_UUID"); - try (DataLabelingServiceClient dataLabelingServiceClient = DataLabelingServiceClient.create()) { + // [END datalabeling_label_video_beta] + String endpoint = System.getenv("DATALABELING_ENDPOINT"); + if (endpoint == null) { + endpoint = DataLabelingServiceSettings.getDefaultEndpoint(); + } + // [START datalabeling_label_video_beta] + DataLabelingServiceSettings settings = DataLabelingServiceSettings + .newBuilder() + // [END datalabeling_label_video_beta] + .setEndpoint(endpoint) + // [START datalabeling_label_video_beta] + .build(); + try (DataLabelingServiceClient dataLabelingServiceClient = + DataLabelingServiceClient.create(settings)) { HumanAnnotationConfig humanAnnotationConfig = HumanAnnotationConfig.newBuilder() .setAnnotatedDatasetDisplayName("annotated_displayname") .setAnnotatedDatasetDescription("annotated_description") @@ -80,4 +94,4 @@ static void labelVideo(String formattedInstructionName, String formattedAnnotati } } } -// [END datalabeling_label_video_beta] \ No newline at end of file +// [END datalabeling_label_video_beta] diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java index 3ee1103d960..a5f9288682a 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateAnnotationSpecSetIT.java @@ -29,6 +29,7 @@ import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -37,6 +38,7 @@ * Integration (system) tests for {@link CreateAnnotationSpecSet}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class CreateAnnotationSpecSetIT { @@ -76,7 +78,7 @@ public void tearDown() { } @Test - public void testCreateAnnotationSpecSet() { + public void testCreateAnnotationSpecSet() throws IOException { CreateAnnotationSpecSet.createAnnotationSpecSet(PROJECT_ID); String output = bout.toString(); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java index b8b57a54394..ce4c845170e 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateDatasetIT.java @@ -29,6 +29,7 @@ import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -37,6 +38,7 @@ * Integration (system) tests for {@link CreateDataset}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class CreateDatasetIT { @@ -77,7 +79,7 @@ public void tearDown() { } @Test - public void testCreateDataset() { + public void testCreateDataset() throws IOException { CreateDataset.createDataset(PROJECT_ID,datasetName); String output = bout.toString(); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java index d80230d4c83..6ebdb898fdb 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/CreateInstructionIT.java @@ -29,6 +29,7 @@ import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -37,6 +38,7 @@ * Integration (system) tests for {@link CreateInstruction}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class CreateInstructionIT { @@ -78,7 +80,7 @@ public void tearDown() { } @Test - public void testCreateInstruction() { + public void testCreateInstruction() throws IOException { CreateInstruction.createInstruction(PROJECT_ID, GCS_SOURCE_URI); String output = bout.toString(); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java index bf7fd2396b2..eb7bd787e92 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/ImportDataIT.java @@ -29,6 +29,7 @@ import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -37,6 +38,7 @@ * Integration (system) tests for {@link ImportData}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class ImportDataIT { @@ -50,7 +52,7 @@ public class ImportDataIT { private static Dataset dataset; @Before - public void setUp() { + public void setUp() throws IOException { bout = new ByteArrayOutputStream(); System.setOut(new PrintStream(bout)); @@ -102,7 +104,7 @@ public void tearDown() { } @Test - public void testImportDataset() { + public void testImportDataset() throws IOException { ImportData.importData(dataset.getName(), GCS_SOURCE_URI); String output = bout.toString(); diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java index 718aaa32390..79e1ef79e67 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelImageIT.java @@ -32,6 +32,7 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -40,6 +41,7 @@ * Integration (system) tests for {@link LabelImage}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class LabelImageIT { private static String PROJECT_ID = System.getenv().get("GOOGLE_CLOUD_PROJECT"); @@ -127,7 +129,7 @@ public void tearDown() { } @Test - public void testLabelImage() { + public void testLabelImage() throws IOException { // Start the labeling task LabelImage.labelImage(instruction.getName(), annotationSpecSet.getName(), dataset.getName()); } diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java index f6379ed1e04..a80cac1a608 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelTextIT.java @@ -37,12 +37,14 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; /** Integration (system) tests for {@link LabelText}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class LabelTextIT { private static String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); @@ -145,7 +147,7 @@ public void tearDown() { } @Test - public void testLabelText() { + public void testLabelText() throws IOException { // Start the labeling task LabelText.labelText(instruction.getName(), annotationSpecSet.getName(), dataset.getName()); } diff --git a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java index 409df270bbf..473abad2c70 100644 --- a/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java +++ b/datalabeling/beta/cloud-client/src/test/java/com/example/datalabeling/LabelVideoIT.java @@ -37,12 +37,14 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; /** Integration (system) tests for {@link LabelVideo}. */ @RunWith(JUnit4.class) +@Ignore("b/146064330") @SuppressWarnings("checkstyle:abbreviationaswordinname") public class LabelVideoIT { private static String PROJECT_ID = System.getenv().get("GOOGLE_CLOUD_PROJECT"); @@ -147,7 +149,7 @@ public void tearDown() { } @Test - public void testLabelVideo() { + public void testLabelVideo() throws IOException { // Start the labeling task LabelVideo.labelVideo(instruction.getName(), annotationSpecSet.getName(), dataset.getName()); }