chore: removed retry class and used com.google.cloud.testing.Multiple… (

#398) * chore: removed retry class and used com.google.cloud.testing.MultipleAttempt * xed lint
GoogleCloudPlatform · Nov 18, 2022 · 26ccfa4 · 26ccfa4
1 parent 6f54c12
commit 26ccfa4
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 69 deletions.
diff --git a/translate/snippets/pom.xml b/translate/snippets/pom.xml
@@ -59,6 +59,13 @@
       <version>1.1.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-core</artifactId>
+      <version>1.94.0</version>
+      <scope>test</scope>
+      <classifier>tests</classifier>
+    </dependency>
     <!-- [END_EXCLUDE] -->
   </dependencies>
   <!-- [END translation_install_with_bom] -->

diff --git a/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextTests.java b/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextTests.java
@@ -23,6 +23,7 @@
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
+import com.google.cloud.testing.junit4.MultipleAttemptsRule;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -49,7 +50,6 @@ public class BatchTranslateTextTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
-  @Rule public Retry retry = new Retry(3);
 
   private static void cleanUpBucket() {
     Storage storage = StorageOptions.getDefaultInstance().getService();
@@ -106,6 +106,9 @@ public void tearDown() {
     System.setOut(originalPrintStream);
   }
 
+  @Rule
+  public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3);
+
   @Test
   public void testBatchTranslateText()
       throws InterruptedException, ExecutionException, IOException, TimeoutException {

diff --git a/...pets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java b/...pets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java
@@ -23,6 +23,7 @@
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
+import com.google.cloud.testing.junit4.MultipleAttemptsRule;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -57,7 +58,6 @@ public class BatchTranslateTextWithGlossaryAndModelTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
-  @Rule public Retry retry = new Retry(3);
 
   private static final void cleanUpBucket() {
     Storage storage = StorageOptions.getDefaultInstance().getService();
@@ -124,6 +124,9 @@ public void tearDown() throws InterruptedException, ExecutionException, IOExcept
     System.setOut(originalPrintStream);
   }
 
+  @Rule
+  public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3);
+
   @Test
   public void testBatchTranslateTextWithGlossaryAndModel()
       throws InterruptedException, ExecutionException, IOException, TimeoutException {

diff --git a/...ate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java b/...ate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java
@@ -23,6 +23,7 @@
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
+import com.google.cloud.testing.junit4.MultipleAttemptsRule;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -122,7 +123,8 @@ public void tearDown() throws InterruptedException, ExecutionException, IOExcept
     System.setOut(originalPrintStream);
   }
 
-  @Rule public Retry retry = new Retry(3);
+  @Rule
+  public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3);
 
   @Test
   public void testBatchTranslateTextWithGlossary()

diff --git a/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java b/translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java
@@ -23,6 +23,7 @@
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
+import com.google.cloud.testing.junit4.MultipleAttemptsRule;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -106,7 +107,8 @@ public void tearDown() {
     System.setOut(originalPrintStream);
   }
 
-  @Rule public Retry retry = new Retry(3);
+  @Rule
+  public MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(3);
 
   @Test
   public void testBatchTranslateTextWithModel()

diff --git a/translate/snippets/src/test/java/com/example/translate/Retry.java b/translate/snippets/src/test/java/com/example/translate/Retry.java