Remove debug from tests

Author: Christopher Skene

src/models/services/types/echo.rs

@@ -87,7 +87,6 @@ impl ServiceHandler<Value> for EchoEndpoint {
             .unwrap_or_default();
 
         envelope.normalized_data = Some(serde_json::json!({
-            "message": "Echo endpoint received the request",
             "path": subpath,
             "full_path": full_path,
             "headers": envelope.request_details.headers,

src/models/services/types/fhir.rs

@@ -87,7 +87,6 @@ impl ServiceHandler<Value> for FhirEndpoint {
             .unwrap_or_default();
 
         envelope.normalized_data = Some(serde_json::json!({
-            "message": "FHIR endpoint received the request",
             "path": subpath,
             "full_path": full_path,
             "headers": envelope.request_details.headers,

src/models/services/types/http.rs

@@ -163,10 +163,25 @@ impl ServiceHandler<Value> for HttpEndpoint {
         mut envelope: RequestEnvelope<Vec<u8>>,
         _options: &HashMap<String, Value>,
     ) -> Result<RequestEnvelope<Vec<u8>>, Error> {
-        // Add or modify normalized data in the envelope
+        // Populate normalized data with real request context
+        let subpath = envelope
+            .request_details
+            .metadata
+            .get("path")
+            .cloned()
+            .unwrap_or_default();
+        let full_path = envelope
+            .request_details
+            .metadata
+            .get("full_path")
+            .cloned()
+            .unwrap_or_default();
+
         envelope.normalized_data = Some(serde_json::json!({
-            "message": "BasicEndpoint processed the request",
-            "original_data": envelope.original_data
+            "path": subpath,
+            "full_path": full_path,
+            "headers": envelope.request_details.headers,
+            "original_data": envelope.original_data,
         }));
 
         Ok(envelope)

tests/fhir_service.rs

@@ -65,7 +65,6 @@ async fn fhir_endpoint_handles_get_request() {
         .unwrap();
     let body = String::from_utf8(bytes.to_vec()).unwrap();
     let json: serde_json::Value = serde_json::from_str(&body).expect("json");
-    assert_eq!(json["message"], "FHIR endpoint received the request");
     assert_eq!(json["path"], "patient/123");
     assert_eq!(json["full_path"], "/fhir/patient/123");
     assert!(json["headers"].is_object());
@@ -123,7 +122,6 @@ async fn fhir_put_is_supported() {
         .unwrap();
     let body = String::from_utf8(bytes.to_vec()).unwrap();
     let json: serde_json::Value = serde_json::from_str(&body).expect("json");
-    assert_eq!(json["message"], "FHIR endpoint received the request");
     assert_eq!(json["path"], "Patient/123");
     assert_eq!(json["full_path"], "/fhir/Patient/123");
     assert!(json["headers"].is_object());
@@ -181,7 +179,6 @@ async fn fhir_delete_is_supported() {
         .unwrap();
     let body = String::from_utf8(bytes.to_vec()).unwrap();
     let json: serde_json::Value = serde_json::from_str(&body).expect("json");
-    assert_eq!(json["message"], "FHIR endpoint received the request");
     assert_eq!(json["path"], "Patient/123");
     assert_eq!(json["full_path"], "/fhir/Patient/123");
     assert!(json["headers"].is_object());
@@ -244,7 +241,6 @@ async fn fhir_backend_is_invoked_in_pipeline() {
         .unwrap();
     let body = String::from_utf8(bytes.to_vec()).unwrap();
     let json: serde_json::Value = serde_json::from_str(&body).expect("json");
-    assert_eq!(json["message"], "FHIR endpoint received the request");
     assert_eq!(json["path"], "Observation");
     assert_eq!(json["full_path"], "/fhir/Observation");
     assert!(json["headers"].is_object());

tests/router_runs.rs

@@ -114,8 +114,9 @@ async fn router_handles_basic_request() {
         .expect("read response body");
     let body_str = String::from_utf8(body.to_vec()).expect("parse response body as string");
 
-    // The response should contain the processed message from HttpEndpoint
-    assert!(body_str.contains("BasicEndpoint processed the request"));
+    // The response should contain the computed subpath from HttpEndpoint
+    let json: serde_json::Value = serde_json::from_str(&body_str).expect("json");
+    assert_eq!(json["path"], "get-route");
 }
 
 #[tokio::test]
@@ -184,8 +185,8 @@ async fn router_selects_correct_endpoint_based_on_path() {
     let body = axum::body::to_bytes(response.into_body(), usize::MAX)
         .await
         .expect("read response body");
-    let body_str = String::from_utf8(body.to_vec()).expect("parse response body as string");
-    assert!(body_str.contains("BasicEndpoint processed the request"));
+    let json: serde_json::Value = serde_json::from_slice(&body).expect("json");
+    assert_eq!(json["path"], "get-route");
 
     // Test `/fhir/:path` endpoint
     let response = app
@@ -206,8 +207,8 @@ async fn router_selects_correct_endpoint_based_on_path() {
     let body = axum::body::to_bytes(response.into_body(), usize::MAX)
         .await
         .expect("read response body");
-    let body_str = String::from_utf8(body.to_vec()).expect("parse response body as string");
-    assert!(body_str.contains("FHIR endpoint received the request"));
+    let json: serde_json::Value = serde_json::from_slice(&body).expect("json");
+    assert_eq!(json["path"], "patient");
 
     // Test a non-existent route
     let response = app
@@ -286,7 +287,8 @@ async fn router_handles_path_based_routing() {
         .await
         .expect("read response body");
     let body_str = String::from_utf8(body.to_vec()).expect("parse response body as string");
-    assert!(body_str.contains("Echo endpoint received the request"));
+    let json: serde_json::Value = serde_json::from_str(&body_str).expect("json");
+    assert_eq!(json["path"], "test");
 
     // Test second endpoint `/echo2/:path`
     let response = app
@@ -307,7 +309,8 @@ async fn router_handles_path_based_routing() {
         .await
         .expect("read response body");
     let body_str = String::from_utf8(body.to_vec()).expect("parse response body as string");
-    assert!(body_str.contains("Echo endpoint received the request"));
+    let json: serde_json::Value = serde_json::from_str(&body_str).expect("json");
+    assert_eq!(json["path"], "test");
 
     // Test non-existent route
     let response = app

tests/smoke_http_echo.rs

@@ -89,7 +89,6 @@ async fn smoke_http_get_echo_backend() {
     let json: serde_json::Value = serde_json::from_str(&body_str).expect("json");
     assert_eq!(json["path"], "ping");
     assert_eq!(json["full_path"], "/smoke/ping");
-    assert_eq!(json["message"], "Echo endpoint received the request");
     assert!(json["headers"].is_object());
 }
 
@@ -124,7 +123,6 @@ async fn smoke_http_post_echo_backend() {
     let json: serde_json::Value = serde_json::from_str(&body_str).expect("json");
     assert_eq!(json["path"], "echo");
     assert_eq!(json["full_path"], "/smoke/echo");
-    assert_eq!(json["message"], "Echo endpoint received the request");
     assert!(json["headers"].is_object());
 }
 
@@ -159,7 +157,6 @@ async fn smoke_http_put_echo_backend() {
     let json: serde_json::Value = serde_json::from_str(&body_str).expect("json");
     assert_eq!(json["path"], "resource/123");
     assert_eq!(json["full_path"], "/smoke/resource/123");
-    assert_eq!(json["message"], "Echo endpoint received the request");
     assert!(json["headers"].is_object());
 }
 
@@ -190,6 +187,5 @@ async fn smoke_http_delete_echo_backend() {
     let json: serde_json::Value = serde_json::from_str(&body_str).expect("json");
     assert_eq!(json["path"], "resource/123");
     assert_eq!(json["full_path"], "/smoke/resource/123");
-    assert_eq!(json["message"], "Echo endpoint received the request");
     assert!(json["headers"].is_object());
 }