Added and fixed tests for mj-html-attributes, mj-selector, mj-html-attribute.

Signed-off-by: Michael Pivonka <me@coded.ninja>

Author: codedninja

packages/mrml-core/src/mj_html_attribute/json.rs

@@ -27,7 +27,7 @@ mod tests {
         );
         assert_eq!(
             serde_json::to_string(&elt).unwrap(),
-            r#"{"type":"mj-html-attribute","attributes":{"name":".test"}}"#
+            r#"{"type":"mj-html-attribute","attributes":{"name":".classname"},"children":"42"}"#
         );
     }
 }

packages/mrml-core/src/mj_html_attribute/parse.rs

@@ -58,8 +58,15 @@ mod tests {
     use crate::mj_html_attribute::MjHtmlAttribute;
 
     crate::should_parse!(
-        normal,
+        basic_with_children,
         MjHtmlAttribute,
-        r#"<mj-html-attribute path=".class">42</mj-html-attribute>"#
+        r#"<mj-html-attribute name="data-id">42</mj-html-attribute>"#
+    );
+
+    crate::should_not_parse!(
+        missing_attribute,
+        MjHtmlAttribute,
+        r#"<mj-html-attribute>42</mj-html-attribute>"#,
+        r#"MissingAttribute { name: "name", origin: Root, position: Span { start: 1, end: 18 } }"#
     );
 }

packages/mrml-core/src/mj_html_attribute/print.rs

@@ -27,7 +27,7 @@ mod tests {
     fn empty() {
         let item = crate::mj_html_attribute::MjHtmlAttribute::default();
         assert_eq!(
-            r#"<mj-html-attribute name=".test"></mj-html-attribute>"#,
+            r#"<mj-html-attribute name=""></mj-html-attribute>"#,
             item.print_dense().unwrap()
         )
     }

packages/mrml-core/src/mj_html_attributes/json.rs

@@ -16,13 +16,13 @@ mod tests {
 
         assert_eq!(
             serde_json::to_string(&elt).unwrap(),
-            r#"{"children":[{}],"mj-selector":{"attributes":{},"name":"","type":""}}"#
+            r#"{"type":"mj-html-attributes","children":[{"type":"mj-selector","attributes":{"path":".class"}}]}"#
         )
     }
 
     #[test]
     fn deserialize() {
-        let json = r#"{"type":"mj-html-attributes","children":[{"type":"mj-selector"}, {"type":"mj-html-attribute"}]}"#;
+        let json = r#"{"type":"mj-html-attributes","children":[{"type":"mj-selector","attributes":{"path":".class"}},{"type":"mj-selector","attributes":{"path":"a[href]"}}]}"#;
         let res: MjHtmlAttributes = serde_json::from_str(json).unwrap();
         assert_eq!(res.children.len(), 2);
         let next = serde_json::to_string(&res).unwrap();

packages/mrml-core/src/mj_selector/json.rs

@@ -31,7 +31,7 @@ mod tests {
 
         assert_eq!(
             serde_json::to_string(&elt).unwrap(),
-            r#"{"type":"mj-selector",attributes:{"name":"classname"}}"#,
+            r#"{"type":"mj-selector","attributes":{"path":".test"}}"#,
         );
     }
 }

packages/mrml-core/src/mj_selector/parse.rs

@@ -1,6 +1,8 @@
 use htmlparser::StrSpan;
 
-use super::{MjSelector, MjSelectorAttributes};
+#[cfg(feature = "async")]
+use super::MjSelector;
+use super::MjSelectorAttributes;
 use crate::mj_html_attribute::MjHtmlAttribute;
 #[cfg(feature = "async")]
 use crate::prelude::parser::{AsyncMrmlParser, AsyncParseChildren, AsyncParseElement};
@@ -125,12 +127,13 @@ mod tests {
     crate::should_sync_parse!(
         parse_complete,
         MjSelector,
-        r#"<mj-selector name="data-id" />"#
+        r#"<mj-selector path="data-id" />"#
     );
+
     crate::should_not_sync_parse!(
         should_have_name,
         MjSelector,
         r#"<mj-selector />"#,
-        "MissingAttribute { name: \"name\", origin: Root, Position: Span { start: 1, end 9 } }"
+        r#"MissingAttribute { name: "path", origin: Root, position: Span { start: 1, end: 12 } }"#
     );
 }

packages/mrml-core/src/mj_selector/print.rs

@@ -8,11 +8,32 @@ impl PrintableAttributes for super::MjSelectorAttributes {
 
 #[cfg(test)]
 mod tests {
+    use crate::mj_selector::{MjSelector, MjSelectorAttributes};
     use crate::prelude::print::Printable;
 
+    #[test]
+    fn normal() {
+        let item = MjSelector::new(
+            MjSelectorAttributes {
+                path: String::from(".cool_class"),
+            },
+            Vec::new(),
+        );
+
+        assert_eq!(
+            "<mj-selector path=\".cool_class\" />",
+            item.print_dense().unwrap()
+        );
+    }
+
     #[test]
     fn empty() {
-        let item = crate::mj_html_attributes::MjHtmlAttributes::default();
-        assert_eq!("<mj-selector />", item.print_dense().unwrap());
+        let item = MjSelector::new(
+            MjSelectorAttributes {
+                path: String::from(""),
+            },
+            Vec::new(),
+        );
+        assert_eq!("<mj-selector path=\"\" />", item.print_dense().unwrap());
     }
 }