diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetFeatures.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetFeatures.java index ffbb435dd5..c5cc527f57 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetFeatures.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetFeatures.java @@ -36,6 +36,11 @@ public class GetFeatures implements TestkitRequest { private static final Set COMMON_FEATURES = new HashSet<>( Arrays.asList( + "Feature:Bolt:4.0", + "Feature:Bolt:4.1", + "Feature:Bolt:4.2", + "Feature:Bolt:4.3", + "Feature:Bolt:4.4", "AuthorizationExpiredTreatment", "ConfHint:connection.recv_timeout_seconds", "Temporary:DriverFetchSize", @@ -43,18 +48,19 @@ public class GetFeatures implements TestkitRequest "Feature:Auth:Bearer", "Feature:Auth:Kerberos", "Feature:Auth:Custom", - "Feature:Bolt:4.4", "Feature:Impersonation", "Temporary:FastFailingDiscovery" ) ); private static final Set SYNC_FEATURES = new HashSet<>( Arrays.asList( + "Feature:Bolt:3.0", "Optimization:PullPipelining", "Temporary:TransactionClose", "Temporary:ResultList" ) ); private static final Set ASYNC_FEATURES = new HashSet<>( Arrays.asList( + "Feature:Bolt:3.0", "Optimization:PullPipelining", "Temporary:ResultList" ) ); 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 index 0a17e86f38..81a265759f 100644 --- 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 @@ -42,21 +42,8 @@ public class StartTest implements TestkitRequest { ASYNC_SKIP_PATTERN_TO_REASON.put( "^.*\\.test_should_reject_server_using_verify_connectivity_bolt_3x0$", "Does not error as expected" ); - // V3 tests - String skipMessage = "v3 is not applicable to reactive"; - REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestAuthorizationV3\\..*$", skipMessage ); - REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestBookmarksV3\\..*$", skipMessage ); - REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.NoRoutingV3\\..*$", skipMessage ); - REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.RoutingV3\\..*$", skipMessage ); - REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestProtocolVersions\\.test_should_reject_server_using_verify_connectivity_bolt_3x0$", skipMessage ); - REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestProtocolVersions\\.test_supports_bolt_3x0", skipMessage ); - REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestIterationSessionRun\\.test_all_v3$", skipMessage ); - REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestIterationSessionRun\\.test_discards_on_session_close$", skipMessage ); - REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestIterationTxRun\\.test_batch_v3$", skipMessage ); - REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestIterationTxRun\\.test_all_v3$", skipMessage ); - // Current limitations (require further investigation or bug fixing) - skipMessage = "Does not report RUN FAILURE"; + String skipMessage = "Does not report RUN FAILURE"; REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_write_successfully_on_leader_switch_using_tx_function$", skipMessage ); REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestDisconnects\\.test_disconnect_after_hello$", skipMessage ); REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestDisconnects\\.test_disconnect_session_on_run$", skipMessage );