opendev/gerrit
Code Issues Proposed changes

gerrit-gwtexpui: Convert tests to use Google Truth

Browse Source 
Change-Id: I7a8bf41df3b9118a7c21cdbf89925ffe76119019
This commit is contained in:
David Pursehouse
2015-06-03 17:57:44 +09:00
parent 56ef7a8902
commit cd4c01dadc
10 changed files with 315 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtexpui/BUCK
View File

@@ -73,7 +73,7 @@ java_test(
]),
deps = [
':SafeHtml',
'//lib:junit',
'//lib:truth',
'//lib/gwt:user',
'//lib/gwt:dev',
],

44
gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/LinkFindReplaceTest.java
View File

@@ -14,10 +14,8 @@
package com.google.gwtexpui.safehtml.client;
import static com.google.common.truth.Truth.assertThat;
import static com.google.gwtexpui.safehtml.client.LinkFindReplace.hasValidScheme;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Rule;
import org.junit.Test;
@@ -32,29 +30,30 @@ public class LinkFindReplaceTest {
String find = "find";
String link = "link";
LinkFindReplace a = new LinkFindReplace(find, link);
assertEquals(find, a.pattern().getSource());
assertEquals("<a href=\"link\">find</a>", a.replace(find));
assertEquals("find = " + find + ", link = " + link, a.toString());
assertThat(a.pattern().getSource()).isEqualTo(find);
assertThat(a.replace(find)).isEqualTo("<a href=\"link\">find</a>");
assertThat(a.toString()).isEqualTo("find = " + find + ", link = " + link);
}
@Test
public void testBackreference() {
assertEquals("<a href=\"/bug?id=123\">issue 123</a>",
new LinkFindReplace("(bug|issue)\\s*([0-9]+)", "/bug?id=$2")
.replace("issue 123"));
LinkFindReplace l = new LinkFindReplace(
"(bug|issue)\\s*([0-9]+)", "/bug?id=$2");
assertThat(l.replace("issue 123"))
.isEqualTo("<a href=\"/bug?id=123\">issue 123</a>");
}
@Test
public void testHasValidScheme() {
assertTrue(hasValidScheme("/absolute/path"));
assertTrue(hasValidScheme("relative/path"));
assertTrue(hasValidScheme("http://url/"));
assertTrue(hasValidScheme("HTTP://url/"));
assertTrue(hasValidScheme("https://url/"));
assertTrue(hasValidScheme("mailto://url/"));
assertFalse(hasValidScheme("ftp://url/"));
assertFalse(hasValidScheme("data:evil"));
assertFalse(hasValidScheme("javascript:alert(1)"));
assertThat(hasValidScheme("/absolute/path")).isTrue();
assertThat(hasValidScheme("relative/path")).isTrue();
assertThat(hasValidScheme("http://url/")).isTrue();
assertThat(hasValidScheme("HTTP://url/")).isTrue();
assertThat(hasValidScheme("https://url/")).isTrue();
assertThat(hasValidScheme("mailto://url/")).isTrue();
assertThat(hasValidScheme("ftp://url/")).isFalse();
assertThat(hasValidScheme("data:evil")).isFalse();
assertThat(hasValidScheme("javascript:alert(1)")).isFalse();
}
@Test
@@ -72,15 +71,16 @@ public class LinkFindReplaceTest {
@Test
public void testReplaceEscaping() {
assertEquals("<a href=\"a&quot;&amp;&#39;&lt;&gt;b\">find</a>",
new LinkFindReplace("find", "a\"&'<>b").replace("find"));
assertThat(new LinkFindReplace("find", "a\"&'<>b").replace("find"))
.isEqualTo("<a href=\"a&quot;&amp;&#39;&lt;&gt;b\">find</a>");
}
@Test
public void testHtmlInFind() {
String rawFind = "<b>&quot;bold&quot;</b>";
LinkFindReplace a = new LinkFindReplace(rawFind, "/bold");
assertEquals(rawFind, a.pattern().getSource());
assertEquals("<a href=\"/bold\">" + rawFind + "</a>", a.replace(rawFind));
assertThat(a.pattern().getSource()).isEqualTo(rawFind);
assertThat(a.replace(rawFind))
.isEqualTo("<a href=\"/bold\">" + rawFind + "</a>");
}
}

8
gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/RawFindReplaceTest.java
View File

@@ -14,7 +14,7 @@
package com.google.gwtexpui.safehtml.client;
import static org.junit.Assert.assertEquals;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
@@ -24,8 +24,8 @@ public class RawFindReplaceTest {
final String find = "find";
final String replace = "replace";
final RawFindReplace a = new RawFindReplace(find, replace);
assertEquals(find, a.pattern().getSource());
assertEquals(replace, a.replace(find));
assertEquals("find = " + find + ", replace = " + replace, a.toString());
assertThat(a.pattern().getSource()).isEqualTo(find);
assertThat(a.replace(find)).isEqualTo(replace);
assertThat(a.toString()).isEqualTo("find = " + find + ", replace = " + replace);
}
}

219
gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java
View File

@@ -14,12 +14,7 @@
package com.google.gwtexpui.safehtml.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Rule;
import org.junit.Test;
@@ -32,13 +27,13 @@ public class SafeHtmlBuilderTest {
@Test
public void testEmpty() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertTrue(b.isEmpty());
assertFalse(b.hasContent());
assertEquals("", b.asString());
assertThat(b.isEmpty()).isTrue();
assertThat(b.hasContent()).isFalse();
assertThat(b.asString()).isEmpty();
b.append("a");
assertTrue(b.hasContent());
assertEquals("a", b.asString());
assertThat(b.hasContent()).isTrue();
assertThat(b.asString()).isEqualTo("a");
}
@Test
@@ -47,216 +42,216 @@ public class SafeHtmlBuilderTest {
b.append(1);
final SafeHtml h = b.toSafeHtml();
assertNotNull(h);
assertNotSame(h, b);
assertFalse(h instanceof SafeHtmlBuilder);
assertEquals("1", h.asString());
assertThat(h).isNotNull();
assertThat(h).isNotSameAs(b);
assertThat(h).isNotInstanceOf(SafeHtmlBuilder.class);
assertThat(h.asString()).isEqualTo("1");
}
@Test
public void testAppend_boolean() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append(true));
assertSame(b, b.append(false));
assertEquals("truefalse", b.asString());
assertThat(b).isSameAs(b.append(true));
assertThat(b).isSameAs(b.append(false));
assertThat(b.asString()).isEqualTo("truefalse");
}
@Test
public void testAppend_char() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append('a'));
assertSame(b, b.append('b'));
assertEquals("ab", b.asString());
assertThat(b).isSameAs(b.append('a'));
assertThat(b).isSameAs(b.append('b'));
assertThat("ab");
}
@Test
public void testAppend_int() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append(4));
assertSame(b, b.append(2));
assertSame(b, b.append(-100));
assertEquals("42-100", b.asString());
assertThat(b).isSameAs(b.append(4));
assertThat(b).isSameAs(b.append(2));
assertThat(b).isSameAs(b.append(-100));
assertThat(b.asString()).isEqualTo("42-100");
}
@Test
public void testAppend_long() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append(4L));
assertSame(b, b.append(2L));
assertEquals("42", b.asString());
assertThat(b).isSameAs(b.append(4L));
assertThat(b).isSameAs(b.append(2L));
assertThat(b.asString()).isEqualTo("42");
}
@Test
public void testAppend_float() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append(0.0f));
assertEquals("0.0", b.asString());
assertThat(b).isSameAs(b.append(0.0f));
assertThat(b.asString()).isEqualTo("0.0");
}
@Test
public void testAppend_double() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append(0.0));
assertEquals("0.0", b.asString());
assertThat(b).isSameAs(b.append(0.0));
assertThat(b.asString()).isEqualTo("0.0");
}
@Test
public void testAppend_String() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append((String) null));
assertEquals("", b.asString());
assertSame(b, b.append("foo"));
assertSame(b, b.append("bar"));
assertEquals("foobar", b.asString());
assertThat(b).isSameAs(b.append((String) null));
assertThat(b.asString()).isEmpty();
assertThat(b).isSameAs(b.append("foo"));
assertThat(b).isSameAs(b.append("bar"));
assertThat(b.asString()).isEqualTo("foobar");
}
@Test
public void testAppend_StringBuilder() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append((StringBuilder) null));
assertEquals("", b.asString());
assertSame(b, b.append(new StringBuilder("foo")));
assertSame(b, b.append(new StringBuilder("bar")));
assertEquals("foobar", b.asString());
assertThat(b).isSameAs(b.append((StringBuilder) null));
assertThat(b.asString()).isEmpty();
assertThat(b).isSameAs(b.append(new StringBuilder("foo")));
assertThat(b).isSameAs(b.append(new StringBuilder("bar")));
assertThat(b.asString()).isEqualTo("foobar");
}
@Test
public void testAppend_StringBuffer() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append((StringBuffer) null));
assertEquals("", b.asString());
assertSame(b, b.append(new StringBuffer("foo")));
assertSame(b, b.append(new StringBuffer("bar")));
assertEquals("foobar", b.asString());
assertThat(b).isSameAs(b.append((StringBuffer) null));
assertThat(b.asString()).isEmpty();
assertThat(b).isSameAs(b.append(new StringBuffer("foo")));
assertThat(b).isSameAs(b.append(new StringBuffer("bar")));
assertThat(b.asString()).isEqualTo("foobar");
}
@Test
public void testAppend_Object() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append((Object) null));
assertEquals("", b.asString());
assertSame(b, b.append(new Object() {
assertThat(b).isSameAs(b.append((Object) null));
assertThat(b.asString()).isEmpty();
assertThat(b).isSameAs(b.append(new Object() {
@Override
public String toString() {
return "foobar";
}
}));
assertEquals("foobar", b.asString());
assertThat(b.asString()).isEqualTo("foobar");
}
@Test
public void testAppend_CharSequence() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append((CharSequence) null));
assertEquals("", b.asString());
assertSame(b, b.append((CharSequence) "foo"));
assertSame(b, b.append((CharSequence) "bar"));
assertEquals("foobar", b.asString());
assertThat(b).isSameAs(b.append((CharSequence) null));
assertThat(b.asString()).isEmpty();
assertThat(b).isSameAs(b.append((CharSequence) "foo"));
assertThat(b).isSameAs(b.append((CharSequence) "bar"));
assertThat(b.asString()).isEqualTo("foobar");
}
@Test
public void testAppend_SafeHtml() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.append((SafeHtml) null));
assertEquals("", b.asString());
assertSame(b, b.append(new SafeHtmlString("foo")));
assertSame(b, b.append(new SafeHtmlBuilder().append("bar")));
assertEquals("foobar", b.asString());
assertThat(b).isSameAs(b.append((SafeHtml) null));
assertThat(b.asString()).isEmpty();
assertThat(b).isSameAs(b.append(new SafeHtmlString("foo")));
assertThat(b).isSameAs(b.append(new SafeHtmlBuilder().append("bar")));
assertThat(b.asString()).isEqualTo("foobar");
}
@Test
public void testHtmlSpecialCharacters() {
assertEquals("&amp;", escape("&"));
assertEquals("&lt;", escape("<"));
assertEquals("&gt;", escape(">"));
assertEquals("&quot;", escape("\""));
assertEquals("&#39;", escape("'"));
assertThat(escape("&")).isEqualTo("&amp;");
assertThat(escape("<")).isEqualTo("&lt;");
assertThat(escape(">")).isEqualTo("&gt;");
assertThat(escape("\"")).isEqualTo("&quot;");
assertThat(escape("'")).isEqualTo("&#39;");
assertEquals("&amp;", escape('&'));
assertEquals("&lt;", escape('<'));
assertEquals("&gt;", escape('>'));
assertEquals("&quot;", escape('"'));
assertEquals("&#39;", escape('\''));
assertThat(escape('&')).isEqualTo("&amp;");
assertThat(escape('<')).isEqualTo("&lt;");
assertThat(escape('>')).isEqualTo("&gt;");
assertThat(escape('"')).isEqualTo("&quot;");
assertThat(escape('\'')).isEqualTo("&#39;");
assertEquals("&lt;b&gt;", escape("<b>"));
assertEquals("&amp;lt;b&amp;gt;", escape("&lt;b&gt;"));
assertThat(escape("<b>")).isEqualTo("&lt;b&gt;");
assertThat(escape("&lt;b&gt;")).isEqualTo("&amp;lt;b&amp;gt;");
}
@Test
public void testEntityNbsp() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.nbsp());
assertEquals("&nbsp;", b.asString());
assertThat(b).isSameAs(b.nbsp());
assertThat(b.asString()).isEqualTo("&nbsp;");
}
@Test
public void testTagBr() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.br());
assertEquals("<br />", b.asString());
assertThat(b).isSameAs(b.br());
assertThat(b.asString()).isEqualTo("<br />");
}
@Test
public void testTagTableTrTd() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.openElement("table"));
assertSame(b, b.openTr());
assertSame(b, b.openTd());
assertSame(b, b.append("d<a>ta"));
assertSame(b, b.closeTd());
assertSame(b, b.closeTr());
assertSame(b, b.closeElement("table"));
assertEquals("<table><tr><td>d&lt;a&gt;ta</td></tr></table>", b.asString());
assertThat(b).isSameAs(b.openElement("table"));
assertThat(b).isSameAs(b.openTr());
assertThat(b).isSameAs(b.openTd());
assertThat(b).isSameAs(b.append("d<a>ta"));
assertThat(b).isSameAs(b.closeTd());
assertThat(b).isSameAs(b.closeTr());
assertThat(b).isSameAs(b.closeElement("table"));
assertThat(b.asString()).isEqualTo("<table><tr><td>d&lt;a&gt;ta</td></tr></table>");
}
@Test
public void testTagDiv() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.openDiv());
assertSame(b, b.append("d<a>ta"));
assertSame(b, b.closeDiv());
assertEquals("<div>d&lt;a&gt;ta</div>", b.asString());
assertThat(b).isSameAs(b.openDiv());
assertThat(b).isSameAs(b.append("d<a>ta"));
assertThat(b).isSameAs(b.closeDiv());
assertThat(b.asString()).isEqualTo("<div>d&lt;a&gt;ta</div>");
}
@Test
public void testTagAnchor() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.openAnchor());
assertThat(b).isSameAs(b.openAnchor());
assertEquals("", b.getAttribute("href"));
assertSame(b, b.setAttribute("href", "http://here"));
assertEquals("http://here", b.getAttribute("href"));
assertSame(b, b.setAttribute("href", "d<a>ta"));
assertEquals("d<a>ta", b.getAttribute("href"));
assertThat(b.getAttribute("href")).isEmpty();
assertThat(b).isSameAs(b.setAttribute("href", "http://here"));
assertThat(b.getAttribute("href")).isEqualTo("http://here");
assertThat(b).isSameAs(b.setAttribute("href", "d<a>ta"));
assertThat(b.getAttribute("href")).isEqualTo("d<a>ta");
assertEquals("", b.getAttribute("target"));
assertSame(b, b.setAttribute("target", null));
assertEquals("", b.getAttribute("target"));
assertThat(b.getAttribute("target")).isEmpty();
assertThat(b).isSameAs(b.setAttribute("target", null));
assertThat(b.getAttribute("target")).isEmpty();
assertSame(b, b.append("go"));
assertSame(b, b.closeAnchor());
assertEquals("<a href=\"d&lt;a&gt;ta\">go</a>", b.asString());
assertThat(b).isSameAs(b.append("go"));
assertThat(b).isSameAs(b.closeAnchor());
assertThat(b.asString()).isEqualTo("<a href=\"d&lt;a&gt;ta\">go</a>");
}
@Test
public void testTagHeightWidth() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.openElement("img"));
assertSame(b, b.setHeight(100));
assertSame(b, b.setWidth(42));
assertSame(b, b.closeSelf());
assertEquals("<img height=\"100\" width=\"42\" />", b.asString());
assertThat(b).isSameAs(b.openElement("img"));
assertThat(b).isSameAs(b.setHeight(100));
assertThat(b).isSameAs(b.setWidth(42));
assertThat(b).isSameAs(b.closeSelf());
assertThat(b.asString()).isEqualTo("<img height=\"100\" width=\"42\" />");
}
@Test
public void testStyleName() {
final SafeHtmlBuilder b = new SafeHtmlBuilder();
assertSame(b, b.openSpan());
assertSame(b, b.setStyleName("foo"));
assertSame(b, b.addStyleName("bar"));
assertSame(b, b.append("d<a>ta"));
assertSame(b, b.closeSpan());
assertEquals("<span class=\"foo bar\">d&lt;a&gt;ta</span>", b.asString());
assertThat(b).isSameAs(b.openSpan());
assertThat(b).isSameAs(b.setStyleName("foo"));
assertThat(b).isSameAs(b.addStyleName("bar"));
assertThat(b).isSameAs(b.append("d<a>ta"));
assertThat(b).isSameAs(b.closeSpan());
assertThat(b.asString()).isEqualTo("<span class=\"foo bar\">d&lt;a&gt;ta</span>");
}
@Test

48
gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_LinkifyTest.java
View File

@@ -14,8 +14,7 @@
package com.google.gwtexpui.safehtml.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
@@ -24,72 +23,81 @@ public class SafeHtml_LinkifyTest {
public void testLinkify_SimpleHttp1() {
final SafeHtml o = html("A http://go.here/ B");
final SafeHtml n = o.linkify();
assertNotSame(o, n);
assertEquals("A <a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a> B", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A <a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a> B");
}
@Test
public void testLinkify_SimpleHttps2() {
final SafeHtml o = html("A https://go.here/ B");
final SafeHtml n = o.linkify();
assertNotSame(o, n);
assertEquals("A <a href=\"https://go.here/\" target=\"_blank\">https://go.here/</a> B", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A <a href=\"https://go.here/\" target=\"_blank\">https://go.here/</a> B");
}
@Test
public void testLinkify_Parens1() {
final SafeHtml o = html("A (http://go.here/) B");
final SafeHtml n = o.linkify();
assertNotSame(o, n);
assertEquals("A (<a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>) B", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A (<a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>) B");
}
@Test
public void testLinkify_Parens() {
final SafeHtml o = html("A http://go.here/#m() B");
final SafeHtml n = o.linkify();
assertNotSame(o, n);
assertEquals("A <a href=\"http://go.here/#m()\" target=\"_blank\">http://go.here/#m()</a> B", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A <a href=\"http://go.here/#m()\" target=\"_blank\">http://go.here/#m()</a> B");
}
@Test
public void testLinkify_AngleBrackets1() {
final SafeHtml o = html("A <http://go.here/> B");
final SafeHtml n = o.linkify();
assertNotSame(o, n);
assertEquals("A &lt;<a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>&gt; B", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A &lt;<a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>&gt; B");
}
@Test
public void testLinkify_TrailingPlainLetter() {
final SafeHtml o = html("A http://go.here/foo B");
final SafeHtml n = o.linkify();
assertNotSame(o, n);
assertEquals("A <a href=\"http://go.here/foo\" target=\"_blank\">http://go.here/foo</a> B", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A <a href=\"http://go.here/foo\" target=\"_blank\">http://go.here/foo</a> B");
}
@Test
public void testLinkify_TrailingDot() {
final SafeHtml o = html("A http://go.here/. B");
final SafeHtml n = o.linkify();
assertNotSame(o, n);
assertEquals("A <a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>. B", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A <a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>. B");
}
@Test
public void testLinkify_TrailingComma() {
final SafeHtml o = html("A http://go.here/, B");
final SafeHtml n = o.linkify();
assertNotSame(o, n);
assertEquals("A <a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>, B", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A <a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>, B");
}
@Test
public void testLinkify_TrailingDotDot() {
final SafeHtml o = html("A http://go.here/.. B");
final SafeHtml n = o.linkify();
assertNotSame(o, n);
assertEquals("A <a href=\"http://go.here/.\" target=\"_blank\">http://go.here/.</a>. B", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A <a href=\"http://go.here/.\" target=\"_blank\">http://go.here/.</a>. B");
}
private static SafeHtml html(String text) {

54
gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java
View File

@@ -14,9 +14,7 @@
package com.google.gwtexpui.safehtml.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
@@ -28,8 +26,8 @@ public class SafeHtml_ReplaceTest {
@Test
public void testReplaceEmpty() {
SafeHtml o = html("A\nissue42\nB");
assertSame(o, o.replaceAll(null));
assertSame(o, o.replaceAll(Collections.<FindReplace> emptyList()));
assertThat(o.replaceAll(null)).isSameAs(o);
assertThat(o.replaceAll(Collections.<FindReplace> emptyList())).isSameAs(o);
}
@Test
@@ -37,8 +35,9 @@ public class SafeHtml_ReplaceTest {
SafeHtml o = html("A\nissue 42\nB");
SafeHtml n = o.replaceAll(repls(
new RawFindReplace("(issue\\s(\\d+))", "<a href=\"?$2\">$1</a>")));
assertNotSame(o, n);
assertEquals("A\n<a href=\"?42\">issue 42</a>\nB", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A\n<a href=\"?42\">issue 42</a>\nB");
}
@Test
@@ -46,8 +45,9 @@ public class SafeHtml_ReplaceTest {
SafeHtml o = html("issue 42");
SafeHtml n = o.replaceAll(repls(
new RawFindReplace("(issue\\s(\\d+))", "<a href=\"?$2\">$1</a>")));
assertNotSame(o, n);
assertEquals("<a href=\"?42\">issue 42</a>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<a href=\"?42\">issue 42</a>");
}
@Test
@@ -55,12 +55,12 @@ public class SafeHtml_ReplaceTest {
SafeHtml o = html("A\nissue 42\nissue 9918\nB");
SafeHtml n = o.replaceAll(repls(
new RawFindReplace("(issue\\s(\\d+))", "<a href=\"?$2\">$1</a>")));
assertNotSame(o, n);
assertEquals("A\n"
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A\n"
+ "<a href=\"?42\">issue 42</a>\n"
+ "<a href=\"?9918\">issue 9918</a>\n"
+ "B"
, n.asString());
+ "B");
}
@Test
@@ -71,12 +71,12 @@ public class SafeHtml_ReplaceTest {
"<a href=\"gwtexpui-bug?$2\">$1</a>"),
new RawFindReplace("(issue\\s+(\\d+))",
"<a href=\"generic-bug?$2\">$1</a>")));
assertNotSame(o, n);
assertEquals("A\n"
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"A\n"
+ "<a href=\"generic-bug?42\">issue 42</a>\n"
+ "Really <a href=\"gwtexpui-bug?9918\">GWTEXPUI-9918</a> is better\n"
+ "B"
, n.asString());
+ "B");
}
@Test
@@ -86,9 +86,9 @@ public class SafeHtml_ReplaceTest {
RawFindReplace bc = new RawFindReplace("bc", "23");
RawFindReplace cd = new RawFindReplace("cd", "YZ");
assertEquals("ABcd", o.replaceAll(repls(ab, bc)).asString());
assertEquals("ABcd", o.replaceAll(repls(bc, ab)).asString());
assertEquals("ABYZ", o.replaceAll(repls(ab, bc, cd)).asString());
assertThat(o.replaceAll(repls(ab, bc)).asString()).isEqualTo("ABcd");
assertThat(o.replaceAll(repls(bc, ab)).asString()).isEqualTo("ABcd");
assertThat(o.replaceAll(repls(ab, bc, cd)).asString()).isEqualTo("ABYZ");
}
@Test
@@ -97,8 +97,8 @@ public class SafeHtml_ReplaceTest {
RawFindReplace ab = new RawFindReplace("ab", "AB");
RawFindReplace abc = new RawFindReplace("[^d][^d][^d]", "234");
assertEquals("ABcd", o.replaceAll(repls(ab, abc)).asString());
assertEquals("234d", o.replaceAll(repls(abc, ab)).asString());
assertThat(o.replaceAll(repls(ab, abc)).asString()).isEqualTo("ABcd");
assertThat(o.replaceAll(repls(abc, ab)).asString()).isEqualTo("234d");
}
@Test
@@ -107,8 +107,8 @@ public class SafeHtml_ReplaceTest {
RawFindReplace ab1 = new RawFindReplace("ab", "AB");
RawFindReplace ab2 = new RawFindReplace("[^cd][^cd]", "12");
assertEquals("ABcd", o.replaceAll(repls(ab1, ab2)).asString());
assertEquals("12cd", o.replaceAll(repls(ab2, ab1)).asString());
assertThat(o.replaceAll(repls(ab1, ab2)).asString()).isEqualTo("ABcd");
assertThat(o.replaceAll(repls(ab2, ab1)).asString()).isEqualTo("12cd");
}
@Test
@@ -116,10 +116,10 @@ public class SafeHtml_ReplaceTest {
SafeHtml o = html("abcd");
LinkFindReplace evil = new LinkFindReplace("(b)", "javascript:alert('$1')");
LinkFindReplace ok = new LinkFindReplace("(b)", "/$1");
assertEquals("abcd", o.replaceAll(repls(evil)).asString());
assertThat(o.replaceAll(repls(evil)).asString()).isEqualTo("abcd");
String linked = "a<a href=\"/b\">b</a>cd";
assertEquals(linked, o.replaceAll(repls(ok)).asString());
assertEquals(linked, o.replaceAll(repls(evil, ok)).asString());
assertThat(o.replaceAll(repls(ok)).asString()).isEqualTo(linked);
assertThat(o.replaceAll(repls(evil, ok)).asString()).isEqualTo(linked);
}
private static SafeHtml html(String text) {

119
gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyListTest.java
View File

@@ -14,8 +14,7 @@
package com.google.gwtexpui.safehtml.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
@@ -31,40 +30,40 @@ public class SafeHtml_WikifyListTest {
public void testBulletList1() {
final SafeHtml o = html("A\n\n* line 1\n* 2nd line");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A</p>"//
+ BEGIN_LIST //
+ item("line 1") //
+ item("2nd line") //
+ END_LIST //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A</p>"
+ BEGIN_LIST
+ item("line 1")
+ item("2nd line")
+ END_LIST);
}
@Test
public void testBulletList2() {
final SafeHtml o = html("A\n\n* line 1\n* 2nd line\n\nB");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A</p>"//
+ BEGIN_LIST //
+ item("line 1") //
+ item("2nd line") //
+ END_LIST //
+ "<p>B</p>" //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A</p>"
+ BEGIN_LIST
+ item("line 1")
+ item("2nd line")
+ END_LIST
+ "<p>B</p>");
}
@Test
public void testBulletList3() {
final SafeHtml o = html("* line 1\n* 2nd line\n\nB");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals(BEGIN_LIST //
+ item("line 1") //
+ item("2nd line") //
+ END_LIST //
+ "<p>B</p>" //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
BEGIN_LIST
+ item("line 1")
+ item("2nd line")
+ END_LIST
+ "<p>B</p>");
}
@Test
@@ -73,13 +72,13 @@ public class SafeHtml_WikifyListTest {
+ "* Be on IMAP or EAS (not on POP)\n"//
+ "* Be very unlucky\n");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>To see this bug, you have to:</p>" //
+ BEGIN_LIST //
+ item("Be on IMAP or EAS (not on POP)") //
+ item("Be very unlucky") //
+ END_LIST //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>To see this bug, you have to:</p>"
+ BEGIN_LIST
+ item("Be on IMAP or EAS (not on POP)")
+ item("Be very unlucky")
+ END_LIST);
}
@Test
@@ -89,53 +88,53 @@ public class SafeHtml_WikifyListTest {
+ "* Be on IMAP or EAS (not on POP)\n"//
+ "* Be very unlucky\n");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>To see this bug, you have to:</p>" //
+ BEGIN_LIST //
+ item("Be on IMAP or EAS (not on POP)") //
+ item("Be very unlucky") //
+ END_LIST //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>To see this bug, you have to:</p>"
+ BEGIN_LIST
+ item("Be on IMAP or EAS (not on POP)")
+ item("Be very unlucky")
+ END_LIST);
}
@Test
public void testDashList1() {
final SafeHtml o = html("A\n\n- line 1\n- 2nd line");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A</p>"//
+ BEGIN_LIST //
+ item("line 1") //
+ item("2nd line") //
+ END_LIST //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A</p>"
+ BEGIN_LIST
+ item("line 1")
+ item("2nd line")
+ END_LIST);
}
@Test
public void testDashList2() {
final SafeHtml o = html("A\n\n- line 1\n- 2nd line\n\nB");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A</p>"//
+ BEGIN_LIST //
+ item("line 1") //
+ item("2nd line") //
+ END_LIST //
+ "<p>B</p>" //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A</p>"
+ BEGIN_LIST
+ item("line 1")
+ item("2nd line")
+ END_LIST
+ "<p>B</p>");
}
@Test
public void testDashList3() {
final SafeHtml o = html("- line 1\n- 2nd line\n\nB");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals(BEGIN_LIST //
+ item("line 1") //
+ item("2nd line") //
+ END_LIST //
+ "<p>B</p>" //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
BEGIN_LIST
+ item("line 1")
+ item("2nd line")
+ END_LIST
+ "<p>B</p>");
}
private static SafeHtml html(String text) {

67
gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyPreformatTest.java
View File

@@ -14,8 +14,7 @@
package com.google.gwtexpui.safehtml.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
@@ -31,56 +30,56 @@ public class SafeHtml_WikifyPreformatTest {
public void testPreformat1() {
final SafeHtml o = html("A\n\n This is pre\n formatted");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A</p>"//
+ "<p>" //
+ pre(" This is pre") //
+ pre(" formatted") //
+ "</p>" //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A</p>"
+ "<p>"
+ pre(" This is pre")
+ pre(" formatted")
+ "</p>");
}
@Test
public void testPreformat2() {
final SafeHtml o = html("A\n\n This is pre\n formatted\n\nbut this is not");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A</p>" //
+ "<p>" //
+ pre(" This is pre") //
+ pre(" formatted") //
+ "</p>" //
+ "<p>but this is not</p>" //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A</p>"
+ "<p>"
+ pre(" This is pre")
+ pre(" formatted")
+ "</p>"
+ "<p>but this is not</p>");
}
@Test
public void testPreformat3() {
final SafeHtml o = html("A\n\n Q\n <R>\n S\n\nB");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A</p>" //
+ "<p>" //
+ pre(" Q") //
+ pre(" &lt;R&gt;") //
+ pre(" S") //
+ "</p>" //
+ "<p>B</p>" //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A</p>"
+ "<p>"
+ pre(" Q")
+ pre(" &lt;R&gt;")
+ pre(" S")
+ "</p>"
+ "<p>B</p>");
}
@Test
public void testPreformat4() {
final SafeHtml o = html(" Q\n <R>\n S\n\nB");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>" //
+ pre(" Q") //
+ pre(" &lt;R&gt;") //
+ pre(" S") //
+ "</p>" //
+ "<p>B</p>" //
, n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>"
+ pre(" Q")
+ pre(" &lt;R&gt;")
+ pre(" S")
+ "</p>"
+ "<p>B</p>");
}
private static SafeHtml html(String text) {

21
gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyQuoteTest.java
View File

@@ -14,8 +14,7 @@
package com.google.gwtexpui.safehtml.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
@@ -31,32 +30,28 @@ public class SafeHtml_WikifyQuoteTest {
public void testQuote1() {
final SafeHtml o = html("> I'm happy\n > with quotes!\n\nSee above.");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals(
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
quote("I&#39;m happy\nwith quotes!")
+ "<p>See above.</p>",
n.asString());
+ "<p>See above.</p>");
}
@Test
public void testQuote2() {
final SafeHtml o = html("See this said:\n\n > a quoted\n > string block\n\nOK?");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals(
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>See this said:</p>"
+ quote("a quoted\nstring block")
+ "<p>OK?</p>",
n.asString());
+ "<p>OK?</p>");
}
@Test
public void testNestedQuotes1() {
final SafeHtml o = html(" > > prior\n > \n > next\n");
final SafeHtml n = o.wikify();
assertEquals(
quote(quote("prior") + "next\n"),
n.asString());
assertThat(n.asString()).isEqualTo(quote(quote("prior") + "next\n"));
}
private static SafeHtml html(String text) {

48
gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyTest.java
View File

@@ -14,8 +14,7 @@
package com.google.gwtexpui.safehtml.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
@@ -24,80 +23,85 @@ public class SafeHtml_WikifyTest {
public void testWikify_OneLine1() {
final SafeHtml o = html("A B");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A B</p>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo("<p>A B</p>");
}
@Test
public void testWikify_OneLine2() {
final SafeHtml o = html("A B\n");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A B\n</p>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo("<p>A B\n</p>");
}
@Test
public void testWikify_OneParagraph1() {
final SafeHtml o = html("A\nB");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A\nB</p>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo("<p>A\nB</p>");
}
@Test
public void testWikify_OneParagraph2() {
final SafeHtml o = html("A\nB\n");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A\nB\n</p>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo("<p>A\nB\n</p>");
}
@Test
public void testWikify_TwoParagraphs() {
final SafeHtml o = html("A\nB\n\nC\nD");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A\nB</p><p>C\nD</p>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo("<p>A\nB</p><p>C\nD</p>");
}
@Test
public void testLinkify_SimpleHttp1() {
final SafeHtml o = html("A http://go.here/ B");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A <a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a> B</p>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A <a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a> B</p>");
}
@Test
public void testLinkify_SimpleHttps2() {
final SafeHtml o = html("A https://go.here/ B");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A <a href=\"https://go.here/\" target=\"_blank\">https://go.here/</a> B</p>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A <a href=\"https://go.here/\" target=\"_blank\">https://go.here/</a> B</p>");
}
@Test
public void testLinkify_Parens1() {
final SafeHtml o = html("A (http://go.here/) B");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A (<a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>) B</p>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A (<a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>) B</p>");
}
@Test
public void testLinkify_Parens() {
final SafeHtml o = html("A http://go.here/#m() B");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A <a href=\"http://go.here/#m()\" target=\"_blank\">http://go.here/#m()</a> B</p>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A <a href=\"http://go.here/#m()\" target=\"_blank\">http://go.here/#m()</a> B</p>");
}
@Test
public void testLinkify_AngleBrackets1() {
final SafeHtml o = html("A <http://go.here/> B");
final SafeHtml n = o.wikify();
assertNotSame(o, n);
assertEquals("<p>A &lt;<a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>&gt; B</p>", n.asString());
assertThat(o).isNotSameAs(n);
assertThat(n.asString()).isEqualTo(
"<p>A &lt;<a href=\"http://go.here/\" target=\"_blank\">http://go.here/</a>&gt; B</p>");
}
private static SafeHtml html(String text) {