Skip to content

Commit 8a25ea4

Browse files
committed
Merge branch 'main' of https://github.com/tinyhumansai/tinymcp into legacy-test-renames
2 parents 7ee9d91 + 3a9a27a commit 8a25ea4

20 files changed

Lines changed: 61 additions & 60 deletions

File tree

‎crates/tinymcp-bus/src/config/mod_tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ fn server_env_serializes_in_a_stable_order() {
194194
fn a_client_config_decodes_from_the_empty_object() {
195195
let config: McpClientConfig = serde_json::from_value(json!({})).expect("empty object decodes");
196196
assert!(config.enabled);
197-
assert!(config.servers.is_empty());
197+
assert_eq!(config.servers.len(), 0);
198198
assert_eq!(config.proxy, None);
199199
assert_eq!(config.registry_auth, McpRegistryAuthConfig::default());
200200
}
@@ -309,7 +309,7 @@ fn a_redacted_registry_auth_never_serializes_a_secret() {
309309
fn a_proxy_decodes_from_the_empty_object_with_nothing_set() {
310310
let proxy: McpProxyConfig = serde_json::from_value(json!({})).expect("empty object decodes");
311311
assert_eq!(proxy, McpProxyConfig::default());
312-
assert!(proxy.no_proxy.is_empty());
312+
assert_eq!(proxy.no_proxy.len(), 0);
313313
}
314314

315315
#[test]

‎crates/tinymcp-bus/src/registry/mod_tests.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ fn a_summary_tolerates_everything_optional_being_absent() {
495495
assert_eq!(summary.use_count, 0);
496496
assert!(!summary.is_deployed);
497497
assert!(!summary.official);
498-
assert!(summary.source.is_empty());
498+
assert_eq!(summary.source.len(), 0);
499499
}
500500

501501
#[test]

‎crates/tinymcp-bus/src/transport/mod_tests.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ fn an_error_result_is_flagged_and_carries_its_message() {
272272
#[test]
273273
fn text_skips_json_blocks_but_output_renders_them() {
274274
let result = McpToolResult::json(json!({ "key": "value" }));
275-
assert!(result.text().is_empty());
275+
assert_eq!(result.text().len(), 0);
276276
assert!(result.output().contains("key"));
277277
}
278278

@@ -344,7 +344,7 @@ fn output_for_llm_falls_back_when_there_is_no_markdown() {
344344
#[test]
345345
fn a_default_tool_result_is_empty_and_successful() {
346346
let result = McpToolResult::default();
347-
assert!(result.content.is_empty());
347+
assert_eq!(result.content.len(), 0);
348348
assert!(!result.is_error);
349349
assert_eq!(result.output(), "");
350350
}
@@ -387,8 +387,8 @@ fn protected_resource_metadata_decodes_with_only_its_resource() {
387387
let metadata: ProtectedResourceMetadata =
388388
serde_json::from_value(json!({ "resource": "https://example.test/mcp" })).unwrap();
389389
assert_eq!(metadata.resource, "https://example.test/mcp");
390-
assert!(metadata.authorization_servers.is_empty());
391-
assert!(metadata.scopes_supported.is_empty());
390+
assert_eq!(metadata.authorization_servers.len(), 0);
391+
assert_eq!(metadata.scopes_supported.len(), 0);
392392
}
393393

394394
#[test]
@@ -397,7 +397,7 @@ fn authorization_server_metadata_decodes_with_only_its_issuer() {
397397
serde_json::from_value(json!({ "issuer": "https://auth.test" })).unwrap();
398398
assert_eq!(metadata.issuer, "https://auth.test");
399399
assert_eq!(metadata.token_endpoint, None);
400-
assert!(metadata.code_challenge_methods_supported.is_empty());
400+
assert_eq!(metadata.code_challenge_methods_supported.len(), 0);
401401
}
402402

403403
#[test]

‎crates/tinymcp/src/audit/store/mod_tests.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ fn an_offset_skips_the_most_recent_records() {
296296

297297
#[test]
298298
fn an_empty_log_lists_nothing() {
299-
assert!(store().list(&all()).unwrap().is_empty());
299+
assert_eq!(store().list(&all()).unwrap().len(), 0);
300300
}
301301

302302
#[test]

‎crates/tinymcp/src/registry/config_doc/mod_tests.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ fn a_declaration_becomes_a_row_keyed_by_its_name() {
237237
assert_eq!(row.display_name, "fs");
238238
assert_eq!(row.command_kind, CommandKind::Node);
239239
assert_eq!(row.installed_at, 42);
240-
assert!(row.env_keys.is_empty());
240+
assert_eq!(row.env_keys.len(), 0);
241241
}
242242

243243
#[test]
@@ -274,7 +274,7 @@ fn a_null_args_list_and_a_null_flag_read_as_absent() {
274274
"mcpServers": { "a": { "command": "c", "args": null, "enabled": null, "env": null, "url": null } }
275275
}))
276276
.unwrap();
277-
assert!(declared[0].args.is_empty());
277+
assert_eq!(declared[0].args.len(), 0);
278278
assert!(declared[0].enabled);
279279
assert_eq!(declared[0].credentials, None);
280280
}
@@ -346,8 +346,8 @@ async fn applying_to_an_empty_store_installs_every_declared_server() {
346346
.unwrap();
347347

348348
assert_eq!(names(&report.installed), ["hosted", "local"]);
349-
assert!(report.updated.is_empty());
350-
assert!(report.removed.is_empty());
349+
assert_eq!(report.updated.len(), 0);
350+
assert_eq!(report.removed.len(), 0);
351351

352352
let local = registry
353353
.store()
@@ -388,9 +388,9 @@ async fn a_server_absent_from_the_document_is_removed() {
388388

389389
assert_eq!(names(&report.removed), ["gone"]);
390390
assert_eq!(report.removed[0].server_id, "id-gone");
391-
assert!(report.installed.is_empty());
392-
assert!(report.updated.is_empty());
393-
assert!(report.connect_queued.is_empty());
391+
assert_eq!(report.installed.len(), 0);
392+
assert_eq!(report.updated.len(), 0);
393+
assert_eq!(report.connect_queued.len(), 0);
394394
assert!(registry.store().find_server("id-gone").unwrap().is_none());
395395
}
396396

@@ -410,10 +410,10 @@ async fn re_applying_what_a_read_shows_changes_nothing_and_keeps_credentials() {
410410

411411
let report = registry.apply_config_doc(&doc).await.unwrap();
412412

413-
assert!(report.installed.is_empty());
414-
assert!(report.updated.is_empty());
415-
assert!(report.removed.is_empty());
416-
assert!(report.connect_queued.is_empty());
413+
assert_eq!(report.installed.len(), 0);
414+
assert_eq!(report.updated.len(), 0);
415+
assert_eq!(report.removed.len(), 0);
416+
assert_eq!(report.connect_queued.len(), 0);
417417
assert_eq!(registry.store().load_env_values("id-a").unwrap(), stored);
418418
}
419419

@@ -504,7 +504,7 @@ async fn a_disabled_server_is_updated_but_not_connected() {
504504
.unwrap();
505505

506506
assert_eq!(names(&report.updated), ["a"]);
507-
assert!(report.connect_queued.is_empty());
507+
assert_eq!(report.connect_queued.len(), 0);
508508
assert!(!registry.store().get_server("id-a").unwrap().enabled);
509509
}
510510

‎crates/tinymcp/src/registry/connections/mod_tests.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ async fn a_fresh_map_holds_nothing() {
416416
assert_eq!(connections.connected_count().await, 0);
417417
assert!(!connections.is_connected("srv-1").await);
418418
assert!(connections.tools_for("srv-1").await.is_none());
419-
assert!(connections.connected_overview().await.is_empty());
419+
assert_eq!(connections.connected_overview().await.len(), 0);
420420
}
421421

422422
#[tokio::test]

‎crates/tinymcp/src/registry/curation/mod_tests.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fn every_canonical_name_is_fully_qualified() {
4747
// A bare vendor word here would badge far more than intended.
4848
for name in OFFICIAL_SERVERS {
4949
assert!(name.contains('/'), "{name} is not a qualified name");
50-
assert!(!name.trim().is_empty());
50+
assert_ne!(name.trim().len(), 0);
5151
}
5252
}
5353

@@ -100,7 +100,7 @@ fn a_row_arriving_with_the_badge_set_has_it_cleared() {
100100
fn badging_an_empty_catalog_does_nothing() {
101101
let mut servers: Vec<RegistryServerSummary> = Vec::new();
102102
tag_official(&mut servers);
103-
assert!(servers.is_empty());
103+
assert_eq!(servers.len(), 0);
104104
}
105105

106106
#[test]
@@ -183,7 +183,7 @@ fn filtering_reports_the_full_count_when_it_drops_everything() {
183183
// user as "there is nothing here".
184184
let mut servers = vec![server("a/one"), server("b/two"), server("c/three")];
185185
assert_eq!(retain_perfect_servers(&mut servers), 3);
186-
assert!(servers.is_empty());
186+
assert_eq!(servers.len(), 0);
187187
}
188188

189189
#[test]

‎crates/tinymcp/src/registry/ops/mod_tests.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,12 @@ fn a_connection_with_no_schema_requires_nothing() {
175175
Some("https://api.test/mcp"),
176176
)]));
177177

178-
assert!(required.is_empty());
178+
assert_eq!(required.len(), 0);
179179
}
180180

181181
#[test]
182182
fn a_server_with_no_connections_requires_nothing() {
183-
assert!(collect_required_env_keys(&detail(Vec::new())).is_empty());
183+
assert_eq!(collect_required_env_keys(&detail(Vec::new())).len(), 0);
184184
}
185185

186186
// ---------------------------------------------------------------------------
@@ -201,8 +201,8 @@ fn a_hosted_connection_becomes_a_remote_install_with_no_command() {
201201
url: "https://api.test/mcp".into()
202202
}
203203
);
204-
assert!(command.is_empty());
205-
assert!(args.is_empty());
204+
assert_eq!(command.len(), 0);
205+
assert_eq!(args.len(), 0);
206206
}
207207

208208
#[test]
@@ -466,7 +466,7 @@ async fn a_server_that_is_turned_off_is_not_reconnected_when_its_credentials_cha
466466
.unwrap();
467467

468468
assert_eq!(outcome.status, UpdateEnvStatus::Disabled);
469-
assert!(outcome.tools.is_empty());
469+
assert_eq!(outcome.tools.len(), 0);
470470
assert_eq!(
471471
registry
472472
.store()
@@ -1140,7 +1140,7 @@ async fn a_connection_test_reaches_the_server_without_installing_it() {
11401140

11411141
assert_eq!(tools.len(), 1);
11421142
assert_eq!(tools[0].name, "forecast");
1143-
assert!(registry.installed_list().unwrap().is_empty());
1143+
assert_eq!(registry.installed_list().unwrap().len(), 0);
11441144
}
11451145

11461146
#[tokio::test]
@@ -1322,7 +1322,7 @@ async fn the_facade_hands_out_the_pieces_a_host_drives_directly() {
13221322
let (handle, _receiver) = registry.vault().request("API_KEY").await;
13231323
assert!(registry.vault().submit(&handle, "sekrit".into()).await);
13241324
assert_eq!(registry.oauth().pending_count(), 0);
1325-
assert!(registry.connected_overview().await.is_empty());
1325+
assert_eq!(registry.connected_overview().await.len(), 0);
13261326
}
13271327

13281328
#[tokio::test]
@@ -1480,7 +1480,7 @@ async fn installing_and_connecting_reports_the_install_even_when_the_connect_fai
14801480
.await
14811481
.expect("the install succeeded even though the connect did not");
14821482

1483-
assert!(outcome.tools.is_empty());
1483+
assert_eq!(outcome.tools.len(), 0);
14841484
assert_eq!(registry.installed_list().unwrap().len(), 1);
14851485
}
14861486

‎crates/tinymcp/src/registry/setup/mod_tests.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ async fn resolving_leaves_the_handles_in_place() {
207207
#[tokio::test]
208208
async fn resolving_nothing_yields_nothing() {
209209
let vault = SecretVault::new();
210-
assert!(vault.resolve(&HashMap::new()).await.unwrap().is_empty());
210+
assert_eq!(vault.resolve(&HashMap::new()).await.unwrap().len(), 0);
211211
}
212212

213213
// ---------------------------------------------------------------------------

‎crates/tinymcp/src/registry/sources/official/mod_tests.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ fn a_row_with_no_server_key_is_a_parse_error_rather_than_a_blank_card() {
6464

6565
#[test]
6666
fn an_empty_response_yields_no_rows() {
67-
assert!(list_response(&json!([]), None).into_summaries().is_empty());
67+
assert_eq!(list_response(&json!([]), None).into_summaries().len(), 0);
6868
let empty: OfficialListResponse = serde_json::from_value(json!({})).unwrap();
69-
assert!(empty.into_summaries().is_empty());
69+
assert_eq!(empty.into_summaries().len(), 0);
7070
}
7171

7272
// ---------------------------------------------------------------------------
@@ -82,7 +82,7 @@ fn a_row_offering_no_way_to_connect_is_dropped() {
8282
None,
8383
);
8484

85-
assert!(response.into_summaries().is_empty());
85+
assert_eq!(response.into_summaries().len(), 0);
8686
}
8787

8888
#[test]
@@ -117,7 +117,7 @@ fn a_deprecated_row_is_dropped() {
117117
None,
118118
);
119119

120-
assert!(response.into_summaries().is_empty());
120+
assert_eq!(response.into_summaries().len(), 0);
121121
}
122122

123123
#[test]
@@ -905,7 +905,7 @@ async fn a_page_past_the_end_of_the_chain_comes_back_empty() {
905905
.await
906906
.expect("running out of pages is not a failure");
907907

908-
assert!(servers.is_empty());
908+
assert_eq!(servers.len(), 0);
909909
assert_eq!(total_pages, 5);
910910
}
911911

0 commit comments

Comments
 (0)