Improved handling of tmp dirs in integration tests

Author: Heliozoa

crates/tmc-langs-cli/tests/integration.rs

@@ -6,10 +6,11 @@ use tmc_langs_cli::app::Cli;
 use walkdir::WalkDir;
 
 fn cp_exercise(path: &Path) -> TempDir {
+    let path_parent = path.parent().unwrap();
     let temp = tempdir().unwrap();
     for file in WalkDir::new(path) {
         let file = file.unwrap();
-        let relative = file.path().strip_prefix(path).unwrap();
+        let relative = file.path().strip_prefix(path_parent).unwrap();
         let target = temp.path().join(relative);
         if file.file_type().is_dir() {
             std::fs::create_dir_all(target).unwrap();
@@ -91,23 +92,24 @@ fn test(f: impl Fn(&Path)) {
         ],
     }, {
         insta::glob!("../../../", "sample_exercises/*/*", |exercise| {
-            println!("testing {exercise:?}");
-            f(exercise)
+            let dir_name = exercise.file_name().unwrap();
+            let exercise = cp_exercise(&exercise);
+            println!("testing {:?}", exercise.path().join(dir_name));
+            f(&exercise.path().join(dir_name))
         })
     })
 }
 
 #[test]
 fn checkstyle() {
     test(|exercise| {
-        let ex = cp_exercise(exercise);
         let out = NamedTempFile::new().unwrap();
         let cli = Cli::parse_from([
             "tmc-langs-cli",
             "--pretty",
             "checkstyle",
             "--exercise-path",
-            path_str(&ex),
+            path_str(&exercise),
             "--locale",
             "eng",
             "--output-path",
@@ -121,17 +123,16 @@ fn checkstyle() {
 #[test]
 fn clean() {
     test(|exercise| {
-        let ex = cp_exercise(exercise);
         let cli = Cli::parse_from([
             "tmc-langs-cli",
             "--pretty",
             "clean",
             "--exercise-path",
-            path_str(&ex),
+            path_str(&exercise),
         ]);
         let output = tmc_langs_cli::run(cli).unwrap();
         insta::assert_yaml_snapshot!(output);
-        let files = sorted_list_of_files(&ex);
+        let files = sorted_list_of_files(&exercise);
         insta::assert_yaml_snapshot!(files);
     })
 }

crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@csharp__failing-exercise-2.snap

@@ -0,0 +1,11 @@
+---
+source: crates/tmc-langs-cli/tests/integration.rs
+expression: files
+input_file: sample_exercises/csharp/failing-exercise
+---
+- failing-exercise
+- failing-exercise/src
+- failing-exercise/src/FailingSample
+- failing-exercise/src/FailingSample/FailingSample.csproj
+- failing-exercise/src/FailingSample/Program.cs
+

crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@csharp__failing-exercise.snap

@@ -0,0 +1,11 @@
+---
+source: crates/tmc-langs-cli/tests/integration.rs
+expression: output
+input_file: sample_exercises/csharp/failing-exercise
+---
+output-kind: output-data
+status: finished
+message: compressed project from [PATH] to [PATH]
+result: executed-command
+data: ~
+

crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@csharp__non-compiling-exercise-2.snap

@@ -0,0 +1,11 @@
+---
+source: crates/tmc-langs-cli/tests/integration.rs
+expression: files
+input_file: sample_exercises/csharp/non-compiling-exercise
+---
+- non-compiling-exercise
+- non-compiling-exercise/src
+- non-compiling-exercise/src/NonCompilingSample
+- non-compiling-exercise/src/NonCompilingSample/NonCompilingSample.csproj
+- non-compiling-exercise/src/NonCompilingSample/Program.cs
+

crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@csharp__non-compiling-exercise.snap

@@ -0,0 +1,11 @@
+---
+source: crates/tmc-langs-cli/tests/integration.rs
+expression: output
+input_file: sample_exercises/csharp/non-compiling-exercise
+---
+output-kind: output-data
+status: finished
+message: compressed project from [PATH] to [PATH]
+result: executed-command
+data: ~
+

crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@csharp__partially-passing-2.snap

@@ -0,0 +1,11 @@
+---
+source: crates/tmc-langs-cli/tests/integration.rs
+expression: files
+input_file: sample_exercises/csharp/partially-passing
+---
+- partially-passing
+- partially-passing/src
+- partially-passing/src/TestProject
+- partially-passing/src/TestProject/Program.cs
+- partially-passing/src/TestProject/TestProject.csproj
+

crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@csharp__partially-passing.snap

@@ -0,0 +1,11 @@
+---
+source: crates/tmc-langs-cli/tests/integration.rs
+expression: output
+input_file: sample_exercises/csharp/partially-passing
+---
+output-kind: output-data
+status: finished
+message: compressed project from [PATH] to [PATH]
+result: executed-command
+data: ~
+

crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@csharp__passing-exercise-2.snap

@@ -0,0 +1,11 @@
+---
+source: crates/tmc-langs-cli/tests/integration.rs
+expression: files
+input_file: sample_exercises/csharp/passing-exercise
+---
+- passing-exercise
+- passing-exercise/src
+- passing-exercise/src/PassingSample
+- passing-exercise/src/PassingSample/PassingSample.csproj
+- passing-exercise/src/PassingSample/Program.cs
+

crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@csharp__passing-exercise.snap

@@ -0,0 +1,11 @@
+---
+source: crates/tmc-langs-cli/tests/integration.rs
+expression: output
+input_file: sample_exercises/csharp/passing-exercise
+---
+output-kind: output-data
+status: finished
+message: compressed project from [PATH] to [PATH]
+result: executed-command
+data: ~
+

crates/tmc-langs-cli/tests/snapshots/integration__compress_project_tar@java__ant-exercise-2.snap

@@ -0,0 +1,9 @@
+---
+source: crates/tmc-langs-cli/tests/integration.rs
+expression: files
+input_file: sample_exercises/java/ant-exercise
+---
+- ant-exercise
+- ant-exercise/src
+- ant-exercise/src/Arith.java
+