refactor(samples): restore stdout to original state after test (#379)

GoogleCloudPlatform · Feb 24, 2021 · a5a6242 · a5a6242
1 parent 35143b3
commit a5a6242
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 13 deletions.
diff --git a/translate/snippets/src/test/java/com/example/translate/CreateGlossaryTests.java b/translate/snippets/src/test/java/com/example/translate/CreateGlossaryTests.java
@@ -45,6 +45,7 @@ public class CreateGlossaryTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -62,15 +63,17 @@ public static void checkRequirements() {
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() throws InterruptedException, ExecutionException, IOException {
     // Delete the created glossary
     DeleteGlossary.deleteGlossary(PROJECT_ID, GLOSSARY_ID);
-
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/translate/snippets/src/test/java/com/example/translate/DeleteGlossaryTests.java b/translate/snippets/src/test/java/com/example/translate/DeleteGlossaryTests.java
@@ -46,6 +46,7 @@ public class DeleteGlossaryTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -71,12 +72,15 @@ public void setUp() throws InterruptedException, ExecutionException, IOException
 
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/translate/snippets/src/test/java/com/example/translate/DetectLanguageTests.java b/translate/snippets/src/test/java/com/example/translate/DetectLanguageTests.java
@@ -37,6 +37,7 @@ public class DetectLanguageTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -54,12 +55,15 @@ public static void checkRequirements() {
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/translate/snippets/src/test/java/com/example/translate/GetGlossaryTests.java b/translate/snippets/src/test/java/com/example/translate/GetGlossaryTests.java
@@ -45,6 +45,7 @@ public class GetGlossaryTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -70,14 +71,17 @@ public void setUp() throws InterruptedException, ExecutionException, IOException
 
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() throws InterruptedException, ExecutionException, IOException {
     // Delete the created glossary
     DeleteGlossary.deleteGlossary(PROJECT_ID, GLOSSARY_ID);
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/...ate/snippets/src/test/java/com/example/translate/GetSupportedLanguagesForTargetTests.java b/...ate/snippets/src/test/java/com/example/translate/GetSupportedLanguagesForTargetTests.java
@@ -37,6 +37,7 @@ public class GetSupportedLanguagesForTargetTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -54,12 +55,15 @@ public static void checkRequirements() {
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/translate/snippets/src/test/java/com/example/translate/GetSupportedLanguagesTests.java b/translate/snippets/src/test/java/com/example/translate/GetSupportedLanguagesTests.java
@@ -37,6 +37,7 @@ public class GetSupportedLanguagesTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -54,12 +55,15 @@ public static void checkRequirements() {
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/translate/snippets/src/test/java/com/example/translate/ListGlossariesTests.java b/translate/snippets/src/test/java/com/example/translate/ListGlossariesTests.java
@@ -46,6 +46,7 @@ public class ListGlossariesTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -71,14 +72,17 @@ public void setUp() throws InterruptedException, ExecutionException, IOException
 
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() throws InterruptedException, ExecutionException, IOException {
     // Delete the created glossary
     DeleteGlossary.deleteGlossary(PROJECT_ID, GLOSSARY_ID);
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/translate/snippets/src/test/java/com/example/translate/QuickstartSampleIT.java b/translate/snippets/src/test/java/com/example/translate/QuickstartSampleIT.java
@@ -32,17 +32,21 @@
 public class QuickstartSampleIT {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/translate/snippets/src/test/java/com/example/translate/TranslateTextTests.java b/translate/snippets/src/test/java/com/example/translate/TranslateTextTests.java
@@ -37,6 +37,7 @@ public class TranslateTextTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -54,12 +55,15 @@ public static void checkRequirements() {
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/.../snippets/src/test/java/com/example/translate/TranslateTextWithGlossaryAndModelTests.java b/.../snippets/src/test/java/com/example/translate/TranslateTextWithGlossaryAndModelTests.java
@@ -46,6 +46,7 @@ public class TranslateTextWithGlossaryAndModelTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -71,6 +72,7 @@ public void setUp() throws InterruptedException, ExecutionException, IOException
 
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
@@ -79,7 +81,9 @@ public void tearDown() throws InterruptedException, ExecutionException, IOExcept
     // Clean up
     // Delete the created glossary
     DeleteGlossary.deleteGlossary(PROJECT_ID, GLOSSARY_ID);
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/translate/snippets/src/test/java/com/example/translate/TranslateTextWithGlossaryTests.java b/translate/snippets/src/test/java/com/example/translate/TranslateTextWithGlossaryTests.java
@@ -45,6 +45,7 @@ public class TranslateTextWithGlossaryTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -70,6 +71,7 @@ public void setUp() throws InterruptedException, ExecutionException, IOException
 
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
@@ -78,7 +80,9 @@ public void tearDown() throws InterruptedException, ExecutionException, IOExcept
     // Clean up
     // Delete the created glossary
     DeleteGlossary.deleteGlossary(PROJECT_ID, GLOSSARY_ID);
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

diff --git a/translate/snippets/src/test/java/com/example/translate/TranslateTextWithModelTests.java b/translate/snippets/src/test/java/com/example/translate/TranslateTextWithModelTests.java
@@ -38,6 +38,7 @@ public class TranslateTextWithModelTests {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
@@ -55,12 +56,15 @@ public static void checkRequirements() {
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test