You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/11/20 16:55:27 UTC
[5/7] tomee git commit: Refactoring test methods
Refactoring test methods
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eedd7050
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eedd7050
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eedd7050
Branch: refs/heads/master
Commit: eedd705057d30f0e5b0e3329e55abbe08859373a
Parents: 5bc648a
Author: ivanjunckes <ij...@tomitribe.com>
Authored: Tue Nov 20 13:37:02 2018 -0200
Committer: ivanjunckes <ij...@tomitribe.com>
Committed: Tue Nov 20 13:37:02 2018 -0200
----------------------------------------------------------------------
.../org/superbiz/rest/WeatherServiceTest.java | 23 ++++++++++----------
1 file changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/eedd7050/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 db78d03..110f7fd 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
@@ -45,32 +45,31 @@ public class WeatherServiceTest {
@ArquillianResource
private URL base;
-
@Test
- public void testCountedPrometheus() {
+ public void testCountedMetric() {
final String message = WebClient.create(base.toExternalForm())
.path("/weather/day/status")
.get(String.class);
assertEquals("Hi, today is a sunny day!", message);
+ String metricPath = "/metrics/application/weather_day_status";
+ assertPrometheusFormat(metricPath);
+ assertJsonFormat(metricPath);
+ }
+
+ private void assertPrometheusFormat(final String metricPath) {
final String metric = WebClient.create(base.toExternalForm())
- .path("/metrics/application/weather_day_status")
+ .path(metricPath)
.accept(MediaType.TEXT_PLAIN)
.get(String.class);
assertEquals("# TYPE application:weather_day_status counter\napplication:weather_day_status 1.0\n", metric);
}
- @Test
- public void testCountedJson() {
- final String message = WebClient.create(base.toExternalForm())
- .path("/weather/week/status")
- .get(String.class);
- assertEquals("Hi, week will be mostly sunny!", message);
-
+ private void assertJsonFormat(final String metricPath) {
final String metric = WebClient.create(base.toExternalForm())
- .path("/metrics/application/weather_week_status")
+ .path(metricPath)
.accept(MediaType.APPLICATION_JSON)
.get(String.class);
- assertEquals("{\"weather_week_status\":{\"delegate\":{},\"unit\":\"none\",\"count\":1}}", metric);
+ assertEquals("{\"weather_day_status\":{\"delegate\":{},\"unit\":\"none\",\"count\":1}}", metric);
}
}