Skip to content

Commit 145722b

Browse files
eramongodberamongodb
committed
Replace wire versions in string literals with feature macros
1 parent 16b7739 commit 145722b

21 files changed

+518
-609
lines changed

‎src/libmongoc/tests/test-mongoc-async.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,11 @@ test_hello_impl (bool with_ssl)
171171
reply =
172172
bson_strdup_printf ("{'ok': 1,"
173173
" '" HANDSHAKE_RESPONSE_LEGACY_HELLO "': true,"
174-
" 'minWireVersion': 0,"
175-
" 'maxWireVersion': 1000,"
174+
" 'minWireVersion': %d,"
175+
" 'maxWireVersion': %d,"
176176
" 'serverId': %d}",
177+
WIRE_VERSION_MIN,
178+
WIRE_VERSION_MAX,
177179
server_id);
178180

179181
mock_server_replies_simple (request, reply);

‎src/libmongoc/tests/test-mongoc-bulk.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2889,12 +2889,14 @@ test_unordered_bulk_writes_with_error (void)
28892889
/* server is "recovering": not primary, not secondary */
28902890
mock_server_auto_hello (server,
28912891
"{'ok': 1,"
2892+
" 'minWireVersion': %d,"
28922893
" 'maxWireVersion': %d,"
28932894
" 'maxWriteBatchSize': 1,"
28942895
" 'isWritablePrimary': true,"
28952896
" 'secondary': false,"
28962897
" 'setName': 'rs',"
28972898
" 'hosts': ['%s']}",
2899+
WIRE_VERSION_MIN,
28982900
WIRE_VERSION_OP_MSG,
28992901
mock_server_get_host_and_port (server));
29002902

@@ -3402,9 +3404,10 @@ _test_numerous (bool ordered)
34023404
mock_server_auto_hello (server,
34033405
"{'ok': 1.0,"
34043406
" 'isWritablePrimary': true,"
3405-
" 'minWireVersion': 0,"
3407+
" 'minWireVersion': %d,"
34063408
" 'maxWireVersion': %d,"
34073409
" 'maxWriteBatchSize': 3}",
3410+
WIRE_VERSION_MIN,
34083411
WIRE_VERSION_OP_MSG);
34093412

34103413
mock_server_run (server);

‎src/libmongoc/tests/test-mongoc-client.c

Lines changed: 62 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -839,8 +839,10 @@ test_wire_version (void)
839839
mock_server_auto_hello (server,
840840
"{'ok': 1.0,"
841841
" 'isWritablePrimary': true,"
842-
" 'minWireVersion': 20,"
843-
" 'maxWireVersion': 21}");
842+
" 'minWireVersion': %d,"
843+
" 'maxWireVersion': %d}",
844+
WIRE_VERSION_MAX + 1,
845+
WIRE_VERSION_MAX + 1);
844846

845847
mock_server_run (server);
846848
uri = mongoc_uri_copy (mock_server_get_uri (server));
@@ -855,8 +857,10 @@ test_wire_version (void)
855857
mock_server_auto_hello (server,
856858
"{'ok': 1.0,"
857859
" 'isWritablePrimary': true,"
858-
" 'minWireVersion': -1,"
859-
" 'maxWireVersion': -1}");
860+
" 'minWireVersion': %d,"
861+
" 'maxWireVersion': %d}",
862+
WIRE_VERSION_MIN - 1,
863+
WIRE_VERSION_MIN - 1);
860864

861865
/* wait until it's time for next heartbeat */
862866
_mongoc_usleep (600 * 1000);
@@ -869,8 +873,10 @@ test_wire_version (void)
869873
mock_server_auto_hello (server,
870874
"{'ok': 1.0,"
871875
" 'isWritablePrimary': true,"
872-
" 'minWireVersion': 2,"
873-
" 'maxWireVersion': 5}");
876+
" 'minWireVersion': %d,"
877+
" 'maxWireVersion': %d}",
878+
WIRE_VERSION_MIN,
879+
WIRE_VERSION_MAX);
874880

875881
/* wait until it's time for next heartbeat */
876882
_mongoc_usleep (600 * 1000);
@@ -2348,9 +2354,12 @@ test_mongoc_client_mismatched_me (void)
23482354
" 'setName': 'rs',"
23492355
" 'isWritablePrimary': false,"
23502356
" 'secondary': true,"
2351-
" 'minWireVersion': 2, 'maxWireVersion': 5,"
2357+
" 'minWireVersion': %d,"
2358+
" 'maxWireVersion': %d,"
23522359
" 'me': 'foo.com'," /* mismatched "me" field */
23532360
" 'hosts': ['%s']}",
2361+
WIRE_VERSION_MIN,
2362+
WIRE_VERSION_MAX,
23542363
mock_server_get_host_and_port (server));
23552364

23562365
capture_logs (true);
@@ -2832,10 +2841,15 @@ _test_mongoc_client_select_server_retry (bool retry_succeeds)
28322841

28332842
server = mock_server_new ();
28342843
mock_server_run (server);
2835-
hello = bson_strdup_printf ("{'ok': 1, 'isWritablePrimary': true,"
2844+
hello = bson_strdup_printf ("{'ok': 1,"
2845+
" 'isWritablePrimary': true,"
28362846
" 'secondary': false,"
2837-
" 'minWireVersion': 2, 'maxWireVersion': 5,"
2838-
" 'setName': 'rs', 'hosts': ['%s']}",
2847+
" 'minWireVersion': %d,"
2848+
" 'maxWireVersion': %d,"
2849+
" 'setName': 'rs',"
2850+
" 'hosts': ['%s']}",
2851+
WIRE_VERSION_MIN,
2852+
WIRE_VERSION_MAX,
28392853
mock_server_get_host_and_port (server));
28402854

28412855
uri = mongoc_uri_copy (mock_server_get_uri (server));
@@ -2859,8 +2873,8 @@ _test_mongoc_client_select_server_retry (bool retry_succeeds)
28592873

28602874
/* second selection requires ping, which fails */
28612875
future = future_client_select_server (client, true, NULL, &error);
2862-
request = mock_server_receives_command (
2863-
server, "admin", MONGOC_QUERY_SECONDARY_OK, "{'ping': 1}");
2876+
request = mock_server_receives_msg (
2877+
server, MONGOC_MSG_NONE, tmp_bson ("{'$db': 'admin', 'ping': 1}"));
28642878

28652879
mock_server_hangs_up (request);
28662880
request_destroy (request);
@@ -2916,8 +2930,12 @@ _test_mongoc_client_fetch_stream_retry (bool retry_succeeds)
29162930

29172931
server = mock_server_new ();
29182932
mock_server_run (server);
2919-
hello = bson_strdup_printf ("{'ok': 1, 'isWritablePrimary': true, "
2920-
"'minWireVersion': 2, 'maxWireVersion': 5}");
2933+
hello = bson_strdup_printf ("{'ok': 1,"
2934+
" 'isWritablePrimary': true,"
2935+
" 'minWireVersion': %d,"
2936+
" 'maxWireVersion': %d}",
2937+
WIRE_VERSION_MIN,
2938+
WIRE_VERSION_MAX);
29212939
uri = mongoc_uri_copy (mock_server_get_uri (server));
29222940
mongoc_uri_set_option_as_int32 (uri, "socketCheckIntervalMS", 50);
29232941
client = test_framework_client_new_from_uri (uri, NULL);
@@ -2929,10 +2947,9 @@ _test_mongoc_client_fetch_stream_retry (bool retry_succeeds)
29292947
mock_server_replies_simple (request, hello);
29302948
request_destroy (request);
29312949

2932-
request = mock_server_receives_command (
2933-
server, "db", MONGOC_QUERY_SECONDARY_OK, "{'cmd': 1}");
2934-
mock_server_replies_simple (request, "{'ok': 1}");
2935-
request_destroy (request);
2950+
request = mock_server_receives_msg (
2951+
server, MONGOC_MSG_NONE, tmp_bson ("{'$db': 'db', 'cmd': 1}"));
2952+
mock_server_replies_ok_and_destroys (request);
29362953

29372954
ASSERT_OR_PRINT (future_get_bool (future), error);
29382955
future_destroy (future);
@@ -2944,8 +2961,8 @@ _test_mongoc_client_fetch_stream_retry (bool retry_succeeds)
29442961
future = future_client_command_simple (
29452962
client, "db", tmp_bson ("{'cmd': 1}"), NULL, NULL, &error);
29462963

2947-
request = mock_server_receives_command (
2948-
server, "admin", MONGOC_QUERY_SECONDARY_OK, "{'ping': 1}");
2964+
request = mock_server_receives_msg (
2965+
server, MONGOC_MSG_NONE, tmp_bson ("{'$db': 'admin', 'ping': 1}"));
29492966

29502967
mock_server_hangs_up (request);
29512968
request_destroy (request);
@@ -2956,8 +2973,8 @@ _test_mongoc_client_fetch_stream_retry (bool retry_succeeds)
29562973
mock_server_replies_simple (request, hello);
29572974
request_destroy (request);
29582975

2959-
request = mock_server_receives_command (
2960-
server, "db", MONGOC_QUERY_SECONDARY_OK, "{'cmd': 1}");
2976+
request = mock_server_receives_msg (
2977+
server, MONGOC_MSG_NONE, tmp_bson ("{'$db': 'db', 'cmd': 1}"));
29612978

29622979
mock_server_replies_simple (request, "{'ok': 1}");
29632980
ASSERT_OR_PRINT (future_get_bool (future), error);
@@ -3244,8 +3261,8 @@ _respond_to_ping (future_t *future, mock_server_t *server)
32443261

32453262
ASSERT (future);
32463263

3247-
request = mock_server_receives_command (
3248-
server, "admin", MONGOC_QUERY_SECONDARY_OK, "{'ping': 1}");
3264+
request = mock_server_receives_msg (
3265+
server, MONGOC_MSG_NONE, tmp_bson ("{'$db': 'admin', 'ping': 1}"));
32493266

32503267
mock_server_replies_simple (request, "{'ok': 1}");
32513268

@@ -3265,8 +3282,12 @@ test_mongoc_handshake_pool (void)
32653282
mongoc_client_t *client2;
32663283
mongoc_client_pool_t *pool;
32673284
const char *const server_reply =
3268-
"{'ok': 1, '" HANDSHAKE_RESPONSE_LEGACY_HELLO "': true, "
3269-
"'minWireVersion': 2, 'maxWireVersion': 5}";
3285+
tmp_str ("{'ok': 1,"
3286+
" '" HANDSHAKE_RESPONSE_LEGACY_HELLO "': true,"
3287+
" 'minWireVersion': %d,"
3288+
" 'maxWireVersion': %d}",
3289+
WIRE_VERSION_MIN,
3290+
WIRE_VERSION_MAX);
32703291
future_t *future;
32713292

32723293
server = mock_server_new ();
@@ -3292,8 +3313,8 @@ test_mongoc_handshake_pool (void)
32923313
mock_server_replies_simple (request2, server_reply);
32933314
request_destroy (request2);
32943315

3295-
request2 = mock_server_receives_command (
3296-
server, "test", MONGOC_QUERY_SECONDARY_OK, NULL);
3316+
request2 = mock_server_receives_msg (
3317+
server, MONGOC_MSG_NONE, tmp_bson ("{'$db': 'test'}"));
32973318
mock_server_replies_ok_and_destroys (request2);
32983319
ASSERT (future_get_bool (future));
32993320
future_destroy (future);
@@ -3315,8 +3336,12 @@ _test_client_sends_handshake (bool pooled)
33153336
future_t *future;
33163337
mongoc_client_t *client;
33173338
mongoc_client_pool_t *pool;
3318-
const char *const server_reply = "{'ok': 1, 'isWritablePrimary': true, "
3319-
"'minWireVersion': 2, 'maxWireVersion': 5}";
3339+
const char *const server_reply = tmp_str ("{'ok': 1,"
3340+
" 'isWritablePrimary': true,"
3341+
" 'minWireVersion': %d,"
3342+
" 'maxWireVersion': %d}",
3343+
WIRE_VERSION_MIN,
3344+
WIRE_VERSION_MAX);
33203345
const int heartbeat_ms = 500;
33213346

33223347
if (!TestSuite_CheckMockServerAllowed ()) {
@@ -3433,8 +3458,12 @@ test_client_appname (bool pooled, bool use_uri)
34333458
future_t *future;
34343459
mongoc_client_t *client;
34353460
mongoc_client_pool_t *pool;
3436-
const char *const server_reply = "{'ok': 1, 'isWritablePrimary': true, "
3437-
"'minWireVersion': 2, 'maxWireVersion': 5}";
3461+
const char *const server_reply = tmp_str ("{'ok': 1,"
3462+
" 'isWritablePrimary': true,"
3463+
" 'minWireVersion': %d,"
3464+
" 'maxWireVersion': %d}",
3465+
WIRE_VERSION_MIN,
3466+
WIRE_VERSION_MAX);
34383467
const int heartbeat_ms = 500;
34393468

34403469
server = mock_server_new ();
@@ -4180,6 +4209,7 @@ test_mongoc_client_resends_handshake_on_network_error (void)
41804209
mock_server_replies_simple (
41814210
request,
41824211
tmp_str ("{'ok': 1, 'minWireVersion': %d, 'maxWireVersion': %d }",
4212+
WIRE_VERSION_MIN,
41834213
WIRE_VERSION_5_1));
41844214
request_destroy (request);
41854215

0 commit comments

Comments
 (0)