-
Notifications
You must be signed in to change notification settings - Fork 157
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
New features: - `Temporary:ResultList` Migrated tests: - shouldHandleLeaderSwitchAndRetryWhenWritingInTxFunctionAsync -> test_should_write_successfully_on_leader_switch_using_tx_function (existing test, bolt bump to 4.1) - shouldOnlyPullRecordsWhenNeededAsyncSession -> test_should_accept_custom_fetch_size_using_session_configuration (existing test, bolt bump to 4.1) - shouldPullAllRecordsOnListAsyncWhenOverWatermark -> test_should_pull_custom_size_and_then_all_using_session_configuration
- Loading branch information
1 parent
f53891b
commit 61e2706
Showing
9 changed files
with
124 additions
and
161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 0 additions & 25 deletions
25
driver/src/test/resources/not_able_to_write_server_tx_func_retries.script
This file was deleted.
Oops, something went wrong.
19 changes: 0 additions & 19 deletions
19
driver/src/test/resources/streaming_records_v4_buffering.script
This file was deleted.
Oops, something went wrong.
23 changes: 0 additions & 23 deletions
23
driver/src/test/resources/streaming_records_v4_list_async.script
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultList.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Copyright (c) "Neo4j" | ||
| * Neo4j Sweden AB [http://neo4j.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package neo4j.org.testkit.backend.messages.requests; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
| import neo4j.org.testkit.backend.TestkitState; | ||
| import neo4j.org.testkit.backend.messages.responses.Record; | ||
| import neo4j.org.testkit.backend.messages.responses.RecordList; | ||
| import neo4j.org.testkit.backend.messages.responses.TestkitResponse; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.concurrent.CompletionStage; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @NoArgsConstructor | ||
| public class ResultList implements TestkitRequest | ||
| { | ||
| private ResultListBody data; | ||
|
|
||
| @Override | ||
| public TestkitResponse process( TestkitState testkitState ) | ||
| { | ||
| return createResponse( testkitState.getResults().get( data.getResultId() ).list() ); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletionStage<Optional<TestkitResponse>> processAsync( TestkitState testkitState ) | ||
| { | ||
| return testkitState.getResultCursors().get( data.getResultId() ) | ||
| .listAsync() | ||
| .thenApply( this::createResponse ) | ||
| .thenApply( Optional::of ); | ||
| } | ||
|
|
||
| private RecordList createResponse( List<org.neo4j.driver.Record> records ) | ||
| { | ||
| List<Record.RecordBody> mappedRecords = records.stream() | ||
| .map( record -> Record.RecordBody.builder().values( record ).build() ) | ||
| .collect( Collectors.toList() ); | ||
| return RecordList.builder() | ||
| .data( RecordList.RecordListBody.builder().records( mappedRecords ).build() ) | ||
| .build(); | ||
| } | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @NoArgsConstructor | ||
| public static class ResultListBody | ||
| { | ||
| private String resultId; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RecordList.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright (c) "Neo4j" | ||
| * Neo4j Sweden AB [http://neo4j.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package neo4j.org.testkit.backend.messages.responses; | ||
|
|
||
| import lombok.Builder; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @Builder | ||
| public class RecordList implements TestkitResponse | ||
| { | ||
| private final RecordListBody data; | ||
|
|
||
| @Override | ||
| public String testkitName() | ||
| { | ||
| return "RecordList"; | ||
| } | ||
|
|
||
| @Setter | ||
| @Getter | ||
| @Builder | ||
| public static class RecordListBody | ||
| { | ||
| private final List<Record.RecordBody> records; | ||
| } | ||
| } |