mindol1004/j2html
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add condWith, fix tests

Browse Source
This commit is contained in:
tipsy
2015-05-17 15:51:49 +02:00
parent 66e43859d3
commit 53ff02a187
6 changed files with 242 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/j2html/tags/ContainerTag.java
View File

@@ -28,6 +28,14 @@ public class ContainerTag extends Tag {
return this;
}
/**
* Call with-method based on condition
* {@link #with(Tag child)}
*/
public ContainerTag condWith(boolean condition, Tag child) {
return condition ? this.with(child) : this;
}
/**
* Appends a list of tags to the end of this element
* @param children tags to be appended
@@ -40,6 +48,14 @@ public class ContainerTag extends Tag {
return this;
}
/**
* Call with-method based on condition
* {@link #with(List children)}
*/
public ContainerTag condWith(boolean condition, List<Tag> children) {
return condition ? this.with(children) : this;
}
/**
* Appends the tags to the end of this element
* @param children tags to be appended
@@ -52,6 +68,14 @@ public class ContainerTag extends Tag {
return this;
}
/**
* Call with-method based on condition
* {@link #with(Tag... children)}
*/
public ContainerTag condWith(boolean condition, Tag... children) {
return condition ? this.with(children) : this;
}
/**
* Appends a text tag to this element
* @param text the text to be appended
@@ -73,11 +97,8 @@ public class ContainerTag extends Tag {
}
/**
* Sets a custom attribute based on a condition
* @param condition the condition that decides if attribute should be set
* @param attribute the attribute name
* @param value the attribute value
* @return itself for easy chaining
* Call attr-method based on condition
* {@link #attr(String attribute, String value)}
*/
public ContainerTag condAttr(boolean condition, String attribute, String value) {
return condition ? attr(attribute, value) : this;

12
src/test/java/j2html/attributes/AttributeTest.java
View File

@@ -1,22 +1,22 @@
package j2html.attributes;
import org.junit.Test;
import j2html.tags.ContainerTag;
import org.junit.Test;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.assertEquals;
public class AttributeTest {
@Test
public void testRender() throws Exception {
Attribute attributeWithValue = new Attribute("href", "http://example.com");
assertTrue(attributeWithValue.render().equals(" href=\"http://example.com\""));
assertEquals(attributeWithValue.render(), " href=\"http://example.com\"");
Attribute attribute = new Attribute("required", null);
assertTrue(attribute.render().equals(" required"));
assertEquals(attribute.render(), " required");
Attribute nullAttribute = new Attribute(null, null);
assertTrue(nullAttribute.render().equals(""));
assertEquals(nullAttribute.render(), "");
}
@Test
@@ -24,7 +24,7 @@ public class AttributeTest {
ContainerTag testTag = new ContainerTag("a");
testTag.setAttribute("href", "http://example.com");
testTag.setAttribute("href", "http://example.org");
assertTrue(testTag.render().equals("<a href=\"http://example.org\"></a>"));
assertEquals(testTag.render(), "<a href=\"http://example.org\"></a>");
}
}

48
src/test/java/j2html/tags/ComplexRenderTest.java
View File

@@ -2,37 +2,43 @@ package j2html.tags;
import org.junit.Test;
import static junit.framework.TestCase.assertTrue;
import static j2html.TagCreator.*;
import static junit.framework.Assert.assertEquals;
public class ComplexRenderTest {
private String renderTest() {
return document().render()+
boolean USER_SHOULD_LOG_IN = true;
boolean USER_SHOULD_SIGN_UP = false;
return document().render() +
html().with(
head().with(
title().withText("Test")
),
body().with(
header().with(
h1("Test Header")
head().with(
title().withText("Test")
),
main().with(
h2("Test Form"),
div().with(
input().withType("email").withName("email").withPlaceholder("Email"),
input().withType("password").withName("password").withPlaceholder("Password"),
button().withType("submit").withText("Login")
)
),
footer().withText("Test Footer"),
script().withSrc("/testScript.js")
)
).render();
body().with(
header().with(
h1("Test Header")
),
main().with(
h2("Test Form"),
div().with(
input().withType("email").withName("email").withPlaceholder("Email"),
input().withType("password").withName("password").withPlaceholder("Password")
).condWith(USER_SHOULD_LOG_IN,
button().withType("submit").withText("Login")
).condWith(USER_SHOULD_SIGN_UP,
button().withType("submit").withText("Signup")
)
),
footer().withText("Test Footer"),
script().withSrc("/testScript.js")
)
).render();
}
@Test
public void testComplexRender() {
String expectedResult = "<!DOCTYPE html><html><head><title>Test</title></head><body><header><h1>Test Header</h1></header><main><h2>Test Form</h2><div><input type=\"email\" name=\"email\" placeholder=\"Email\"><input type=\"password\" name=\"password\" placeholder=\"Password\"><button type=\"submit\">Login</button></div></main><footer>Test Footer</footer><script src=\"/testScript.js\"></script></body></html>";
assertTrue(renderTest().equals(expectedResult));
assertEquals(renderTest(), expectedResult);
}
}

42
src/test/java/j2html/tags/ConvenienceMethodTest.java
View File

@@ -2,32 +2,32 @@ package j2html.tags;
import org.junit.Test;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.assertEquals;
import static j2html.TagCreator.*;
public class ConvenienceMethodTest {
@Test
public void testAllConvenienceMethods() throws Exception {
assertTrue(input().isAutoComplete().render().equals("<input autocomplete>"));
assertTrue(input().isAutoFocus().render().equals("<input autofocus>"));
assertTrue(input().isHidden().render().equals("<input hidden>"));
assertTrue(input().isRequired().render().equals("<input required>"));
assertTrue(img().withAlt("An image").render().equals("<img alt=\"An image\">"));
assertTrue(form().withAction("post").render().equals("<form action=\"post\"></form>"));
assertTrue(meta().withCharset("UTF-8").render().equals("<meta charset=\"UTF-8\">"));
assertTrue(div().withClass("test-class").render().equals("<div class=\"test-class\"></div>"));
assertTrue(meta().withContent("Test Content").render().equals("<meta content=\"Test Content\">"));
assertTrue(a().withHref("http://example.com").render().equals("<a href=\"http://example.com\"></a>"));
assertTrue(div().withId("test-id").render().equals("<div id=\"test-id\"></div>"));
assertTrue(div().withData("testdata", "test").render().equals("<div data-testdata=\"test\"></div>"));
assertTrue(form().withMethod("get").render().equals("<form method=\"get\"></form>"));
assertTrue(input().withName("test-name").render().equals("<input name=\"test-name\">"));
assertTrue(input().withPlaceholder("test-placeholder").render().equals("<input placeholder=\"test-placeholder\">"));
assertTrue(a().withTarget("_blank").render().equals("<a target=\"_blank\"></a>"));
assertTrue(input().withType("email").render().equals("<input type=\"email\">"));
assertTrue(link().withRel("stylesheet").render().equals("<link rel=\"stylesheet\">"));
assertTrue(img().withSrc("/img/test.png").render().equals("<img src=\"/img/test.png\">"));
assertTrue(input().withValue("test-value").render().equals("<input value=\"test-value\">"));
assertEquals(input().isAutoComplete().render(), "<input autocomplete>");
assertEquals(input().isAutoFocus().render(), "<input autofocus>");
assertEquals(input().isHidden().render(), "<input hidden>");
assertEquals(input().isRequired().render(), "<input required>");
assertEquals(img().withAlt("An image").render(), "<img alt=\"An image\">");
assertEquals(form().withAction("post").render(), "<form action=\"post\"></form>");
assertEquals(meta().withCharset("UTF-8").render(), "<meta charset=\"UTF-8\">");
assertEquals(div().withClass("test-class").render(), "<div class=\"test-class\"></div>");
assertEquals(meta().withContent("Test Content").render(), "<meta content=\"Test Content\">");
assertEquals(a().withHref("http://example.com").render(), "<a href=\"http://example.com\"></a>");
assertEquals(div().withId("test-id").render(), "<div id=\"test-id\"></div>");
assertEquals(div().withData("testdata", "test").render(), "<div data-testdata=\"test\"></div>");
assertEquals(form().withMethod("get").render(), "<form method=\"get\"></form>");
assertEquals(input().withName("test-name").render(), "<input name=\"test-name\">");
assertEquals(input().withPlaceholder("test-placeholder").render(), "<input placeholder=\"test-placeholder\">");
assertEquals(a().withTarget("_blank").render(), "<a target=\"_blank\"></a>");
assertEquals(input().withType("email").render(), "<input type=\"email\">");
assertEquals(link().withRel("stylesheet").render(), "<link rel=\"stylesheet\">");
assertEquals(img().withSrc("/img/test.png").render(), "<img src=\"/img/test.png\">");
assertEquals(input().withValue("test-value").render(), "<input value=\"test-value\">");
}
}

308
src/test/java/j2html/tags/TagCreatorTest.java
View File

@@ -2,7 +2,7 @@ package j2html.tags;
import org.junit.Test;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.assertEquals;
import static j2html.TagCreator.*;
public class TagCreatorTest {
@@ -11,163 +11,163 @@ public class TagCreatorTest {
public void testAllTags() throws Exception {
//Special Tags
assertTrue(tag("tagname").render().equals("<tagname></tagname>"));
assertTrue(emptyTag("tagname").render().equals("<tagname>"));
assertTrue(text("text").render().equals("text"));
assertTrue(text("<script>").render().equals("&#60;script&#62;"));
assertTrue(unsafeHtml("<script>").render().equals("<script>"));
assertEquals(tag("tagname").render(), "<tagname></tagname>");
assertEquals(emptyTag("tagname").render(), "<tagname>");
assertEquals(text("text").render(), "text");
assertEquals(text("<script>").render(), "&#60;script&#62;");
assertEquals(unsafeHtml("<script>").render(), "<script>");
//EmptyTags
assertTrue(document().render().equals("<!DOCTYPE html>"));
assertTrue(area().render().equals("<area>"));
assertTrue(base().render().equals("<base>"));
assertTrue(br().render().equals("<br>"));
assertTrue(col().render().equals("<col>"));
assertTrue(embed().render().equals("<embed>"));
assertTrue(hr().render().equals("<hr>"));
assertTrue(img().render().equals("<img>"));
assertTrue(input().render().equals("<input>"));
assertTrue(keygen().render().equals("<keygen>"));
assertTrue(link().render().equals("<link>"));
assertTrue(meta().render().equals("<meta>"));
assertTrue(param().render().equals("<param>"));
assertTrue(source().render().equals("<source>"));
assertTrue(track().render().equals("<track>"));
assertTrue(wbr().render().equals("<wbr>"));
assertEquals(document().render(), "<!DOCTYPE html>");
assertEquals(area().render(), "<area>");
assertEquals(base().render(), "<base>");
assertEquals(br().render(), "<br>");
assertEquals(col().render(), "<col>");
assertEquals(embed().render(), "<embed>");
assertEquals(hr().render(), "<hr>");
assertEquals(img().render(), "<img>");
assertEquals(input().render(), "<input>");
assertEquals(keygen().render(), "<keygen>");
assertEquals(link().render(), "<link>");
assertEquals(meta().render(), "<meta>");
assertEquals(param().render(), "<param>");
assertEquals(source().render(), "<source>");
assertEquals(track().render(), "<track>");
assertEquals(wbr().render(), "<wbr>");
//ContainerTags
assertTrue(a().render().equals("<a></a>"));
assertTrue(a("Text").render().equals("<a>Text</a>"));
assertTrue(abbr().render().equals("<abbr></abbr>"));
assertTrue(address().render().equals("<address></address>"));
assertTrue(article().render().equals("<article></article>"));
assertTrue(aside().render().equals("<aside></aside>"));
assertTrue(audio().render().equals("<audio></audio>"));
assertTrue(b().render().equals("<b></b>"));
assertTrue(b("Text").render().equals("<b>Text</b>"));
assertTrue(bdi().render().equals("<bdi></bdi>"));
assertTrue(bdi("Text").render().equals("<bdi>Text</bdi>"));
assertTrue(bdo().render().equals("<bdo></bdo>"));
assertTrue(bdo("Text").render().equals("<bdo>Text</bdo>"));
assertTrue(blockquote().render().equals("<blockquote></blockquote>"));
assertTrue(blockquote("Text").render().equals("<blockquote>Text</blockquote>"));
assertTrue(body().render().equals("<body></body>"));
assertTrue(button().render().equals("<button></button>"));
assertTrue(button("Text").render().equals("<button>Text</button>"));
assertTrue(canvas().render().equals("<canvas></canvas>"));
assertTrue(caption().render().equals("<caption></caption>"));
assertTrue(caption("Text").render().equals("<caption>Text</caption>"));
assertTrue(cite().render().equals("<cite></cite>"));
assertTrue(cite("Text").render().equals("<cite>Text</cite>"));
assertTrue(code().render().equals("<code></code>"));
assertTrue(colgroup().render().equals("<colgroup></colgroup>"));
assertTrue(datalist().render().equals("<datalist></datalist>"));
assertTrue(dd().render().equals("<dd></dd>"));
assertTrue(dd("Text").render().equals("<dd>Text</dd>"));
assertTrue(del().render().equals("<del></del>"));
assertTrue(del("Text").render().equals("<del>Text</del>"));
assertTrue(details().render().equals("<details></details>"));
assertTrue(dfn().render().equals("<dfn></dfn>"));
assertTrue(dfn("Text").render().equals("<dfn>Text</dfn>"));
assertTrue(dialog().render().equals("<dialog></dialog>"));
assertTrue(dialog("Text").render().equals("<dialog>Text</dialog>"));
assertTrue(div().render().equals("<div></div>"));
assertTrue(dl().render().equals("<dl></dl>"));
assertTrue(dt().render().equals("<dt></dt>"));
assertTrue(dt("Text").render().equals("<dt>Text</dt>"));
assertTrue(em().render().equals("<em></em>"));
assertTrue(em("Text").render().equals("<em>Text</em>"));
assertTrue(fieldset().render().equals("<fieldset></fieldset>"));
assertTrue(figcaption().render().equals("<figcaption></figcaption>"));
assertTrue(figcaption("Text").render().equals("<figcaption>Text</figcaption>"));
assertTrue(figure().render().equals("<figure></figure>"));
assertTrue(footer().render().equals("<footer></footer>"));
assertTrue(form().render().equals("<form></form>"));
assertTrue(h1().render().equals("<h1></h1>"));
assertTrue(h1("Text").render().equals("<h1>Text</h1>"));
assertTrue(h2().render().equals("<h2></h2>"));
assertTrue(h2("Text").render().equals("<h2>Text</h2>"));
assertTrue(h3().render().equals("<h3></h3>"));
assertTrue(h3("Text").render().equals("<h3>Text</h3>"));
assertTrue(h4().render().equals("<h4></h4>"));
assertTrue(h4("Text").render().equals("<h4>Text</h4>"));
assertTrue(h5().render().equals("<h5></h5>"));
assertTrue(h5("Text").render().equals("<h5>Text</h5>"));
assertTrue(h6().render().equals("<h6></h6>"));
assertTrue(h6("Text").render().equals("<h6>Text</h6>"));
assertTrue(head().render().equals("<head></head>"));
assertTrue(header().render().equals("<header></header>"));
assertTrue(html().render().equals("<html></html>"));
assertTrue(i().render().equals("<i></i>"));
assertTrue(i("Text").render().equals("<i>Text</i>"));
assertTrue(iframe().render().equals("<iframe></iframe>"));
assertTrue(ins().render().equals("<ins></ins>"));
assertTrue(ins("Text").render().equals("<ins>Text</ins>"));
assertTrue(kbd().render().equals("<kbd></kbd>"));
assertTrue(label().render().equals("<label></label>"));
assertTrue(label("Text").render().equals("<label>Text</label>"));
assertTrue(legend().render().equals("<legend></legend>"));
assertTrue(legend("Text").render().equals("<legend>Text</legend>"));
assertTrue(li().render().equals("<li></li>"));
assertTrue(li("Text").render().equals("<li>Text</li>"));
assertTrue(main().render().equals("<main></main>"));
assertTrue(map().render().equals("<map></map>"));
assertTrue(mark().render().equals("<mark></mark>"));
assertTrue(menu().render().equals("<menu></menu>"));
assertTrue(menuitem().render().equals("<menuitem></menuitem>"));
assertTrue(meter().render().equals("<meter></meter>"));
assertTrue(nav().render().equals("<nav></nav>"));
assertTrue(noscript().render().equals("<noscript></noscript>"));
assertTrue(object().render().equals("<object></object>"));
assertTrue(ol().render().equals("<ol></ol>"));
assertTrue(optgroup().render().equals("<optgroup></optgroup>"));
assertTrue(option().render().equals("<option></option>"));
assertTrue(option("Text").render().equals("<option>Text</option>"));
assertTrue(output().render().equals("<output></output>"));
assertTrue(p().render().equals("<p></p>"));
assertTrue(p("Text").render().equals("<p>Text</p>"));
assertTrue(pre().render().equals("<pre></pre>"));
assertTrue(progress().render().equals("<progress></progress>"));
assertTrue(q().render().equals("<q></q>"));
assertTrue(q("Text").render().equals("<q>Text</q>"));
assertTrue(rp().render().equals("<rp></rp>"));
assertTrue(rt().render().equals("<rt></rt>"));
assertTrue(ruby().render().equals("<ruby></ruby>"));
assertTrue(s().render().equals("<s></s>"));
assertTrue(samp().render().equals("<samp></samp>"));
assertTrue(script().render().equals("<script></script>"));
assertTrue(section().render().equals("<section></section>"));
assertTrue(select().render().equals("<select></select>"));
assertTrue(small().render().equals("<small></small>"));
assertTrue(small("Text").render().equals("<small>Text</small>"));
assertTrue(span().render().equals("<span></span>"));
assertTrue(span("Text").render().equals("<span>Text</span>"));
assertTrue(strong().render().equals("<strong></strong>"));
assertTrue(strong("Text").render().equals("<strong>Text</strong>"));
assertTrue(style().render().equals("<style></style>"));
assertTrue(sub().render().equals("<sub></sub>"));
assertTrue(sub("Text").render().equals("<sub>Text</sub>"));
assertTrue(summary().render().equals("<summary></summary>"));
assertTrue(summary("Text").render().equals("<summary>Text</summary>"));
assertTrue(sup().render().equals("<sup></sup>"));
assertTrue(sup("Text").render().equals("<sup>Text</sup>"));
assertTrue(table().render().equals("<table></table>"));
assertTrue(tbody().render().equals("<tbody></tbody>"));
assertTrue(td().render().equals("<td></td>"));
assertTrue(td("Text").render().equals("<td>Text</td>"));
assertTrue(textarea().render().equals("<textarea></textarea>"));
assertTrue(tfoot().render().equals("<tfoot></tfoot>"));
assertTrue(th().render().equals("<th></th>"));
assertTrue(th("Text").render().equals("<th>Text</th>"));
assertTrue(thead().render().equals("<thead></thead>"));
assertTrue(time().render().equals("<time></time>"));
assertTrue(title().render().equals("<title></title>"));
assertTrue(tr().render().equals("<tr></tr>"));
assertTrue(u().render().equals("<u></u>"));
assertTrue(u("Text").render().equals("<u>Text</u>"));
assertTrue(ul().render().equals("<ul></ul>"));
assertTrue(var().render().equals("<var></var>"));
assertTrue(video().render().equals("<video></video>"));
assertEquals(a().render(), "<a></a>");
assertEquals(a("Text").render(), "<a>Text</a>");
assertEquals(abbr().render(), "<abbr></abbr>");
assertEquals(address().render(), "<address></address>");
assertEquals(article().render(), "<article></article>");
assertEquals(aside().render(), "<aside></aside>");
assertEquals(audio().render(), "<audio></audio>");
assertEquals(b().render(), "<b></b>");
assertEquals(b("Text").render(), "<b>Text</b>");
assertEquals(bdi().render(), "<bdi></bdi>");
assertEquals(bdi("Text").render(), "<bdi>Text</bdi>");
assertEquals(bdo().render(), "<bdo></bdo>");
assertEquals(bdo("Text").render(), "<bdo>Text</bdo>");
assertEquals(blockquote().render(), "<blockquote></blockquote>");
assertEquals(blockquote("Text").render(), "<blockquote>Text</blockquote>");
assertEquals(body().render(), "<body></body>");
assertEquals(button().render(), "<button></button>");
assertEquals(button("Text").render(), "<button>Text</button>");
assertEquals(canvas().render(), "<canvas></canvas>");
assertEquals(caption().render(), "<caption></caption>");
assertEquals(caption("Text").render(), "<caption>Text</caption>");
assertEquals(cite().render(), "<cite></cite>");
assertEquals(cite("Text").render(), "<cite>Text</cite>");
assertEquals(code().render(), "<code></code>");
assertEquals(colgroup().render(), "<colgroup></colgroup>");
assertEquals(datalist().render(), "<datalist></datalist>");
assertEquals(dd().render(), "<dd></dd>");
assertEquals(dd("Text").render(), "<dd>Text</dd>");
assertEquals(del().render(), "<del></del>");
assertEquals(del("Text").render(), "<del>Text</del>");
assertEquals(details().render(), "<details></details>");
assertEquals(dfn().render(), "<dfn></dfn>");
assertEquals(dfn("Text").render(), "<dfn>Text</dfn>");
assertEquals(dialog().render(), "<dialog></dialog>");
assertEquals(dialog("Text").render(), "<dialog>Text</dialog>");
assertEquals(div().render(), "<div></div>");
assertEquals(dl().render(), "<dl></dl>");
assertEquals(dt().render(), "<dt></dt>");
assertEquals(dt("Text").render(), "<dt>Text</dt>");
assertEquals(em().render(), "<em></em>");
assertEquals(em("Text").render(), "<em>Text</em>");
assertEquals(fieldset().render(), "<fieldset></fieldset>");
assertEquals(figcaption().render(), "<figcaption></figcaption>");
assertEquals(figcaption("Text").render(), "<figcaption>Text</figcaption>");
assertEquals(figure().render(), "<figure></figure>");
assertEquals(footer().render(), "<footer></footer>");
assertEquals(form().render(), "<form></form>");
assertEquals(h1().render(), "<h1></h1>");
assertEquals(h1("Text").render(), "<h1>Text</h1>");
assertEquals(h2().render(), "<h2></h2>");
assertEquals(h2("Text").render(), "<h2>Text</h2>");
assertEquals(h3().render(), "<h3></h3>");
assertEquals(h3("Text").render(), "<h3>Text</h3>");
assertEquals(h4().render(), "<h4></h4>");
assertEquals(h4("Text").render(), "<h4>Text</h4>");
assertEquals(h5().render(), "<h5></h5>");
assertEquals(h5("Text").render(), "<h5>Text</h5>");
assertEquals(h6().render(), "<h6></h6>");
assertEquals(h6("Text").render(), "<h6>Text</h6>");
assertEquals(head().render(), "<head></head>");
assertEquals(header().render(), "<header></header>");
assertEquals(html().render(), "<html></html>");
assertEquals(i().render(), "<i></i>");
assertEquals(i("Text").render(), "<i>Text</i>");
assertEquals(iframe().render(), "<iframe></iframe>");
assertEquals(ins().render(), "<ins></ins>");
assertEquals(ins("Text").render(), "<ins>Text</ins>");
assertEquals(kbd().render(), "<kbd></kbd>");
assertEquals(label().render(), "<label></label>");
assertEquals(label("Text").render(), "<label>Text</label>");
assertEquals(legend().render(), "<legend></legend>");
assertEquals(legend("Text").render(), "<legend>Text</legend>");
assertEquals(li().render(), "<li></li>");
assertEquals(li("Text").render(), "<li>Text</li>");
assertEquals(main().render(), "<main></main>");
assertEquals(map().render(), "<map></map>");
assertEquals(mark().render(), "<mark></mark>");
assertEquals(menu().render(), "<menu></menu>");
assertEquals(menuitem().render(), "<menuitem></menuitem>");
assertEquals(meter().render(), "<meter></meter>");
assertEquals(nav().render(), "<nav></nav>");
assertEquals(noscript().render(), "<noscript></noscript>");
assertEquals(object().render(), "<object></object>");
assertEquals(ol().render(), "<ol></ol>");
assertEquals(optgroup().render(), "<optgroup></optgroup>");
assertEquals(option().render(), "<option></option>");
assertEquals(option("Text").render(), "<option>Text</option>");
assertEquals(output().render(), "<output></output>");
assertEquals(p().render(), "<p></p>");
assertEquals(p("Text").render(), "<p>Text</p>");
assertEquals(pre().render(), "<pre></pre>");
assertEquals(progress().render(), "<progress></progress>");
assertEquals(q().render(), "<q></q>");
assertEquals(q("Text").render(), "<q>Text</q>");
assertEquals(rp().render(), "<rp></rp>");
assertEquals(rt().render(), "<rt></rt>");
assertEquals(ruby().render(), "<ruby></ruby>");
assertEquals(s().render(), "<s></s>");
assertEquals(samp().render(), "<samp></samp>");
assertEquals(script().render(), "<script></script>");
assertEquals(section().render(), "<section></section>");
assertEquals(select().render(), "<select></select>");
assertEquals(small().render(), "<small></small>");
assertEquals(small("Text").render(), "<small>Text</small>");
assertEquals(span().render(), "<span></span>");
assertEquals(span("Text").render(), "<span>Text</span>");
assertEquals(strong().render(), "<strong></strong>");
assertEquals(strong("Text").render(), "<strong>Text</strong>");
assertEquals(style().render(), "<style></style>");
assertEquals(sub().render(), "<sub></sub>");
assertEquals(sub("Text").render(), "<sub>Text</sub>");
assertEquals(summary().render(), "<summary></summary>");
assertEquals(summary("Text").render(), "<summary>Text</summary>");
assertEquals(sup().render(), "<sup></sup>");
assertEquals(sup("Text").render(), "<sup>Text</sup>");
assertEquals(table().render(), "<table></table>");
assertEquals(tbody().render(), "<tbody></tbody>");
assertEquals(td().render(), "<td></td>");
assertEquals(td("Text").render(), "<td>Text</td>");
assertEquals(textarea().render(), "<textarea></textarea>");
assertEquals(tfoot().render(), "<tfoot></tfoot>");
assertEquals(th().render(), "<th></th>");
assertEquals(th("Text").render(), "<th>Text</th>");
assertEquals(thead().render(), "<thead></thead>");
assertEquals(time().render(), "<time></time>");
assertEquals(title().render(), "<title></title>");
assertEquals(tr().render(), "<tr></tr>");
assertEquals(u().render(), "<u></u>");
assertEquals(u("Text").render(), "<u>Text</u>");
assertEquals(ul().render(), "<ul></ul>");
assertEquals(var().render(), "<var></var>");
assertEquals(video().render(), "<video></video>");
}
}

16
src/test/java/j2html/tags/TagTest.java
View File

@@ -2,8 +2,8 @@ package j2html.tags;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static j2html.TagCreator.*;
import static org.junit.Assert.assertEquals;
public class TagTest {
@@ -11,28 +11,28 @@ public class TagTest {
public void testRender() throws Exception {
ContainerTag testTag = new ContainerTag("a");
testTag.setAttribute("href", "http://example.com");
assertTrue(testTag.render().equals("<a href=\"http://example.com\"></a>"));
assertEquals(testTag.render(), "<a href=\"http://example.com\"></a>");
ContainerTag complexTestTag = html().with(body().with(header(), main().with(p().withText("Main stuff...")), footer()));
String expectedResult ="<html><body><header></header><main><p>Main stuff...</p></main><footer></footer></body></html>";
assertTrue(complexTestTag.render().equals(expectedResult));
ContainerTag complexTestTag = html().with(body().with(header(),main().with(p("Main stuff...")),footer().condWith(1 == 1,p("Conditional with!"))));
String expectedResult ="<html><body><header></header><main><p>Main stuff...</p></main><footer><p>Conditional with!</p></footer></body></html>";
assertEquals(complexTestTag.render(), (expectedResult));
}
@Test
public void testOpenTag() throws Exception {
ContainerTag testTag = new ContainerTag("a");
assertTrue(testTag.renderOpenTag().equals("<a>"));
assertEquals(testTag.renderOpenTag(), "<a>");
ContainerTag complexTestTag = new ContainerTag("input");
complexTestTag.withType("password").withId("password").withName("password").withPlaceholder("Password").isRequired();
String expectedResult = "<input type=\"password\" id=\"password\" name=\"password\" placeholder=\"Password\" required>";
assertTrue(complexTestTag.renderOpenTag().equals(expectedResult));
assertEquals(complexTestTag.renderOpenTag(), expectedResult);
}
@Test
public void testCloseTag() throws Exception {
ContainerTag testTag = new ContainerTag("a");
assertTrue(testTag.renderCloseTag().equals("</a>"));
assertEquals(testTag.renderCloseTag(), "</a>");
}
}