Added regression tests for custom attributes for further elements. Fo…

…und new bug (#118), added test for it.

src/test/java/io/john/amiscaray/stir/tests/ArticleTest.java

@@ -9,6 +9,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -44,4 +45,18 @@ public void testArticleFromBuilderWithAll() throws IOException {
 
     }
 
+    @Test
+    public void testArticleWithCustomAttributes() throws IOException {
+
+        LinkedHashMap<String, String> attributes = new LinkedHashMap<>();
+        attributes.put("data-type", "blog");
+        attributes.put("data-role", "content");
+        Article article = Article.builder()
+                .customAttribute("data-todo-id", "1")
+                .customAttributes(attributes)
+                .build();
+        assertEquals(htmlLoader.getHTMLContentOf("html/articleWithCustomAttributes.html"), processor.getMarkup(article));
+
+    }
+
 }

src/test/java/io/john/amiscaray/stir/tests/ButtonTest.java

@@ -5,6 +5,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 import io.john.amiscaray.stir.setup.ExpectedHTMLLoader;
@@ -43,4 +44,20 @@ public void testButtonWithAll() throws IOException {
 
     }
 
+    @Test
+    public void testButtonWithCustomAttributes() throws IOException {
+
+        LinkedHashMap<String, String> attributes = new LinkedHashMap<>();
+        attributes.put("data-todo-id", "1");
+        attributes.put("data-role", "link");
+
+        Button button = Button.builder()
+                .customAttribute("data-color", "red")
+                .customAttributes(attributes)
+                .build();
+
+        assertEquals(htmlLoader.getHTMLContentOf("html/buttonWithCustomAttributes.html"), processor.getMarkup(button));
+
+    }
+
 }

src/test/java/io/john/amiscaray/stir/tests/DivTest.java

@@ -11,6 +11,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -171,4 +172,20 @@ public void testHiddenDiv() throws IOException {
 
     }
 
+    @Test
+    public void testDivWithCustomAttributes() throws IOException {
+
+        LinkedHashMap<String, String> attributes = new LinkedHashMap<>();
+        attributes.put("data-todo-id", "1");
+        attributes.put("data-role", "link");
+
+        Div div = Div.builder()
+                .customAttribute("data-color", "red")
+                .customAttributes(attributes)
+                .build();
+
+        assertEquals(htmlLoader.getHTMLContentOf("html/divWithCustomAttributes.html"), processor.getMarkup(div));
+
+    }
+
 }

src/test/java/io/john/amiscaray/stir/tests/FooterTest.java

@@ -9,6 +9,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -64,4 +65,20 @@ public void testHiddenFooter() throws IOException {
 
     }
 
+    @Test
+    public void testFooterWithCustomAttributes() throws IOException {
+
+        LinkedHashMap<String, String> attributes = new LinkedHashMap<>();
+        attributes.put("data-todo-id", "1");
+        attributes.put("data-role", "link");
+
+        Footer footer = Footer.builder()
+                .customAttribute("data-color", "red")
+                .customAttributes(attributes)
+                .build();
+
+        assertEquals(htmlLoader.getHTMLContentOf("html/footerWithCustomAttributes.html"), processor.getMarkup(footer));
+
+    }
+
 }

src/test/java/io/john/amiscaray/stir/tests/FormTest.java

@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 import static io.john.amiscaray.stir.util.ElementDescriptorProcessor.element;
@@ -36,4 +37,20 @@ public void testFormWithAll() throws IOException {
 
     }
 
+    @Test
+    public void testFormWithCustomAttributes() throws IOException {
+
+        LinkedHashMap<String, String> attributes = new LinkedHashMap<>();
+        attributes.put("data-todo-id", "1");
+        attributes.put("data-role", "link");
+
+        Form form = Form.builder()
+                .customAttribute("data-color", "red")
+                .customAttributes(attributes)
+                .build();
+
+        assertEquals(htmlLoader.getHTMLContentOf("html/formWithCustomAttributes.html"), processor.getMarkup(form));
+
+    }
+
 }

src/test/java/io/john/amiscaray/stir/tests/HeaderTest.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 import static io.john.amiscaray.stir.util.ElementDescriptorProcessor.element;
@@ -33,4 +34,20 @@ public void testHeaderWithAll() throws IOException {
 
     }
 
+    @Test
+    public void testHeaderWithCustomAttributes() throws IOException {
+
+        LinkedHashMap<String, String> attributes = new LinkedHashMap<>();
+        attributes.put("data-todo-id", "1");
+        attributes.put("data-role", "link");
+
+        Header header = Header.builder()
+                .customAttribute("data-color", "red")
+                .customAttributes(attributes)
+                .build();
+
+        assertEquals(htmlLoader.getHTMLContentOf("html/headerWithCustomAttributes.html"), processor.getMarkup(header));
+
+    }
+
 }

src/test/java/io/john/amiscaray/stir/tests/HeadingTest.java

@@ -2,12 +2,14 @@
 
 import io.john.amiscaray.stir.domain.elements.Div;
 import io.john.amiscaray.stir.domain.elements.Heading;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.john.amiscaray.stir.setup.ExpectedHTMLLoader;
 import io.john.amiscaray.stir.util.ElementProcessor;
 
 import java.io.IOException;
+import java.util.LinkedHashMap;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -48,4 +50,34 @@ public void testHiddenHeading() throws IOException {
 
     }
 
+    @Test
+    public void testHeadingWithCustomAttributes() throws IOException {
+
+        LinkedHashMap<String, String> attributes = new LinkedHashMap<>();
+        attributes.put("data-todo-id", "1");
+        attributes.put("data-role", "link");
+
+        Heading heading = Heading.builder()
+                .level(1)
+                .customAttribute("data-color", "red")
+                .customAttributes(attributes)
+                .build();
+
+        assertEquals(htmlLoader.getHTMLContentOf("html/headingWithCustomAttributes.html"), processor.getMarkup(heading));
+
+    }
+
+    // TODO fix this not working
+    @Test
+    @Disabled
+    public void testHeadingWithNoLevelSet() throws IOException {
+
+        Heading heading = Heading.builder()
+                .content("This is the title")
+                .build();
+
+        assertEquals(htmlLoader.getHTMLContentOf("html/headingWithNoLevelSet.html"), processor.getMarkup(heading));
+
+    }
+
 }

src/test/resources/html/articleWithCustomAttributes.html

@@ -0,0 +1,2 @@
+<article data-todo-id="1" data-type="blog" data-role="content">
+</article>

src/test/resources/html/buttonWithCustomAttributes.html

@@ -0,0 +1,2 @@
+<button data-color="red" data-todo-id="1" data-role="link">
+</button>

src/test/resources/html/divWithCustomAttributes.html

@@ -0,0 +1,2 @@
+<div data-color="red" data-todo-id="1" data-role="link">
+</div>

src/test/resources/html/footerWithCustomAttributes.html

@@ -0,0 +1,2 @@
+<footer data-color="red" data-todo-id="1" data-role="link">
+</footer>

src/test/resources/html/formWithCustomAttributes.html

@@ -0,0 +1,2 @@
+<form method="get" action="/" data-color="red" data-todo-id="1" data-role="link">
+</form>

src/test/resources/html/headerWithCustomAttributes.html

@@ -0,0 +1,2 @@
+<header data-color="red" data-todo-id="1" data-role="link">
+</header>

src/test/resources/html/headingWithCustomAttributes.html

@@ -0,0 +1,2 @@
+<h1 data-color="red" data-todo-id="1" data-role="link">
+</h1>

src/test/resources/html/headingWithNoLevelSet.html

@@ -0,0 +1 @@
+<h1>This is the title</h1>