This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1678d74350324cb76257ca7aa75e8423154f739a
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jul 20 14:51:41 2020 +0200
[CAMEL-11807] Upgrade camel-rxjava to junit5
---
components/camel-rxjava/pom.xml | 6 +--
.../RxJavaStreamsServiceBackpressureTest.java | 5 +-
.../engine/RxJavaStreamsServiceEventTypeTest.java | 9 ++--
.../engine/RxJavaStreamsServiceSubscriberTest.java | 11 +++--
.../rxjava/engine/RxJavaStreamsServiceTest.java | 55 ++++++++++++----------
.../engine/RxJavaStreamsServiceTestSupport.java | 2 +-
6 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/components/camel-rxjava/pom.xml b/components/camel-rxjava/pom.xml
index f78b92d..57e403f 100644
--- a/components/camel-rxjava/pom.xml
+++ b/components/camel-rxjava/pom.xml
@@ -63,7 +63,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -72,8 +72,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
index f402fd1..a94f448 100644
---
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
+++
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
@@ -25,7 +25,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import
org.apache.camel.component.reactive.streams.ReactiveStreamsBackpressureStrategy;
import org.apache.camel.component.rxjava.engine.support.TestSubscriber;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RxJavaStreamsServiceBackpressureTest extends
RxJavaStreamsServiceTestSupport {
diff --git
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceEventTypeTest.java
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceEventTypeTest.java
index 70caf34..eb6156e 100644
---
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceEventTypeTest.java
+++
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceEventTypeTest.java
@@ -21,10 +21,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.reactive.streams.ReactiveStreamsConstants;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.reactivestreams.Subscriber;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RxJavaStreamsServiceEventTypeTest extends
RxJavaStreamsServiceTestSupport {
@Test
@@ -93,7 +94,7 @@ public class RxJavaStreamsServiceEventTypeTest extends
RxJavaStreamsServiceTestS
endpoint.assertIsSatisfied();
Exchange ex = endpoint.getExchanges().get(0);
- Assert.assertEquals(1, ex.getIn().getBody());
+ assertEquals(1, ex.getIn().getBody());
}
@Test
@@ -128,7 +129,7 @@ public class RxJavaStreamsServiceEventTypeTest extends
RxJavaStreamsServiceTestS
endpoint.assertIsSatisfied();
Exchange exch = endpoint.getExchanges().get(0);
- Assert.assertEquals(ex, exch.getIn().getBody());
+ assertEquals(ex, exch.getIn().getBody());
}
@Test
diff --git
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceSubscriberTest.java
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceSubscriberTest.java
index e44e9e3..c92c423 100644
---
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceSubscriberTest.java
+++
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceSubscriberTest.java
@@ -22,11 +22,12 @@ import io.reactivex.Flowable;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class RxJavaStreamsServiceSubscriberTest extends
RxJavaStreamsServiceTestSupport {
@Test
@@ -101,7 +102,7 @@ public class RxJavaStreamsServiceSubscriberTest extends
RxJavaStreamsServiceTest
endpoint.expectedMessageCount(1000);
endpoint.assertIsSatisfied();
- Assert.assertEquals(
+ assertEquals(
1,
endpoint.getExchanges().stream()
.map(x -> x.getIn().getHeader("thread", String.class))
@@ -114,7 +115,7 @@ public class RxJavaStreamsServiceSubscriberTest extends
RxJavaStreamsServiceTest
endpoint.getExchanges().stream()
.map(x -> x.getIn().getBody(Long.class))
- .forEach(n -> Assert.assertEquals(num.getAndIncrement(),
n.longValue()));
+ .forEach(n -> assertEquals(num.getAndIncrement(), n.longValue()));
}
@Test
@@ -139,7 +140,7 @@ public class RxJavaStreamsServiceSubscriberTest extends
RxJavaStreamsServiceTest
endpoint.expectedMessageCount(1000);
endpoint.assertIsSatisfied();
- Assert.assertEquals(
+ assertEquals(
3,
endpoint.getExchanges().stream()
.map(x -> x.getIn().getHeader("thread", String.class))
diff --git
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
index dd068f6..5c7dce3 100644
---
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
+++
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
@@ -31,10 +31,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.ExchangeHelper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.reactivestreams.Publisher;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class RxJavaStreamsServiceTest extends RxJavaStreamsServiceTestSupport {
@BindToRegistry("hello")
@@ -63,7 +67,7 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
AtomicInteger value = new AtomicInteger(0);
- Flowable.fromPublisher(crs.fromStream("numbers",
Integer.class)).doOnNext(res -> Assert.assertEquals(value.incrementAndGet(),
res.intValue())).subscribe();
+ Flowable.fromPublisher(crs.fromStream("numbers",
Integer.class)).doOnNext(res -> assertEquals(value.incrementAndGet(),
res.intValue())).subscribe();
template.sendBody("direct:reactive", 1);
template.sendBody("direct:reactive", 2);
@@ -83,14 +87,14 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
final CountDownLatch latch = new CountDownLatch(num);
final AtomicInteger value = new AtomicInteger(0);
- Flowable.fromPublisher(crs.fromStream("tick",
Integer.class)).doOnNext(res -> Assert.assertEquals(value.incrementAndGet(),
res.intValue())).doOnNext(n -> latch.countDown())
+ Flowable.fromPublisher(crs.fromStream("tick",
Integer.class)).doOnNext(res -> assertEquals(value.incrementAndGet(),
res.intValue())).doOnNext(n -> latch.countDown())
.subscribe();
context.start();
latch.await(5, TimeUnit.SECONDS);
- Assert.assertEquals(num, value.get());
+ assertEquals(num, value.get());
}
@Test
@@ -112,8 +116,8 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
template.sendBody("direct:reactive", 1);
template.sendBody("direct:reactive", 2);
- Assert.assertTrue(latch1.await(5, TimeUnit.SECONDS));
- Assert.assertTrue(latch2.await(5, TimeUnit.SECONDS));
+ assertTrue(latch1.await(5, TimeUnit.SECONDS));
+ assertTrue(latch2.await(5, TimeUnit.SECONDS));
}
@Test
@@ -162,11 +166,11 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
CountDownLatch latch = new CountDownLatch(3);
Flowable.fromPublisher(timer).map(exchange ->
ExchangeHelper.getHeaderOrProperty(exchange, Exchange.TIMER_COUNTER,
Integer.class))
- .doOnNext(res -> Assert.assertEquals(value.incrementAndGet(),
res.intValue()))
+ .doOnNext(res -> assertEquals(value.incrementAndGet(),
res.intValue()))
.doOnNext(res -> latch.countDown())
.subscribe();
- Assert.assertTrue(latch.await(2, TimeUnit.SECONDS));
+ assertTrue(latch.await(2, TimeUnit.SECONDS));
}
// ************************************************
@@ -191,7 +195,7 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
}));
for (int i = 1; i <= 3; i++) {
- Assert.assertEquals("after stream: " + (-i),
template.requestBody("direct:source", i, String.class));
+ assertEquals("after stream: " + (-i),
template.requestBody("direct:source", i, String.class));
}
}
@@ -208,7 +212,7 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
crs.process("direct:stream", Integer.class, publisher ->
Flowable.fromPublisher(publisher).map(Math::negateExact));
for (int i = 1; i <= 3; i++) {
- Assert.assertEquals("after stream: " + (-i),
template.requestBody("direct:source", i, String.class));
+ assertEquals("after stream: " + (-i),
template.requestBody("direct:source", i, String.class));
}
}
@@ -229,12 +233,12 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
Publisher<Exchange> publisher = crs.toStream("reactive", new
DefaultExchange(context));
Exchange res = Flowable.fromPublisher(publisher).blockingFirst();
- Assert.assertNotNull(res);
+ assertNotNull(res);
String content = res.getIn().getBody(String.class);
- Assert.assertNotNull(content);
- Assert.assertEquals("123", content);
+ assertNotNull(content);
+ assertEquals("123", content);
}
@Test
@@ -244,10 +248,10 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
AtomicInteger value = new AtomicInteger(0);
CountDownLatch latch = new CountDownLatch(1);
- Flowable.just(1, 2, 3).flatMap(e -> crs.to("bean:hello", e,
String.class)).doOnNext(res -> Assert.assertEquals("Hello " +
value.incrementAndGet(), res))
+ Flowable.just(1, 2, 3).flatMap(e -> crs.to("bean:hello", e,
String.class)).doOnNext(res -> assertEquals("Hello " + value.incrementAndGet(),
res))
.doOnNext(res -> latch.countDown()).subscribe();
- Assert.assertTrue(latch.await(2, TimeUnit.SECONDS));
+ assertTrue(latch.await(2, TimeUnit.SECONDS));
}
@Test
@@ -258,9 +262,9 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
CountDownLatch latch = new CountDownLatch(1);
Flowable.just(1, 2, 3).flatMap(e -> crs.to("bean:hello",
e)).map(Exchange::getMessage).map(e -> e.getBody(String.class))
- .doOnNext(res -> Assert.assertEquals("Hello " +
value.incrementAndGet(), res)).doOnNext(res -> latch.countDown()).subscribe();
+ .doOnNext(res -> assertEquals("Hello " + value.incrementAndGet(),
res)).doOnNext(res -> latch.countDown()).subscribe();
- Assert.assertTrue(latch.await(2, TimeUnit.SECONDS));
+ assertTrue(latch.await(2, TimeUnit.SECONDS));
}
@Test
@@ -271,9 +275,9 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
CountDownLatch latch = new CountDownLatch(1);
Function<Object, Publisher<String>> fun = crs.to("bean:hello",
String.class);
- Flowable.just(1, 2, 3).flatMap(fun::apply).doOnNext(res ->
Assert.assertEquals("Hello " + value.incrementAndGet(), res)).doOnNext(res ->
latch.countDown()).subscribe();
+ Flowable.just(1, 2, 3).flatMap(fun::apply).doOnNext(res ->
assertEquals("Hello " + value.incrementAndGet(), res)).doOnNext(res ->
latch.countDown()).subscribe();
- Assert.assertTrue(latch.await(2, TimeUnit.SECONDS));
+ assertTrue(latch.await(2, TimeUnit.SECONDS));
}
@Test
@@ -285,9 +289,9 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
Function<Object, Publisher<Exchange>> fun = crs.to("bean:hello");
Flowable.just(1, 2,
3).flatMap(fun::apply).map(Exchange::getMessage).map(e ->
e.getBody(String.class))
- .doOnNext(res -> Assert.assertEquals("Hello " +
value.incrementAndGet(), res)).doOnNext(res -> latch.countDown()).subscribe();
+ .doOnNext(res -> assertEquals("Hello " + value.incrementAndGet(),
res)).doOnNext(res -> latch.countDown()).subscribe();
- Assert.assertTrue(latch.await(2, TimeUnit.SECONDS));
+ assertTrue(latch.await(2, TimeUnit.SECONDS));
}
// ************************************************
@@ -312,7 +316,7 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
int idx = 1;
for (Exchange ex : mock.getExchanges()) {
- Assert.assertEquals(Integer.valueOf(idx++),
ex.getIn().getBody(Integer.class));
+ assertEquals(Integer.valueOf(idx++),
ex.getIn().getBody(Integer.class));
}
}
@@ -320,7 +324,7 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
// misc
// ************************************************
- @Test(expected = FailedToStartRouteException.class)
+ @Test
public void testOnlyOneCamelProducerPerPublisher() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
@@ -330,6 +334,7 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
}
});
- context.start();
+ assertThrows(FailedToStartRouteException.class,
+ () -> context.start());
}
}
diff --git
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java
index 827b823..9cb76a9 100644
---
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java
+++
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java
@@ -21,7 +21,7 @@ import
org.apache.camel.component.reactive.streams.ReactiveStreamsComponent;
import org.apache.camel.component.reactive.streams.ReactiveStreamsConstants;
import org.apache.camel.component.reactive.streams.api.CamelReactiveStreams;
import
org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
class RxJavaStreamsServiceTestSupport extends CamelTestSupport {
