test: tidy up the tests

2 files changed, 15 insertions, 20 deletions

diff --git a/src/authorization/check_service.rs b/src/authorization/check_service.rs
index d2dd1e17..b6809339 100644
--- a/src/authorization/check_service.rs
+++ b/src/authorization/check_service.rs
@@ -24,7 +24,7 @@ impl envoy_types::ext_authz::v3::pb::Authorization for CheckService {
     ) -> Result<Response<CheckResponse>, Status> {
         let request = request.into_inner();
 
-        if dbg!(self.authorizer.authorize(dbg!(request))) {
+        if self.authorizer.authorize(request) {
             log::info!("OK");
             Ok(Response::new(CheckResponse::with_status(Status::ok("OK"))))
         } else {
diff --git a/tests/authorization/cedar_authorizer_test.rs b/tests/authorization/cedar_authorizer_test.rs
index 6e1591eb..d6742995 100644
--- a/tests/authorization/cedar_authorizer_test.rs
+++ b/tests/authorization/cedar_authorizer_test.rs
@@ -24,42 +24,38 @@ mod tests {
     #[test]
     fn test_cedar_authorizer_denies_invalid_token() {
         let authorizer = CedarAuthorizer::default();
-        let mut headers = HashMap::new();
-        headers.insert(
-            "authorization".to_string(),
-            "Bearer invalid-token".to_string(),
-        );
         let request = create_request(|item: &mut HttpRequest| {
-            item.headers = headers;
+            item.headers = build_with(|item: &mut HashMap<String, String>| {
+                item.insert(
+                    String::from("authorization"),
+                    String::from("Bearer invalid-token"),
+                );
+            });
         });
 
-        let result = authorizer.authorize(request);
-        assert!(!result);
+        assert!(!authorizer.authorize(request));
     }
 
     #[test]
     fn test_cedar_authorizer_denies_missing_header() {
         let authorizer = CedarAuthorizer::default();
-        let headers = HashMap::new();
         let request = create_request(|item: &mut HttpRequest| {
-            item.headers = headers;
+            item.headers = HashMap::new();
         });
 
-        let result = authorizer.authorize(request);
-        assert!(!result);
+        assert!(!authorizer.authorize(request));
     }
 
     #[test]
     fn test_cedar_authorizer_allows_static_assets() {
         let authorizer = CedarAuthorizer::default();
-        let mut headers = HashMap::new();
-        headers.insert(":path".to_string(), "/public/style.css".to_string());
         let request = create_request(|item: &mut HttpRequest| {
-            item.headers = headers;
+            item.headers = build_with(|item: &mut HashMap<String, String>| {
+                item.insert(String::from(":path"), String::from("/public/style.css"));
+            });
         });
 
-        let result = authorizer.authorize(request);
-        assert!(result);
+        assert!(authorizer.authorize(request));
     }
 
     #[test]
@@ -71,7 +67,6 @@ mod tests {
             item.headers = headers;
         });
 
-        let result = authorizer.authorize(request);
-        assert!(result);
+        assert!(authorizer.authorize(request));
     }
 }