Updated test patterns

forge/lang/expander.rkt

@@ -1077,7 +1077,7 @@
 (define-syntax (SatisfiabilityDecl stx)
   (syntax-parse stx
   [sd:SatisfiabilityDeclClass 
-   #:with test_name (format-id stx "~a_Assertion_~a" #'sd.expected (make-temporary-name stx))
+   #:with test_name (format-id stx "~a_assertion_~a" #'sd.expected (make-temporary-name stx))
    (syntax/loc stx
       (test
         test_name
@@ -1089,7 +1089,7 @@
 (define-syntax (ConsistencyDecl stx)
   (syntax-parse stx
   [cd:ConsistencyDeclClass 
-    #:with test_name (format-id stx "Assert_~a_~a_~a" #'cd.consistency #'cd.pred-name (make-temporary-name stx))
+    #:with test_name (format-id stx "~a_assertion_for_~a_~a" #'cd.consistency #'cd.pred-name (make-temporary-name stx))
     #:with conj_total (syntax/loc stx (&& cd.test-expr cd.pred-name))
    (syntax/loc stx
       (test

forge/tests/error/main.rkt

@@ -156,15 +156,13 @@
     ;;; ? after * makes the match lazy, meaning it will match as few characters as possible while still allowing the remainder of the regular expression to match.
 
 
-    ;;;; TODO: Change these patterns!
-    (list "multiple_test_failures.frg" #rx".*?Assertion_All_isRoot_is_necessary_for_isNotRoot failed.*?Invalid example 'thisIsNotATree'.*?Test t1 failed")
-    (list "properties_undirected_tree_underconstraint_multiple_errors.frg" #rx".*?necessary_assertion_for_isUndirectedTree_.*? failed.*?quantified_necessary_assertion_for_isUndirectedTree.*?failed")
-    (list "properties_undirected_tree_overconstraint_error.frg" #rx"Assertion_isUndirected_is_sufficient_for_isUndirectedTree failed.")
-    (list "properties_directed_tree_sufficiency_error.frg" #rx"Assertion_All_arethesame_is_sufficient_for_bothRoots failed.")
-    (list "consistency-error.frg" #rx"Failed test Assert_consistent_q_")
-    (list "inconsistency-error.frg" #rx"Failed test Assert_inconsistent_q_")
-    (list "properties_directed_tree_necessity_error.frg" #rx"Assertion_All_isRoot_is_necessary_for_isNotRoot failed.")
-
+    (list "multiple_test_failures.frg" #rx".*?quantified_necessary_assertion_for_isNotRoot.*? failed.*?Invalid example 'thisIsNotATree'.*?Test t1 failed")
+    (list "properties_undirected_tree_underconstraint_multiple_errors.frg" #rx".*?necessary_assertion_for_isUndirectedTree.*? failed.*?quantified_necessary_assertion_for_isUndirectedTree.*?failed")
+    (list "properties_undirected_tree_overconstraint_error.frg" #rx"sufficient_assertion_for_isUndirectedTree.*?failed.")
+    (list "properties_directed_tree_sufficiency_error.frg" #rx".*?quantified_sufficient_assertion_for_bothRoots.*?failed.")
+    (list "consistency-error.frg" #rx"Failed test consistent_assertion_for_q_")
+    (list "inconsistency-error.frg" #rx"Failed test inconsistent_assertion_for_q_")
+    (list "properties_directed_tree_necessity_error.frg" #rx".*?quantified_necessary_assertion_for_isNotRoot.*?failed.")
 
 
     (list "formula_comprehension_cardinality.frg" #rx"expected to be given")