From f762b160efd5cafd919a6fd7f9587f578eceb454 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 02 Oct 2011 16:59:44 -0400
Subject: [PATCH] Merge branch 'master' into rpc

---
 tests/com/gitblit/tests/StringUtilsTest.java |   62 +++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/tests/com/gitblit/tests/StringUtilsTest.java b/tests/com/gitblit/tests/StringUtilsTest.java
index 24033b2..489972a 100644
--- a/tests/com/gitblit/tests/StringUtilsTest.java
+++ b/tests/com/gitblit/tests/StringUtilsTest.java
@@ -16,6 +16,7 @@
 package com.gitblit.tests;
 
 import java.util.Arrays;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -35,13 +36,25 @@
 		String output = "this<br/>is<br/>a<br/>test<br/><br/>of<br/><br/>line<br/><br/>breaking";
 		assertTrue(StringUtils.breakLinesForHtml(input).equals(output));
 	}
-	
+
+	public void testEncodeUrl() throws Exception {
+		String input = "test /";
+		String output = "test%20%2F";
+		assertTrue(StringUtils.encodeURL(input).equals(output));
+	}
+
 	public void testEscapeForHtml() throws Exception {
 		String input = "& < > \" \t";
-		String output_nochange = "&amp; &lt; &gt; &quot; \t";
-		String output_change = "&amp;&nbsp;&lt;&nbsp;&gt;&nbsp;&quot;&nbsp; &nbsp; &nbsp;";
-		assertTrue(StringUtils.escapeForHtml(input, false).equals(output_nochange));
-		assertTrue(StringUtils.escapeForHtml(input, true).equals(output_change));
+		String outputNoChange = "&amp; &lt; &gt; &quot; \t";
+		String outputChange = "&amp;&nbsp;&lt;&nbsp;&gt;&nbsp;&quot;&nbsp; &nbsp; &nbsp;";
+		assertTrue(StringUtils.escapeForHtml(input, false).equals(outputNoChange));
+		assertTrue(StringUtils.escapeForHtml(input, true).equals(outputChange));
+	}
+
+	public void testDecodeForHtml() throws Exception {
+		String input = "&amp; &lt; &gt; &quot;";
+		String output = "& < > \"";
+		assertTrue(StringUtils.decodeFromHtml(input).equals(output));
 	}
 
 	public void testFlattenStrings() throws Exception {
@@ -64,15 +77,48 @@
 		assertTrue(StringUtils.leftPad(input, input.length(), ' ').equals(input));
 		assertTrue(StringUtils.rightPad(input, input.length(), ' ').equals(input));
 	}
-	
+
 	public void testSHA1() throws Exception {
-		assertTrue(StringUtils.getSHA1("blob 16\000what is up, doc?").equals("bd9dbf5aae1a3862dd1526723246b20206e5fc37"));
+		assertTrue(StringUtils.getSHA1("blob 16\000what is up, doc?").equals(
+				"bd9dbf5aae1a3862dd1526723246b20206e5fc37"));
 	}
-	
+
+	public void testMD5() throws Exception {
+		assertTrue(StringUtils.getMD5("blob 16\000what is up, doc?").equals(
+				"77fb8d95331f0d557472f6776d3aedf6"));
+	}
+
 	public void testRootPath() throws Exception {
 		String input = "/nested/path/to/repository";
 		String output = "/nested/path/to";
 		assertTrue(StringUtils.getRootPath(input).equals(output));
 		assertTrue(StringUtils.getRootPath("repository").equals(""));
 	}
+
+	public void testStringsFromValue() throws Exception {
+		List<String> strings = StringUtils.getStringsFromValue("A B C D");
+		assertTrue(strings.size() == 4);
+		assertTrue(strings.get(0).equals("A"));
+		assertTrue(strings.get(1).equals("B"));
+		assertTrue(strings.get(2).equals("C"));
+		assertTrue(strings.get(3).equals("D"));
+	}
+
+	public void testStringsFromValue2() throws Exception {
+		List<String> strings = StringUtils.getStringsFromValue("common/* libraries/*");
+		assertTrue(strings.size() == 2);
+		assertTrue(strings.get(0).equals("common/*"));
+		assertTrue(strings.get(1).equals("libraries/*"));
+	}
+
+	public void testFuzzyMatching() throws Exception {
+		assertTrue(StringUtils.fuzzyMatch("12345", "12345"));
+		assertTrue(StringUtils.fuzzyMatch("AbCdEf", "abcdef"));
+		assertTrue(StringUtils.fuzzyMatch("AbCdEf", "abc*"));
+		assertTrue(StringUtils.fuzzyMatch("AbCdEf", "*def"));
+		assertTrue(StringUtils.fuzzyMatch("AbCdEfHIJ", "abc*hij"));
+
+		assertFalse(StringUtils.fuzzyMatch("123", "12345"));
+		assertFalse(StringUtils.fuzzyMatch("AbCdEfHIJ", "abc*hhh"));
+	}
 }

--
Gitblit v1.9.1