fmt

Author: Hendler

crates/rmcp/tests/test_message_protocol.rs

@@ -84,10 +84,23 @@ async fn test_context_inclusion_integration() -> anyhow::Result<()> {
     }
 
     // Test AllServers context inclusion
-    let mut request = request;
-    if let ServerRequest::CreateMessageRequest(ref mut req) = request {
-        req.params.include_context = Some(ContextInclusion::AllServers);
-    }
+    let request = ServerRequest::CreateMessageRequest(CreateMessageRequest {
+        method: Default::default(),
+        params: CreateMessageRequestParam {
+            messages: vec![SamplingMessage {
+                role: Role::User,
+                content: Content::text("test message"),
+            }],
+            include_context: Some(ContextInclusion::AllServers),
+            model_preferences: None,
+            system_prompt: None,
+            temperature: None,
+            max_tokens: 100,
+            stop_sequences: None,
+            metadata: None,
+        },
+    });
+
     let result = handler
         .handle_request(
             request.clone(),
@@ -110,10 +123,23 @@ async fn test_context_inclusion_integration() -> anyhow::Result<()> {
     }
 
     // Test No context inclusion
-    let mut request = request;
-    if let ServerRequest::CreateMessageRequest(ref mut req) = request {
-        req.params.include_context = Some(ContextInclusion::None);
-    }
+    let request = ServerRequest::CreateMessageRequest(CreateMessageRequest {
+        method: Default::default(),
+        params: CreateMessageRequestParam {
+            messages: vec![SamplingMessage {
+                role: Role::User,
+                content: Content::text("test message"),
+            }],
+            include_context: Some(ContextInclusion::None),
+            model_preferences: None,
+            system_prompt: None,
+            temperature: None,
+            max_tokens: 100,
+            stop_sequences: None,
+            metadata: None,
+        },
+    });
+
     let result = handler
         .handle_request(
             request.clone(),
@@ -175,7 +201,7 @@ async fn test_context_inclusion_ignored_integration() -> anyhow::Result<()> {
 
     let result = handler
         .handle_request(
-            request,
+            request.clone(),
             RequestContext {
                 peer: client.peer().clone(),
                 ct: CancellationToken::new(),
@@ -239,7 +265,7 @@ async fn test_message_sequence_integration() -> anyhow::Result<()> {
 
     let result = handler
         .handle_request(
-            request,
+            request.clone(),
             RequestContext {
                 peer: client.peer().clone(),
                 ct: CancellationToken::new(),
@@ -311,7 +337,7 @@ async fn test_message_sequence_validation_integration() -> anyhow::Result<()> {
 
     let result = handler
         .handle_request(
-            request,
+            request.clone(),
             RequestContext {
                 peer: client.peer().clone(),
                 ct: CancellationToken::new(),
@@ -342,7 +368,7 @@ async fn test_message_sequence_validation_integration() -> anyhow::Result<()> {
 
     let result = handler
         .handle_request(
-            request,
+            request.clone(),
             RequestContext {
                 peer: client.peer().clone(),
                 ct: CancellationToken::new(),
@@ -392,7 +418,7 @@ async fn test_selective_context_handling_integration() -> anyhow::Result<()> {
 
     let result = handler
         .handle_request(
-            request,
+            request.clone(),
             RequestContext {
                 peer: client.peer().clone(),
                 ct: CancellationToken::new(),
@@ -429,7 +455,7 @@ async fn test_selective_context_handling_integration() -> anyhow::Result<()> {
 
     let result = handler
         .handle_request(
-            request,
+            request.clone(),
             RequestContext {
                 peer: client.peer().clone(),
                 ct: CancellationToken::new(),
@@ -464,24 +490,26 @@ async fn test_context_inclusion() -> anyhow::Result<()> {
     let client = handler.clone().serve(client_transport).await?;
 
     // Test context handling
+    let request = ServerRequest::CreateMessageRequest(CreateMessageRequest {
+        method: Default::default(),
+        params: CreateMessageRequestParam {
+            messages: vec![SamplingMessage {
+                role: Role::User,
+                content: Content::text("test"),
+            }],
+            include_context: Some(ContextInclusion::ThisServer),
+            model_preferences: None,
+            system_prompt: None,
+            temperature: None,
+            max_tokens: 100,
+            stop_sequences: None,
+            metadata: None,
+        },
+    });
+
     let result = handler
         .handle_request(
-            ServerRequest::CreateMessageRequest(CreateMessageRequest {
-                method: Default::default(),
-                params: CreateMessageRequestParam {
-                    messages: vec![SamplingMessage {
-                        role: Role::User,
-                        content: Content::text("test"),
-                    }],
-                    include_context: Some(ContextInclusion::ThisServer),
-                    model_preferences: None,
-                    system_prompt: None,
-                    temperature: None,
-                    max_tokens: 100,
-                    stop_sequences: None,
-                    metadata: None,
-                },
-            }),
+            request.clone(),
             RequestContext {
                 peer: client.peer().clone(),
                 ct: CancellationToken::new(),