ok

Signed-off-by: Shaobo He <[email protected]>

Author: shaobo-he-aws

cedar-policy-symcc/src/symcc/compiler.rs

@@ -723,7 +723,7 @@ mod decimal_tests {
     use cedar_policy_core::ast::Name;
 
     use cedar_policy::{RequestEnv, Schema};
-    use cool_asserts::{assert_matches, assert_panics};
+    use cool_asserts::assert_matches;
 
     use crate::symcc::{extension_types::decimal::Decimal, result::CompileError};
 
@@ -794,12 +794,11 @@ mod decimal_tests {
     #[track_caller]
     fn test_invalid(str: &str, msg: &str) {
         let sym_env = SymEnv::new(&decimal_schema(), &request_env()).expect("Malformed sym env.");
-        assert_panics!(
-            assert_matches!(
-                compile(&dec_lit(str), &sym_env),
-                Err(CompileError::TypeError),
-            ),
-            includes(msg)
+        assert_matches!(
+            compile(&dec_lit(str), &sym_env),
+            Err(CompileError::ExtError(_)),
+            "{}",
+            msg
         );
     }
 
@@ -836,12 +835,11 @@ mod decimal_tests {
         test_invalid("922337203685477.5808", "overflow");
         test_invalid("-922337203685477.5809", "overflow");
         let s = Expr::get_attr(Expr::var(Var::Context), "s".into());
-        assert_panics!(
-            assert_matches!(
-                compile(&dec_expr(s), &sym_env()),
-                Err(CompileError::TypeError),
-            ),
-            includes("Error: applying decimal constructor to a non-literal")
+        assert_matches!(
+            compile(&dec_expr(s), &sym_env()),
+            Err(CompileError::TypeError),
+            "{}",
+            "Error: applying decimal constructor to a non-literal"
         );
     }
 
@@ -870,7 +868,7 @@ mod datetime_tests {
     use cedar_policy_core::ast::Name;
 
     use cedar_policy::{RequestEnv, Schema};
-    use cool_asserts::{assert_matches, assert_panics};
+    use cool_asserts::assert_matches;
 
     use crate::symcc::{
         extension_types::datetime::{Datetime, Duration},
@@ -972,12 +970,11 @@ mod datetime_tests {
     #[track_caller]
     fn test_invalid_datetime_constructor(str: &str, msg: &str) {
         let sym_env = SymEnv::new(&datetime_schema(), &request_env()).expect("Malformed sym env.");
-        assert_panics!(
-            assert_matches!(
-                compile(&datetime_lit(str), &sym_env),
-                Err(CompileError::ExtError(_)),
-            ),
-            includes(msg)
+        assert_matches!(
+            compile(&datetime_lit(str), &sym_env),
+            Err(CompileError::ExtError(_)),
+            "{}",
+            msg
         );
     }
 
@@ -995,12 +992,11 @@ mod datetime_tests {
     #[track_caller]
     fn test_invalid_duration_constructor(str: &str, msg: &str) {
         let sym_env = SymEnv::new(&duration_schema(), &request_env()).expect("Malformed sym env.");
-        assert_panics!(
-            assert_matches!(
-                compile(&duration_lit(str), &sym_env),
-                Err(CompileError::TypeError),
-            ),
-            includes(msg)
+        assert_matches!(
+            compile(&duration_lit(str), &sym_env),
+            Err(CompileError::ExtError(_)),
+            "{}",
+            msg
         );
     }