Skip to content

Commit 919b8ca

Browse files
DaleSeoDaleSeo
committed
chore: fix remaining non-exhaustive struct literal usage in tests
1 parent 1547fea commit 919b8ca

2 files changed

Lines changed: 13 additions & 93 deletions

File tree

‎crates/rmcp/tests/test_message_protocol.rs‎

Lines changed: 10 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use rmcp::{
88
model::*,
99
service::{RequestContext, Service},
1010
};
11-
use tokio_util::sync::CancellationToken;
1211

1312
// Tests start here
1413
#[tokio::test]
@@ -48,13 +47,7 @@ async fn test_context_inclusion_integration() -> anyhow::Result<()> {
4847
let result = handler
4948
.handle_request(
5049
request.clone(),
51-
RequestContext {
52-
peer: client.peer().clone(),
53-
ct: CancellationToken::new(),
54-
id: NumberOrString::Number(1),
55-
meta: Default::default(),
56-
extensions: Default::default(),
57-
},
50+
RequestContext::new(NumberOrString::Number(1), client.peer().clone()),
5851
)
5952
.await?;
6053

@@ -85,13 +78,7 @@ async fn test_context_inclusion_integration() -> anyhow::Result<()> {
8578
let result = handler
8679
.handle_request(
8780
request.clone(),
88-
RequestContext {
89-
peer: client.peer().clone(),
90-
ct: CancellationToken::new(),
91-
id: NumberOrString::Number(2),
92-
meta: Default::default(),
93-
extensions: Default::default(),
94-
},
81+
RequestContext::new(NumberOrString::Number(2), client.peer().clone()),
9582
)
9683
.await?;
9784

@@ -122,13 +109,7 @@ async fn test_context_inclusion_integration() -> anyhow::Result<()> {
122109
let result = handler
123110
.handle_request(
124111
request.clone(),
125-
RequestContext {
126-
peer: client.peer().clone(),
127-
ct: CancellationToken::new(),
128-
id: NumberOrString::Number(3),
129-
meta: Default::default(),
130-
extensions: Default::default(),
131-
},
112+
RequestContext::new(NumberOrString::Number(3), client.peer().clone()),
132113
)
133114
.await?;
134115

@@ -179,13 +160,7 @@ async fn test_context_inclusion_ignored_integration() -> anyhow::Result<()> {
179160
let result = handler
180161
.handle_request(
181162
request.clone(),
182-
RequestContext {
183-
peer: client.peer().clone(),
184-
ct: CancellationToken::new(),
185-
id: NumberOrString::Number(1),
186-
meta: Meta::default(),
187-
extensions: Default::default(),
188-
},
163+
RequestContext::new(NumberOrString::Number(1), client.peer().clone()),
189164
)
190165
.await?;
191166

@@ -241,13 +216,7 @@ async fn test_message_sequence_integration() -> anyhow::Result<()> {
241216
let result = handler
242217
.handle_request(
243218
request.clone(),
244-
RequestContext {
245-
peer: client.peer().clone(),
246-
ct: CancellationToken::new(),
247-
id: NumberOrString::Number(1),
248-
meta: Meta::default(),
249-
extensions: Default::default(),
250-
},
219+
RequestContext::new(NumberOrString::Number(1), client.peer().clone()),
251220
)
252221
.await?;
253222

@@ -307,13 +276,7 @@ async fn test_message_sequence_validation_integration() -> anyhow::Result<()> {
307276
let result = handler
308277
.handle_request(
309278
request.clone(),
310-
RequestContext {
311-
peer: client.peer().clone(),
312-
ct: CancellationToken::new(),
313-
id: NumberOrString::Number(1),
314-
meta: Meta::default(),
315-
extensions: Default::default(),
316-
},
279+
RequestContext::new(NumberOrString::Number(1), client.peer().clone()),
317280
)
318281
.await?;
319282

@@ -330,13 +293,7 @@ async fn test_message_sequence_validation_integration() -> anyhow::Result<()> {
330293
let result = handler
331294
.handle_request(
332295
request.clone(),
333-
RequestContext {
334-
peer: client.peer().clone(),
335-
ct: CancellationToken::new(),
336-
id: NumberOrString::Number(2),
337-
meta: Meta::default(),
338-
extensions: Default::default(),
339-
},
296+
RequestContext::new(NumberOrString::Number(2), client.peer().clone()),
340297
)
341298
.await;
342299

@@ -370,13 +327,7 @@ async fn test_selective_context_handling_integration() -> anyhow::Result<()> {
370327
let result = handler
371328
.handle_request(
372329
request.clone(),
373-
RequestContext {
374-
peer: client.peer().clone(),
375-
ct: CancellationToken::new(),
376-
id: NumberOrString::Number(1),
377-
meta: Meta::default(),
378-
extensions: Default::default(),
379-
},
330+
RequestContext::new(NumberOrString::Number(1), client.peer().clone()),
380331
)
381332
.await?;
382333

@@ -405,13 +356,7 @@ async fn test_selective_context_handling_integration() -> anyhow::Result<()> {
405356
let result = handler
406357
.handle_request(
407358
request.clone(),
408-
RequestContext {
409-
peer: client.peer().clone(),
410-
ct: CancellationToken::new(),
411-
id: NumberOrString::Number(2),
412-
meta: Meta::default(),
413-
extensions: Default::default(),
414-
},
359+
RequestContext::new(NumberOrString::Number(2), client.peer().clone()),
415360
)
416361
.await?;
417362

@@ -457,13 +402,7 @@ async fn test_context_inclusion() -> anyhow::Result<()> {
457402
let result = handler
458403
.handle_request(
459404
request.clone(),
460-
RequestContext {
461-
peer: client.peer().clone(),
462-
ct: CancellationToken::new(),
463-
id: NumberOrString::Number(1),
464-
meta: Meta::default(),
465-
extensions: Default::default(),
466-
},
405+
RequestContext::new(NumberOrString::Number(1), client.peer().clone()),
467406
)
468407
.await?;
469408

‎crates/rmcp/tests/test_sampling.rs‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use rmcp::{
88
model::*,
99
service::{RequestContext, Service},
1010
};
11-
use tokio_util::sync::CancellationToken;
1211

1312
#[tokio::test]
1413
async fn test_basic_sampling_message_creation() -> Result<()> {
@@ -126,13 +125,7 @@ async fn test_sampling_integration_with_test_handlers() -> Result<()> {
126125
let result = handler
127126
.handle_request(
128127
request.clone(),
129-
RequestContext {
130-
peer: client.peer().clone(),
131-
ct: CancellationToken::new(),
132-
id: NumberOrString::Number(1),
133-
meta: Default::default(),
134-
extensions: Default::default(),
135-
},
128+
RequestContext::new(NumberOrString::Number(1), client.peer().clone()),
136129
)
137130
.await?;
138131

@@ -189,13 +182,7 @@ async fn test_sampling_no_context_inclusion() -> Result<()> {
189182
let result = handler
190183
.handle_request(
191184
request.clone(),
192-
RequestContext {
193-
peer: client.peer().clone(),
194-
ct: CancellationToken::new(),
195-
id: NumberOrString::Number(2),
196-
meta: Default::default(),
197-
extensions: Default::default(),
198-
},
185+
RequestContext::new(NumberOrString::Number(2), client.peer().clone()),
199186
)
200187
.await?;
201188

@@ -253,13 +240,7 @@ async fn test_sampling_error_invalid_message_sequence() -> Result<()> {
253240
let result = handler
254241
.handle_request(
255242
request.clone(),
256-
RequestContext {
257-
peer: client.peer().clone(),
258-
ct: CancellationToken::new(),
259-
id: NumberOrString::Number(3),
260-
meta: Default::default(),
261-
extensions: Default::default(),
262-
},
243+
RequestContext::new(NumberOrString::Number(3), client.peer().clone()),
263244
)
264245
.await;
265246

0 commit comments

Comments
 (0)