fix(harness)!: Clean up presentation of API (#115)

This is prep for making putting discovery more in the hands of the user

Author: epage

crates/libtest2-harness/src/harness.rs

@@ -8,22 +8,17 @@ pub struct Harness {
 }
 
 impl Harness {
-    pub fn with_args(args: impl IntoIterator<Item = impl Into<std::ffi::OsString>>) -> Self {
-        let raw = expand_args(args);
-        Self { raw, cases: vec![] }
-    }
-
     pub fn with_env() -> Self {
         let raw = std::env::args_os();
-        let raw = expand_args(raw);
-        Self { raw, cases: vec![] }
+        Self::with_args(raw)
     }
 
-    pub fn case(&mut self, case: impl Case + 'static) {
-        self.cases.push(Box::new(case));
+    pub fn with_args(args: impl IntoIterator<Item = impl Into<std::ffi::OsString>>) -> Self {
+        let raw = expand_args(args);
+        Self { raw, cases: vec![] }
     }
 
-    pub fn cases(&mut self, cases: impl IntoIterator<Item = impl Case + 'static>) {
+    pub fn discover(&mut self, cases: impl IntoIterator<Item = impl Case + 'static>) {
         for case in cases {
             self.cases.push(Box::new(case));
         }

crates/libtest2-mimic/examples/mimic-simple.rs

@@ -5,11 +5,13 @@ use libtest2_mimic::Trial;
 
 fn main() {
     libtest2_mimic::Harness::with_env()
-        .case(Trial::test("check_toph", check_toph))
-        .case(Trial::test("check_katara", check_katara))
-        .case(Trial::test("check_sokka", check_sokka))
-        .case(Trial::test("long_computation", long_computation))
-        .case(Trial::test("compile_fail_dummy", compile_fail_dummy))
+        .discover([
+            Trial::test("check_toph", check_toph),
+            Trial::test("check_katara", check_katara),
+            Trial::test("check_sokka", check_sokka),
+            Trial::test("long_computation", long_computation),
+            Trial::test("compile_fail_dummy", compile_fail_dummy),
+        ])
         .main();
 }
 

crates/libtest2-mimic/examples/mimic-tidy.rs

@@ -4,7 +4,7 @@ use libtest2_mimic::Trial;
 
 fn main() -> std::io::Result<()> {
     let tests = collect_tests()?;
-    libtest2_mimic::Harness::with_env().cases(tests).main()
+    libtest2_mimic::Harness::with_env().discover(tests).main()
 }
 
 /// Creates one test for each `.rs` file in the current directory or

crates/libtest2-mimic/src/lib.rs

@@ -43,14 +43,9 @@ impl Harness {
         }
     }
 
-    pub fn case(mut self, case: Trial) -> Self {
-        self.harness.case(TrialCase { inner: case });
-        self
-    }
-
-    pub fn cases(mut self, cases: impl IntoIterator<Item = Trial>) -> Self {
+    pub fn discover(mut self, cases: impl IntoIterator<Item = Trial>) -> Self {
         self.harness
-            .cases(cases.into_iter().map(|c| TrialCase { inner: c }));
+            .discover(cases.into_iter().map(|c| TrialCase { inner: c }));
         self
     }
 

crates/libtest2-mimic/tests/testsuite/all_passing.rs

@@ -10,7 +10,7 @@ fn test_cmd() -> snapbox::cmd::Command {
 fn main() {
     use libtest2_mimic::Trial;
     libtest2_mimic::Harness::with_env()
-        .cases(vec![
+        .discover([
             Trial::test("foo", |_| Ok(())),
             Trial::test("bar", |_| Ok(())),
             Trial::test("barro", |_| Ok(())),

crates/libtest2-mimic/tests/testsuite/argfile.rs

@@ -11,7 +11,7 @@ fn main() {
     use libtest2_mimic::Trial;
     use libtest2_mimic::RunError;
     libtest2_mimic::Harness::with_env()
-        .cases(vec![
+        .discover([
             Trial::test("one", |_| Ok(())),
             Trial::test("two", |_| Ok(())),
             Trial::test("three", |_| Ok(())),

crates/libtest2-mimic/tests/testsuite/main_thread.rs

@@ -8,7 +8,7 @@ fn main() {
     use libtest2_mimic::Trial;
     let outer_thread = std::thread::current().id();
     libtest2_mimic::Harness::with_env()
-        .cases(vec![
+        .discover([
             Trial::test("check", move |_| {
                 assert_eq!(outer_thread, std::thread::current().id());
                 Ok(())

crates/libtest2-mimic/tests/testsuite/mixed_bag.rs

@@ -11,7 +11,7 @@ fn main() {
     use libtest2_mimic::Trial;
     use libtest2_mimic::RunError;
     libtest2_mimic::Harness::with_env()
-        .cases(vec![
+        .discover([
             Trial::test("cat", |_| Ok(())),
             Trial::test("dog", |_| Err(RunError::fail("was not a good boy"))),
             Trial::test("fox", |_| Ok(())),

crates/libtest2-mimic/tests/testsuite/panic.rs

@@ -10,7 +10,7 @@ fn test_cmd() -> snapbox::cmd::Command {
 fn main() {
     use libtest2_mimic::Trial;
     libtest2_mimic::Harness::with_env()
-        .cases(vec![
+        .discover([
             Trial::test("passes", |_| Ok(())),
             Trial::test("panics", |_| panic!("uh oh")),
         ])

crates/libtest2/examples/tidy.rs

@@ -5,7 +5,7 @@ use libtest2::Trial;
 fn main() -> std::io::Result<()> {
     let tests = collect_tests()?;
     let mut harness = libtest2::Harness::with_env();
-    harness.cases(tests);
+    harness.discover(tests);
     harness.main()
 }