tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgallim...@apache.org
Subject [1/5] tomee git commit: jsonb was wrong, so the payload was wrong as well
Date Wed, 28 Nov 2018 23:01:30 GMT
Repository: tomee
Updated Branches:
  refs/heads/master 1d4f3a6fb -> f2f2808a9


jsonb was wrong, so the payload was wrong as well


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e5455e5c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e5455e5c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e5455e5c

Branch: refs/heads/master
Commit: e5455e5c46702dbae58e31b31230879be73b162b
Parents: 354b14a
Author: ivanjunckes <ijunckes@tomitribe.com>
Authored: Mon Nov 26 16:29:48 2018 -0200
Committer: ivanjunckes <ijunckes@tomitribe.com>
Committed: Mon Nov 26 16:29:48 2018 -0200

----------------------------------------------------------------------
 .../org/superbiz/rest/WeatherServiceTest.java   | 25 +++++---------------
 1 file changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/e5455e5c/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
----------------------------------------------------------------------
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 0f87d6c..61adfe9 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
@@ -74,7 +74,7 @@ public class WeatherServiceTest {
                 .path(metricPath)
                 .accept(MediaType.APPLICATION_JSON)
                 .get(String.class);
-        assertEquals("{\"weather_day_status\":{\"delegate\":{},\"unit\":\"none\",\"count\":1}}",
metric);
+        assertEquals("{\"weather_day_status\":{\"count\":1}}", metric);
     }
 
     @Test
@@ -88,27 +88,14 @@ public class WeatherServiceTest {
 
         final String expected = "{\n" +
                 "  \"weather_day_status\": {\n" +
-                "    \"unit\": \"none\",\n" +
+                "    \"description\": \"This metric shows the weather status of the day.\",\n"
+
                 "    \"displayName\": \"Weather Day Status\",\n" +
                 "    \"name\": \"weather_day_status\",\n" +
-                "    \"typeRaw\": \"COUNTER\",\n" +
-                "    \"description\": \"This metric shows the weather status of the day.\",\n"
+
-                "    \"type\": \"counter\",\n" +
-                "    \"value\": {\n" +
-                "      \"unit\": \"none\",\n" +
-                "      \"displayName\": \"Weather Day Status\",\n" +
-                "      \"name\": \"weather_day_status\",\n" +
-                "      \"tagsAsString\": \"\",\n" +
-                "      \"typeRaw\": \"COUNTER\",\n" +
-                "      \"description\": \"This metric shows the weather status of the day.\",\n"
+
-                "      \"type\": \"counter\",\n" +
-                "      \"reusable\": false,\n" +
-                "      \"tags\": {\n" +
-                "        \n" +
-                "      }\n" +
-                "    },\n" +
                 "    \"reusable\": false,\n" +
-                "    \"tags\": \"\"\n" +
+                "    \"tags\": \"\",\n" +
+                "    \"type\": \"counter\",\n" +
+                "    \"typeRaw\": \"COUNTER\",\n" +
+                "    \"unit\": \"none\"\n" +
                 "  }\n" +
                 "}";
 


Mime
View raw message