Skip to content

Commit 59600be

Browse files
authored
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
1 parent 68f3871 commit 59600be

File tree

5 files changed

+5
-297
lines changed

5 files changed

+5
-297
lines changed

driver/src/test/java/org/neo4j/driver/integration/NestedQueries.java

Lines changed: 0 additions & 174 deletions
This file was deleted.

driver/src/test/java/org/neo4j/driver/integration/NestedQueriesIT.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

driver/src/test/java/org/neo4j/driver/stress/CausalClusteringIT.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ public TestkitResponse process( TestkitState testkitState )
117117
Optional.ofNullable( data.connectionAcquisitionTimeoutMs )
118118
.ifPresent( timeout -> configBuilder.withConnectionAcquisitionTimeout( timeout, TimeUnit.MILLISECONDS ) );
119119
configBuilder.withDriverMetrics();
120-
// configBuilder.withLogging( Logging.console( Level.FINE ) );
121120
org.neo4j.driver.Driver driver;
122121
Config config = configBuilder.build();
123122
try

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,19 @@ public class StartTest implements TestkitRequest
9797
REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestRoutingConnectionRecvTimeout\\.test_timeout_managed_tx_retry$", skipMessage );
9898
REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestTxRun\\.test_broken_transaction_should_not_break_session$", skipMessage );
9999
REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestTxRun\\.test_does_not_update_last_bookmark_on_failure$", skipMessage );
100-
skipMessage = "Does not support multiple concurrent result streams on session level";
101-
REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_iteration_nested$", skipMessage );
102-
REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_partial_iteration$", skipMessage );
103100
skipMessage = "The expects run failure to be reported immediately on run method";
104101
REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put(
105102
"^.*\\.Routing[^.]+\\.test_should_fail_when_writing_on_unexpectedly_interrupting_writer_on_run_using_tx_run$", skipMessage );
103+
skipMessage = "Does not support multiple concurrent result streams on session level";
104+
REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_iteration_nested$", skipMessage );
105+
REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_partial_iteration$", skipMessage );
106+
REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestIterationSessionRun\\.test_nested$", skipMessage );
106107

107108
REACTIVE_SKIP_PATTERN_TO_REASON.putAll( COMMON_SKIP_PATTERN_TO_REASON );
108109

109110
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_iteration_nested$", skipMessage );
110111
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_partial_iteration$", skipMessage );
112+
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestIterationSessionRun\\.test_nested$", skipMessage );
111113
}
112114

113115
private StartTestBody data;

0 commit comments

Comments
 (0)