Skip to content

Commit 1e86586

Browse files
yh-0yh-0
committed
RDBC-954 Fix tests
1 parent e86a8c2 commit 1e86586

File tree

1 file changed

+55
-21
lines changed

1 file changed

+55
-21
lines changed

‎ravendb/tests/jvm_migrated_tests/client_tests/documents_tests/operations_tests/test_connection_string.py‎

Lines changed: 55 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ def test_full_lifecycle_for_all_connection_string_types(self):
8383
self.assertEqual(1, len(raven_get_result.raven_connection_strings))
8484

8585
# 3. Delete
86-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(raven_connection_string))
86+
remove_result = self.store.maintenance.send(
87+
RemoveConnectionStringOperation("raven1", ConnectionStringType.RAVEN)
88+
)
8789
self.assertGreater(remove_result.raft_command_index, 0)
8890

8991
# 4. Get and Assert None
@@ -101,7 +103,7 @@ def test_full_lifecycle_for_all_connection_string_types(self):
101103
self.assertEqual(1, len(sql_get_result.sql_connection_strings))
102104

103105
# 3. Delete
104-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(sql_connection_string))
106+
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation("sql1", ConnectionStringType.SQL))
105107
self.assertGreater(remove_result.raft_command_index, 0)
106108

107109
# 4. Get and Assert None
@@ -119,7 +121,7 @@ def test_full_lifecycle_for_all_connection_string_types(self):
119121
self.assertEqual(1, len(olap_get_result.olap_connection_strings))
120122

121123
# 3. Delete
122-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(olap_connection_string))
124+
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation("olap1", ConnectionStringType.OLAP))
123125
self.assertGreater(remove_result.raft_command_index, 0)
124126

125127
# 4. Get and Assert None
@@ -138,7 +140,9 @@ def test_full_lifecycle_for_all_connection_string_types(self):
138140
self.assertEqual(1, len(elastic_get_result.elastic_search_connection_strings))
139141

140142
# 3. Delete
141-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(elastic_search_connection_string))
143+
remove_result = self.store.maintenance.send(
144+
RemoveConnectionStringOperation("elastic1", ConnectionStringType.ELASTIC_SEARCH)
145+
)
142146
self.assertGreater(remove_result.raft_command_index, 0)
143147

144148
# 4. Get and Assert None
@@ -160,7 +164,9 @@ def test_full_lifecycle_for_all_connection_string_types(self):
160164
self.assertEqual(1, len(queue_get_result.queue_connection_strings))
161165

162166
# 3. Delete
163-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(queue_connection_string))
167+
remove_result = self.store.maintenance.send(
168+
RemoveConnectionStringOperation("queue1", ConnectionStringType.QUEUE)
169+
)
164170
self.assertGreater(remove_result.raft_command_index, 0)
165171

166172
# 4. Get and Assert None
@@ -180,7 +186,9 @@ def test_full_lifecycle_for_all_connection_string_types(self):
180186
self.assertEqual(1, len(snowflake_get_result.snowflake_connection_strings))
181187

182188
# 3. Delete
183-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(snowflake_connection_string))
189+
remove_result = self.store.maintenance.send(
190+
RemoveConnectionStringOperation("snowflake1", ConnectionStringType.SNOWFLAKE)
191+
)
184192
self.assertGreater(remove_result.raft_command_index, 0)
185193

186194
# 4. Get and Assert None
@@ -200,7 +208,7 @@ def test_full_lifecycle_for_all_connection_string_types(self):
200208
self.assertEqual(1, len(ai_get_result.ai_connection_strings))
201209

202210
# 3. Delete
203-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_connection_string))
211+
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation("ai1", ConnectionStringType.AI))
204212
self.assertGreater(remove_result.raft_command_index, 0)
205213

206214
# 4. Get and Assert None
@@ -229,7 +237,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
229237
self.assertEqual(raven_connection_string.topology_discovery_urls, retrieved.topology_discovery_urls)
230238

231239
# Delete
232-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(raven_connection_string))
240+
remove_result = self.store.maintenance.send(
241+
RemoveConnectionStringOperation("raven_all_fields", ConnectionStringType.RAVEN)
242+
)
233243
self.assertGreater(remove_result.raft_command_index, 0)
234244

235245
# Get and Assert None
@@ -261,7 +271,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
261271
self.assertEqual(sql_connection_string.factory_name, retrieved.factory_name)
262272

263273
# Delete
264-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(sql_connection_string))
274+
remove_result = self.store.maintenance.send(
275+
RemoveConnectionStringOperation("sql_all_fields", ConnectionStringType.SQL)
276+
)
265277
self.assertGreater(remove_result.raft_command_index, 0)
266278

267279
# Get and Assert None
@@ -455,7 +467,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
455467
)
456468

457469
# Delete
458-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(olap_connection_string))
470+
remove_result = self.store.maintenance.send(
471+
RemoveConnectionStringOperation("olap_all_fields", ConnectionStringType.OLAP)
472+
)
459473
self.assertGreater(remove_result.raft_command_index, 0)
460474

461475
# Get and Assert None
@@ -504,7 +518,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
504518
self.assertEqual(openai_chat_settings.dimensions, retrieved.openai_settings.dimensions)
505519

506520
# Delete
507-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_openai_chat_connection_string))
521+
remove_result = self.store.maintenance.send(
522+
RemoveConnectionStringOperation("ai_openai_chat", ConnectionStringType.AI)
523+
)
508524
self.assertGreater(remove_result.raft_command_index, 0)
509525

510526
# Get and Assert None
@@ -554,7 +570,7 @@ def test_all_possible_fields_for_each_connection_string_type(self):
554570

555571
# Delete
556572
remove_result = self.store.maintenance.send(
557-
RemoveConnectionStringOperation(ai_openai_embeddings_connection_string)
573+
RemoveConnectionStringOperation("ai_openai_embeddings", get_result.ai_connection_strings)
558574
)
559575
self.assertGreater(remove_result.raft_command_index, 0)
560576

@@ -602,7 +618,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
602618
self.assertEqual(azure_openai_settings.dimensions, retrieved.azure_openai_settings.dimensions)
603619

604620
# Delete
605-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_azure_openai_connection_string))
621+
remove_result = self.store.maintenance.send(
622+
RemoveConnectionStringOperation("ai_azure_openai", get_result.ai_connection_strings)
623+
)
606624
self.assertGreater(remove_result.raft_command_index, 0)
607625

608626
# Get and Assert None
@@ -643,7 +661,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
643661
self.assertEqual(ollama_settings.think, retrieved.ollama_settings.think)
644662

645663
# Delete
646-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_ollama_connection_string))
664+
remove_result = self.store.maintenance.send(
665+
RemoveConnectionStringOperation("ai_ollama", ConnectionStringType.AI)
666+
)
647667
self.assertGreater(remove_result.raft_command_index, 0)
648668

649669
# Get and Assert None
@@ -674,7 +694,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
674694
self.assertIsNotNone(retrieved.embedded_settings)
675695

676696
# Delete
677-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_embedded_connection_string))
697+
remove_result = self.store.maintenance.send(
698+
RemoveConnectionStringOperation("ai_embedded", ConnectionStringType.AI)
699+
)
678700
self.assertGreater(remove_result.raft_command_index, 0)
679701

680702
# Get and Assert None
@@ -710,7 +732,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
710732
self.assertEqual(google_settings.dimensions, retrieved.google_settings.dimensions)
711733

712734
# Delete
713-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_google_connection_string))
735+
remove_result = self.store.maintenance.send(
736+
RemoveConnectionStringOperation("ai_google", ConnectionStringType.AI)
737+
)
714738
self.assertGreater(remove_result.raft_command_index, 0)
715739

716740
# Get and Assert None
@@ -750,7 +774,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
750774
self.assertEqual(huggingface_settings.endpoint, retrieved.huggingface_settings.endpoint)
751775

752776
# Delete
753-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_huggingface_connection_string))
777+
remove_result = self.store.maintenance.send(
778+
RemoveConnectionStringOperation("ai_huggingface", ConnectionStringType.AI)
779+
)
754780
self.assertGreater(remove_result.raft_command_index, 0)
755781

756782
# Get and Assert None
@@ -788,7 +814,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
788814
self.assertEqual(mistral_ai_settings.endpoint, retrieved.mistral_ai_settings.endpoint)
789815

790816
# Delete
791-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(ai_mistral_connection_string))
817+
remove_result = self.store.maintenance.send(
818+
RemoveConnectionStringOperation("ai_mistral", ConnectionStringType.AI)
819+
)
792820
self.assertGreater(remove_result.raft_command_index, 0)
793821

794822
# Get and Assert None
@@ -853,7 +881,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
853881
)
854882

855883
# Delete
856-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(elastic_search_connection_string))
884+
remove_result = self.store.maintenance.send(
885+
RemoveConnectionStringOperation("elastic_all_fields", ConnectionStringType.ELASTIC_SEARCH)
886+
)
857887
self.assertGreater(remove_result.raft_command_index, 0)
858888

859889
# Get and Assert None
@@ -986,7 +1016,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
9861016
)
9871017

9881018
# Delete
989-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(queue_connection_string))
1019+
remove_result = self.store.maintenance.send(
1020+
RemoveConnectionStringOperation("queue_all_fields", ConnectionStringType.QUEUE)
1021+
)
9901022
self.assertGreater(remove_result.raft_command_index, 0)
9911023

9921024
# Get and Assert None
@@ -1016,7 +1048,9 @@ def test_all_possible_fields_for_each_connection_string_type(self):
10161048
self.assertEqual(snowflake_connection_string.connection_string, retrieved.connection_string)
10171049

10181050
# Delete
1019-
remove_result = self.store.maintenance.send(RemoveConnectionStringOperation(snowflake_connection_string))
1051+
remove_result = self.store.maintenance.send(
1052+
RemoveConnectionStringOperation("snowflake_all_fields", ConnectionStringType.SNOWFLAKE)
1053+
)
10201054
self.assertGreater(remove_result.raft_command_index, 0)
10211055

10221056
# Get and Assert None

0 commit comments

Comments
 (0)