Snapshot tests for JSON input

Summary: Adapted existing snapshot tests to also support json input, see file `test_projects/standard/build_info.json`. Reviewed By: ilya-klyuchnikov Differential Revision: D40837664 fbshipit-source-id: 4e829cb81e5613afab84bb07d14be768241b1eb1
WhatsApp · Nov 2, 2022 · fc7977c · fc7977c
1 parent ff54eb5
commit fc7977c
Show file tree

Hide file tree

Showing 5 changed files with 135 additions and 33 deletions.
diff --git a/mini-elp/Cargo.lock b/mini-elp/Cargo.lock
diff --git a/mini-elp/Cargo.toml b/mini-elp/Cargo.toml
@@ -30,6 +30,8 @@ serde_json = "1.0.85"
 smol_str = "0.1.21"
 stdx = {git = "https://github.com/rust-analyzer/rust-analyzer", rev = "2022-09-05"}
 tempfile = "3.3.0"
+test-case = "2.2.1"
+test-env-helpers = { git = "https://github.com/perehonchuk/test-env-helpers" }
 timeout-readwrite = "0.3.2"
 text-size = "1.1.0"
 vfs = {git = "https://github.com/rust-analyzer/rust-analyzer", rev = "2022-09-05"}

diff --git a/mini-elp/crates/elp/Cargo.toml b/mini-elp/crates/elp/Cargo.toml
@@ -40,3 +40,5 @@ jemallocator.workspace = true
 
 [dev-dependencies]
 expect-test.workspace = true
+test-case.workspace = true
+test-env-helpers.workspace = true
diff --git a/mini-elp/crates/elp/src/bin/main.rs b/mini-elp/crates/elp/src/bin/main.rs
@@ -82,6 +82,7 @@ mod tests {
     use expect_test::expect_file;
     use expect_test::ExpectFile;
     use tempfile::Builder;
+    use test_case::test_case;
 
     use super::*;
 
@@ -195,55 +196,47 @@ mod tests {
         eqwalize_snapshot("parse_error", "parse_error_a", false).unwrap();
     }
 
-    #[test]
-    fn eqwalize_module_diagnostics_match_snapshot_jsonl() {
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "JSON")]
+    fn eqwalize_module_diagnostics_match_snapshot_jsonl(json_config: bool) {
         simple_snapshot(
-            args_vec![
-                "eqwalize",
-                "app_a_mod2",
-                "--project",
-                "../../test_projects/standard",
-                "--format",
-                "json"
-            ],
+            args_vec!["eqwalize", "app_a_mod2", "--format", "json"],
             expect_file!["../resources/test/standard/eqwalize_app_a_mod2_diagnostics.jsonl"],
+            json_config,
+            "../../test_projects/standard".into(),
         );
     }
 
-    #[test]
-    fn eqwalize_module_diagnostics_match_snapshot_json_lsp() {
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "JSON")]
+    fn eqwalize_module_diagnostics_match_snapshot_json_lsp(json_config: bool) {
         simple_snapshot(
-            args_vec![
-                "eqwalize",
-                "app_a_mod2",
-                "--project",
-                "../../test_projects/standard",
-                "--format",
-                "json-lsp"
-            ],
+            args_vec!["eqwalize", "app_a_mod2", "--format", "json-lsp"],
             expect_file!["../resources/test/standard/eqwalize_app_a_mod2_diagnostics_lsp.jsonl"],
+            json_config,
+            "../../test_projects/standard".into(),
         );
     }
 
-    #[test]
-    fn eqwalize_all_diagnostics_match_snapshot_jsonl() {
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "JSON")]
+    fn eqwalize_all_diagnostics_match_snapshot_jsonl(json_config: bool) {
         simple_snapshot(
-            args_vec![
-                "eqwalize-all",
-                "--project",
-                "../../test_projects/standard",
-                "--format",
-                "json"
-            ],
+            args_vec!["eqwalize-all", "--format", "json"],
             expect_file!["../resources/test/standard/eqwalize_all_diagnostics.jsonl"],
+            json_config,
+            "../../test_projects/standard".into(),
         );
     }
 
-    #[test]
-    fn eqwalize_all_diagnostics_match_snapshot_pretty() {
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "JSON")]
+    fn eqwalize_all_diagnostics_match_snapshot_pretty(json_config: bool) {
         simple_snapshot(
-            args_vec!["eqwalize-all", "--project", "../../test_projects/standard"],
+            args_vec!["eqwalize-all"],
             expect_file!["../resources/test/standard/eqwalize_all_diagnostics.pretty"],
+            json_config,
+            "../../test_projects/standard".into(),
         );
     }
 
@@ -264,7 +257,18 @@ mod tests {
         )
     }
 
-    fn simple_snapshot(args: Vec<OsString>, expected: ExpectFile) {
+    fn simple_snapshot(
+        args: Vec<OsString>,
+        expected: ExpectFile,
+        json_config: bool,
+        project: PathBuf,
+    ) {
+        let project_path = if json_config {
+            project.join("build_info.json")
+        } else {
+            project
+        };
+        let args = [args, args_vec!["--project", project_path]].concat();
         let (stdout, stderr, code) = elp(args);
         assert_eq!(
             code, 0,

diff --git a/mini-elp/test_projects/standard/build_info.json b/mini-elp/test_projects/standard/build_info.json
@@ -0,0 +1,31 @@
+{
+  "apps": [
+    {
+      "name": "app_a",
+      "dir": "app_a",
+      "ebin": "../_build/test/lib/app_a/ebin",
+      "extra_src_dirs": ["test"],
+      "include_dirs": ["include"],
+      "macros": ["TEST"],
+      "src_dirs": ["src"]
+    },
+    {
+      "name": "app_b",
+      "dir": "app_b",
+      "ebin": "../_build/test/lib/app_b/ebin",
+      "macros": ["TEST"],
+      "src_dirs": ["src"]
+    },
+    {
+      "name": "eqwalizer",
+      "dir": "eqwalizer",
+      "ebin": "../_build/test/lib/eqwalizer/ebin",
+      "macros": ["TEST"],
+      "src_dirs": ["src"]
+    }
+  ],
+  "deps": [
+
+  ],
+  "root": ""
+}