From 0e44acbb2fec928a1606dc60f427a148fff405c9 Mon Sep 17 00:00:00 2001
From: Mohamed Ragab <moragab@gmail.com>
Date: Wed, 02 May 2012 11:15:01 -0400
Subject: [PATCH] Added a script to facilitate setting the proxy host and port and no proxy hosts, and then it concatenates all the java system properties for setting the java proxy configurations and puts the resulting string in an environment variable JAVA_PROXY_CONFIG, modified the scirpts gitblit, gitblit-ubuntu, and gitblit-centos to source the java-proxy-config.sh script and then include the resulting java proxy configuration in the java command
---
tests/com/gitblit/tests/StringUtilsTest.java | 89 +++++++++++++++++++++++++++++---------------
1 files changed, 59 insertions(+), 30 deletions(-)
diff --git a/tests/com/gitblit/tests/StringUtilsTest.java b/tests/com/gitblit/tests/StringUtilsTest.java
index 489972a..91bfa67 100644
--- a/tests/com/gitblit/tests/StringUtilsTest.java
+++ b/tests/com/gitblit/tests/StringUtilsTest.java
@@ -15,15 +15,20 @@
*/
package com.gitblit.tests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
+import org.junit.Test;
import com.gitblit.utils.StringUtils;
-public class StringUtilsTest extends TestCase {
+public class StringUtilsTest {
+ @Test
public void testIsEmpty() throws Exception {
assertTrue(StringUtils.isEmpty(null));
assertTrue(StringUtils.isEmpty(""));
@@ -31,86 +36,110 @@
assertFalse(StringUtils.isEmpty("A"));
}
+ @Test
public void testBreakLinesForHtml() throws Exception {
String input = "this\nis\r\na\rtest\r\n\r\nof\n\nline\r\rbreaking";
String output = "this<br/>is<br/>a<br/>test<br/><br/>of<br/><br/>line<br/><br/>breaking";
- assertTrue(StringUtils.breakLinesForHtml(input).equals(output));
+ assertEquals(output, StringUtils.breakLinesForHtml(input));
}
+ @Test
public void testEncodeUrl() throws Exception {
String input = "test /";
String output = "test%20%2F";
- assertTrue(StringUtils.encodeURL(input).equals(output));
+ assertEquals(output, StringUtils.encodeURL(input));
}
+ @Test
public void testEscapeForHtml() throws Exception {
String input = "& < > \" \t";
String outputNoChange = "& < > " \t";
String outputChange = "& < > " ";
- assertTrue(StringUtils.escapeForHtml(input, false).equals(outputNoChange));
- assertTrue(StringUtils.escapeForHtml(input, true).equals(outputChange));
+ assertEquals(outputNoChange, StringUtils.escapeForHtml(input, false));
+ assertEquals(outputChange, StringUtils.escapeForHtml(input, true));
}
+ @Test
public void testDecodeForHtml() throws Exception {
String input = "& < > "";
String output = "& < > \"";
- assertTrue(StringUtils.decodeFromHtml(input).equals(output));
+ assertEquals(output, StringUtils.decodeFromHtml(input));
}
+ @Test
public void testFlattenStrings() throws Exception {
String[] strings = { "A", "B", "C", "D" };
- assertTrue(StringUtils.flattenStrings(Arrays.asList(strings)).equals("A B C D"));
+ assertEquals("A B C D", StringUtils.flattenStrings(Arrays.asList(strings)));
}
+ @Test
public void testTrim() throws Exception {
String input = "123456789 123456789 123456789 123456789 123456789 123456789 123456789 ";
String output = "123456789 123456789 123456789 123456789 123456789 1234567...";
- assertTrue(StringUtils.trimShortLog(input).equals(output));
- assertTrue(StringUtils.trimString(input, input.length()).equals(input));
+ assertEquals(output, StringUtils.trimString(input, 60));
+ assertEquals(input, StringUtils.trimString(input, input.length()));
}
+ @Test
public void testPadding() throws Exception {
String input = "test";
- assertTrue(StringUtils.leftPad(input, 6 + input.length(), ' ').equals(" test"));
- assertTrue(StringUtils.rightPad(input, 6 + input.length(), ' ').equals("test "));
+ assertEquals(" test", StringUtils.leftPad(input, 6 + input.length(), ' '));
+ assertEquals("test ", StringUtils.rightPad(input, 6 + input.length(), ' '));
- assertTrue(StringUtils.leftPad(input, input.length(), ' ').equals(input));
- assertTrue(StringUtils.rightPad(input, input.length(), ' ').equals(input));
+ assertEquals(input, StringUtils.leftPad(input, input.length(), ' '));
+ assertEquals(input, StringUtils.rightPad(input, input.length(), ' '));
}
+ @Test
public void testSHA1() throws Exception {
- assertTrue(StringUtils.getSHA1("blob 16\000what is up, doc?").equals(
- "bd9dbf5aae1a3862dd1526723246b20206e5fc37"));
+ assertEquals("bd9dbf5aae1a3862dd1526723246b20206e5fc37",
+ StringUtils.getSHA1("blob 16\000what is up, doc?"));
}
+ @Test
public void testMD5() throws Exception {
- assertTrue(StringUtils.getMD5("blob 16\000what is up, doc?").equals(
- "77fb8d95331f0d557472f6776d3aedf6"));
+ assertEquals("77fb8d95331f0d557472f6776d3aedf6",
+ StringUtils.getMD5("blob 16\000what is up, doc?"));
}
+ @Test
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(""));
+ assertEquals(output, StringUtils.getRootPath(input));
+ assertEquals("", StringUtils.getRootPath("repository"));
}
+ @Test
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"));
- }
+ List<String> strings = StringUtils.getStringsFromValue("\"A A \" B \"C C\" D \"\" \"E\"");
+ assertEquals(6, strings.size());
+ assertEquals("A A", strings.get(0));
+ assertEquals("B", strings.get(1));
+ assertEquals("C C", strings.get(2));
+ assertEquals("D", strings.get(3));
+ assertEquals("", strings.get(4));
+ assertEquals("E", strings.get(5));
+ strings = StringUtils.getStringsFromValue("\"A A \", B, \"C C\", D, \"\", \"E\"", ",");
+ assertEquals(6, strings.size());
+ assertEquals("A A", strings.get(0));
+ assertEquals("B", strings.get(1));
+ assertEquals("C C", strings.get(2));
+ assertEquals("D", strings.get(3));
+ assertEquals("", strings.get(4));
+ assertEquals("E", strings.get(5));
+ }
+
+ @Test
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/*"));
+ assertEquals(2, strings.size());
+ assertEquals("common/*", strings.get(0));
+ assertEquals("libraries/*", strings.get(1));
}
+ @Test
public void testFuzzyMatching() throws Exception {
assertTrue(StringUtils.fuzzyMatch("12345", "12345"));
assertTrue(StringUtils.fuzzyMatch("AbCdEf", "abcdef"));
--
Gitblit v1.9.1