You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/12/26 10:55:55 UTC
[cxf] 03/08: Removing Assert from tracing
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 69d9b04b5404ac4417c678d68343627510e2a7f7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Sat Dec 22 18:36:22 2018 +0000
Removing Assert from tracing
---
.../apache/cxf/jaxrs/servlet/AbstractSciTest.java | 1 +
.../jaxrs/servlet/jetty/AbstractJettyServer.java | 2 +
.../servlet/jetty/JettyEmptyApplicationTest.java | 2 +
.../jetty/JettyEmptyPathApplicationTest.java | 2 +
.../servlet/jetty/JettyNoApplicationTest.java | 2 +
.../JettySingleApplicationOnlyClassesTest.java | 2 +
.../JettySingleApplicationOnlySingletonsTest.java | 2 +
.../servlet/jetty/JettySingleApplicationTest.java | 2 +
.../cxf/systest/jaxrs/sse/AbstractSseTest.java | 82 +++++++++++-----------
.../jaxrs/sse/jetty/AbstractJettyServer.java | 2 +
.../systest/jaxrs/sse/jetty/JettyEmbeddedTest.java | 2 +
.../cxf/systest/jaxrs/sse/jetty/JettyWarTest.java | 2 +
.../jaxrs/sse/tomcat/AbstractTomcatServer.java | 2 +
.../jaxrs/sse/tomcat/TomcatEmbeddedTest.java | 2 +
.../systest/jaxrs/sse/tomcat/TomcatWarTest.java | 2 +
.../jaxrs/sse/undertow/AbstractUndertowServer.java | 5 +-
.../jaxrs/sse/undertow/UndertowEmbeddedTest.java | 2 +
.../jaxrs/tracing/brave/BraveTracingTest.java | 39 +++++-----
.../opentracing/OpenTracingTracingTest.java | 40 ++++++-----
.../jaxws/tracing/brave/BraveTracingTest.java | 7 +-
.../opentracing/OpenTracingTracingTest.java | 10 +--
21 files changed, 127 insertions(+), 85 deletions(-)
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/AbstractSciTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/AbstractSciTest.java
index d91494f..69c36cf 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/AbstractSciTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/AbstractSciTest.java
@@ -33,6 +33,7 @@ import org.apache.demo.resources.Book;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
public abstract class AbstractSciTest extends AbstractBusClientServerTestBase {
@Test
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/AbstractJettyServer.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/AbstractJettyServer.java
index e15fac5..6c79115 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/AbstractJettyServer.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/AbstractJettyServer.java
@@ -27,6 +27,8 @@ import org.eclipse.jetty.webapp.Configuration;
import org.eclipse.jetty.webapp.WebAppContext;
import org.eclipse.jetty.webapp.WebXmlConfiguration;
+import static org.junit.Assert.fail;
+
public abstract class AbstractJettyServer extends AbstractBusTestServerBase {
private org.eclipse.jetty.server.Server server;
private final Resource[] resources;
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java
index d3cf804..4bb9aa4 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java
@@ -28,6 +28,8 @@ import org.eclipse.jetty.util.resource.Resource;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class JettyEmptyApplicationTest extends AbstractSciTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java
index c3b2219..fe03dd9 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java
@@ -29,6 +29,8 @@ import org.eclipse.jetty.webapp.WebAppContext;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class JettyEmptyPathApplicationTest extends AbstractSciTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java
index ccd62fb..dc90554 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java
@@ -29,6 +29,8 @@ import org.eclipse.jetty.webapp.WebAppContext;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class JettyNoApplicationTest extends AbstractSciTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java
index a55b66a..26508bc 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java
@@ -26,6 +26,8 @@ import org.eclipse.jetty.util.resource.Resource;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class JettySingleApplicationOnlyClassesTest extends AbstractSciTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java
index cd1eba5..6431ef0 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java
@@ -26,6 +26,8 @@ import org.eclipse.jetty.util.resource.Resource;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class JettySingleApplicationOnlySingletonsTest extends AbstractSciTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java
index 7ee2ecf..cc6e414 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java
@@ -26,6 +26,8 @@ import org.eclipse.jetty.util.resource.Resource;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class JettySingleApplicationTest extends AbstractSciTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
diff --git a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java
index 0b7457c..e0077a9 100644
--- a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java
+++ b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java
@@ -43,6 +43,8 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
public abstract class AbstractSseTest extends AbstractSseBaseTest {
@Test
@@ -50,7 +52,7 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
final WebTarget target = createWebTarget("/rest/api/bookstore/sse/" + UUID.randomUUID())
.property(HttpHeaders.LAST_EVENT_ID_HEADER, 150);
final Collection<Book> books = new ArrayList<>();
-
+
try (SseEventSource eventSource = SseEventSource.target(target).build()) {
eventSource.register(collect(books), System.out::println);
eventSource.open();
@@ -59,11 +61,11 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
}
// Easing the test verification here, it does not work well for Atm + Jetty
- assertThat(books,
+ assertThat(books,
hasItems(
- new Book("New Book #151", 151),
- new Book("New Book #152", 152),
- new Book("New Book #153", 153),
+ new Book("New Book #151", 151),
+ new Book("New Book #152", 152),
+ new Book("New Book #153", 153),
new Book("New Book #154", 154)
)
);
@@ -73,7 +75,7 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
public void testBooksStreamIsReturnedFromInboundSseEvents() throws InterruptedException {
final WebTarget target = createWebTarget("/rest/api/bookstore/sse/0");
final Collection<Book> books = new ArrayList<>();
-
+
try (SseEventSource eventSource = SseEventSource.target(target).build()) {
eventSource.register(collect(books), System.out::println);
eventSource.open();
@@ -81,11 +83,11 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
awaitEvents(5000, books, 4);
}
// Easing the test verification here, it does not work well for Atm + Jetty
- assertThat(books,
+ assertThat(books,
hasItems(
- new Book("New Book #1", 1),
- new Book("New Book #2", 2),
- new Book("New Book #3", 3),
+ new Book("New Book #1", 1),
+ new Book("New Book #2", 2),
+ new Book("New Book #3", 3),
new Book("New Book #4", 4)
)
);
@@ -95,7 +97,7 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
public void testNoDataIsReturnedFromInboundSseEvents() throws InterruptedException {
final WebTarget target = createWebTarget("/rest/api/bookstore/nodata");
final Collection<Book> books = new ArrayList<>();
-
+
try (SseEventSource eventSource = SseEventSource.target(target).build()) {
eventSource.register(collect(books), System.out::println);
eventSource.open();
@@ -110,7 +112,7 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
public void testBooksStreamIsReconnectedFromInboundSseEvents() throws InterruptedException {
final WebTarget target = createWebTarget("/rest/api/bookstore/sse/0");
final Collection<Book> books = new ArrayList<>();
-
+
final Builder builder = SseEventSource.target(target).reconnectingEvery(1, TimeUnit.SECONDS);
try (SseEventSource eventSource = builder.build()) {
eventSource.register(collect(books), System.out::println);
@@ -119,24 +121,24 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
awaitEvents(5000, books, 12);
}
- assertThat(books,
+ assertThat(books,
hasItems(
- new Book("New Book #1", 1),
- new Book("New Book #2", 2),
- new Book("New Book #3", 3),
+ new Book("New Book #1", 1),
+ new Book("New Book #2", 2),
+ new Book("New Book #3", 3),
new Book("New Book #4", 4),
- new Book("New Book #5", 5),
- new Book("New Book #6", 6),
- new Book("New Book #7", 7),
+ new Book("New Book #5", 5),
+ new Book("New Book #6", 6),
+ new Book("New Book #7", 7),
new Book("New Book #8", 8),
- new Book("New Book #9", 9),
- new Book("New Book #10", 10),
- new Book("New Book #11", 11),
+ new Book("New Book #9", 9),
+ new Book("New Book #10", 10),
+ new Book("New Book #11", 11),
new Book("New Book #12", 12)
)
);
}
-
+
@Test
public void testBooksStreamIsBroadcasted() throws Exception {
final Collection<Future<Response>> results = new ArrayList<>();
@@ -183,7 +185,7 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
public void testBooksStreamIsReturnedFromInboundSseEventsNoDelay() throws InterruptedException {
final WebTarget target = createWebTarget("/rest/api/bookstore/nodelay/sse/0");
final Collection<Book> books = new ArrayList<>();
-
+
try (SseEventSource eventSource = SseEventSource.target(target).build()) {
eventSource.register(collect(books), System.out::println);
eventSource.open();
@@ -191,11 +193,11 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
awaitEvents(5000, books, 5);
}
// Easing the test verification here, it does not work well for Atm + Jetty
- assertThat(books,
+ assertThat(books,
hasItems(
- new Book("New Book #1", 1),
- new Book("New Book #2", 2),
- new Book("New Book #3", 3),
+ new Book("New Book #1", 1),
+ new Book("New Book #2", 2),
+ new Book("New Book #3", 3),
new Book("New Book #4", 4),
new Book("New Book #5", 5)
)
@@ -210,16 +212,16 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
try (SseEventSource eventSource = SseEventSource.target(target).build()) {
eventSource.register(collect(books), System.out::println);
eventSource.open();
-
+
// wait for single event, close before server sends other 3
awaitEvents(200, books, 1);
-
+
// Only two out of 4 messages should be delivered, others should be discarded
- final Response r =
+ final Response r =
createWebClient("/rest/api/bookstore/client-closes-connection/received", MediaType.APPLICATION_JSON)
.put(null);
assertThat(r.getStatus(), equalTo(204));
-
+
assertThat(eventSource.close(1, TimeUnit.SECONDS), equalTo(true));
}
@@ -229,22 +231,22 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
new Book("New Book #1", 1)
)
);
-
+
// Only two out of 4 messages should be delivered, others should be discarded
- final Response r =
+ final Response r =
createWebClient("/rest/api/bookstore/client-closes-connection/closed", MediaType.APPLICATION_JSON)
.put(null);
assertThat(r.getStatus(), equalTo(204));
// Give server some time to finish up the sink
Thread.sleep(2000);
-
+
// Only two out of 4 messages should be delivered, others should be discarded
- final BookBroadcasterStats stats =
+ final BookBroadcasterStats stats =
createWebClient("/rest/api/bookstore/client-closes-connection/stats", MediaType.APPLICATION_JSON)
.get()
.readEntity(BookBroadcasterStats.class);
-
+
// Tomcat will feedback through onError callback, others through onComplete
assertThat(stats.isErrored(), equalTo(supportsErrorPropagation()));
// The sink should be in closed state
@@ -256,10 +258,10 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
// 2 events could get through before the client's connection drop off
assertTrue(stats.getCompleted() == 2 || stats.getCompleted() == 1);
}
-
+
/**
- * Jetty / Undertow do not propagate errors from the runnable passed to
- * AsyncContext::start() up to the AsyncEventListener::onError(). Tomcat however
+ * Jetty / Undertow do not propagate errors from the runnable passed to
+ * AsyncContext::start() up to the AsyncEventListener::onError(). Tomcat however
* does it.
* @return
*/
diff --git a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
index 89deec5..5912e4f 100644
--- a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
+++ b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
@@ -32,6 +32,8 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.webapp.WebAppContext;
+import static org.junit.Assert.fail;
+
public abstract class AbstractJettyServer extends AbstractBusTestServerBase {
private org.eclipse.jetty.server.Server server;
diff --git a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyEmbeddedTest.java b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyEmbeddedTest.java
index 6834fdd..370c264 100644
--- a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyEmbeddedTest.java
+++ b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyEmbeddedTest.java
@@ -25,6 +25,8 @@ import org.apache.cxf.systest.jaxrs.sse.AbstractSseTest;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class JettyEmbeddedTest extends AbstractSseTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
diff --git a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
index daefc7a..b84c328 100644
--- a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
+++ b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
@@ -25,6 +25,8 @@ import org.apache.cxf.systest.jaxrs.sse.AbstractSseTest;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class JettyWarTest extends AbstractSseTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
diff --git a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
index 8e31c50..acb8106 100644
--- a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
+++ b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
@@ -31,6 +31,8 @@ import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
import org.apache.cxf.systest.jaxrs.sse.BookStore;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import static org.junit.Assert.fail;
+
public abstract class AbstractTomcatServer extends AbstractBusTestServerBase {
private Tomcat server;
diff --git a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatEmbeddedTest.java b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatEmbeddedTest.java
index e655391..45999ae 100644
--- a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatEmbeddedTest.java
+++ b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatEmbeddedTest.java
@@ -25,6 +25,8 @@ import org.apache.cxf.systest.jaxrs.sse.AbstractSseTest;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class TomcatEmbeddedTest extends AbstractSseTest {
@Ignore
public static class EmbeddedTomcatServer extends AbstractTomcatServer {
diff --git a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
index 58f6194..8425d0d 100644
--- a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
+++ b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
@@ -25,6 +25,8 @@ import org.apache.cxf.systest.jaxrs.sse.AbstractSseTest;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class TomcatWarTest extends AbstractSseTest {
@Ignore
public static class EmbeddedTomcatServer extends AbstractTomcatServer {
diff --git a/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/AbstractUndertowServer.java b/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/AbstractUndertowServer.java
index c24dfef..301f9a1 100644
--- a/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/AbstractUndertowServer.java
+++ b/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/AbstractUndertowServer.java
@@ -34,6 +34,7 @@ import io.undertow.servlet.api.DeploymentManager;
import static io.undertow.servlet.Servlets.defaultContainer;
import static io.undertow.servlet.Servlets.deployment;
import static io.undertow.servlet.Servlets.servlet;
+import static org.junit.Assert.fail;
public abstract class AbstractUndertowServer extends AbstractBusTestServerBase {
private Undertow server;
@@ -66,12 +67,12 @@ public abstract class AbstractUndertowServer extends AbstractBusTestServerBase {
PathHandler path = Handlers
.path(Handlers.redirect("/"))
.addPrefixPath("/", manager.start());
-
+
server = Undertow.builder()
.addHttpListener(port, "localhost")
.setHandler(path)
.build();
-
+
server.start();
} catch (final Exception ex) {
ex.printStackTrace();
diff --git a/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/UndertowEmbeddedTest.java b/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/UndertowEmbeddedTest.java
index fb9569c..0c48ce1 100644
--- a/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/UndertowEmbeddedTest.java
+++ b/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/UndertowEmbeddedTest.java
@@ -25,6 +25,8 @@ import org.apache.cxf.systest.jaxrs.sse.AbstractSseTest;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import static org.junit.Assert.assertTrue;
+
public class UndertowEmbeddedTest extends AbstractSseTest {
@Ignore
public static class EmbeddedTomcatServer extends AbstractUndertowServer {
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
index de8db72..2629c03 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
@@ -70,6 +70,9 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsMapContaining.hasEntry;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
public class BraveTracingTest extends AbstractBusClientServerTestBase {
public static final String PORT = allocatePort(BraveTracingTest.class);
@@ -77,7 +80,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
private Tracing brave;
private BraveClientProvider braveClientProvider;
private Random random;
-
+
@Ignore
public static class Server extends AbstractBusTestServerBase {
protected void run() {
@@ -247,7 +250,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
@Test
public void testThatNewSpansAreCreatedWhenNotProvidedUsingMultipleAsyncClients() throws Exception {
final WebClient client = createWebClient("/bookstore/books", braveClientProvider);
-
+
// The intention is to make a calls one after another, not in parallel, to ensure the
// thread have trace contexts cleared out.
final Collection<Response> responses = IntStream
@@ -262,24 +265,24 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
}
assertThat(TestSpanReporter.getAllSpans().size(), equalTo(12));
-
+
IntStream
.range(0, 4)
.map(index -> index * 3)
.forEach(index -> {
- assertThat(TestSpanReporter.getAllSpans().get(index).name(),
+ assertThat(TestSpanReporter.getAllSpans().get(index).name(),
equalTo("get books"));
- assertThat(TestSpanReporter.getAllSpans().get(index + 1).name(),
+ assertThat(TestSpanReporter.getAllSpans().get(index + 1).name(),
equalTo("get /bookstore/books"));
- assertThat(TestSpanReporter.getAllSpans().get(index + 2).name(),
+ assertThat(TestSpanReporter.getAllSpans().get(index + 2).name(),
equalTo("get " + client.getCurrentURI()));
});
}
-
+
@Test
public void testThatNewSpansAreCreatedWhenNotProvidedUsingMultipleClients() throws Exception {
final WebClient client = createWebClient("/bookstore/books", braveClientProvider);
-
+
// The intention is to make a calls one after another, not in parallel, to ensure the
// thread have trace contexts cleared out.
final Collection<Response> responses = IntStream
@@ -293,16 +296,16 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
}
assertThat(TestSpanReporter.getAllSpans().size(), equalTo(12));
-
+
IntStream
.range(0, 4)
.map(index -> index * 3)
.forEach(index -> {
- assertThat(TestSpanReporter.getAllSpans().get(index).name(),
+ assertThat(TestSpanReporter.getAllSpans().get(index).name(),
equalTo("get books"));
- assertThat(TestSpanReporter.getAllSpans().get(index + 1).name(),
+ assertThat(TestSpanReporter.getAllSpans().get(index + 1).name(),
equalTo("get /bookstore/books"));
- assertThat(TestSpanReporter.getAllSpans().get(index + 2).name(),
+ assertThat(TestSpanReporter.getAllSpans().get(index + 2).name(),
equalTo("get " + client.getCurrentURI()));
});
}
@@ -316,19 +319,19 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
try (SpanInScope scope = brave.tracer().withSpanInScope(span)) {
final Response r = client.get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
-
+
assertThat(TestSpanReporter.getAllSpans().size(), equalTo(3));
assertThat(TestSpanReporter.getAllSpans().get(0).name(), equalTo("get books"));
assertThat(TestSpanReporter.getAllSpans().get(0).parentId(), not(nullValue()));
assertThat(TestSpanReporter.getAllSpans().get(1).name(), equalTo("get /bookstore/books"));
assertThat(TestSpanReporter.getAllSpans().get(2).name(), equalTo("get " + client.getCurrentURI()));
-
+
assertThatTraceHeadersArePresent(r, true);
}
} finally {
span.finish();
}
-
+
// Await till flush happens, usually a second is enough
await().atMost(Duration.ONE_SECOND).until(()-> TestSpanReporter.getAllSpans().size() == 4);
@@ -344,7 +347,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
try {
try (SpanInScope scope = brave.tracer().withSpanInScope(span)) {
final Future<Response> f = client.async().get();
-
+
final Response r = f.get(1, TimeUnit.SECONDS);
assertEquals(Status.OK.getStatusCode(), r.getStatus());
assertThat(brave.tracer().currentSpan().context().spanId(), equalTo(span.context().spanId()));
@@ -353,7 +356,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
assertThat(TestSpanReporter.getAllSpans().get(0).name(), equalTo("get books"));
assertThat(TestSpanReporter.getAllSpans().get(1).name(), equalTo("get /bookstore/books"));
assertThat(TestSpanReporter.getAllSpans().get(2).name(), equalTo("get " + client.getCurrentURI()));
-
+
assertThatTraceHeadersArePresent(r, true);
}
} finally {
@@ -432,7 +435,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
assertFalse(r.getHeaders().containsKey(PARENT_SPAN_ID_NAME));
}
}
-
+
private<T> T get(final Future<T> future) {
try {
return future.get(1, TimeUnit.HOURS);
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
index 712b1d4..b0da034 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java
@@ -74,6 +74,8 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
public static final String PORT = allocatePort(OpenTracingTracingTest.class);
@@ -81,7 +83,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
private Tracer tracer;
private OpenTracingClientProvider openTracingClientProvider;
private Random random;
-
+
@Ignore
public static class Server extends AbstractBusTestServerBase {
protected void run() {
@@ -96,7 +98,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
}
))
.getTracer();
-
+
final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(BookStore.class);
sf.setResourceProvider(BookStore.class, new SingletonResourceProvider(new BookStore<Scope>()));
@@ -202,7 +204,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
assertThat(TestSender.getAllSpans().get(0).getOperationName(), equalTo("Processing books"));
assertThat(TestSender.getAllSpans().get(1).getOperationName(), equalTo("GET /bookstore/books/async"));
assertThat(TestSender.getAllSpans().get(1).getReferences(), not(empty()));
- assertThat(TestSender.getAllSpans().get(1).getReferences().get(0).getSpanContext().getSpanId(),
+ assertThat(TestSender.getAllSpans().get(1).getReferences().get(0).getSpanContext().getSpanId(),
equalTo(spanId.getSpanId()));
}
@@ -244,7 +246,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
@Test
public void testThatNewSpansAreCreatedWhenNotProvidedUsingMultipleAsyncClients() throws Exception {
final WebClient client = createWebClient("/bookstore/books", openTracingClientProvider);
-
+
// The intention is to make a calls one after another, not in parallel, to ensure the
// thread have trace contexts cleared out.
final Collection<Response> responses = IntStream
@@ -258,24 +260,24 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
}
assertThat(TestSender.getAllSpans().size(), equalTo(12));
-
+
IntStream
.range(0, 4)
.map(index -> index * 3)
.forEach(index -> {
- assertThat(TestSender.getAllSpans().get(index).getOperationName(),
+ assertThat(TestSender.getAllSpans().get(index).getOperationName(),
equalTo("Get Books"));
- assertThat(TestSender.getAllSpans().get(index + 1).getOperationName(),
+ assertThat(TestSender.getAllSpans().get(index + 1).getOperationName(),
equalTo("GET /bookstore/books"));
- assertThat(TestSender.getAllSpans().get(index + 2).getOperationName(),
+ assertThat(TestSender.getAllSpans().get(index + 2).getOperationName(),
equalTo("GET " + client.getCurrentURI()));
});
}
-
+
@Test
public void testThatNewSpansAreCreatedWhenNotProvidedUsingMultipleClients() throws Exception {
final WebClient client = createWebClient("/bookstore/books", openTracingClientProvider);
-
+
// The intention is to make a calls one after another, not in parallel, to ensure the
// thread have trace contexts cleared out.
final Collection<Response> responses = IntStream
@@ -288,16 +290,16 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
}
assertThat(TestSender.getAllSpans().size(), equalTo(12));
-
+
IntStream
.range(0, 4)
.map(index -> index * 3)
.forEach(index -> {
- assertThat(TestSender.getAllSpans().get(index).getOperationName(),
+ assertThat(TestSender.getAllSpans().get(index).getOperationName(),
equalTo("Get Books"));
- assertThat(TestSender.getAllSpans().get(index + 1).getOperationName(),
+ assertThat(TestSender.getAllSpans().get(index + 1).getOperationName(),
equalTo("GET /bookstore/books"));
- assertThat(TestSender.getAllSpans().get(index + 2).getOperationName(),
+ assertThat(TestSender.getAllSpans().get(index + 2).getOperationName(),
equalTo("GET " + client.getCurrentURI()));
});
}
@@ -321,7 +323,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
// Await till flush happens, usually every second
await().atMost(Duration.ONE_SECOND).until(()-> TestSender.getAllSpans().size() == 4);
-
+
assertThat(TestSender.getAllSpans().size(), equalTo(4));
assertThat(TestSender.getAllSpans().get(3).getOperationName(), equalTo("test span"));
assertThat(TestSender.getAllSpans().get(3).getReferences(), empty());
@@ -375,18 +377,18 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
protected WebClient withTrace(final WebClient client, final JaegerSpanContext spanContext) {
tracer.inject(spanContext, Builtin.HTTP_HEADERS, new TextMap() {
-
+
@Override
public void put(String key, String value) {
client.header(key, value);
}
-
+
@Override
public Iterator<Entry<String, String>> iterator() {
return null;
}
});
-
+
return client;
}
@@ -399,7 +401,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
}
private JaegerSpanContext fromRandom() {
- return new JaegerSpanContext(random.nextLong(), /* traceId */ random.nextLong() /* spanId */,
+ return new JaegerSpanContext(random.nextLong(), /* traceId */ random.nextLong() /* spanId */,
random.nextLong() /* parentId */, (byte)1 /* sampled */);
}
}
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
index 8858087..884bbad 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
@@ -60,6 +60,9 @@ import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class BraveTracingTest extends AbstractBusClientServerTestBase {
@@ -185,14 +188,14 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase {
try (SpanInScope scope = brave.tracer().withSpanInScope(span)) {
assertThat(service.getBooks().size(), equalTo(2));
assertThat(brave.tracer().currentSpan(), not(nullValue()));
-
+
assertThat(TestSpanReporter.getAllSpans().size(), equalTo(3));
assertThat(TestSpanReporter.getAllSpans().get(0).name(), equalTo("get books"));
assertThat(TestSpanReporter.getAllSpans().get(0).parentId(), not(nullValue()));
assertThat(TestSpanReporter.getAllSpans().get(1).name(), equalTo("post /bookstore"));
assertThat(TestSpanReporter.getAllSpans().get(2).name(),
equalTo("post http://localhost:" + PORT + "/bookstore"));
-
+
final Map<String, List<String>> response = getResponseHeaders(service);
assertThatTraceHeadersArePresent(response, true);
}
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
index 7a3f201..6c044ac 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
@@ -65,13 +65,15 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
public static final String PORT = allocatePort(OpenTracingTracingTest.class);
private Tracer tracer;
private Random random;
-
+
@Ignore
public static class Server extends AbstractBusTestServerBase {
protected void run() {
@@ -87,7 +89,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
))
.getTracer();
GlobalTracer.register(tracer);
-
+
final JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean();
sf.setServiceClass(BookStore.class);
sf.setAddress("http://localhost:" + PORT);
@@ -110,7 +112,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
@Before
public void setUp() {
random = new Random();
-
+
tracer = new Configuration("tracer")
.withSampler(new SamplerConfiguration().withType(ConstSampler.TYPE).withParam(1))
.withReporter(new ReporterConfiguration().withSender(
@@ -272,7 +274,7 @@ public class OpenTracingTracingTest extends AbstractBusClientServerTestBase {
}
private JaegerSpanContext fromRandom() {
- return new JaegerSpanContext(random.nextLong(), /* traceId */ random.nextLong() /* spanId */,
+ return new JaegerSpanContext(random.nextLong(), /* traceId */ random.nextLong() /* spanId */,
random.nextLong() /* parentId */, (byte)1 /* sampled */);
}
}