[tomee] branch master updated: Fix test cases

[dblevins]

This is an automated email from the ASF dual-hosted git repository.

dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 73d9a58  Fix test cases
73d9a58 is described below

commit 73d9a5895df12ad4839c15838f5443aa968339cd
Author: David Blevins <david.blev...@gmail.com>
AuthorDate: Mon May 27 11:56:58 2019 -0700

    Fix test cases
---
 .../src/test/java/org/superbiz/rest/WeatherServiceTest.java          | 3 ++-
 .../src/test/java/org/superbiz/rest/WeatherServiceTest.java          | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
 
b/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
index 4d78387..f68cd2c 100644
--- 
a/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
+++ 
b/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
@@ -87,7 +87,8 @@ public class WeatherServiceTest {
                 .request()
                 .accept(MediaType.TEXT_PLAIN)
                 .get(String.class);
-        assertEquals("# TYPE application:weather_day_status 
counter\napplication:weather_day_status 1.0\n", metric);
+        assertEquals("# TYPE application:weather_day_status counter\n" +
+                "application:weather_day_status{weather=\"day\"} 1.0\n", 
metric);
     }
 
     private void assertJsonFormat(final String metricPath) {
diff --git 
a/examples/mp-metrics-gauge/src/test/java/org/superbiz/rest/WeatherServiceTest.java
 
b/examples/mp-metrics-gauge/src/test/java/org/superbiz/rest/WeatherServiceTest.java
index 9e9a8fa..c9746fb 100644
--- 
a/examples/mp-metrics-gauge/src/test/java/org/superbiz/rest/WeatherServiceTest.java
+++ 
b/examples/mp-metrics-gauge/src/test/java/org/superbiz/rest/WeatherServiceTest.java
@@ -102,9 +102,8 @@ public class WeatherServiceTest {
         assertNotNull(metric);
 
         JsonObject metricJson = Json.createReader(new 
StringReader(metric)).readObject();
-        JsonObject weatherDayTemperature = 
metricJson.getJsonObject("weather_day_temperature");
-        assertNotNull(weatherDayTemperature);
-        assertEquals(weatherDayTemperature.getInt("value"), 30);
+        final int temperature = metricJson.getInt("weather_day_temperature");
+        assertEquals(temperature, 30);
     }
 
     @Test