Merge pull request GoogleCloudPlatform#362 from GoogleCloudPlatform/tswast-monitoring

tswast · web-flow · commit 126145150000 · 2016-10-11T13:11:29.000-07:00
Fix monitoring tests.
diff --git a/monitoring/v3/src/test/java/ListResourcesTest.java b/monitoring/v3/src/test/java/ListResourcesTest.java
@@ -67,7 +67,6 @@ public void testListMonitoredResourceDescriptors() throws Exception {
     this.underTest.listMonitoredResourceDescriptors();
     String result = new String(os.toByteArray());
     assertThat(result)
-        .named("output text stream")
         .contains("An application running in Google App Engine");
   }
 
@@ -80,8 +79,7 @@ public void testListMetrics() throws Exception {
     this.underTest.listMetricDescriptors();
     String result = new String(os.toByteArray());
     assertThat(result)
-        .named("output text stream")
-        .contains("Delta CPU usage time. Units are second");
+        .contains("agent.googleapis.com/cpu/usage_time");
   }
 
   /**
@@ -93,7 +91,6 @@ public void testListTimeseries() throws Exception {
     this.underTest.listTimeseries();
     String result = new String(os.toByteArray());
     assertThat(result)
-        .named("output text stream")
         .contains("listTimeseries response");
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ public void testListMonitoredResourceDescriptors() throws Exception {`
`67`	`67`	`this.underTest.listMonitoredResourceDescriptors();`
`68`	`68`	`String result = new String(os.toByteArray());`
`69`	`69`	`assertThat(result)`
`70`		`- .named("output text stream")`
`71`	`70`	`.contains("An application running in Google App Engine");`
`72`	`71`	`}`
`73`	`72`
`@@ -80,8 +79,7 @@ public void testListMetrics() throws Exception {`
`80`	`79`	`this.underTest.listMetricDescriptors();`
`81`	`80`	`String result = new String(os.toByteArray());`
`82`	`81`	`assertThat(result)`
`83`		`- .named("output text stream")`
`84`		`- .contains("Delta CPU usage time. Units are second");`
	`82`	`+ .contains("agent.googleapis.com/cpu/usage_time");`
`85`	`83`	`}`
`86`	`84`
`87`	`85`	`/**`
`@@ -93,7 +91,6 @@ public void testListTimeseries() throws Exception {`
`93`	`91`	`this.underTest.listTimeseries();`
`94`	`92`	`String result = new String(os.toByteArray());`
`95`	`93`	`assertThat(result)`
`96`		`- .named("output text stream")`
`97`	`94`	`.contains("listTimeseries response");`
`98`	`95`	`}`
`99`	`96`	`}`