Merge branch 'QuentinC-fix-tab-escape' into master

The contribution branch was rebased to current master.
This should close #1065 as merged.

1 files changed, 31 insertions, 3 deletions

diff --git a/src/test/java/com/gitblit/tests/StringUtilsTest.java b/src/test/java/com/gitblit/tests/StringUtilsTest.java
index 3dae66f4..cc579888 100644
--- a/src/test/java/com/gitblit/tests/StringUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/StringUtilsTest.java
@@ -61,11 +61,39 @@ public class StringUtilsTest extends GitblitUnitTest {
 

 	@Test

 	public void testEscapeForHtml() throws Exception {

-		String input = "& < > \" \t";

-		String outputNoChange = "&amp; &lt; &gt; &quot; \t";

-		String outputChange = "&amp;&nbsp;&lt;&nbsp;&gt;&nbsp;&quot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";

+		String input = "\t & < > \"";

+		String outputNoChange = "\t &amp; &lt; &gt; &quot;";

+		String outputChange = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&amp;&nbsp;&lt;&nbsp;&gt;&nbsp;&quot;";

 		assertEquals(outputNoChange, StringUtils.escapeForHtml(input, false));

 		assertEquals(outputChange, StringUtils.escapeForHtml(input, true));

+

+		input = "a\tb";

+		outputNoChange = "a\tb";

+		outputChange = "a&nbsp;&nbsp;&nbsp;b";

+		assertEquals(outputNoChange, StringUtils.escapeForHtml(input, false));

+		assertEquals(outputChange, StringUtils.escapeForHtml(input, true));

+

+		input = "\ta b\t";

+		outputNoChange = "\ta b\t";

+		outputChange = "&nbsp;&nbsp;&nbsp;&nbsp;a&nbsp;b&nbsp;";

+		assertEquals(outputNoChange, StringUtils.escapeForHtml(input, false));

+		assertEquals(outputChange, StringUtils.escapeForHtml(input, true));

+

+		input = "\t <> \t";

+		outputNoChange = "\t &lt;&gt; \t";

+		outputChange = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";

+		assertEquals(outputNoChange, StringUtils.escapeForHtml(input, false));

+		assertEquals(outputChange, StringUtils.escapeForHtml(input, true));

+

+		String tabs = "\t";

+		int tabSpaces;

+		int expectedLength;

+		for (int i = 0; i < 50; i++) {

+			tabSpaces = 4 - i % 4;

+			expectedLength = (i + tabSpaces) * 6; // &nbsp; = 6 chars

+			assertEquals(expectedLength, StringUtils.escapeForHtml(tabs, true).length());

+			tabs = " " + tabs;

+		}

 	}

 

 	@Test