From ba13a2bc4a1016e3e4bfc9c92922ca6566e4bfec Mon Sep 17 00:00:00 2001
From: Robsdedude <rouven.bauer@neo4j.com>
Date: Mon, 23 Jan 2023 09:35:09 +0100
Subject: [PATCH] Fix bookmark manager related test for executeQuery

Since the test was conceived, the bookmark manager was altered to not track
bookmarks per database.
---
 .../transaction_chaining_custom_bmm.script     | 18 +++++++++---------
 .../test_driver_execute_query.py               |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/stub/driver_execute_query/scripts/transaction_chaining_custom_bmm.script b/tests/stub/driver_execute_query/scripts/transaction_chaining_custom_bmm.script
index 3ee125b35..4da264095 100644
--- a/tests/stub/driver_execute_query/scripts/transaction_chaining_custom_bmm.script
+++ b/tests/stub/driver_execute_query/scripts/transaction_chaining_custom_bmm.script
@@ -3,7 +3,7 @@
 A: HELLO {"{}": "*"}
 *: RESET
 
-C: BEGIN {"bookmarks": ["other_db:bm1"], "[db]": "*"}
+C: BEGIN {"bookmarks": ["bm1"], "[db]": "*"}
 S: SUCCESS {}
 C: RUN "CREATE (p:Person {name:$name}) RETURN p.name AS name" {"name": "a person"} {}
 S: SUCCESS {"fields": ["name"]}
@@ -11,28 +11,28 @@ C: PULL {"n": 1000}
 S: RECORD ["a person"]
    SUCCESS {"type": "w"}
 C: COMMIT
-S: SUCCESS {"bookmark": "bm1"}
+S: SUCCESS {"bookmark": "bm2"}
 *: RESET
 
 {{
-    C: BEGIN {"bookmarks": ["other_db:bm1"], "[db]": "*"}
+    C: BEGIN {"bookmarks{}": ["bm2"], "[db]": "*"}
     S: SUCCESS {}
     C: RUN "MATCH (p:Person {name:$name}) RETURN p.name AS name" {"name": "a person"} {}
     S: SUCCESS {"fields": ["name"]}
     C: PULL {"n": 1000}
-    S: SUCCESS {"type": "r"}
+    S: RECORD ["a person"]
+       SUCCESS {"type": "r"}
     C: COMMIT
-    S: SUCCESS {"bookmark": "bm1"}
+    S: SUCCESS {"bookmark": "bm2"}
 ----
-    C: BEGIN {"bookmarks{}": ["bm1", "other_db:bm1"], "[db]": "*"}
+    C: BEGIN {"{}": "*"}
     S: SUCCESS {}
     C: RUN "MATCH (p:Person {name:$name}) RETURN p.name AS name" {"name": "a person"} {}
     S: SUCCESS {"fields": ["name"]}
     C: PULL {"n": 1000}
-    S: RECORD ["a person"]
-       SUCCESS {"type": "r"}
+    S: SUCCESS {"type": "r"}
     C: COMMIT
-    S: SUCCESS {"bookmark": "bm2"}
+    S: SUCCESS {"bookmark": "bm1"}
 }}
 *: RESET
 
diff --git a/tests/stub/driver_execute_query/test_driver_execute_query.py b/tests/stub/driver_execute_query/test_driver_execute_query.py
index 13835f243..f0ac5f245 100644
--- a/tests/stub/driver_execute_query/test_driver_execute_query.py
+++ b/tests/stub/driver_execute_query/test_driver_execute_query.py
@@ -205,7 +205,7 @@ def test_configure_custom_bookmark_manager(self):
         bookmark_manager = BookmarkManager(
             self._backend,
             config=Neo4jBookmarkManagerConfig(
-                initial_bookmarks={"other_db": ["other_db:bm1"]}
+                initial_bookmarks=["bm1"]
             )
         )
         self._driver = self._new_driver()