Update tests with broken GCS links (GoogleCloudPlatform#1797)

nnegrey · web-flow · commit 5603df8086fd · 2019-12-10T15:47:01.000-07:00
* GCS files no longer exist, updated to general GCS location and updated tests accordingly

* Update AnalyzeBetaIT.java
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeBetaIT.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeBetaIT.java
@@ -35,7 +35,6 @@
 public class AnalyzeBetaIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String BUCKET = PROJECT_ID;
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
@@ -66,7 +65,7 @@ public void analyzeCategoriesInTextReturnsExpectedResult() throws Exception {
 
   @Test
   public void analyzeCategoriesInFileReturnsExpectedResult() throws Exception {
-    String gcsFile = "gs://" + PROJECT_ID + "/natural-language/android_text.txt";
+    String gcsFile = "gs://cloud-samples-data/language/android.txt";
     AnalyzeBeta.classifyFile(gcsFile);
     String got = bout.toString();
     assertThat(got).contains("Computers & Electronics");
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
@@ -63,7 +63,7 @@ public void analyzeCategoriesInTextReturnsExpectedResult() throws Exception {
 
   @Test
   public void analyzeCategoriesInFileReturnsExpectedResult() throws Exception {
-    String gcsFile = "gs://" + PROJECT_ID + "/natural-language/android_text.txt";
+    String gcsFile = "gs://cloud-samples-data/language/android.txt";
     Analyze.classifyFile(gcsFile);
     String got = bout.toString();
     assertThat(got).contains("Computers & Electronics");
@@ -81,10 +81,10 @@ public void analyzeEntities_withEntities_returnsLarryPage() throws Exception {
   }
 
   @Test
-  public void analyzeEntities_withEntitiesFile_containsGod() throws Exception {
-    Analyze.analyzeEntitiesFile("gs://" + BUCKET + "/natural-language/gettysburg.txt");
+  public void analyzeEntities_withEntitiesFile_containsCalifornia() throws Exception {
+    Analyze.analyzeEntitiesFile("gs://cloud-samples-data/language/entity.txt");
     String got = bout.toString();
-    assertThat(got).contains("God");
+    assertThat(got).contains("California");
   }
 
   @Test
@@ -97,8 +97,8 @@ public void analyzeSentimentText_returnPositive() throws Exception {
 
   @Test
   public void analyzeSentimentFile_returnPositiveFile() throws Exception {
-    Sentiment sentiment = Analyze.analyzeSentimentFile("gs://" + BUCKET + "/natural-language/"
-        + "sentiment/bladerunner-pos.txt");
+    Sentiment sentiment = Analyze.analyzeSentimentFile("gs://cloud-samples-data/language/"
+        + "sentiment-positive.txt");
     assertThat(sentiment.getMagnitude()).isGreaterThan(0.0F);
     assertThat(sentiment.getScore()).isGreaterThan(0.0F);
   }
@@ -113,21 +113,12 @@ public void analyzeSentimentText_returnNegative() throws Exception {
 
   @Test
   public void analyzeSentiment_returnNegative() throws Exception {
-    Sentiment sentiment = Analyze.analyzeSentimentFile("gs://" + BUCKET + "/natural-language/"
-        + "sentiment/bladerunner-neg.txt");
+    Sentiment sentiment = Analyze.analyzeSentimentFile("gs://cloud-samples-data/language/"
+        + "sentiment-negative.txt");
     assertThat(sentiment.getMagnitude()).isGreaterThan(0.0F);
     assertThat(sentiment.getScore()).isLessThan(0.0F);
   }
 
-  @Test
-  public void analyzeSentiment_returnNeutralFile() throws Exception {
-    Sentiment sentiment = Analyze.analyzeSentimentFile("gs://" + BUCKET + "/natural-language/"
-        + "sentiment/bladerunner-neutral.txt");
-    assertThat(sentiment.getMagnitude()).isGreaterThan(1.0F);
-    // TODO sentiment score for netural sample appears to be zero now.
-    // assertThat((double)sentiment.getScore()).isGreaterThan(0.0);
-  }
-
   @Test
   public void analyzeSyntax_partOfSpeech() throws Exception {
     List<Token> tokens = Analyze
@@ -142,16 +133,13 @@ public void analyzeSyntax_partOfSpeech() throws Exception {
 
   @Test
   public void analyzeSyntax_partOfSpeechFile() throws Exception {
-    List<Token> token = Analyze.analyzeSyntaxFile("gs://" + BUCKET + "/natural-language/"
-        + "sentiment/bladerunner-neutral.txt");
+    List<Token> token = Analyze.analyzeSyntaxFile("gs://cloud-samples-data/language/"
+        + "syntax-sentence.txt");
 
     List<Tag> got = token.stream().map(e -> e.getPartOfSpeech().getTag())
         .collect(Collectors.toList());
-
-    assertThat(got).containsExactly(Tag.PRON, Tag.CONJ, Tag.VERB, Tag.CONJ, Tag.VERB,
-        Tag.DET, Tag.NOUN, Tag.PUNCT, Tag.NOUN, Tag.VERB, Tag.ADJ, Tag.PUNCT, Tag.CONJ,
-        Tag.ADV, Tag.PRON, Tag.VERB, Tag.VERB, Tag.VERB, Tag.ADJ, Tag.PUNCT, Tag.DET,
-        Tag.NOUN, Tag.VERB, Tag.ADV, Tag.ADJ, Tag.PUNCT).inOrder();
+    assertThat(got).containsExactly(Tag.DET, Tag.VERB, Tag.DET, Tag.ADJ, Tag.NOUN,
+        Tag.PUNCT).inOrder();
   }
 
   @Test
@@ -171,9 +159,9 @@ public void analyzeEntitySentimentTextEncodedReturnsExpectedResult() throws Exce
 
   @Test
   public void analyzeEntitySentimenFileReturnsExpectedResult() throws Exception {
-    Analyze.entitySentimentFile("gs://" + BUCKET + "/natural-language/gettysburg.txt");
+    Analyze.entitySentimentFile("gs://cloud-samples-data/language/president.txt");
     String got = bout.toString();
-    assertThat(got).contains("God");
+    assertThat(got).contains("Kennedy");
   }
 
 }
