samples: Flaky test fix (#1490)

* Rework the tests to remove flakiness (hopefully) * Update IDs since old test deleted my knowledge base * Update GCS links to fix permission denied errors * Use declared var
GoogleCloudPlatform · Feb 24, 2021 · 1c0951b · 1c0951b
1 parent a806f80
commit 1c0951b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/video/src/main/java/com/example/video/QuickstartSample.java b/video/src/main/java/com/example/video/QuickstartSample.java
@@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception {
     // Instantiate a video intelligence client
     try (VideoIntelligenceServiceClient client = VideoIntelligenceServiceClient.create()) {
       // The Google Cloud Storage path to the video to annotate.
-      String gcsUri = "gs://demomaker/cat.mp4";
+      String gcsUri = "gs://cloud-samples-data/video/cat.mp4";
 
       // Create an operation that will contain the response when the operation completes.
       AnnotateVideoRequest request = AnnotateVideoRequest.newBuilder()

diff --git a/video/src/test/java/com/example/video/DetectIT.java b/video/src/test/java/com/example/video/DetectIT.java
@@ -38,10 +38,10 @@ public class DetectIT {
   private ByteArrayOutputStream bout;
   private PrintStream out;
 
-  static final String LABEL_GCS_LOCATION = "gs://demomaker/cat.mp4";
+  static final String LABEL_GCS_LOCATION = "gs://cloud-samples-data/video/cat.mp4";
   static final String LABEL_FILE_LOCATION = "./resources/cat.mp4";
-  static final String SHOTS_FILE_LOCATION = "gs://demomaker/gbikes_dinosaur.mp4";
-  static final String EXPLICIT_CONTENT_LOCATION =  "gs://demomaker/cat.mp4";
+  static final String SHOTS_FILE_LOCATION = "gs://cloud-samples-data/video/gbikes_dinosaur.mp4";
+  static final String EXPLICIT_CONTENT_LOCATION =  "gs://cloud-samples-data/video/cat.mp4";
   static final String SPEECH_GCS_LOCATION =
           "gs://java-docs-samples-testing/video/googlework_short.mp4";
   private static final List<String> POSSIBLE_TEXTS = Arrays.asList(
@@ -106,7 +106,7 @@ public void testSpeechTranscription() throws Exception {
 
   @Test
   public void testTrackObjects() throws Exception {
-    VideoAnnotationResults result = TrackObjects.trackObjects("resources/cat.mp4");
+    VideoAnnotationResults result = TrackObjects.trackObjects(LABEL_FILE_LOCATION);
 
     boolean textExists = false;
     for (ObjectTrackingAnnotation objectTrackingAnnotation : result.getObjectAnnotationsList()) {
@@ -121,7 +121,7 @@ public void testTrackObjects() throws Exception {
 
   @Test
   public void testTrackObjectsGcs() throws Exception {
-    VideoAnnotationResults result = TrackObjects.trackObjectsGcs("gs://demomaker/cat.mp4");
+    VideoAnnotationResults result = TrackObjects.trackObjectsGcs(LABEL_GCS_LOCATION);
 
     boolean textExists = false;
     for (ObjectTrackingAnnotation objectTrackingAnnotation : result.getObjectAnnotationsList()) {