From 9ddcf45fc6f975883a62d9d1163e288ebeb663de Mon Sep 17 00:00:00 2001 From: Noah Negrey Date: Wed, 5 Feb 2020 13:18:59 -0700 Subject: [PATCH] samples: translate: use unique gcs folders for batch translate tests (#2053) * translate: use unique gcs folders for batch translate tests * update based on feedback * fix typo --- .../com/example/translate/BatchTranslateTextTests.java | 8 ++++++-- .../BatchTranslateTextWithGlossaryAndModelTests.java | 7 +++++-- .../translate/BatchTranslateTextWithGlossaryTests.java | 7 +++++-- .../translate/BatchTranslateTextWithModelTests.java | 8 ++++++-- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextTests.java b/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextTests.java index daebf827fb9..ccd20972474 100644 --- a/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextTests.java +++ b/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextTests.java @@ -27,6 +27,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; +import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; @@ -43,6 +44,9 @@ public class BatchTranslateTextTests { private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); private static final String INPUT_URI = "gs://cloud-samples-data/translation/text.txt"; + private static final String PREFIX = "BATCH_TRANSLATION_OUTPUT/"; + private static final String OUTPUT_URI = + String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; @@ -53,7 +57,7 @@ private static void cleanUpBucket() { storage.list( PROJECT_ID, Storage.BlobListOption.currentDirectory(), - Storage.BlobListOption.prefix("BATCH_TRANSLATION_OUTPUT/")); + Storage.BlobListOption.prefix(PREFIX)); deleteDirectory(storage, blobs); } @@ -102,7 +106,7 @@ public void tearDown() { public void testBatchTranslateText() throws InterruptedException, ExecutionException, IOException, TimeoutException { BatchTranslateText.batchTranslateText( - PROJECT_ID, "en", "es", INPUT_URI, "gs://" + PROJECT_ID + "/BATCH_TRANSLATION_OUTPUT/"); + PROJECT_ID, "en", "es", INPUT_URI, OUTPUT_URI); String got = bout.toString(); assertThat(got).contains("Total Characters: 13"); } diff --git a/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java b/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java index 29da0562812..e8fe25709a2 100644 --- a/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java +++ b/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java @@ -64,6 +64,9 @@ public class BatchTranslateTextWithGlossaryAndModelTests { private static final String MODEL_ID = "TRL2188848820815848149"; private static final String GLOSSARY_INPUT_URI = "gs://cloud-samples-data/translation/glossary_ja.csv"; + private static final String PREFIX = "BATCH_TRANSLATION_OUTPUT/"; + private static final String OUTPUT_URI = + String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; @@ -74,7 +77,7 @@ private static final void cleanUpBucket() { storage.list( PROJECT_ID, Storage.BlobListOption.currentDirectory(), - Storage.BlobListOption.prefix("BATCH_TRANSLATION_OUTPUT/")); + Storage.BlobListOption.prefix(PREFIX)); deleteDirectory(storage, blobs); } @@ -137,7 +140,7 @@ public void testBatchTranslateTextWithGlossaryAndModel() "en", "ja", INPUT_URI, - "gs://" + PROJECT_ID + "/BATCH_TRANSLATION_OUTPUT/", + OUTPUT_URI, GLOSSARY_ID, MODEL_ID); String got = bout.toString(); diff --git a/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java b/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java index 39fb65a58dd..ebd61202233 100644 --- a/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java +++ b/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java @@ -63,6 +63,9 @@ public class BatchTranslateTextWithGlossaryTests { "gs://cloud-samples-data/translation/glossary_ja.csv"; private static final String GLOSSARY_ID = String.format("test_%s", UUID.randomUUID().toString().replace("-", "_").substring(0, 26)); + private static final String PREFIX = "BATCH_TRANSLATION_OUTPUT/"; + private static final String OUTPUT_URI = + String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; @@ -73,7 +76,7 @@ private static final void cleanUpBucket() { storage.list( PROJECT_ID, Storage.BlobListOption.currentDirectory(), - Storage.BlobListOption.prefix("BATCH_TRANSLATION_OUTPUT/")); + Storage.BlobListOption.prefix(PREFIX)); deleteDirectory(storage, blobs); } @@ -137,7 +140,7 @@ public void testBatchTranslateTextWithGlossary() "en", "ja", INPUT_URI, - "gs://" + PROJECT_ID + "/BATCH_TRANSLATION_OUTPUT/", + OUTPUT_URI, GLOSSARY_ID); String got = bout.toString(); assertThat(got).contains("Total Characters: 9"); diff --git a/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java b/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java index fa6a3852b7d..f81a0faa307 100644 --- a/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java +++ b/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java @@ -27,6 +27,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; +import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; @@ -45,6 +46,9 @@ public class BatchTranslateTextWithModelTests { private static final String INPUT_URI = "gs://cloud-samples-data/translation/custom_model_text.txt"; private static final String MODEL_ID = "TRL2188848820815848149"; + private static final String PREFIX = "BATCH_TRANSLATION_OUTPUT/"; + private static final String OUTPUT_URI = + String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; @@ -55,7 +59,7 @@ private static final void cleanUpBucket() { storage.list( PROJECT_ID, Storage.BlobListOption.currentDirectory(), - Storage.BlobListOption.prefix("BATCH_TRANSLATION_OUTPUT/")); + Storage.BlobListOption.prefix(PREFIX)); deleteDirectory(storage, blobs); } @@ -108,7 +112,7 @@ public void testBatchTranslateTextWithModel() "en", "ja", INPUT_URI, - "gs://" + PROJECT_ID + "/BATCH_TRANSLATION_OUTPUT/", + OUTPUT_URI, MODEL_ID); String got = bout.toString(); assertThat(got).contains("Total Characters: 15");