Add AssertValue for 4 types

This commit is contained in:
Rick Ossendrijver
2021-09-21 09:33:12 +02:00
committed by Pieter Dirk Soels
parent 6405f5560b
commit af259ce97e
12 changed files with 133 additions and 20 deletions

View File

@@ -1164,6 +1164,21 @@ final class RxJavaFlowableToReactorTemplates {
}
}
static final class FlowableTestAssertValue<T> {
@BeforeTemplate
void before(Flowable<T> flowable, Predicate<T> predicate) throws InterruptedException {
flowable.test().await().assertValue(predicate);
}
@AfterTemplate
void after(Flowable<T> flowable, Predicate<T> predicate) {
RxJava2Adapter.flowableToFlux(flowable)
.as(StepVerifier::create)
.expectNextMatches(RxJavaReactorMigrationUtil.toJdkPredicate(predicate))
.verifyComplete();
}
}
static final class FlowableTestAssertResultValues<T> {
@BeforeTemplate
void before(Flowable<T> flowable, @Repeated T item) throws InterruptedException {

View File

@@ -627,6 +627,21 @@ final class RxJavaMaybeToReactorTemplates {
}
}
static final class MaybeTestAssertValue<T> {
@BeforeTemplate
void before(Maybe<T> maybe, Predicate<T> predicate) throws InterruptedException {
maybe.test().await().assertValue(predicate);
}
@AfterTemplate
void after(Maybe<T> maybe, Predicate<T> predicate) {
RxJava2Adapter.maybeToMono(maybe)
.as(StepVerifier::create)
.expectNextMatches(RxJavaReactorMigrationUtil.toJdkPredicate(predicate))
.verifyComplete();
}
}
static final class MaybeTestAssertComplete<T> {
@BeforeTemplate
void before(Maybe<T> maybe) throws InterruptedException {

View File

@@ -614,15 +614,16 @@ final class RxJavaObservableToReactorTemplates {
@BeforeTemplate
void before(Observable<T> observable, T item) throws InterruptedException {
Refaster.anyOf(
observable.test().await().assertResult(item), observable.test().await().assertValue(item));
observable.test().await().assertResult(item),
observable.test().await().assertValue(item));
}
@AfterTemplate
void after(Observable<T> observable, T item) {
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER)
.as(StepVerifier::create)
.expectNext(item)
.verifyComplete();
.as(StepVerifier::create)
.expectNext(item)
.verifyComplete();
}
}
@@ -635,7 +636,25 @@ final class RxJavaObservableToReactorTemplates {
@AfterTemplate
void after(Observable<T> observable) {
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER).as(StepVerifier::create).verifyComplete();
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER)
.as(StepVerifier::create)
.verifyComplete();
}
}
// XXX: Default BackpressureStrategy.BUFFER
static final class ObservableTestAssertValue<T> {
@BeforeTemplate
void before(Observable<T> observable, Predicate<T> predicate) throws InterruptedException {
observable.test().await().assertValue(predicate);
}
@AfterTemplate
void after(Observable<T> observable, Predicate<T> predicate) {
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER)
.as(StepVerifier::create)
.expectNextMatches(RxJavaReactorMigrationUtil.toJdkPredicate(predicate))
.verifyComplete();
}
}
@@ -644,16 +663,16 @@ final class RxJavaObservableToReactorTemplates {
@BeforeTemplate
void before(Observable<T> observable, @Repeated T item) throws InterruptedException {
Refaster.anyOf(
observable.test().await().assertResult(Refaster.asVarargs(item)),
observable.test().await().assertValues(Refaster.asVarargs(item)));
observable.test().await().assertResult(Refaster.asVarargs(item)),
observable.test().await().assertValues(Refaster.asVarargs(item)));
}
@AfterTemplate
void after(Observable<T> observable, @Repeated T item) {
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER)
.as(StepVerifier::create)
.expectNext(item)
.verifyComplete();
.as(StepVerifier::create)
.expectNext(item)
.verifyComplete();
}
}
@@ -667,7 +686,9 @@ final class RxJavaObservableToReactorTemplates {
@AfterTemplate
void after(Observable<T> observable) {
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER).as(StepVerifier::create).verifyComplete();
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER)
.as(StepVerifier::create)
.verifyComplete();
}
}
@@ -675,16 +696,16 @@ final class RxJavaObservableToReactorTemplates {
static final class ObservableTestAssertErrorClass<T> {
@BeforeTemplate
void before(Observable<T> observable, Class<? extends Throwable> errorClass)
throws InterruptedException {
throws InterruptedException {
observable.test().await().assertError(errorClass);
}
@AfterTemplate
void after(Observable<T> observable, Class<? extends Throwable> errorClass) {
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER)
.as(StepVerifier::create)
.expectError(errorClass)
.verify();
.as(StepVerifier::create)
.expectError(errorClass)
.verify();
}
}
@@ -699,7 +720,9 @@ final class RxJavaObservableToReactorTemplates {
@AfterTemplate
void after(Observable<T> observable) {
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER).as(StepVerifier::create).verifyComplete();
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER)
.as(StepVerifier::create)
.verifyComplete();
}
}
@@ -714,7 +737,8 @@ final class RxJavaObservableToReactorTemplates {
//
// @AfterTemplate
// void after(Observable<T> observable, Collection<? extends T> expected) {
// RxJava2Adapter.observableToMono(observable).as(StepVerifier::create).expectNextMatches(t ->
// RxJava2Adapter.observableToMono(observable).as(StepVerifier::create).expectNextMatches(t
// ->
// ).verifyComplete();
// }
// }
@@ -729,9 +753,9 @@ final class RxJavaObservableToReactorTemplates {
@AfterTemplate
void after(Observable<T> observable, int count) {
RxJava2Adapter.observableToFlux(observable, BackpressureStrategy.BUFFER)
.as(StepVerifier::create)
.expectNextCount(count)
.verifyComplete();
.as(StepVerifier::create)
.expectNextCount(count)
.verifyComplete();
}
}

View File

@@ -448,6 +448,21 @@ final class RxJavaSingleToReactorTemplates {
}
}
static final class SingleTestAssertValue<T> {
@BeforeTemplate
void before(Single<T> single, Predicate<T> predicate) throws InterruptedException {
single.test().await().assertValue(predicate);
}
@AfterTemplate
void after(Single<T> single, Predicate<T> predicate) {
RxJava2Adapter.singleToMono(single)
.as(StepVerifier::create)
.expectNextMatches(RxJavaReactorMigrationUtil.toJdkPredicate(predicate))
.verifyComplete();
}
}
static final class SingleTestAssertComplete<T> {
@BeforeTemplate
void before(Single<T> single) throws InterruptedException {

View File

@@ -180,6 +180,10 @@ final class RxJavaFlowableToReactorTemplatesTest implements RefasterTemplateTest
Flowable.just(1).test().await().assertResult();
}
void testFlowableTestAssertValue() throws InterruptedException {
Flowable.just(1).test().await().assertValue(i -> i > 1);
}
void testFlowableTestAssertResultValues() throws InterruptedException {
Flowable.just(1, 2, 3).test().await().assertResult(1, 2, 3);
Flowable.just(4, 5, 6).test().await().assertValues(4, 5, 6);

View File

@@ -257,6 +257,13 @@ final class RxJavaFlowableToReactorTemplatesTest implements RefasterTemplateTest
RxJava2Adapter.flowableToFlux(Flowable.just(1)).as(StepVerifier::create).verifyComplete();
}
void testFlowableTestAssertValue() throws InterruptedException {
RxJava2Adapter.flowableToFlux(Flowable.just(1))
.as(StepVerifier::create)
.expectNextMatches(RxJavaReactorMigrationUtil.toJdkPredicate(i -> i > 1))
.verifyComplete();
}
void testFlowableTestAssertResultValues() throws InterruptedException {
RxJava2Adapter.flowableToFlux(Flowable.just(1, 2, 3))
.as(StepVerifier::create)

View File

@@ -168,6 +168,10 @@ final class RxJavaMaybeToReactorTemplatesTest implements RefasterTemplateTestCas
Maybe.just(1).test().await().assertResult();
}
void MaybeTestAssertValue() throws InterruptedException {
Maybe.just(1).test().await().assertValue(i -> i > 1);
}
void testMaybeTestAssertComplete() throws InterruptedException {
Maybe.just(1).test().await().assertComplete();
}

View File

@@ -240,6 +240,13 @@ final class RxJavaMaybeToReactorTemplatesTest implements RefasterTemplateTestCas
RxJava2Adapter.maybeToMono(Maybe.just(1)).as(StepVerifier::create).verifyComplete();
}
void MaybeTestAssertValue() throws InterruptedException {
RxJava2Adapter.maybeToMono(Maybe.just(1))
.as(StepVerifier::create)
.expectNextMatches(RxJavaReactorMigrationUtil.toJdkPredicate(i -> i > 1))
.verifyComplete();
}
void testMaybeTestAssertComplete() throws InterruptedException {
RxJava2Adapter.maybeToMono(Maybe.just(1)).as(StepVerifier::create).verifyComplete();
}

View File

@@ -46,6 +46,10 @@ final class RxJavaObservableToReactorTemplatesTest implements RefasterTemplateTe
Observable.just(1).test().await().assertResult();
}
void testObservableTestAssertValue() throws InterruptedException {
Observable.just(1).test().await().assertValue(i -> i > 2);
}
void testObservableTestAssertResultValues() throws InterruptedException {
Observable.just(1, 2, 3).test().await().assertResult(1, 2, 3);
Observable.just(4, 5, 6).test().await().assertValues(4, 5, 6);

View File

@@ -71,6 +71,13 @@ final class RxJavaObservableToReactorTemplatesTest implements RefasterTemplateTe
.verifyComplete();
}
void testObservableTestAssertValue() throws InterruptedException {
RxJava2Adapter.observableToFlux(Observable.just(1), BackpressureStrategy.BUFFER)
.as(StepVerifier::create)
.expectNextMatches(RxJavaReactorMigrationUtil.toJdkPredicate(i -> i > 2))
.verifyComplete();
}
void testObservableTestAssertResultValues() throws InterruptedException {
RxJava2Adapter.observableToFlux(Observable.just(1, 2, 3), BackpressureStrategy.BUFFER)
.as(StepVerifier::create)

View File

@@ -69,6 +69,10 @@ final class RxJavaSingleToReactorTemplatesTest implements RefasterTemplateTestCa
Single.just(1).test().await().assertResult();
}
void testSingleTestAssertValue() throws InterruptedException {
Single.just(1).test().await().assertValue(i -> i > 1);
}
void testSingleTestAssertComplete() throws InterruptedException {
Single.just(1).test().await().assertComplete();
}

View File

@@ -103,6 +103,13 @@ final class RxJavaSingleToReactorTemplatesTest implements RefasterTemplateTestCa
RxJava2Adapter.singleToMono(Single.just(1)).as(StepVerifier::create).verifyComplete();
}
void testSingleTestAssertValue() throws InterruptedException {
RxJava2Adapter.singleToMono(Single.just(1))
.as(StepVerifier::create)
.expectNextMatches(RxJavaReactorMigrationUtil.toJdkPredicate(i -> i > 1))
.verifyComplete();
}
void testSingleTestAssertComplete() throws InterruptedException {
RxJava2Adapter.singleToMono(Single.just(1)).as(StepVerifier::create).verifyComplete();
}