refactor(samples): restore stdout to original state in test (#500)

Author: suraj-qlogic

asset/src/test/java/com/example/asset/Analyze.java

@@ -50,6 +50,7 @@ public class Analyze {
 
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private static final void deleteObjects(String bucketName, String objectName) {
     Storage storage = StorageOptions.getDefaultInstance().getService();
@@ -70,13 +71,15 @@ private static final void deleteObjects(String bucketName, String objectName) {
   public void setUp() {
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
-    bout.reset();
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

asset/src/test/java/com/example/asset/ListAssets.java

@@ -33,17 +33,22 @@
 @SuppressWarnings("checkstyle:abbreviationaswordinname")
 public class ListAssets {
   private ByteArrayOutputStream bout;
+  private PrintStream out;
+  private PrintStream originalPrintStream;
 
   @Before
   public void setUp() {
     bout = new ByteArrayOutputStream();
-    System.setOut(new PrintStream(bout));
+    out = new PrintStream(bout);
+    originalPrintStream = System.out;
+    System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
-    bout.reset();
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

asset/src/test/java/com/example/asset/QuickStartIT.java

@@ -48,6 +48,7 @@ public class QuickStartIT {
   private static final String datasetName = RemoteBigQueryHelper.generateDatasetName();
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
   private BigQuery bigquery;
 
   private static final void deleteObjects() {
@@ -72,13 +73,15 @@ public void setUp() {
     }
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    String consoleOutput = bout.toString();
-    System.setOut(null);
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
     deleteObjects();
     DatasetId datasetId = DatasetId.of(bigquery.getOptions().getProjectId(), datasetName);
     bigquery.delete(datasetId, DatasetDeleteOption.deleteContents());

asset/src/test/java/com/example/asset/RealTimeFeed.java

@@ -49,6 +49,8 @@ public class RealTimeFeed {
   private final String[] assetNames = {UUID.randomUUID().toString()};
   private static final ProjectTopicName topicName = ProjectTopicName.of(projectId, topicId);
   private ByteArrayOutputStream bout;
+  private PrintStream out;
+  private PrintStream originalPrintStream;
 
   private String getProjectNumber(String projectId) {
     ResourceManager resourceManager = ResourceManagerOptions.getDefaultInstance().getService();
@@ -71,13 +73,16 @@ public static void deleteTopic() throws Exception {
   @Before
   public void beforeTest() {
     bout = new ByteArrayOutputStream();
-    System.setOut(new PrintStream(bout));
+    out = new PrintStream(bout);
+    originalPrintStream = System.out;
+    System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
-    bout.reset();
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
   }
 
   @Test

asset/src/test/java/com/example/asset/Search.java

@@ -41,6 +41,7 @@ public class Search {
   private static final String datasetName = RemoteBigQueryHelper.generateDatasetName();
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private PrintStream originalPrintStream;
   private BigQuery bigquery;
 
   @Before
@@ -51,13 +52,15 @@ public void setUp() {
     }
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
+    originalPrintStream = System.out;
     System.setOut(out);
   }
 
   @After
   public void tearDown() {
-    System.setOut(null);
-    bout.reset();
+    // restores print statements in the original method
+    System.out.flush();
+    System.setOut(originalPrintStream);
     DatasetId datasetId = DatasetId.of(bigquery.getOptions().getProjectId(), datasetName);
     bigquery.delete(datasetId, DatasetDeleteOption.deleteContents());
   }