From 5e1b2189a189f5cb004085e0ad16dc89f3bfa3be Mon Sep 17 00:00:00 2001 From: nnegrey Date: Tue, 4 Feb 2020 11:52:51 -0700 Subject: [PATCH 1/3] translate: use unique gcs folders for batch translate tests --- .../com/example/translate/BatchTranslateTextTests.java | 7 +++++-- .../BatchTranslateTextWithGlossaryAndModelTests.java | 6 ++++-- .../translate/BatchTranslateTextWithGlossaryTests.java | 6 ++++-- .../translate/BatchTranslateTextWithModelTests.java | 7 +++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java index daebf827fb9..fa3851d7c09 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java +++ b/translate/cloud-client/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,8 @@ 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 PREFIX_PATH = PREFIX + UUID.randomUUID().toString() + "/"; private ByteArrayOutputStream bout; private PrintStream out; @@ -53,7 +56,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 +105,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, "gs://" + PROJECT_ID + "/" + PREFIX_PATH); String got = bout.toString(); assertThat(got).contains("Total Characters: 13"); } diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java index 29da0562812..a7391163d78 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java +++ b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java @@ -64,6 +64,8 @@ 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 PREFIX_PATH = PREFIX + UUID.randomUUID().toString() + "/"; private ByteArrayOutputStream bout; private PrintStream out; @@ -74,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 +139,7 @@ public void testBatchTranslateTextWithGlossaryAndModel() "en", "ja", INPUT_URI, - "gs://" + PROJECT_ID + "/BATCH_TRANSLATION_OUTPUT/", + "gs://" + PROJECT_ID + "/" + PREFIX_PATH, GLOSSARY_ID, MODEL_ID); String got = bout.toString(); diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java index 39fb65a58dd..10e59490254 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java +++ b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java @@ -63,6 +63,8 @@ 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 PREFIX_PATH = PREFIX + UUID.randomUUID().toString() + "/"; private ByteArrayOutputStream bout; private PrintStream out; @@ -73,7 +75,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 +139,7 @@ public void testBatchTranslateTextWithGlossary() "en", "ja", INPUT_URI, - "gs://" + PROJECT_ID + "/BATCH_TRANSLATION_OUTPUT/", + "gs://" + PROJECT_ID + "/" + PREFIX_PATH, GLOSSARY_ID); String got = bout.toString(); assertThat(got).contains("Total Characters: 9"); diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java index fa6a3852b7d..6a12d600266 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java +++ b/translate/cloud-client/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,8 @@ 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 PREFIX_PATH = PREFIX + UUID.randomUUID().toString() + "/"; private ByteArrayOutputStream bout; private PrintStream out; @@ -55,7 +58,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 +111,7 @@ public void testBatchTranslateTextWithModel() "en", "ja", INPUT_URI, - "gs://" + PROJECT_ID + "/BATCH_TRANSLATION_OUTPUT/", + "gs://" + PROJECT_ID + "/" + PREFIX_PATH, MODEL_ID); String got = bout.toString(); assertThat(got).contains("Total Characters: 15"); From d3ca993fa92557080d80a246d5f3c1f548eead92 Mon Sep 17 00:00:00 2001 From: nnegrey Date: Tue, 4 Feb 2020 12:17:59 -0700 Subject: [PATCH 2/3] update based on feedback --- .../java/com/example/translate/BatchTranslateTextTests.java | 5 +++-- .../BatchTranslateTextWithGlossaryAndModelTests.java | 5 +++-- .../translate/BatchTranslateTextWithGlossaryTests.java | 5 +++-- .../example/translate/BatchTranslateTextWithModelTests.java | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java index fa3851d7c09..733ae6cad0f 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java +++ b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java @@ -45,7 +45,8 @@ 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 PREFIX_PATH = PREFIX + UUID.randomUUID().toString() + "/"; + private static final String OUTPUT_URI = + String.format("gs://%s/%s/%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; @@ -105,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 + "/" + PREFIX_PATH); + PROJECT_ID, "en", "es", INPUT_URI, OUTPUT_URI); String got = bout.toString(); assertThat(got).contains("Total Characters: 13"); } diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java index a7391163d78..0c0019b913a 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java +++ b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java @@ -65,7 +65,8 @@ public class BatchTranslateTextWithGlossaryAndModelTests { 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 PREFIX_PATH = PREFIX + UUID.randomUUID().toString() + "/"; + private static final String OUTPUT_URI = + String.format("gs://%s/%s/%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; @@ -139,7 +140,7 @@ public void testBatchTranslateTextWithGlossaryAndModel() "en", "ja", INPUT_URI, - "gs://" + PROJECT_ID + "/" + PREFIX_PATH, + OUTPUT_URI, GLOSSARY_ID, MODEL_ID); String got = bout.toString(); diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java index 10e59490254..d017ea2193a 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java +++ b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java @@ -64,7 +64,8 @@ public class BatchTranslateTextWithGlossaryTests { 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 PREFIX_PATH = PREFIX + UUID.randomUUID().toString() + "/"; + private static final String OUTPUT_URI = + String.format("gs://%s/%s/%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; @@ -139,7 +140,7 @@ public void testBatchTranslateTextWithGlossary() "en", "ja", INPUT_URI, - "gs://" + PROJECT_ID + "/" + PREFIX_PATH, + OUTPUT_URI, GLOSSARY_ID); String got = bout.toString(); assertThat(got).contains("Total Characters: 9"); diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java index 6a12d600266..28c4084a0ed 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java +++ b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java @@ -47,7 +47,8 @@ public class BatchTranslateTextWithModelTests { "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 PREFIX_PATH = PREFIX + UUID.randomUUID().toString() + "/"; + private static final String OUTPUT_URI = + String.format("gs://%s/%s/%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; @@ -111,7 +112,7 @@ public void testBatchTranslateTextWithModel() "en", "ja", INPUT_URI, - "gs://" + PROJECT_ID + "/" + PREFIX_PATH, + OUTPUT_URI, MODEL_ID); String got = bout.toString(); assertThat(got).contains("Total Characters: 15"); From 68cffb5216e08e200409646d4c23d9c96aefd189 Mon Sep 17 00:00:00 2001 From: nnegrey Date: Tue, 4 Feb 2020 13:14:22 -0700 Subject: [PATCH 3/3] fix typo --- .../java/com/example/translate/BatchTranslateTextTests.java | 2 +- .../translate/BatchTranslateTextWithGlossaryAndModelTests.java | 2 +- .../example/translate/BatchTranslateTextWithGlossaryTests.java | 2 +- .../com/example/translate/BatchTranslateTextWithModelTests.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java index 733ae6cad0f..ccd20972474 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java +++ b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextTests.java @@ -46,7 +46,7 @@ public class BatchTranslateTextTests { 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()); + String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java index 0c0019b913a..e8fe25709a2 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java +++ b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java @@ -66,7 +66,7 @@ public class BatchTranslateTextWithGlossaryAndModelTests { "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()); + String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java index d017ea2193a..ebd61202233 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java +++ b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java @@ -65,7 +65,7 @@ public class BatchTranslateTextWithGlossaryTests { 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()); + String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out; diff --git a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java index 28c4084a0ed..f81a0faa307 100644 --- a/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java +++ b/translate/cloud-client/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java @@ -48,7 +48,7 @@ public class BatchTranslateTextWithModelTests { 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()); + String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID()); private ByteArrayOutputStream bout; private PrintStream out;