move test to integration test

Author: xxchan

src/formatting/cargo_toml.rs

@@ -334,78 +334,3 @@ impl VisitMut for FormatInlineTable {
         });
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn cargo_toml() {
-        #[rustfmt::skip]
-        let s = r#"
-
-
-[[bin]]
-        "aa" = 1
-        'bb' = 2
-        "啊"=1
-[package]
-    version = 1
-    description = "a\nb\nhaha"
-    name = 3
-
-# comment 1
-
-    arr1 = [1,
-        2,3]
-
-# comment 2
-
-    arr2 = ["11111111111111111111111111111111111111111111111111111111111111111111111111111111","1111111111111111111111111111111111111111111111111111111111111111111111111111111"]
-
-[dependencies]
-        extremely_long_crate_name_goes_here = {path = "extremely_long_path_name_goes_right_here",version = "4.5.6"}
-        crate1 = {            path = "crate1",version = "1.2.3"                   }
-
-[[bin]]
-        d = "git-rustfmt"
-        c = "src/git-rustfmt/main.rs""#;
-
-        let formatted = format_cargo_toml_inner(s, &Default::default()).unwrap();
-
-        #[rustfmt::skip]
-        let expected = r#"[package]
-name = 3
-version = 1
-# comment 1
-arr1 = [1, 2, 3]
-# comment 2
-arr2 = [
-    "11111111111111111111111111111111111111111111111111111111111111111111111111111111",
-    "1111111111111111111111111111111111111111111111111111111111111111111111111111111"
-]
-description = """
-a
-b
-haha"""
-
-[[bin]]
-aa = 1
-bb = 2
-"啊" = 1
-
-[[bin]]
-c = "src/git-rustfmt/main.rs"
-d = "git-rustfmt"
-
-[dependencies]
-crate1 = { path = "crate1", version = "1.2.3" }
-
-[dependencies.extremely_long_crate_name_goes_here]
-path = "extremely_long_path_name_goes_right_here"
-version = "4.5.6"
-"#;
-
-        assert_eq!(formatted, expected);
-    }
-}

src/test/mod.rs

@@ -95,8 +95,8 @@ fn is_file_skip(path: &Path) -> bool {
         .any(|file_path| is_subpath(path, file_path))
 }
 
-// Returns a `Vec` containing `PathBuf`s of files with an  `rs` extension in the
-// given path. The `recursive` argument controls if files from subdirectories
+// Returns a `Vec` containing `PathBuf`s of files with an `rs` extension or a `Cargo.toml` filename
+// in the given path. The `recursive` argument controls if files from subdirectories
 // are also returned.
 fn get_test_files(path: &Path, recursive: bool) -> Vec<PathBuf> {
     let mut files = vec![];
@@ -109,7 +109,10 @@ fn get_test_files(path: &Path, recursive: bool) -> Vec<PathBuf> {
             let path = entry.path();
             if path.is_dir() && recursive {
                 files.append(&mut get_test_files(&path, recursive));
-            } else if path.extension().map_or(false, |f| f == "rs") && !is_file_skip(&path) {
+            } else if (path.extension().map_or(false, |f| f == "rs")
+                || path.file_name().map_or(false, |f| f == "Cargo.toml"))
+                && !is_file_skip(&path)
+            {
                 files.push(path);
             }
         }

tests/source/cargo-toml/1/Cargo.toml

@@ -0,0 +1,27 @@
+
+
+[[bin]]
+        "aa" = 1
+        'bb' = 2
+        "啊"=1
+[package]
+    version = 1
+    description = "a\nb\nhaha"
+    name = 3
+
+# comment 1
+
+    arr1 = [1,
+        2,3]
+
+# comment 2
+
+    arr2 = ["11111111111111111111111111111111111111111111111111111111111111111111111111111111","1111111111111111111111111111111111111111111111111111111111111111111111111111111"]
+
+[dependencies]
+        extremely_long_crate_name_goes_here = {path = "extremely_long_path_name_goes_right_here",version = "4.5.6"}
+        crate1 = {            path = "crate1",version = "1.2.3"                   }
+
+[[bin]]
+        d = "git-rustfmt"
+        c = "src/git-rustfmt/main.rs"

tests/target/cargo-toml/1/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+name = 3
+version = 1
+# comment 1
+arr1 = [1, 2, 3]
+# comment 2
+arr2 = [
+    "11111111111111111111111111111111111111111111111111111111111111111111111111111111",
+    "1111111111111111111111111111111111111111111111111111111111111111111111111111111"
+]
+description = """
+a
+b
+haha"""
+
+[[bin]]
+aa = 1
+bb = 2
+"啊" = 1
+
+[[bin]]
+c = "src/git-rustfmt/main.rs"
+d = "git-rustfmt"
+
+[dependencies]
+crate1 = { path = "crate1", version = "1.2.3" }
+
+[dependencies.extremely_long_crate_name_goes_here]
+path = "extremely_long_path_name_goes_right_here"
+version = "4.5.6"