Fixing to use webtarget
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ee90765e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ee90765e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ee90765e Branch: refs/heads/master Commit: ee90765e427d570025e29d0f3515fcddbb1c39dc Parents: 385f98a Author: ivanjunckes <[email protected]> Authored: Tue Nov 27 14:44:16 2018 -0200 Committer: ivanjunckes <[email protected]> Committed: Tue Nov 27 14:44:16 2018 -0200 ---------------------------------------------------------------------- .../org/superbiz/rest/WeatherServiceTest.java | 39 ++++++++++++++++---- 1 file changed, 31 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/ee90765e/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 61adfe9..f4eb0fe 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 @@ -16,18 +16,22 @@ */ package org.superbiz.rest; -import org.apache.cxf.jaxrs.client.WebClient; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import javax.json.Json; import javax.json.JsonObject; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.io.StringReader; @@ -49,11 +53,25 @@ public class WeatherServiceTest { @ArquillianResource private URL base; + private Client client; + + @Before + public void before() { + this.client = ClientBuilder.newClient(); + } + + @After + public void after() { + this.client.close(); + } + @Test public void testCountedMetric() { - final String message = WebClient.create(base.toExternalForm()) - .path("/weather/day/status") + WebTarget webTarget = this.client.target(this.base.toExternalForm()); + final String message = webTarget.path("/weather/day/status") + .request() .get(String.class); + assertEquals("Hi, today is a sunny day!", message); final String metricPath = "/metrics/application/weather_day_status"; @@ -62,16 +80,19 @@ public class WeatherServiceTest { } private void assertPrometheusFormat(final String metricPath) { - final String metric = WebClient.create(base.toExternalForm()) - .path(metricPath) + WebTarget webTarget = this.client.target(this.base.toExternalForm()); + final String metric = webTarget.path(metricPath) + .request() .accept(MediaType.TEXT_PLAIN) .get(String.class); assertEquals("# TYPE application:weather_day_status counter\napplication:weather_day_status 1.0\n", metric); } private void assertJsonFormat(final String metricPath) { - final String metric = WebClient.create(base.toExternalForm()) - .path(metricPath) + WebTarget webTarget = this.client.target(this.base.toExternalForm()); + + final String metric = webTarget.path(metricPath) + .request() .accept(MediaType.APPLICATION_JSON) .get(String.class); assertEquals("{\"weather_day_status\":{\"count\":1}}", metric); @@ -79,8 +100,10 @@ public class WeatherServiceTest { @Test public void testCountedMetricMetadata() { - final Response response = WebClient.create(base.toExternalForm()) + WebTarget webTarget = this.client.target(this.base.toExternalForm()); + final Response response = webTarget .path("/metrics/application/weather_day_status") + .request() .accept(MediaType.APPLICATION_JSON) .options(); final String metaData = response.readEntity(String.class);
