Skip to content

Update dependencies #1417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
*/
package org.neo4j.driver.tck.reactive;

import static reactor.adapter.JdkFlowAdapter.flowPublisherToFlux;

import java.time.Duration;
import java.util.Map;
import org.neo4j.driver.Driver;
import org.neo4j.driver.reactive.ReactiveResult;
import org.neo4j.driver.reactive.ReactiveSession;
import org.neo4j.driver.Record;
import org.neo4j.driver.reactivestreams.ReactiveResult;
import org.neo4j.driver.reactivestreams.ReactiveSession;
import org.reactivestreams.Publisher;
import org.reactivestreams.tck.PublisherVerification;
import org.reactivestreams.tck.TestEnvironment;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import reactor.core.publisher.Mono;

public class ReactiveResultPublisherVerificationIT extends PublisherVerification<ReactiveResult> {
public class ReactiveResultPublisherVerificationIT extends PublisherVerification<Record> {
private final Neo4jManager NEO4J = new Neo4jManager();
private static final Duration TIMEOUT = Duration.ofSeconds(10);
private static final Duration TIMEOUT_FOR_NO_SIGNALS = Duration.ofSeconds(1);
Expand Down Expand Up @@ -63,15 +63,14 @@ public long maxElementsFromPublisher() {
}

@Override
public Publisher<ReactiveResult> createPublisher(long elements) {
ReactiveSession session = driver.session(ReactiveSession.class);
return Mono.from(flowPublisherToFlux(session.run("RETURN 1")));
public Publisher<Record> createPublisher(long elements) {
var session = driver.session(ReactiveSession.class);
return Mono.from(session.run("UNWIND range(0, $elements) AS x RETURN x", Map.of("elements", elements - 1)))
.flatMapMany(ReactiveResult::records);
}

@Override
public Publisher<ReactiveResult> createFailedPublisher() {
ReactiveSession session = driver.session(ReactiveSession.class);
// Please note that this publisher fails on run stage.
return Mono.from(flowPublisherToFlux(session.run("RETURN 5/0")));
public Publisher<Record> createFailedPublisher() {
return null;
}
}
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@
<!-- Please note that when updating this dependency -->
<!-- (i.e. due to a security vulnerability or bug) that the -->
<!-- corresponding server dependency also needs updating.-->
<netty-bom.version>4.1.90.Final</netty-bom.version>
<netty-bom.version>4.1.92.Final</netty-bom.version>
<!-- Please note that when updating this dependency -->
<!-- (i.e. due to a security vulnerability or bug) that the -->
<!-- corresponding server dependency also needs updating.-->
<reactor-bom.version>2020.0.30</reactor-bom.version>
<reactor-bom.version>2022.0.6</reactor-bom.version>
<slf4j-api.version>1.7.36</slf4j-api.version>
<hamcrest-junit.version>2.0.0.0</hamcrest-junit.version>
<mockito-core.version>5.2.0</mockito-core.version>
<junit.version>5.9.2</junit.version>
<mockito-core.version>5.3.1</mockito-core.version>
<junit.version>5.9.3</junit.version>
<testng-engine.version>1.0.4</testng-engine.version>
<jarchivelib.version>1.2.0</jarchivelib.version>
<bouncycastle-jdk15on.version>1.70</bouncycastle-jdk15on.version>
<logback-classic.version>1.4.6</logback-classic.version>
<jackson.version>2.14.2</jackson.version>
<logback-classic.version>1.4.7</logback-classic.version>
<jackson.version>2.15.0</jackson.version>
<lombok.version>1.18.26</lombok.version>
<svm.version>22.3.1</svm.version>
<micrometer.version>1.10.5</micrometer.version>
<testcontainers.version>1.17.6</testcontainers.version>
<build-resources.version>5.6.0</build-resources.version>
<svm.version>22.3.2</svm.version>
<micrometer.version>1.10.6</micrometer.version>
<testcontainers.version>1.18.0</testcontainers.version>
<build-resources.version>5.7.0</build-resources.version>
<!-- To be overwritten by child projects -->
<moduleName/>
</properties>
Expand Down