Migrate ITs to Testkit (#1214)

Migrated tests: - `NestedQueriesIT.shouldAllowNestedQueriesInTransactionConsumedAsIterators` -> `TestIterationTxRun.test_nested` - `NestedQueriesIT.shouldAllowNestedQueriesInTransactionConsumedAsIteratorAndList` -> `TestIterationTxRun.test_nested_using_list` - `NestedQueriesIT.shouldAllowNestedQueriesInSessionConsumedAsIterators` -> `TestIterationSessionRun.test_nested` - `NestedQueriesIT.shouldAllowNestedQueriesInSessionConsumedAsIteratorAndList` -> `TestIterationSessionRun.test_nested_using_list` Deleted tests: - `shouldAllowNestedQueriesInTransactionConsumedAsLists` -> deleted, it is effectively a sequential query execution - `shouldAllowNestedQueriesInSessionConsumedAsLists` -> deleted, it is effectively a sequential query execution - `CausalClusteringIT` -> deleted, unsafe cluster tests
neo4j · May 9, 2022 · 59600be · 59600be
1 parent 68f3871
commit 59600be
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 297 deletions.
diff --git a/driver/src/test/java/org/neo4j/driver/integration/NestedQueries.java b/driver/src/test/java/org/neo4j/driver/integration/NestedQueries.java
diff --git a/driver/src/test/java/org/neo4j/driver/integration/NestedQueriesIT.java b/driver/src/test/java/org/neo4j/driver/integration/NestedQueriesIT.java
diff --git a/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringIT.java b/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringIT.java
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java
@@ -117,7 +117,6 @@ public TestkitResponse process( TestkitState testkitState )
         Optional.ofNullable( data.connectionAcquisitionTimeoutMs )
                 .ifPresent( timeout -> configBuilder.withConnectionAcquisitionTimeout( timeout, TimeUnit.MILLISECONDS ) );
         configBuilder.withDriverMetrics();
-//        configBuilder.withLogging( Logging.console( Level.FINE ) );
         org.neo4j.driver.Driver driver;
         Config config = configBuilder.build();
         try

diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java
@@ -97,17 +97,19 @@ public class StartTest implements TestkitRequest
         REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestRoutingConnectionRecvTimeout\\.test_timeout_managed_tx_retry$", skipMessage );
         REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestTxRun\\.test_broken_transaction_should_not_break_session$", skipMessage );
         REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestTxRun\\.test_does_not_update_last_bookmark_on_failure$", skipMessage );
-        skipMessage = "Does not support multiple concurrent result streams on session level";
-        REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_iteration_nested$", skipMessage );
-        REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_partial_iteration$", skipMessage );
         skipMessage = "The expects run failure to be reported immediately on run method";
         REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put(
                 "^.*\\.Routing[^.]+\\.test_should_fail_when_writing_on_unexpectedly_interrupting_writer_on_run_using_tx_run$", skipMessage );
+        skipMessage = "Does not support multiple concurrent result streams on session level";
+        REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_iteration_nested$", skipMessage );
+        REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_partial_iteration$", skipMessage );
+        REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestIterationSessionRun\\.test_nested$", skipMessage );
 
         REACTIVE_SKIP_PATTERN_TO_REASON.putAll( COMMON_SKIP_PATTERN_TO_REASON );
 
         REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_iteration_nested$", skipMessage );
         REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_partial_iteration$", skipMessage );
+        REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestIterationSessionRun\\.test_nested$", skipMessage );
     }
 
     private StartTestBody data;