chore: use new #[testclient::test] macro in tests

dnbln · Feb 6, 2024 · 1acf7ca · 1acf7ca
1 parent bdbb262
commit 1acf7ca
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 28 deletions.
diff --git a/cargo-difftests/tests/test_support/mod.rs b/cargo-difftests/tests/test_support/mod.rs
@@ -549,27 +549,23 @@ pub fn init_sample_project(test_name: &'static str) -> R<CargoProject> {
  project.test_code(
  "{add,sub,mul,div}",
  r#"
- #[test]
- fn test_add() {
- let _env = setup_difftests("test_add");
+ #[cargo_difftests_testclient::test]
+ fn test_add(_: &DifftestsEnv) {
  assert_eq!(add(2, 2), 4);
  }
 
- #[test]
- fn test_sub() {
- let _env = setup_difftests("test_sub");
+ #[cargo_difftests_testclient::test]
+ fn test_sub(_: &DifftestsEnv) {
  assert_eq!(sub(2, 2), 0);
  }
 
- #[test]
- fn test_mul() {
- let _env = setup_difftests("test_mul");
+ #[cargo_difftests_testclient::test]
+ fn test_mul(_: &DifftestsEnv) {
  assert_eq!(mul(2, 2), 4);
  }
 
- #[test]
- fn test_div() {
- let _env = setup_difftests("test_div");
+ #[cargo_difftests_testclient::test]
+ fn test_div(_: &DifftestsEnv) {
  assert_eq!(div(2, 2), 1);
  }
  "#,

diff --git a/cargo-difftests/tests/tests.rs b/cargo-difftests/tests/tests.rs
@@ -32,9 +32,8 @@ fn simple_test(
  project.test_code(
  "add",
  r#"
- #[test]
- fn test_add() {
- let _env = setup_difftests("test_add");
+ #[cargo_difftests_testclient::test]
+ fn test_add(_: &DifftestsEnv) {
  assert_eq!(add(1, 2), 3);
  }
  "#,
@@ -216,10 +215,8 @@ fn test_git_diff_files(
  project.test_code(
  "add",
  r#"
-
- #[test]
- fn test_add() {
- let _env = setup_difftests("test_add");
+ #[cargo_difftests_testclient::test]
+ fn test_add(_: &DifftestsEnv) {
  assert_eq!(add(1, 2), 3);
  }
  "#,
@@ -296,9 +293,8 @@ fn test_git_diff_files_with_commit(
  project.test_code(
  "add",
  r#"
- #[test]
- fn test_add() {
- let _env = setup_difftests("test_add");
+ #[cargo_difftests_testclient::test]
+ fn test_add(_: &DifftestsEnv) {
  assert_eq!(add(1, 2), 3);
  }
  "#,
@@ -399,15 +395,13 @@ pub fn extra() {
  project.test_code(
  "{add, sub}",
  r#"
-#[test]
-fn test_add() {
- let _env = setup_difftests("test_add");
+#[cargo_difftests_testclient::test]
+fn test_add(_: &DifftestsEnv) {
  assert_eq!(add(1, 2), 3);
 }
 
-#[test]
-fn test_sub() {
- let _env = setup_difftests("test_sub");
+#[cargo_difftests_testclient::test]
+fn test_sub(_: &DifftestsEnv) {
  assert_eq!(sub(3, 2), 1);
 }