From f1de2bb0cdff5defdb26a0a17e86d0991a4e1bce Mon Sep 17 00:00:00 2001 From: Dmitriy Tverdiakov Date: Thu, 12 Aug 2021 12:04:04 +0100 Subject: [PATCH] Migrate tests from Java Driver to Testkit Migrated tests: - shouldAllowDatabaseNameInSessionRun -> test_should_support_database_name_using_session_run (Bolt bump from v4 to v4.1) - shouldAllowDatabaseNameInBeginTransaction -> test_should_read_successfully_with_database_name_using_tx_function (Bolt bump from v4 to v4.1) - shouldOnlyPullRecordsWhenNeededSimpleSession -> test_should_accept_custom_fetch_size_using_session_configuration (existing test) --- .../internal/DirectDriverBoltKitIT.java | 58 ------------------- .../test/resources/read_server_v4_read.script | 12 ---- .../resources/read_server_v4_read_tx.script | 16 ----- 3 files changed, 86 deletions(-) delete mode 100644 driver/src/test/resources/read_server_v4_read.script delete mode 100644 driver/src/test/resources/read_server_v4_read_tx.script diff --git a/driver/src/test/java/org/neo4j/driver/internal/DirectDriverBoltKitIT.java b/driver/src/test/java/org/neo4j/driver/internal/DirectDriverBoltKitIT.java index 24ccf58845..47edc42b30 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/DirectDriverBoltKitIT.java +++ b/driver/src/test/java/org/neo4j/driver/internal/DirectDriverBoltKitIT.java @@ -30,12 +30,10 @@ import java.util.ArrayList; import java.util.List; -import org.neo4j.driver.AccessMode; import org.neo4j.driver.AuthTokens; import org.neo4j.driver.Config; import org.neo4j.driver.Driver; import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Result; import org.neo4j.driver.Session; import org.neo4j.driver.async.AsyncSession; import org.neo4j.driver.async.ResultCursor; @@ -55,7 +53,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.neo4j.driver.SessionConfig.builder; -import static org.neo4j.driver.SessionConfig.forDatabase; import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; import static org.neo4j.driver.util.StubServer.INSECURE_CONFIG; import static org.neo4j.driver.util.TestUtil.await; @@ -127,28 +124,6 @@ void shouldStreamingRecordsInBatchesRx() throws Exception } } - @Test - void shouldOnlyPullRecordsWhenNeededSimpleSession() throws Exception - { - StubServer server = stubController.startStub( "streaming_records_v4_buffering.script", 9001 ); - try - { - try ( Driver driver = GraphDatabase.driver( "bolt://localhost:9001", INSECURE_CONFIG ) ) - { - Session session = driver.session( builder().withFetchSize( 2 ).build() ); - Result result = session.run( "MATCH (n) RETURN n.name" ); - ArrayList resultList = new ArrayList<>(); - result.forEachRemaining( ( rec ) -> resultList.add( rec.get( 0 ).asString() ) ); - - assertEquals( resultList, asList( "Bob", "Alice", "Tina", "Frank", "Daisy", "Clive" ) ); - } - } - finally - { - assertEquals( 0, server.exitStatus() ); - } - } - @Test void shouldOnlyPullRecordsWhenNeededAsyncSession() throws Exception { @@ -196,39 +171,6 @@ void shouldPullAllRecordsOnListAsyncWhenOverWatermark() throws Exception } } - @Test - void shouldAllowDatabaseNameInSessionRun() throws Throwable - { - StubServer server = stubController.startStub( "read_server_v4_read.script", 9001 ); - - try ( Driver driver = GraphDatabase.driver( "bolt://localhost:9001", INSECURE_CONFIG ); - Session session = driver.session( builder().withDatabase( "mydatabase" ).withDefaultAccessMode( AccessMode.READ ).build() ) ) - { - final Result result = session.run( "MATCH (n) RETURN n.name" ); - result.consume(); - } - finally - { - assertEquals( 0, server.exitStatus() ); - } - } - - @Test - void shouldAllowDatabaseNameInBeginTransaction() throws Throwable - { - StubServer server = stubController.startStub( "read_server_v4_read_tx.script", 9001 ); - - try ( Driver driver = GraphDatabase.driver( "bolt://localhost:9001", INSECURE_CONFIG ); - Session session = driver.session( forDatabase( "mydatabase" ) ) ) - { - session.readTransaction( tx -> tx.run( "MATCH (n) RETURN n.name" ).consume() ); - } - finally - { - assertEquals( 0, server.exitStatus() ); - } - } - @Test void shouldDiscardIfPullNotFinished() throws Throwable { diff --git a/driver/src/test/resources/read_server_v4_read.script b/driver/src/test/resources/read_server_v4_read.script deleted file mode 100644 index 25396130e9..0000000000 --- a/driver/src/test/resources/read_server_v4_read.script +++ /dev/null @@ -1,12 +0,0 @@ -!: BOLT 4 -!: AUTO RESET -!: AUTO HELLO -!: AUTO GOODBYE - -C: RUN "MATCH (n) RETURN n.name" {} { "mode": "r", "db": "mydatabase" } - PULL { "n": 1000 } -S: SUCCESS {"fields": ["n.name"]} - RECORD ["Bob"] - RECORD ["Alice"] - RECORD ["Tina"] - SUCCESS {} diff --git a/driver/src/test/resources/read_server_v4_read_tx.script b/driver/src/test/resources/read_server_v4_read_tx.script deleted file mode 100644 index d7d0a5bb9e..0000000000 --- a/driver/src/test/resources/read_server_v4_read_tx.script +++ /dev/null @@ -1,16 +0,0 @@ -!: BOLT 4 -!: AUTO RESET -!: AUTO HELLO -!: AUTO GOODBYE - -C: BEGIN { "mode": "r", "db": "mydatabase" } -S: SUCCESS {} -C: RUN "MATCH (n) RETURN n.name" {} {} - PULL { "n": 1000 } -S: SUCCESS {"fields": ["n.name"]} - RECORD ["Bob"] - RECORD ["Alice"] - RECORD ["Tina"] - SUCCESS {} -C: COMMIT -S: SUCCESS { "bookmark": "ABookmark" }