Update all APISpec tests

And add multiple specs files support
input-output-hk · Mar 16, 2023 · daaceb3 · daaceb3
1 parent b224c02
commit daaceb3
Show file tree

Hide file tree

Showing 5 changed files with 217 additions and 178 deletions.
diff --git a/mithril-aggregator/src/http_server/routes/certificate_routes.rs b/mithril-aggregator/src/http_server/routes/certificate_routes.rs
@@ -86,8 +86,6 @@ mod handlers {
 
 #[cfg(test)]
 mod tests {
-    const API_SPEC_FILE: &str = "../openapi.yaml";
-
     use crate::http_server::SERVER_BASE_PATH;
     use mithril_common::store::adapter::FailStoreAdapter;
     use mithril_common::test_utils::apispec::APISpec;
@@ -125,13 +123,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&Null)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&Null)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -147,13 +147,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&Null)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&Null)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -168,13 +170,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&Null)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&Null)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -195,13 +199,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&Null)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&Null)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -217,13 +223,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&Null)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&Null)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -244,12 +252,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&Null)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&Null)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 }
diff --git a/mithril-aggregator/src/http_server/routes/epoch_routes.rs b/mithril-aggregator/src/http_server/routes/epoch_routes.rs
@@ -84,8 +84,6 @@ mod handlers {
 
 #[cfg(test)]
 mod tests {
-    const API_SPEC_FILE: &str = "../openapi.yaml";
-
     use crate::http_server::SERVER_BASE_PATH;
     use mithril_common::test_utils::apispec::APISpec;
     use serde_json::Value::Null;
@@ -120,13 +118,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&Null)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&Null)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -141,12 +141,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&Null)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&Null)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 }
diff --git a/mithril-aggregator/src/http_server/routes/signatures_routes.rs b/mithril-aggregator/src/http_server/routes/signatures_routes.rs
@@ -56,7 +56,6 @@ mod handlers {
 
 #[cfg(test)]
 mod tests {
-    const API_SPEC_FILE: &str = "../openapi.yaml";
 
     use crate::http_server::SERVER_BASE_PATH;
     use mithril_common::messages::RegisterSignatureMessage;
@@ -106,13 +105,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&message)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&message)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -137,13 +138,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&message)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&message)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -170,13 +173,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&message)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&message)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -203,12 +208,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&message)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&message)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 }
diff --git a/mithril-aggregator/src/http_server/routes/signer_routes.rs b/mithril-aggregator/src/http_server/routes/signer_routes.rs
@@ -116,8 +116,6 @@ mod handlers {
 
 #[cfg(test)]
 mod tests {
-    const API_SPEC_FILE: &str = "../openapi.yaml";
-
     use mithril_common::crypto_helper::ProtocolRegistrationError;
     use mithril_common::messages::RegisterSignerMessage;
     use mithril_common::test_utils::apispec::APISpec;
@@ -165,13 +163,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&signer)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&signer)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -196,13 +196,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&signer)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&signer)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -230,13 +232,15 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&signer)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&signer)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 
     #[tokio::test]
@@ -263,12 +267,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        APISpec::from_file(API_SPEC_FILE)
-            .method(method)
-            .path(path)
-            .validate_request(&signer)
-            .unwrap()
-            .validate_response(&response)
-            .expect("OpenAPI error");
+        for spec_file in APISpec::get_all_spec_files() {
+            APISpec::from_file(&spec_file)
+                .method(method)
+                .path(path)
+                .validate_request(&signer)
+                .unwrap()
+                .validate_response(&response)
+                .unwrap_or_else(|_| panic!("OpenAPI error in {}", spec_file));
+        }
     }
 }