Skip to content

Commit b5b55e6

Browse files
p123-stackp123-stack
committed
fixed tests
1 parent a1ca858 commit b5b55e6

File tree

2 files changed

+28
-26
lines changed

2 files changed

+28
-26
lines changed

‎src/Bolt/BoltConnection.php‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,16 @@ public function close(): void
335335
}
336336
}
337337

338-
private function buildRunExtra(?string $database, ?float $timeout, BookmarkHolder $holder, ?AccessMode $mode, ?iterable $metadata, bool $forBegin = false): array
339-
{
338+
private function buildRunExtra(
339+
?string $database,
340+
?float $timeout,
341+
BookmarkHolder $holder,
342+
?AccessMode $mode,
343+
?iterable $metadata,
344+
bool $forBegin = false,
345+
): array {
340346
$extra = [];
347+
341348
if ($database !== null) {
342349
$extra['db'] = $database;
343350
}
@@ -347,24 +354,19 @@ private function buildRunExtra(?string $database, ?float $timeout, BookmarkHolde
347354

348355
$bookmarks = $holder->getBookmark()->values();
349356
if (!empty($bookmarks)) {
350-
$extra['bookmarks'] = $holder->getBookmark()->values();
357+
$extra['bookmarks'] = $bookmarks;
351358
}
352359

353360
if ($forBegin) {
354-
$bookmarks = $holder->getBookmark()->values();
355-
if (!empty($bookmarks)) {
356-
$extra['bookmarks'] = $bookmarks;
357-
}
358-
359361
if ($mode !== null) {
360362
$extra['mode'] = $mode === AccessMode::WRITE() ? 'w' : 'r';
361363
}
364+
}
362365

363-
if ($metadata !== null) {
364-
$metadataArray = $metadata instanceof Traversable ? iterator_to_array($metadata) : $metadata;
365-
if (!empty($metadataArray)) {
366-
$extra['tx_metadata'] = $metadataArray;
367-
}
366+
if ($metadata !== null) {
367+
$metadataArray = $metadata instanceof Traversable ? iterator_to_array($metadata) : $metadata;
368+
if (!empty($metadataArray)) {
369+
$extra['tx_metadata'] = $metadataArray;
368370
}
369371
}
370372

‎testkit-backend/testkit.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ EXIT_CODE=0
4141
#test_authentication
4242
python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic|| EXIT_CODE=1
4343

44-
##test_bookmarks
44+
###test_bookmarks
4545
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_can_obtain_bookmark_after_commit || EXIT_CODE=1
4646
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_can_pass_bookmark_into_next_session || EXIT_CODE=1
4747
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_no_bookmark_after_rollback || EXIT_CODE=1
@@ -50,7 +50,7 @@ python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_fails_on_inval
5050
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_can_handle_multiple_bookmarks || EXIT_CODE=1
5151
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_can_pass_write_bookmark_into_write_session || EXIT_CODE=1
5252

53-
#test_session_run
53+
##test_session_run
5454
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_smaller_than_fetch_size || EXIT_CODE=1
5555
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_node || EXIT_CODE=1
5656
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_relationship || EXIT_CODE=1
@@ -69,15 +69,16 @@ python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_ba
6969
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_missing_parameter || EXIT_CODE=1
7070
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_long_string || EXIT_CODE=1
7171

72-
#test_direct_driver
72+
73+
##test_direct_driver
7374
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_custom_resolver|| EXIT_CODE=1
7475
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_fail_nicely_when_using_http_port|| EXIT_CODE=1
7576
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_supports_multi_db|| EXIT_CODE=1
7677
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_non_existing || EXIT_CODE=1
7778
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db || EXIT_CODE=1
7879
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_various_databases|| EXIT_CODE=1
7980

80-
#test_summary
81+
##test_summary
8182
python3 -m unittest tests.neo4j.test_summary.TestSummary
8283

8384
#test_tx_run
@@ -99,13 +100,13 @@ python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_run_in_a_
99100
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_run_in_a_rollbacked_tx || EXIT_CODE=1
100101
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_to_run_query_for_invalid_bookmark || EXIT_CODE=1
101102
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_broken_transaction_should_not_break_session || EXIT_CODE=1
102-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_tx_configuration || EXIT_CODE=1
103+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_tx_configuration || EXIT_CODE=1 //fail
103104
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_consume_after_commit || EXIT_CODE=1
104105
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_parallel_queries || EXIT_CODE=1
105106
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_unconsumed_result || EXIT_CODE=1
106107

107108

108-
#####test_tx_func_run
109+
#test_tx_func_run
109110
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_simple_query || EXIT_CODE=1
110111
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_parameter || EXIT_CODE=1
111112
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_meta_data || EXIT_CODE=1
@@ -116,33 +117,32 @@ python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_client_excep
116117
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_func_configuration || EXIT_CODE=1
117118
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_timeout || EXIT_CODE=1
118119

119-
#####stub
120-
#####test-basic-query
120+
##stub
121+
#test-basic-query
121122
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_path_element_ids_with_string || EXIT_CODE=1
122123
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_node_element_id_with_id || EXIT_CODE=1
123124
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_node_element_id_with_string || EXIT_CODE=1
124125
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_rel_element_id_with_id || EXIT_CODE=1
125126
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_path_element_ids_with_long || EXIT_CODE=1
126127

127-
####test-session-run
128+
#####test-session-run
128129
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_untouched_result || EXIT_CODE=1
129130
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_unfinished_result || EXIT_CODE=1
130131
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_no_discard_on_session_close_finished_result || EXIT_CODE=1
131132
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_raises_error_on_session_run || EXIT_CODE=1
132133

133-
#TestBookmarksV5
134+
##TestBookmarksV5
134135
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_bookmarks_can_be_set || EXIT_CODE=1
135136
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_last_bookmark || EXIT_CODE=1
136137
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_send_and_receive_bookmarks_write_tx || EXIT_CODE=1
137138
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_sequence_of_writing_and_reading_tx || EXIT_CODE=1
138139
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_send_and_receive_multiple_bookmarks_write_tx || EXIT_CODE=1
139140

140-
#TestBookmarksV4
141+
##TestBookmarksV4
141142
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_on_unused_sessions_are_returned || EXIT_CODE=1
142143
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_session_run || EXIT_CODE=1
143-
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_tx_run || EXIT_CODE=1
144144
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_sequence_of_writing_and_reading_tx || EXIT_CODE=1
145-
145+
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_tx_run || EXIT_CODE=1
146146

147147
exit $EXIT_CODE
148148

0 commit comments

Comments
 (0)