diff --git a/src/xatu/BUILD b/src/xatu/BUILD index 85abfea..8a1f8fb 100644 --- a/src/xatu/BUILD +++ b/src/xatu/BUILD @@ -28,13 +28,6 @@ rust_test( rust_test( name = "xatu_test", srcs = ["xatu_test.rs"], - data = [ - "testdata/clean.nix", - "testdata/deprecated_to_path_ident.nix", - "testdata/deprecated_to_path_select.nix", - "testdata/empty_inherit.nix", - "testdata/invalid.nix", - ], deps = [ ":xatu_lib", "//src/status:status", diff --git a/src/xatu/testdata/clean.nix b/src/xatu/testdata/clean.nix deleted file mode 100644 index a48f8c9..0000000 --- a/src/xatu/testdata/clean.nix +++ /dev/null @@ -1 +0,0 @@ -{ inherit foo; } diff --git a/src/xatu/testdata/deprecated_to_path_ident.nix b/src/xatu/testdata/deprecated_to_path_ident.nix deleted file mode 100644 index 5d2d9bb..0000000 --- a/src/xatu/testdata/deprecated_to_path_ident.nix +++ /dev/null @@ -1 +0,0 @@ -toPath x diff --git a/src/xatu/testdata/deprecated_to_path_select.nix b/src/xatu/testdata/deprecated_to_path_select.nix deleted file mode 100644 index fa6ea4f..0000000 --- a/src/xatu/testdata/deprecated_to_path_select.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.toPath x diff --git a/src/xatu/testdata/empty_inherit.nix b/src/xatu/testdata/empty_inherit.nix deleted file mode 100644 index 73a66e4..0000000 --- a/src/xatu/testdata/empty_inherit.nix +++ /dev/null @@ -1 +0,0 @@ -{ inherit; } diff --git a/src/xatu/testdata/invalid.nix b/src/xatu/testdata/invalid.nix deleted file mode 100644 index 98232c6..0000000 --- a/src/xatu/testdata/invalid.nix +++ /dev/null @@ -1 +0,0 @@ -{ diff --git a/src/xatu/xatu_test.rs b/src/xatu/xatu_test.rs index 6d10aaf..8e612a4 100644 --- a/src/xatu/xatu_test.rs +++ b/src/xatu/xatu_test.rs @@ -1,29 +1,21 @@ -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use status::Code; use xatu::SourceFile; -fn source_file(path: &str) -> SourceFile { +fn source_file(path: &str, source: &str) -> SourceFile { SourceFile { path: PathBuf::from(path), - source: std::fs::read_to_string(testdata_path(path)).expect("fixture should be readable"), + source: source.to_owned(), } } -fn testdata_path(path: &str) -> PathBuf { - if Path::new(path).exists() { - return PathBuf::from(path); - } - - let runfiles = PathBuf::from(std::env::var("TEST_SRCDIR").expect("TEST_SRCDIR should be set")); - let workspace = std::env::var("TEST_WORKSPACE").expect("TEST_WORKSPACE should be set"); - - runfiles.join(workspace).join("src/xatu").join(path) -} - #[test] fn future_sight_reports_clean_sources_as_clean() { - let report = xatu::future_sight(vec![source_file("testdata/clean.nix")]) + let report = xatu::future_sight(vec![source_file( + "clean.nix", + "{ value = builtins.toString x; inherit foo; }", + )]) .expect("fixture should parse"); assert!(report.is_clean()); @@ -31,15 +23,15 @@ fn future_sight_reports_clean_sources_as_clean() { #[test] fn future_sight_rejects_parse_errors() { - let error = xatu::future_sight(vec![source_file("testdata/invalid.nix")]) - .expect_err("fixture should fail to parse"); + let error = xatu::future_sight(vec![source_file("invalid.nix", "{")]) + .expect_err("fixture should fail to parse"); assert_eq!(error.code(), Code::FailedPrecondition); } #[test] fn future_sight_reports_deprecated_to_path_ident_findings() { - let report = xatu::future_sight(vec![source_file("testdata/deprecated_to_path_ident.nix")]) + let report = xatu::future_sight(vec![source_file("deprecated_to_path_ident.nix", "toPath x")]) .expect("fixture should parse"); assert_eq!(report.diagnostics.len(), 1); @@ -47,29 +39,32 @@ fn future_sight_reports_deprecated_to_path_ident_findings() { let diagnostic = &report.diagnostics[0]; assert_eq!( report.files.get(diagnostic.file_id).path, - PathBuf::from("testdata/deprecated_to_path_ident.nix"), + PathBuf::from("deprecated_to_path_ident.nix"), ); assert_eq!(diagnostic.finding.rule_id, "deprecated_to_path"); } #[test] fn future_sight_reports_deprecated_to_path_select_findings() { - let report = xatu::future_sight(vec![source_file("testdata/deprecated_to_path_select.nix")]) - .expect("fixture should parse"); + let report = xatu::future_sight(vec![source_file( + "deprecated_to_path_select.nix", + "builtins.toPath x", + )]) + .expect("fixture should parse"); assert_eq!(report.diagnostics.len(), 1); let diagnostic = &report.diagnostics[0]; assert_eq!( report.files.get(diagnostic.file_id).path, - PathBuf::from("testdata/deprecated_to_path_select.nix"), + PathBuf::from("deprecated_to_path_select.nix"), ); assert_eq!(diagnostic.finding.rule_id, "deprecated_to_path"); } #[test] fn future_sight_reports_empty_inherit_findings() { - let report = xatu::future_sight(vec![source_file("testdata/empty_inherit.nix")]) + let report = xatu::future_sight(vec![source_file("empty_inherit.nix", "{ inherit; }")]) .expect("fixture should parse"); assert_eq!(report.diagnostics.len(), 1); @@ -77,7 +72,7 @@ fn future_sight_reports_empty_inherit_findings() { let diagnostic = &report.diagnostics[0]; assert_eq!( report.files.get(diagnostic.file_id).path, - PathBuf::from("testdata/empty_inherit.nix"), + PathBuf::from("empty_inherit.nix"), ); assert_eq!(diagnostic.finding.rule_id, "empty_inherit"); }