test: Uncomment tests

jpedroh · Mar 12, 2024 · c969061 · c969061
1 parent 0213322
commit c969061
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/bin/tests/cli.rs b/bin/tests/cli.rs
@@ -2,26 +2,26 @@ use std::process::Command;
 
 use assert_cmd::prelude::*;
 
-// #[test]
-// fn if_there_is_a_conflict_it_returns_valid_exit_code() {
-//     let mut cmd = Command::cargo_bin("generic-merge").unwrap();
-//     cmd.arg("--base-path=tests/scenarios/smoke_java/base.java")
-//         .arg("--left-path=tests/scenarios/smoke_java/left.java")
-//         .arg("--right-path=tests/scenarios/smoke_java/right.java")
-//         .arg("--merge-path=tests/scenarios/smoke_java/merge.output.java")
-//         .arg("--language=java")
-//         .assert()
-//         .code(bin::SUCCESS_WITH_CONFLICTS);
-// }
-//
-// #[test]
-// fn if_there_is_no_conflict_it_returns_valid_exit_code() {
-//     let mut cmd = Command::cargo_bin("generic-merge").unwrap();
-//     cmd.arg("--base-path=tests/scenarios/no_conflicts/base.java")
-//         .arg("--left-path=tests/scenarios/no_conflicts/left.java")
-//         .arg("--right-path=tests/scenarios/no_conflicts/right.java")
-//         .arg("--merge-path=tests/scenarios/no_conflicts/merge.output.java")
-//         .arg("--language=java")
-//         .assert()
-//         .code(bin::SUCCESS_WITHOUT_CONFLICTS);
-// }
+#[test]
+fn if_there_is_a_conflict_it_returns_valid_exit_code() {
+    let mut cmd = Command::cargo_bin("generic-merge").unwrap();
+    cmd.arg("--base-path=tests/scenarios/smoke_java/base.java")
+        .arg("--left-path=tests/scenarios/smoke_java/left.java")
+        .arg("--right-path=tests/scenarios/smoke_java/right.java")
+        .arg("--merge-path=tests/scenarios/smoke_java/merge.output.java")
+        .arg("--language=java")
+        .assert()
+        .code(bin::SUCCESS_WITH_CONFLICTS);
+}
+
+#[test]
+fn if_there_is_no_conflict_it_returns_valid_exit_code() {
+    let mut cmd = Command::cargo_bin("generic-merge").unwrap();
+    cmd.arg("--base-path=tests/scenarios/no_conflicts/base.java")
+        .arg("--left-path=tests/scenarios/no_conflicts/left.java")
+        .arg("--right-path=tests/scenarios/no_conflicts/right.java")
+        .arg("--merge-path=tests/scenarios/no_conflicts/merge.output.java")
+        .arg("--language=java")
+        .assert()
+        .code(bin::SUCCESS_WITHOUT_CONFLICTS);
+}