From b73b4ea006a3631a4147cc942fde8b3513d5eea5 Mon Sep 17 00:00:00 2001 From: Siddharth Dinesh Date: Tue, 28 Jan 2020 11:30:42 -0800 Subject: [PATCH 1/3] Parametrize GCS Bucket for integration tests. --- .../cloud/language/it/ITSystemTest.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java b/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java index 3007f68b..b1fa51f1 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java @@ -47,12 +47,19 @@ public class ITSystemTest { private static LanguageServiceClient client; + private static String GCS_BUCKET; + private static final String GCS_BUCKET_ENV_VAR = "GOOGLE_CLOUD_TESTS_LANGUAGE_BUCKET"; private static final String ANALYZE_TEXT = "Android is a mobile operating system developed by Google, based on the Linux kernel and designed primarily for touchscreen mobile devices such as smartphones and tablets."; @Before public void setUp() throws IOException { client = LanguageServiceClient.create(); + if(System.getenv(GCS_BUCKET_ENV_VAR) != null){ + GCS_BUCKET = System.getenv(GCS_BUCKET_ENV_VAR); + } else { + GCS_BUCKET = "cloud-samples-data"; + } } @After @@ -64,7 +71,7 @@ public void tearDown() { public void analyzeEntitiesFileTest() { Document doc = Document.newBuilder() - .setGcsContentUri("gs://cloud-samples-data/language/android.txt") + .setGcsContentUri(String.format("gs://%s/language/android.txt", GCS_BUCKET)) .setType(Type.PLAIN_TEXT) .build(); AnalyzeEntitiesRequest request = AnalyzeEntitiesRequest.newBuilder().setDocument(doc).build(); @@ -104,7 +111,7 @@ public void analyzeEntitiesTextTest() { public void analyzeEntitySentimentFileTest() { Document doc = Document.newBuilder() - .setGcsContentUri("gs://cloud-samples-data/language/president.txt") + .setGcsContentUri(String.format("gs://%s/language/president.txt", GCS_BUCKET)) .setType(Type.PLAIN_TEXT) .build(); AnalyzeEntitySentimentRequest request = @@ -163,7 +170,7 @@ public void analyzeEntitySentimentTextWithEncodedExpectedResultTest() { public void analyzeSentimentFileWithReturnPositiveTest() { Document doc = Document.newBuilder() - .setGcsContentUri("gs://cloud-samples-data/language/sentiment-positive.txt") + .setGcsContentUri(String.format("gs://%s/language/sentiment-positive.txt", GCS_BUCKET)) .setType(Type.PLAIN_TEXT) .build(); AnalyzeSentimentResponse response = client.analyzeSentiment(doc); @@ -188,7 +195,7 @@ public void analyzeSentimentTextWithReturnPositiveTest() { public void analyzeSentimentFileWithReturnNegativeTest() { Document doc = Document.newBuilder() - .setGcsContentUri("gs://cloud-samples-data/language/sentiment-negative.txt") + .setGcsContentUri(String.format("gs://%s/language/sentiment-negative.txt", GCS_BUCKET)) .setType(Type.PLAIN_TEXT) .build(); Sentiment sentiment = client.analyzeSentiment(doc).getDocumentSentiment(); @@ -212,7 +219,7 @@ public void analyzeSentimentTextWithReturnNegativeTest() { public void analyzeSyntaxFileTest() { Document doc = Document.newBuilder() - .setGcsContentUri("gs://cloud-samples-data/language/syntax-sentence.txt") + .setGcsContentUri(String.format("gs://%s/language/syntax-sentence.txt", GCS_BUCKET)) .setType(Type.PLAIN_TEXT) .build(); AnalyzeSyntaxRequest request = @@ -255,7 +262,7 @@ public void analyzeSyntaxTextTest() { public void classifyFileTest() { Document doc = Document.newBuilder() - .setGcsContentUri("gs://cloud-samples-data/language/android.txt") + .setGcsContentUri(String.format("gs://%s/language/android.txt", GCS_BUCKET)) .setType(Type.PLAIN_TEXT) .build(); ClassifyTextRequest request = ClassifyTextRequest.newBuilder().setDocument(doc).build(); From cbdf6601b3dc85383eb9dd63d2af0ba3f3a6ebb5 Mon Sep 17 00:00:00 2001 From: Siddharth Dinesh Date: Tue, 28 Jan 2020 16:16:17 -0800 Subject: [PATCH 2/3] Fix formatting to satisfy maven linter --- .../test/java/com/google/cloud/language/it/ITSystemTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java b/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java index b1fa51f1..d54fc779 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java @@ -55,7 +55,7 @@ public class ITSystemTest { @Before public void setUp() throws IOException { client = LanguageServiceClient.create(); - if(System.getenv(GCS_BUCKET_ENV_VAR) != null){ + if (System.getenv(GCS_BUCKET_ENV_VAR) != null) { GCS_BUCKET = System.getenv(GCS_BUCKET_ENV_VAR); } else { GCS_BUCKET = "cloud-samples-data"; From f2e0528d8706b664272bbde6d2f9d8fa8704c413 Mon Sep 17 00:00:00 2001 From: Siddharth Dinesh Date: Tue, 28 Jan 2020 16:24:46 -0800 Subject: [PATCH 3/3] Move GCS Bucket selection to static class outside of setUp method --- .../google/cloud/language/it/ITSystemTest.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java b/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java index d54fc779..7505175b 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/it/ITSystemTest.java @@ -47,14 +47,10 @@ public class ITSystemTest { private static LanguageServiceClient client; - private static String GCS_BUCKET; + private static final String GCS_BUCKET; private static final String GCS_BUCKET_ENV_VAR = "GOOGLE_CLOUD_TESTS_LANGUAGE_BUCKET"; - private static final String ANALYZE_TEXT = - "Android is a mobile operating system developed by Google, based on the Linux kernel and designed primarily for touchscreen mobile devices such as smartphones and tablets."; - @Before - public void setUp() throws IOException { - client = LanguageServiceClient.create(); + static { if (System.getenv(GCS_BUCKET_ENV_VAR) != null) { GCS_BUCKET = System.getenv(GCS_BUCKET_ENV_VAR); } else { @@ -62,6 +58,14 @@ public void setUp() throws IOException { } } + private static final String ANALYZE_TEXT = + "Android is a mobile operating system developed by Google, based on the Linux kernel and designed primarily for touchscreen mobile devices such as smartphones and tablets."; + + @Before + public void setUp() throws IOException { + client = LanguageServiceClient.create(); + } + @After public void tearDown() { client.close();