Factorize api spec verification tests

input-output-hk · Mar 17, 2023 · 4007a09 · 4007a09
1 parent ec49f73
commit 4007a09
Show file tree

Hide file tree

Showing 6 changed files with 213 additions and 217 deletions.
diff --git a/mithril-aggregator/src/http_server/routes/certificate_routes.rs b/mithril-aggregator/src/http_server/routes/certificate_routes.rs
@@ -123,15 +123,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &Null,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -147,15 +146,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &Null,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -170,15 +168,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &Null,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -199,15 +196,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &Null,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -223,15 +219,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &Null,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -252,14 +247,13 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &Null,
+            &response,
+        );
     }
 }
diff --git a/mithril-aggregator/src/http_server/routes/epoch_routes.rs b/mithril-aggregator/src/http_server/routes/epoch_routes.rs
@@ -118,15 +118,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &Null,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -141,14 +140,13 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &Null,
+            &response,
+        );
     }
 }
diff --git a/mithril-aggregator/src/http_server/routes/signatures_routes.rs b/mithril-aggregator/src/http_server/routes/signatures_routes.rs
@@ -105,15 +105,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &message,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -138,15 +137,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &message,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -173,15 +171,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &message,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -208,14 +205,13 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &message,
+            &response,
+        );
     }
 }
diff --git a/mithril-aggregator/src/http_server/routes/signer_routes.rs b/mithril-aggregator/src/http_server/routes/signer_routes.rs
@@ -163,15 +163,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &signer,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -196,15 +195,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &signer,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -232,15 +230,14 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &signer,
+            &response,
+        );
     }
 
     #[tokio::test]
@@ -267,14 +264,13 @@ mod tests {
             .reply(&setup_router(Arc::new(dependency_manager)))
             .await;
 
-        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));
-        }
+        APISpec::verify_conformity(
+            APISpec::get_all_spec_files(),
+            method,
+            path,
+            "application/json",
+            &signer,
+            &response,
+        );
     }
 }