litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove StringUtils class and use org.apache.commons.lang.StringUtils instead.

Browse source
This commit is contained in:
ryounes 2011-04-05 16:58:27 +00:00
parent 7b93ff82fc
commit dbeceda47c
21 changed files with 32 additions and 369 deletions
Download patch file Download diff file Expand all files Collapse all files

123
webapp/test/edu/cornell/mannlib/vitro/webapp/utils/StringUtilsTest.java
View file

@ -1,123 +0,0 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.utils;
import java.util.List;
import java.util.ArrayList;
import org.junit.Test;
import junit.framework.Assert;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
public class StringUtilsTest extends AbstractTestClass {
protected static List<String> stringList = new ArrayList<String>();
protected static List<Integer> intList = new ArrayList<Integer>();
protected static List<String> stringListWithNulls = new ArrayList<String>();
protected static String[] stringArray = {"duck", "goose", "crow"};
static {
stringList.add("apple");
stringList.add("banana");
stringList.add("orange");
intList.add(1);
intList.add(2);
intList.add(3);
stringListWithNulls.add("rock");
stringListWithNulls.add("paper");
stringListWithNulls.add((String)null);
stringListWithNulls.add("scissors");
}
@Test
public void testCapitalize() {
String s1 = "cat";
Assert.assertEquals("Cat", StringUtils.capitalize(s1));
String s2 = "Cat";
Assert.assertEquals(s2, StringUtils.capitalize(s2));
String s3 = "CAT";
Assert.assertEquals(s3, StringUtils.capitalize(s3));
}
@Test
public void testQuote() {
String s1 = "cat";
Assert.assertEquals("\"cat\"", StringUtils.quote(s1));
String s2 = "";
Assert.assertEquals("", StringUtils.quote(s2));
}
@Test
public void testJoinNoArgs() {
Assert.assertEquals("apple,banana,orange", StringUtils.join(stringList));
Assert.assertEquals("1,2,3", StringUtils.join(intList));
}
@Test
public void testJoinArgs() {
// Three args
Assert.assertEquals("apple:banana:orange", StringUtils.join(stringList, false, ":"));
Assert.assertEquals("\"apple\"|\"banana\"|\"orange\"", StringUtils.join(stringList, true, "|"));
Assert.assertEquals("\"apple\",\"banana\",\"orange\"", StringUtils.join(stringList, true, null));
Assert.assertEquals("apple,banana,orange", StringUtils.join(stringList, false, null));
Assert.assertEquals("apple...banana...orange", StringUtils.join(stringList, false, "..."));
// Two args
Assert.assertEquals("apple - banana - orange", StringUtils.join(stringList, " - "));
}
@Test
public void testJoinWithNulls() {
Assert.assertEquals("rock,paper,scissors", StringUtils.join(stringListWithNulls));
}
@Test
public void testJoinWithVarargs() {
Assert.assertEquals("apple,banana,orange", StringUtils.join((String)null, "apple", "banana", "orange"));
Assert.assertEquals("he/she/it", StringUtils.join("/", "he", "she", "it"));
}
@Test
public void testJoinWithEmptyString() {
Assert.assertEquals(" - 1990", StringUtils.join(" - ", "", "1990"));
Assert.assertEquals("1990 - ", StringUtils.join(" - ", "1990", ""));
}
@Test
public void testArrayJoin() {
Assert.assertEquals("duck,goose,crow", StringUtils.join(stringArray));
}
@Test
public void testQuotedList() {
Assert.assertEquals("\"apple\"|\"banana\"|\"orange\"", StringUtils.quotedList(stringList, "|"));
Assert.assertEquals("\"apple\",\"banana\",\"orange\"", StringUtils.quotedList(stringList, null));
}
@Test
public void testEqualsOneOf() {
String s1 = "cat";
Assert.assertTrue(StringUtils.equalsOneOf(s1, "dog", "mouse", "cat", "horse"));
Assert.assertTrue(StringUtils.equalsOneOf(s1, "cat"));
Assert.assertFalse(StringUtils.equalsOneOf(s1, "dog", "mouse", "horse"));
Assert.assertFalse(StringUtils.equalsOneOf(s1));
}
@Test
public void testSetNullToEmptyString() {
Assert.assertEquals("", StringUtils.setNullToEmptyString((String)null));
Assert.assertEquals("cat", StringUtils.setNullToEmptyString("cat"));
}
}

40
webapp/test/edu/cornell/mannlib/vitro/webapp/utils/view/DateDisplayUtilsTest.java
View file

@ -1,40 +0,0 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.utils.view;
import junit.framework.Assert;
import org.junit.Test;
import edu.cornell.mannlib.vitro.webapp.utils.view.DateDisplayUtils;
public class DateDisplayUtilsTest {
@Test
public void testDisplayDate() {
String date = "2009-10";
Assert.assertEquals("10/2009", DateDisplayUtils.getDisplayDate(date));
}
@Test
public void testGetDisplayDateRange() {
String startRaw = "2010-10-11";
String endRaw = "2010-11-09";
Assert.assertEquals("10/11/2010 - 11/09/2010", DateDisplayUtils.getDisplayDateRangeFromRawDates(startRaw, endRaw));
String start1 = "1/2/2010";
String end1 = "3/4/2011";
Assert.assertEquals("1/2/2010 - 3/4/2011", DateDisplayUtils.getDisplayDateRange(start1, end1));
String empty = "";
Assert.assertEquals("1/2/2010 - ", DateDisplayUtils.getDisplayDateRange(start1, empty));
Assert.assertEquals(" - 3/4/2011", DateDisplayUtils.getDisplayDateRange(empty, end1));
Assert.assertEquals("1/2/2010 - ", DateDisplayUtils.getDisplayDateRange(start1, (String)null));
Assert.assertEquals(" - 3/4/2011", DateDisplayUtils.getDisplayDateRange((String)null, end1));
}
}