fix: fix should_fail_with (noir-lang#2940)

tooling/nargo/src/ops/test.rs

@@ -56,7 +56,16 @@ fn test_status_program_compile_fail(
         return TestStatus::CompileError(diag);
     }
 
-    check_expected_failure_message(test_function, &diag.diagnostic.message)
+    // Given "Failed constraint: 'reason'"
+    // This method will return "reason"
+    fn extract_constraint_error_message(input: &str) -> Option<String> {
+        input.split(": '").nth(1)?.split('\'').next().map(str::to_string)
+    }
+
+    check_expected_failure_message(
+        test_function,
+        &extract_constraint_error_message(&diag.diagnostic.message).unwrap(),
+    )
 }
 
 /// The test function compiled successfully.

tooling/nargo_cli/build.rs

@@ -40,6 +40,8 @@ fn main() {
     let test_dir = manifest_dir.join("tests");
 
     generate_execution_success_tests(&mut test_file, &test_dir);
+    generate_noir_test_success_tests(&mut test_file, &test_dir);
+    generate_noir_test_failure_tests(&mut test_file, &test_dir);
     generate_compile_success_empty_tests(&mut test_file, &test_dir);
     generate_compile_success_contract_tests(&mut test_file, &test_dir);
     generate_compile_failure_tests(&mut test_file, &test_dir);
@@ -83,6 +85,82 @@ fn execution_success_{test_name}() {{
     }
 }
 
+fn generate_noir_test_success_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "noir_test_success";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn noir_test_success_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
+
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("test");
+
+    cmd.assert().success();
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
+fn generate_noir_test_failure_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "noir_test_failure";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn noir_test_failure_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
+
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.env("NARGO_BACKEND_PATH", path_to_mock_backend());
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("test");
+
+    cmd.assert().failure();
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
 fn generate_compile_success_empty_tests(test_file: &mut File, test_data_dir: &Path) {
     let test_sub_dir = "compile_success_empty";
     let test_data_dir = test_data_dir.join(test_sub_dir);

tooling/nargo_cli/tests/noir_test_failure/should_fail_mismatch/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "should_fail_with_mismatch"
+type = "bin"
+authors = [""]
+compiler_version = "0.1"
+
+[dependencies]

tooling/nargo_cli/tests/noir_test_failure/should_fail_mismatch/src/main.nr

@@ -0,0 +1,11 @@
+
+#[test(should_fail_with = "Not equal")]
+fn test_main_1() {
+    assert_eq(0, 1, "Different string");
+}
+
+// The assert message has a space
+#[test(should_fail_with = "Not equal")]
+fn test_main_1() {
+    assert_eq(0, 1, "Not equal ");
+}

tooling/nargo_cli/tests/noir_test_success/should_fail_with_matches/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "should_fail_with_match"
+type = "bin"
+authors = [""]
+compiler_version = "0.1"
+
+[dependencies]

tooling/nargo_cli/tests/noir_test_success/should_fail_with_matches/src/main.nr

@@ -0,0 +1,5 @@
+
+#[test(should_fail_with = "Not equal")]
+fn test_main_1() {
+    assert_eq(0, 1, "Not equal");
+}