test: Move tests to a separate directory

Stranger6667 · Stranger6667 · commit 4c31c818a6f0 · 2020-06-23T00:05:10.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ readme = "README.md"
 description = "A crate for inlining CSS into HTML documents"
 repository = "https://github.com/Stranger6667/css-inline"
 keywords = ["html", "css"]
-exclude = [".github", ".pre-commit-config.yaml", ".yamllint", ".gitignore"]
+exclude = [".github", ".pre-commit-config.yaml", ".yamllint", ".gitignore", "tests"]
 categories = ["web-programming"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/src/lib.rs b/src/lib.rs
@@ -197,92 +197,3 @@ fn merge_styles(existing_style: &str, new_styles: &[Declaration]) -> Result<Stri
         .map(|(key, value)| format!("{}:{};", key, value))
         .collect::<String>())
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::*;
-
-    const HTML: &str = r#"<html>
-<head>
-<title>Test</title>
-<style>
-h1, h2 { color:red; }
-strong {
-  text-decoration:none
-  }
-p { font-size:2px }
-p.footer { font-size: 1px}
-</style>
-</head>
-<body>
-<h1>Big Text</h1>
-<p><strong>Yes!</strong></p>
-<p class="footer">Foot notes</p>
-</body>
-</html>"#;
-
-    #[test]
-    fn test_inline() {
-        let inlined = inline(HTML).expect("Should be valid");
-        assert_eq!(
-            inlined,
-            r#"<html><head>
-<title>Test</title>
-<style>
-h1, h2 { color:red; }
-strong {
-  text-decoration:none
-  }
-p { font-size:2px }
-p.footer { font-size: 1px}
-</style>
-</head>
-<body>
-<h1 style="color:red;">Big Text</h1>
-<p style="font-size:2px ;"><strong style="text-decoration:none
-  ;">Yes!</strong></p>
-<p class="footer" style="font-size: 1px;">Foot notes</p>
-
-</body></html>"#
-        )
-    }
-
-    #[test]
-    fn test_merge_styles() {
-        let html = r#"<html>
-<head>
-<title>Test</title>
-<style>
-h1 { color:red; }
-</style>
-</head>
-<body>
-<h1 style="font-size: 1px">Big Text</h1>
-</body>
-</html>"#;
-        let inlined = inline(html).expect("Should be valid");
-        let valid = (inlined
-            == r#"<html><head>
-<title>Test</title>
-<style>
-h1 { color:red; }
-</style>
-</head>
-<body>
-<h1 style="color:red;font-size: 1px;">Big Text</h1>
-
-</body></html>"#)
-            || (inlined
-                == r#"<html><head>
-<title>Test</title>
-<style>
-h1 { color:red; }
-</style>
-</head>
-<body>
-<h1 style="font-size: 1px;color:red;">Big Text</h1>
-
-</body></html>"#);
-        assert!(valid, inlined)
-    }
-}
diff --git a/tests/test_inlining.rs b/tests/test_inlining.rs
@@ -0,0 +1,66 @@
+use css_inline::inline;
+
+macro_rules! html {
+    ($style: expr, $body: expr) => {
+        format!(
+            r#"<html><head><title>Test</title><style>{}</style></head><body>{}</body></html>"#,
+            $style, $body
+        )
+    };
+}
+
+macro_rules! assert_inlined {
+    (style = $style: expr, body = $body: expr, expected = $expected: expr) => {{
+        let html = html!($style, $body);
+        let inlined = inline(&html).unwrap();
+        assert_eq!(inlined, html!($style, $expected))
+    }};
+}
+
+#[test]
+fn no_existing_style() {
+    // When no "style" attributes exist
+    assert_inlined!(
+        style = r#"h1, h2 { color:red; }
+strong { text-decoration:none }
+p { font-size:2px }
+p.footer { font-size: 1px}"#,
+        body = r#"<h1>Big Text</h1>
+<p><strong>Yes!</strong></p>
+<p class="footer">Foot notes</p>"#,
+        // Then all styles should be added to new "style" attributes
+        expected = r#"<h1 style="color:red;">Big Text</h1>
+<p style="font-size:2px ;"><strong style="text-decoration:none ;">Yes!</strong></p>
+<p class="footer" style="font-size: 1px;">Foot notes</p>"#
+    )
+}
+
+#[test]
+fn simple_merge() {
+    // When "style" attributes exist and collides with values defined in "style" tag
+    let style = "h1 { color:red; }";
+    let html = html!(style, r#"<h1 style="font-size: 1px">Big Text</h1>"#);
+    let inlined = inline(&html).unwrap();
+    // Then new styles should be merged with the existing ones
+    let option_1 = html!(
+        style,
+        r#"<h1 style="font-size: 1px;color:red;">Big Text</h1>"#
+    );
+    let option_2 = html!(
+        style,
+        r#"<h1 style="color:red;font-size: 1px;">Big Text</h1>"#
+    );
+    let valid = (inlined == option_1) || (inlined == option_2);
+    assert!(valid, inlined);
+}
+
+#[test]
+fn overloaded_styles() {
+    // When there is a style, applied to an ID
+    assert_inlined!(
+        style = "h1 { color: red; } #test { color: blue; }",
+        body = r#"<h1 id="test">Hello world!</h1>"#,
+        // Then it should be preferred over a more generic style
+        expected = r#"<h1 id="test" style="color: blue;">Hello world!</h1>"#
+    )
+}
