2 files changed, 125 insertions, 13 deletions
diff --git a/src/test/model/CssParserTest.java b/src/test/model/CssParserTest.java
index fa395f6..35f5310 100644
--- a/src/test/model/CssParserTest.java
+++ b/src/test/model/CssParserTest.java
@@ -1,16 +1,68 @@
 package model;
 
 import model.css.CssParser;
+import org.javatuples.Pair;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CssParserTest {
 
     @Test
     void testIdiomaticCss() {
-        var idiomaticCss = "body {    background-color: #f0f0f2;    margin: 0;  padding: 0;    font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\",    \"Open Sans\", \"Helvetica Neue\", Helvetica, Arial, sans-serif;}div {    width: 600px;    margin: 5em auto;    padding: 2em;    background-color: #fdfdff;    border-radius: 0.5em;    box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);}a:link, a:visited {    color: #38488f;    text-decoration: none;}@media (max - width : 700px) {    div {        margin: 0 auto;        width: auto;    }}";
+        var idiomaticCss = "body {    background-color: '#\\'f0f0f2';    margin: 0;  padding: 0;    font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe\\\" UI\",    'Open\\' Sans', \"Helvetica Neue\", Helvetica, Arial, sans-serif;}div {    width: 600px;    margin: 5em auto;    padding: 2em;    background-color: #fdfdff;    border-radius: 0.5em;    box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);}a:link, a:visited {    color: #38488f;    text-decoration: none;}@media (max - width : 700px) {    @media () {div {        margin: 0 auto;        width: auto    }}}";
+
+        ArrayList<Pair<String, ArrayList<Pair<String, String>>>> expected = new ArrayList<>();
+        ArrayList<Pair<String, String>> body = new ArrayList<>();
+        ArrayList<Pair<String, String>> divOne = new ArrayList<>();
+        ArrayList<Pair<String, String>> selectors = new ArrayList<>();
+        ArrayList<Pair<String, String>> divTwo = new ArrayList<>();
+        expected.add(new Pair<>("body", body));
+        expected.add(new Pair<>("div", divOne));
+        expected.add(new Pair<>("a:link,a:visited", selectors));
+        expected.add(new Pair<>("div", divTwo));
+        body.add(new Pair<>("background-color", "'#'f0f0f2'"));
+        body.add(new Pair<>("margin", "0"));
+        body.add(new Pair<>("padding", "0"));
+        body.add(new Pair<>("font-family", "-apple-system,system-ui,BlinkMacSystemFont,\"Segoe\" UI\",'Open' Sans',\"Helvetica Neue\",Helvetica,Arial,sans-serif"));
+        divOne.add(new Pair<>("width", "600px"));
+        divOne.add(new Pair<>("margin", "5emauto"));
+        divOne.add(new Pair<>("padding", "2em"));
+        divOne.add(new Pair<>("background-color", "#fdfdff"));
+        divOne.add(new Pair<>("border-radius", "0.5em"));
+        divOne.add(new Pair<>("box-shadow", "2px3px7px2pxrgba(0,0,0,0.02)"));
+        selectors.add(new Pair<>("color", "#38488f"));
+        selectors.add(new Pair<>("text-decoration", "none"));
+        divTwo.add(new Pair<>("margin", "0auto"));
+        divTwo.add(new Pair<>("width", "auto"));
+
         CssParser parser = new CssParser();
-        System.out.println(parser.parseCSS(idiomaticCss));
+        assertEqualsCss(parser.parseCSS(idiomaticCss), expected);
+        // System.out.println(parser.parseCSS(idiomaticCss));
+    }
+
+    @Test
+    void testConversions() {
+        assertEquals(CssParser.parseUnits("0gosf"), 0);
+        assertEquals(CssParser.parseUnits("0px"), 0);
+        assertEquals(CssParser.parseUnits("0.0pc"), 0);
+        assertEquals(CssParser.parseUnits("0.00pt"), 0);
+        assertEquals(CssParser.parseUnits("0cm"), 0);
+        assertEquals(CssParser.parseUnits("0mm"), 0);
+        assertEquals(CssParser.parseUnits("0Q"), 0);
+        assertEquals(CssParser.parseUnits("0in"), 0);
+    }
+
+    public static void assertEqualsCss(ArrayList<Pair<String, ArrayList<Pair<String, String>>>> css,
+                                       ArrayList<Pair<String, ArrayList<Pair<String, String>>>> expected) {
+        for (int i = 0; i < css.size(); i++) {
+            assertEquals(css.get(i).getValue0(), expected.get(i).getValue0());
+            for (int j = 0; j < css.get(i).getValue1().size(); j++) {
+                assertEquals(css.get(i).getValue1().get(j).getValue0(), expected.get(i).getValue1().get(j).getValue0());
+                assertEquals(css.get(i).getValue1().get(j).getValue1(), expected.get(i).getValue1().get(j).getValue1());
+            }
+        }
     }
 }
diff --git a/src/test/model/HtmlParserTest.java b/src/test/model/HtmlParserTest.java
index 58b4555..36c5935 100644
--- a/src/test/model/HtmlParserTest.java
+++ b/src/test/model/HtmlParserTest.java
@@ -2,39 +2,99 @@ package model;
 
 import model.html.ElementNode;
 import model.html.HtmlParser;
+import model.html.TextNode;
 import model.util.Node;
+import org.javatuples.Pair;
 import org.junit.jupiter.api.Test;
 
 import java.util.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class HtmlParserTest {
 
     String idiomaticHtml = "<!DOCTYPE html><html><head></head><body><p>Hello,  world!</p></body></html>";
-    String brokenHtml = "<html><foo><bar></bar><ba";
-    String trailingTextHtml = "<html><foo><bar></bar>ba";
+    String brokenHtml = "<html><foo><bar></bar><><ba";
+    String trailingTextHtml = "bot<html><foo><bar></bar>ba";
+    String attributesHtml = "<html><attr hello=\"world\" foo='bar' strange=\"cha\\\"rm\" up='do\\'wn'></attr></html>";
 
     @Test
     void testIdiomaticHtml() {
-        String[] idiomaticHtmlArray = {"<!DOCTYPE html>","<html>","<head>","</head>","<body>","<p>","Hello,world!","</p>","</body>","</html>"};
+        ArrayList<Node> expected = new ArrayList<>();
+        ArrayList<Node> expectedChildren = new ArrayList<>();
+        ArrayList<Node> expectedGrandChildren = new ArrayList<>();
+        ArrayList<Node> expectedGreatGrandChildren = new ArrayList<>();
+        expected.add(new ElementNode("html", new ArrayList<>(), expectedChildren));
+        expectedChildren.add(new ElementNode("head"));
+        expectedChildren.add(new ElementNode("body", new ArrayList<>(), expectedGrandChildren));
+        expectedGrandChildren.add(new ElementNode("p", new ArrayList<>(), expectedGreatGrandChildren));
+        expectedGreatGrandChildren.add(new TextNode("Hello, world!"));
+
         HtmlParser parser = new HtmlParser();
-        displayHtmlTree(parser.parseHtml(idiomaticHtml));
-//        assertEquals(HtmlParser.parseHtmlLL(idiomaticHtml), Arrays.asList(idiomaticHtmlArray));
+        assertEqualsHtml(parser.parseHtml(idiomaticHtml), expected);
+        // displayHtmlTree(parser.parseHtml(idiomaticHtml));
     }
 
     @Test
     void testBrokenHtml() {
-        String[] brokenHtmlArray = {"<html>","<foo>","<bar>","</bar>","<ba>"};
+        ArrayList<Node> expected = new ArrayList<>();
+        ArrayList<Node> expectedChildren = new ArrayList<>();
+        ArrayList<Node> expectedGrandChildren = new ArrayList<>();
+        expected.add(new ElementNode("html", new ArrayList<>(), expectedChildren));
+        expectedChildren.add(new ElementNode("foo", new ArrayList<>(), expectedGrandChildren));
+        expectedGrandChildren.add(new ElementNode("bar", new ArrayList<>()));
+        expectedGrandChildren.add(new TextNode("<>"));
+
         HtmlParser parser = new HtmlParser();
-        displayHtmlTree(parser.parseHtml(brokenHtml));
-//        assertEquals(HtmlParser.parseHtmlLL(brokenHtml), Arrays.asList(brokenHtmlArray));
+        assertEqualsHtml(parser.parseHtml(brokenHtml), expected);
+        // displayHtmlTree(parser.parseHtml(brokenHtml));
     }
 
     @Test
     void testTrailingTextHtml() {
-        String[] trailingTextHtmlArray = {"<html>","<foo>","<bar>","</bar>","ba"};
+        ArrayList<Node> expected = new ArrayList<>();
+        ArrayList<Node> expectedChildren = new ArrayList<>();
+        ArrayList<Node> expectedGrandChildren = new ArrayList<>();
+        expected.add(new TextNode("bot"));
+        expected.add(new ElementNode("html", new ArrayList<>(), expectedChildren));
+        expected.add(new TextNode("ba"));
+        expectedChildren.add(new ElementNode("foo", new ArrayList<>(), expectedGrandChildren));
+        expectedGrandChildren.add(new ElementNode("bar", new ArrayList<>()));
+
         HtmlParser parser = new HtmlParser();
-        displayHtmlTree(parser.parseHtml(trailingTextHtml));
-//        assertEquals(HtmlParser.parseHtmlLL(trailingTextHtml), Arrays.asList(trailingTextHtmlArray));
+        assertEqualsHtml(parser.parseHtml(trailingTextHtml), expected);
+        // displayHtmlTree(parser.parseHtml(trailingTextHtml));
+    }
+
+    @Test
+    void testAttributesHtml() {
+        ArrayList<Node> expected = new ArrayList<>();
+        ArrayList<Node> expectedChildren = new ArrayList<>();
+        ArrayList<Pair<String, String>> expectedAttributes = new ArrayList<>();
+        expected.add(new ElementNode("html", new ArrayList<>(), expectedChildren));
+        expectedChildren.add(new ElementNode("attr", expectedAttributes));
+        expectedAttributes.add(new Pair<>("hello", "world"));
+        expectedAttributes.add(new Pair<>("foo", "bar"));
+        expectedAttributes.add(new Pair<>("strange", "cha\"rm"));
+        expectedAttributes.add(new Pair<>("up", "do'wn"));
+
+        HtmlParser parser = new HtmlParser();
+        var parsed = parser.parseHtml(attributesHtml);
+        displayHtmlTree(parsed);
+        assertEqualsHtml(parsed, expected);
+    }
+
+    /**
+     * Complicated helper function for tests.
+     */
+    private static void assertEqualsHtml(ArrayList<Node> html, ArrayList<Node> expected) {
+        for (int i = 0; i < html.size(); i++) {
+            assertEquals(html.get(i).getData(), expected.get(i).getData());
+            // System.out.println(html.get(i).getData() + " " + expected.get(i).getData());
+            if (html.get(i) instanceof ElementNode) {
+                assertEqualsHtml(((ElementNode) html.get(i)).getChildren(), ((ElementNode) expected.get(i)).getChildren());
+            }
+        }
     }
 
     /**