diff --git a/samples/snippets/src/test/java/com/example/monitoring/CreateAlertPolicyIT.java b/samples/snippets/src/test/java/com/example/monitoring/CreateAlertPolicyIT.java index f01ea125..095b8be5 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/CreateAlertPolicyIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/CreateAlertPolicyIT.java @@ -39,6 +39,7 @@ public class CreateAlertPolicyIT { private String alertPolicyId; private String alertPolicyDisplayName; private PrintStream out; + private PrintStream originalPrintStream; private static String requireEnvVar(String varName) { String value = System.getenv(varName); @@ -58,6 +59,7 @@ public void setUp() { alertPolicyDisplayName = "alert_policy_name_" + suffix; bout = new ByteArrayOutputStream(); out = new PrintStream(bout); + originalPrintStream = System.out; System.setOut(out); } @@ -66,9 +68,8 @@ public void tearDown() throws IOException { // delete an alert policy for clean up DeleteAlertPolicy.deleteAlertPolicy(alertPolicyId); // restores print statements in the original method - bout.reset(); - out.flush(); System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/CreateMetricDescriptorIT.java b/samples/snippets/src/test/java/com/example/monitoring/CreateMetricDescriptorIT.java index 88fea89f..52d73e83 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/CreateMetricDescriptorIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/CreateMetricDescriptorIT.java @@ -39,6 +39,7 @@ public class CreateMetricDescriptorIT { private static final String TYPE = "custom.googleapis.com/invoice/paid/amount" + suffix; private ByteArrayOutputStream bout; private PrintStream out; + private PrintStream originalPrintStream; private static void requireEnvVar(String varName) { assertNotNull( @@ -55,6 +56,7 @@ public static void checkRequirements() { public void setUp() { bout = new ByteArrayOutputStream(); out = new PrintStream(bout); + originalPrintStream = System.out; System.setOut(out); } @@ -63,9 +65,8 @@ public void tearDown() throws IOException { // clean up DeleteMetricDescriptor.deleteMetricDescriptor(PROJECT_ID, TYPE); // restores print statements in the original method - bout.reset(); - out.flush(); System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/DeleteAlertPolicyIT.java b/samples/snippets/src/test/java/com/example/monitoring/DeleteAlertPolicyIT.java index 7a1a1b35..04d626fe 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/DeleteAlertPolicyIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/DeleteAlertPolicyIT.java @@ -39,6 +39,7 @@ public class DeleteAlertPolicyIT { private String alertPolicyId; private String alertPolicyDisplayName; private PrintStream out; + private PrintStream originalPrintStream; private static String requireEnvVar(String varName) { String value = System.getenv(varName); @@ -65,15 +66,15 @@ public void setUp() throws IOException { alertPolicyId = result.substring(result.indexOf(":") + 1); bout.reset(); out.flush(); + originalPrintStream = System.out; System.setOut(out); } @After public void tearDown() { // restores print statements in the original method - bout.reset(); - out.flush(); System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/DeleteMetricDescriptorIT.java b/samples/snippets/src/test/java/com/example/monitoring/DeleteMetricDescriptorIT.java index 4ad6a857..48d684de 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/DeleteMetricDescriptorIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/DeleteMetricDescriptorIT.java @@ -39,6 +39,7 @@ public class DeleteMetricDescriptorIT { private static final String METRIC_TYPE = "custom.googleapis.com/invoice/paid/amount" + suffix; private ByteArrayOutputStream bout; private PrintStream out; + private PrintStream originalPrintStream; private static void requireEnvVar(String varName) { assertNotNull( @@ -53,18 +54,21 @@ public static void checkRequirements() { @Before public void setUp() throws IOException { - CreateMetricDescriptor.createMetricDescriptor(PROJECT_ID, METRIC_TYPE); bout = new ByteArrayOutputStream(); out = new PrintStream(bout); System.setOut(out); + CreateMetricDescriptor.createMetricDescriptor(PROJECT_ID, METRIC_TYPE); + bout.reset(); + out.flush(); + originalPrintStream = System.out; + System.setOut(out); } @After public void tearDown() { // restores print statements in the original method - bout.reset(); - out.flush(); System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/DeleteNotificationChannelIT.java b/samples/snippets/src/test/java/com/example/monitoring/DeleteNotificationChannelIT.java index 43c60c32..4355ba13 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/DeleteNotificationChannelIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/DeleteNotificationChannelIT.java @@ -41,6 +41,7 @@ public class DeleteNotificationChannelIT { private static final String PROJECT_ENV_NAME = "GOOGLE_CLOUD_PROJECT"; private static String NOTIFICATION_CHANNEL_NAME = "channelname"; private static NotificationChannel NOTIFICATION_CHANNEL; + private PrintStream originalPrintStream; private static String getProjectId() { String projectId = System.getProperty(PROJECT_ENV_NAME, System.getenv(PROJECT_ENV_NAME)); @@ -70,13 +71,16 @@ public static void setupClass() throws IOException { public void setUp() { bout = new ByteArrayOutputStream(); out = new PrintStream(bout); + originalPrintStream = System.out; System.setOut(out); System.setProperty("projectId", DeleteNotificationChannelIT.getProjectId()); } @After public void tearDown() { - System.setOut(null); + // restores print statements in the original method + System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/EnableDisableAlertPolicyIT.java b/samples/snippets/src/test/java/com/example/monitoring/EnableDisableAlertPolicyIT.java index 17f0c7d2..27ef75e4 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/EnableDisableAlertPolicyIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/EnableDisableAlertPolicyIT.java @@ -36,6 +36,7 @@ public class EnableDisableAlertPolicyIT { private String alertPolicyId; private String alertPolicyDisplayName; private PrintStream out; + private PrintStream originalPrintStream; private static String requireEnvVar(String varName) { String value = System.getenv(varName); @@ -62,6 +63,7 @@ public void setUp() throws IOException { alertPolicyId = result.substring(result.indexOf(":") + 1); bout.reset(); out.flush(); + originalPrintStream = System.out; System.setOut(out); } @@ -70,9 +72,8 @@ public void tearDown() throws IOException { // delete an alert policy for clean up DeleteAlertPolicy.deleteAlertPolicy(alertPolicyId); // restores print statements in the original method - bout.reset(); - out.flush(); System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/GetAlertPolicyIT.java b/samples/snippets/src/test/java/com/example/monitoring/GetAlertPolicyIT.java index 2e70ab8e..bbe15013 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/GetAlertPolicyIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/GetAlertPolicyIT.java @@ -36,6 +36,7 @@ public class GetAlertPolicyIT { private String alertPolicyId; private String alertPolicyDisplayName; private PrintStream out; + private PrintStream originalPrintStream; private static String requireEnvVar(String varName) { String value = System.getenv(varName); @@ -62,6 +63,7 @@ public void setUp() throws IOException { alertPolicyId = result.substring(result.indexOf(":") + 1); bout.reset(); out.flush(); + originalPrintStream = System.out; System.setOut(out); } @@ -70,9 +72,8 @@ public void tearDown() throws IOException { // delete an alert policy for clean up DeleteAlertPolicy.deleteAlertPolicy(alertPolicyId); // restores print statements in the original method - bout.reset(); - out.flush(); System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/GetMonitoredResourceIT.java b/samples/snippets/src/test/java/com/example/monitoring/GetMonitoredResourceIT.java index 252d38d1..c3d19413 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/GetMonitoredResourceIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/GetMonitoredResourceIT.java @@ -36,6 +36,7 @@ public class GetMonitoredResourceIT { private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); private ByteArrayOutputStream bout; private PrintStream out; + private PrintStream originalPrintStream; private static void requireEnvVar(String varName) { assertNotNull( @@ -52,12 +53,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() { + // restores print statements in the original method System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/ListAlertPolicyIT.java b/samples/snippets/src/test/java/com/example/monitoring/ListAlertPolicyIT.java index d2f5b018..4575bfeb 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/ListAlertPolicyIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/ListAlertPolicyIT.java @@ -32,6 +32,7 @@ public class ListAlertPolicyIT { private static final String PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT"); private ByteArrayOutputStream bout; private PrintStream out; + private PrintStream originalPrintStream; private static String requireEnvVar(String varName) { String value = System.getenv(varName); @@ -50,15 +51,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() { // restores print statements in the original method - bout.reset(); - out.flush(); System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/ListMetricDescriptorIT.java b/samples/snippets/src/test/java/com/example/monitoring/ListMetricDescriptorIT.java index f279fefb..3a9783d9 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/ListMetricDescriptorIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/ListMetricDescriptorIT.java @@ -36,6 +36,7 @@ public class ListMetricDescriptorIT { private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); private ByteArrayOutputStream bout; private PrintStream out; + private PrintStream originalPrintStream; private static void requireEnvVar(String varName) { assertNotNull( @@ -52,15 +53,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() { // restores print statements in the original method - bout.reset(); - out.flush(); System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/ListMonitoredResourcesIT.java b/samples/snippets/src/test/java/com/example/monitoring/ListMonitoredResourcesIT.java index 30ffaeb1..3b015990 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/ListMonitoredResourcesIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/ListMonitoredResourcesIT.java @@ -36,6 +36,7 @@ public class ListMonitoredResourcesIT { private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); private ByteArrayOutputStream bout; private PrintStream out; + private PrintStream originalPrintStream; private static void requireEnvVar(String varName) { assertNotNull( @@ -52,12 +53,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/samples/snippets/src/test/java/com/example/monitoring/QuickstartSampleIT.java b/samples/snippets/src/test/java/com/example/monitoring/QuickstartSampleIT.java index 8f91a161..5d83d75c 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/QuickstartSampleIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/QuickstartSampleIT.java @@ -35,6 +35,7 @@ public class QuickstartSampleIT { private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT"); private ByteArrayOutputStream bout; private PrintStream out; + private PrintStream originalPrintStream; private static void requireEnvVar(String varName) { assertNotNull( @@ -51,13 +52,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() { - // clean up + // restores print statements in the original method System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/TimeSeriesIT.java b/samples/snippets/src/test/java/com/example/monitoring/TimeSeriesIT.java index 60b13bd4..e5208499 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/TimeSeriesIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/TimeSeriesIT.java @@ -38,6 +38,7 @@ public class TimeSeriesIT { String.format("metric.type=\"compute.googleapis.com/instance/cpu/utilization\""); private ByteArrayOutputStream bout; private PrintStream out; + private PrintStream originalPrintStream; private static void requireEnvVar(String varName) { assertNotNull( @@ -54,13 +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); - bout.reset(); + // restores print statements in the original method + System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/UpdateAlertPolicyIT.java b/samples/snippets/src/test/java/com/example/monitoring/UpdateAlertPolicyIT.java index e3f7d849..e5b28959 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/UpdateAlertPolicyIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/UpdateAlertPolicyIT.java @@ -39,6 +39,7 @@ public class UpdateAlertPolicyIT { private String alertPolicyId; private String alertPolicyDisplayName; private PrintStream out; + private PrintStream originalPrintStream; private static String requireEnvVar(String varName) { String value = System.getenv(varName); @@ -65,6 +66,7 @@ public void setUp() throws IOException { alertPolicyId = result.substring(result.indexOf(":") + 1); bout.reset(); out.flush(); + originalPrintStream = System.out; System.setOut(out); } @@ -73,9 +75,8 @@ public void tearDown() throws IOException { // delete an alert policy for clean up DeleteAlertPolicy.deleteAlertPolicy(alertPolicyId); // restores print statements in the original method - bout.reset(); - out.flush(); System.out.flush(); + System.setOut(originalPrintStream); } @Test diff --git a/samples/snippets/src/test/java/com/example/monitoring/UptimeIT.java b/samples/snippets/src/test/java/com/example/monitoring/UptimeIT.java index 799dc646..0b90506f 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/UptimeIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/UptimeIT.java @@ -22,8 +22,8 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.UUID; +import org.junit.After; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,26 +37,28 @@ public class UptimeIT { private ByteArrayOutputStream bout; private PrintStream out; + private PrintStream originalPrintStream; private static UptimeCheckConfig config = UptimeCheckConfig.newBuilder() .setDisplayName("check-" + UUID.randomUUID().toString().substring(0, 6)) .build(); - @BeforeClass - public static void setUpClass() { - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - PrintStream out = new PrintStream(bout); - System.setOut(out); - } - @Before public void setUp() { bout = new ByteArrayOutputStream(); out = new PrintStream(bout); + originalPrintStream = System.out; System.setOut(out); } + @After + public void tearDown() { + // restores print statements in the original method + System.out.flush(); + System.setOut(originalPrintStream); + } + @Test public void test1_CreateUptimeCheck() throws Exception { UptimeSample.main("create", "-n", config.getDisplayName(), "-o", "test.example.com", "-a", "/");