Mailing-List: contact empire-db-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
Reply-To: empire-db-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r741969 - in
 /incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons:
 ObjectUtilsTest.java StringUtilsTest.java
Date: Sat, 07 Feb 2009 21:56:39 -0000
To: empire-db-commits@incubator.apache.org
From: francisdb@apache.org
Message-Id: <20090207215639.4BC312388999@eris.apache.org>

Author: francisdb
Date: Sat Feb  7 21:56:38 2009
New Revision: 741969

URL: http://svn.apache.org/viewvc?rev=741969&view=rev
Log:
added unit test for StringUtils with TODO's or FIXME's, to fix when code is moved to maven layout

Added:
    incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons/StringUtilsTest.java
Modified:
    incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java

Modified: incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java?rev=741969&r1=741968&r2=741969&view=diff
==============================================================================
--- incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java (original)
+++ incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java Sat Feb  7 21:56:38 2009
@@ -404,7 +404,7 @@
 
 	/**
 	 * Test method for
-	 * {@link org.apache.empire.commons.ObjectUtils#contains(T[], java.lang.Object)}
+	 * {@link org.apache.empire.commons.ObjectUtils#contains(Object[], Object)}
 	 * .
 	 */
 	@Test

Added: incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons/StringUtilsTest.java?rev=741969&view=auto
==============================================================================
--- incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons/StringUtilsTest.java (added)
+++ incubator/empire-db/branches/maven/empire-db/src/test/java/org/apache/empire/commons/StringUtilsTest.java Sat Feb  7 21:56:38 2009
@@ -0,0 +1,222 @@
+package org.apache.empire.commons;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class StringUtilsTest
+{
+
+	@Test
+	public void testToStringObjectString()
+	{
+		assertEquals(null,StringUtils.toString((Object)null, null));
+		assertEquals("default",StringUtils.toString(null, "default"));
+		assertEquals("123",StringUtils.toString(Long.valueOf("123"), "456"));
+	}
+
+	@Test
+	public void testToStringObject()
+	{
+		assertEquals(null,StringUtils.toString(null));
+		assertEquals("test",StringUtils.toString("test"));
+		assertEquals(Boolean.FALSE.toString(),StringUtils.toString(Boolean.FALSE));
+	}
+
+	@Test
+	public void testToStringObjectArrayString()
+	{
+		assertEquals(null,StringUtils.toString((Object[])null, null));
+		assertEquals("default",StringUtils.toString((Object[])null, "default"));
+		assertEquals("default",StringUtils.toString(new Number[]{}, "default"));
+		assertEquals("123/12.3",StringUtils.toString(new Number[]{Integer.valueOf("123"), Double.valueOf("12.3")}, "default"));
+	}
+
+	@Test
+	public void testToStringObjectArray()
+	{
+		assertEquals(null,StringUtils.toString((Object[])null));
+		assertEquals(null,StringUtils.toString(new Number[]{}));
+		assertEquals("123/12.3",StringUtils.toString(new Number[]{Integer.valueOf("123"), Double.valueOf("12.3")}));
+	}
+
+	@Test
+	public void testValueOfObject()
+	{
+		assertEquals("",StringUtils.valueOf(null));
+		assertEquals("",StringUtils.valueOf(""));
+		assertEquals("123",StringUtils.valueOf(Long.valueOf("123")));
+	}
+
+	@Test
+	public void testValueOfObjectArray()
+	{
+		assertEquals("",StringUtils.valueOf(null));
+		assertEquals("",StringUtils.valueOf(new Object[]{}));
+		assertEquals("123/12.3",StringUtils.valueOf(new Number[]{Integer.valueOf("123"), Double.valueOf("12.3")}));
+	}
+
+	@Test
+	public void testCoalesce()
+	{
+		assertEquals("ok",StringUtils.coalesce("ok", "fail"));
+		assertEquals("ok",StringUtils.coalesce("   \r \n \t  ", "ok"));
+		assertEquals("ok",StringUtils.coalesce(null, "ok"));
+		assertEquals(null,StringUtils.coalesce(null, null));
+	}
+
+	@Test
+	public void testNullIfEmpty()
+	{
+		assertEquals(null, StringUtils.nullIfEmpty(null));
+		assertEquals(null, StringUtils.nullIfEmpty(""));
+		assertEquals(" ", StringUtils.nullIfEmpty(" "));
+		assertEquals("\r\n\t", StringUtils.nullIfEmpty("\r\n\t"));
+		assertEquals(" value ", StringUtils.nullIfEmpty(" value "));
+	}
+
+	@Test
+	public void testArrayToString()
+	{
+		assertEquals(null, StringUtils.arrayToString(null , null));
+		assertEquals(null, StringUtils.arrayToString(null , "/"));
+		assertEquals(null, StringUtils.arrayToString(new String[]{} , ""));
+		assertEquals("12312.3", StringUtils.arrayToString(new Number[]{Integer.valueOf("123"), Double.valueOf("12.3")} , ""));
+		assertEquals("firstnullsecondnullthird", StringUtils.arrayToString(new String[]{"first", "second", "third"} , null));
+		assertEquals(" first \t second \t third ", StringUtils.arrayToString(new String[]{" first ", " second ", " third "} , "\t"));
+		assertEquals("null/null", StringUtils.arrayToString(new String[]{null, null} , "/"));
+		// FIXME see what this should return + implement (throws nullpointer now)
+		// assertEquals("null", StringUtils.arrayToString(new String[]{null} , "/"));
+	}
+
+	@Test
+	public void testStringToArray()
+	{
+		// TODO see if we want to always return empty arrays instead od nulls
+		assertArrayEquals(null, StringUtils.stringToArray(null , null));
+		assertArrayEquals(null, StringUtils.stringToArray("first null second" , null));
+		assertArrayEquals(null, StringUtils.stringToArray(null , "/"));
+		assertArrayEquals(new String[]{"test"}, StringUtils.stringToArray("test" , "/"));
+		assertArrayEquals(new String[]{"test "," test2"}, StringUtils.stringToArray("test and test2" , "and"));
+		// FIXME this is returning strange results !!!
+		//assertArrayEquals(new String[]{"","","",""}, StringUtils.stringToArray("///" , "/"));
+	}
+
+	@Test
+	public void testCollectionToString()
+	{
+		assertEquals(null, StringUtils.collectionToString(null , null));
+		assertEquals(null, StringUtils.collectionToString(null , "/"));
+		assertEquals(null, StringUtils.collectionToString(Collections.emptySet() , null));
+		List<String> test = new ArrayList<String>();
+		Collections.addAll(test, "first","second","third");
+		assertEquals("firstsecondthird", StringUtils.collectionToString(test , ""));
+		assertEquals("firstnullsecondnullthird", StringUtils.collectionToString(test , null));
+		assertEquals("first \t second \t third", StringUtils.collectionToString(test , " \t "));
+		test.clear();
+		Collections.addAll(test, "first", null, "third");
+		// TODO should null be converted to string null as with the arry method?
+		assertEquals("first//third", StringUtils.collectionToString(test , "/"));
+		test.clear();
+		Collections.addAll(null);
+		// FIXME see what this should return + implement (throws nullpointer now)
+		// assertEquals("null", StringUtils.arrayToString(new String[]{null} , "/"));
+	}
+
+	@Test
+	public void testIsEmpty()
+	{
+		// TODO add javadoc to this method
+		assertTrue(StringUtils.isEmpty(null));
+		assertTrue(StringUtils.isEmpty(""));
+		assertTrue(StringUtils.isEmpty("\t\r\n"));
+		assertFalse(StringUtils.isEmpty(" test "));
+	}
+
+	@Test
+	public void testIsValid()
+	{
+		// TODO add javadoc to this method
+		// TODO change implementation to ! isEmpty()
+		assertFalse(StringUtils.isValid(null));
+		assertFalse(StringUtils.isValid(""));
+		assertFalse(StringUtils.isValid("\t\r\n"));
+		assertTrue(StringUtils.isValid(" test "));
+	}
+
+	@Test
+	public void testIsEmail()
+	{
+		// TODO add javadoc to this method + add possible nullpointer info or fix
+		// assertFalse(StringUtils.isEmail(null));
+		assertFalse(StringUtils.isEmail(""));
+		assertFalse(StringUtils.isEmail("@"));
+		assertTrue(StringUtils.isEmail("f@f.f"));
+		// FIXME these should return false (use regex?)
+		assertTrue(StringUtils.isEmail(" @. "));
+		assertTrue(StringUtils.isEmail("user@site@site.com"));
+	}
+
+	@Test
+	public void testValidate()
+	{
+		assertEquals(null, StringUtils.validate(null));
+		assertEquals(null, StringUtils.validate(""));
+		assertEquals(null, StringUtils.validate(" \r\n\t "));
+		assertEquals("azerty\r\n\tazerty", StringUtils.validate(" \r azerty\r\n\tazerty\t "));
+	}
+
+	@Test
+	public void testReplace()
+	{
+		// TODO fix javadoc spelling
+		assertEquals(null, StringUtils.replace(null, null, null));
+		assertEquals("", StringUtils.replace("", null, null));
+		assertEquals("test null test", StringUtils.replace("test null test", null, ""));
+		assertEquals("test  test", StringUtils.replace("test a test", "a", null));
+		assertEquals("test test", StringUtils.replace("test test", "", "oops"));
+		assertEquals("testoopsoopstest", StringUtils.replace("test  test", " ", "oops"));
+		assertEquals("1-two-3", StringUtils.replace("1 2 3", " 2 ", "-two-"));
+	}
+
+	@Test
+	public void testReplaceAll()
+	{
+		// TODO what is the difference with the other replace method???
+		assertEquals(null, StringUtils.replaceAll(null, null, null));
+		assertEquals("", StringUtils.replaceAll("", null, null));
+		assertEquals("test null test", StringUtils.replaceAll("test null test", null, ""));
+		assertEquals("test  test", StringUtils.replaceAll("test a test", "a", null));
+		// FIXME this causes a OutOfMemoryError: Java heap space
+		// assertEquals("test test", StringUtils.replaceAll("test test", "", "oops"));
+		assertEquals("testoopsoopstest", StringUtils.replaceAll("test  test", " ", "oops"));
+		assertEquals("1-two-3", StringUtils.replaceAll("1 2 3", " 2 ", "-two-"));
+	}
+
+	@Test
+	public void testReplaceBRbyLF()
+	{
+		// TODO add javadoc and specify that only xhtml br's are supported
+		// indicate a doule lf is added
+		assertEquals(null, StringUtils.replaceBRbyLF(null));
+		assertEquals("", StringUtils.replaceBRbyLF(""));
+		assertEquals(" <br> ", StringUtils.replaceBRbyLF(" <br> "));
+		assertEquals(" \n\n ", StringUtils.replaceBRbyLF(" <br /> "));
+		assertEquals(" \n\n ", StringUtils.replaceBRbyLF(" <br/> "));
+		assertEquals(" \n\n \n\n\n", StringUtils.replaceBRbyLF(" <br/> <br />\n"));
+	}
+
+	@Test
+	public void testTrimAll()
+	{
+		// TODO add javadoc to this method, what does this method do??
+		assertEquals(null, StringUtils.trimAll(null));
+		assertEquals("", StringUtils.trimAll(" \t \r \n "));
+		assertEquals("a\r \t b", StringUtils.trimAll(" \t a\r \t b \n "));
+	}
+
+}