shift test data to include another scenario

tbillington · Aug 31, 2023 · 199d18d · 199d18d
1 parent c7912e2
commit 199d18d
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 11 deletions.
diff --git a/kondo-lib/src/lib_test.rs b/kondo-lib/src/lib_test.rs
@@ -1,11 +1,11 @@
 #[cfg(test)]
 mod test {
-    // use kondo_lib::{Project, ProjectType, ScanOptions};
     use std::path::PathBuf;
     use tempfile;
 
     use crate::{Project, ProjectType, ScanOptions};
 
+    // Given test data, clean should remove some files
     #[test]
     fn test_clean() {
         let scan_options: ScanOptions = ScanOptions {
@@ -14,7 +14,7 @@ mod test {
         };
 
         let tempdir = get_copy_of_test_data_as_temp_dir();
-        let path = tempdir.path().join("test_data/test_discover");
+        let path = tempdir.path().join("test_data/scenario_a");
 
         // Given 2 py projects with content cached
         let project_a = Project {

diff --git a/kondo/src/main_test.rs b/kondo/src/main_test.rs
@@ -9,7 +9,7 @@ mod test {
     fn test_discover() {
         // given a directory with two projects
         let tempdir = get_copy_of_test_data_as_temp_dir();
-        let path = tempdir.path().join("test_data/test_discover");
+        let path = tempdir.path().join("test_data");
 
         // and basic setup
         let scan_options: ScanOptions = ScanOptions {
@@ -34,17 +34,16 @@ mod test {
             count += 1;
         }
 
-        // ought to find two projects
-        assert_eq!(count, 2);
+        // ought to find the right number of projects
+        assert_eq!(count, 3);
 
         // clean up
         tempdir.close().unwrap();
     }
 
-
     fn get_copy_of_test_data_as_temp_dir() -> tempfile::TempDir {
         extern crate fs_extra;
-        let options = fs_extra::dir::CopyOptions::new(); 
+        let options = fs_extra::dir::CopyOptions::new();
 
         let mut path: PathBuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
         path.push("../test_data");
@@ -59,5 +58,4 @@ mod test {
 
         return tmp_dir;
     }
-
 }
diff --git a/...t_discover/python-project-a/__pycache__/1 → ...scenario_a/python-project-a/__pycache__/1 b/...t_discover/python-project-a/__pycache__/1 → ...scenario_a/python-project-a/__pycache__/1
diff --git a/...t_discover/python-project-a/__pycache__/2 → ...scenario_a/python-project-a/__pycache__/2 b/...t_discover/python-project-a/__pycache__/2 → ...scenario_a/python-project-a/__pycache__/2
diff --git a/...t_discover/python-project-a/__pycache__/3 → ...scenario_a/python-project-a/__pycache__/3 b/...t_discover/python-project-a/__pycache__/3 → ...scenario_a/python-project-a/__pycache__/3
diff --git a/...ta/test_discover/python-project-a/main.py → ..._data/scenario_a/python-project-a/main.py b/...ta/test_discover/python-project-a/main.py → ..._data/scenario_a/python-project-a/main.py
diff --git a/...r/python-project-b/__pycache__/cache.data → ...a/python-project-b/__pycache__/cache.data b/...r/python-project-b/__pycache__/cache.data → ...a/python-project-b/__pycache__/cache.data
diff --git a/.../python-project-b/__pycache__/other.cache → .../python-project-b/__pycache__/other.cache b/.../python-project-b/__pycache__/other.cache → .../python-project-b/__pycache__/other.cache
diff --git a/...ta/test_discover/python-project-b/main.py → ..._data/scenario_a/python-project-b/main.py b/...ta/test_discover/python-project-b/main.py → ..._data/scenario_a/python-project-b/main.py
diff --git a/test_data/scenario_b/cargo-project-a/Cargo.toml b/test_data/scenario_b/cargo-project-a/Cargo.toml
@@ -0,0 +1 @@
+# empty example is enough to signal this is a cargo project
diff --git a/test_data/scenario_b/cargo-project-a/target/binaries-and-such b/test_data/scenario_b/cargo-project-a/target/binaries-and-such
@@ -0,0 +1 @@
+// This file represents cargo build artifacts
diff --git a/x/test_data/test_discover/python-project-a/main.py b/x/test_data/test_discover/python-project-a/main.py
diff --git a/x/test_data/test_discover/python-project-b/main.py b/x/test_data/test_discover/python-project-b/main.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# empty example is enough to signal this is a cargo project