[Springframework-cvs] spring/test/org/springframework/util CollectionUtilsTests.java,1.1.4.1,1.1.4.2 StringUtilsTests.java,1.7.2.1,1.7.2.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/test/org/springframework/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/test/org/springframework/util

Modified Files:
      Tag: mbranch-1-2
	CollectionUtilsTests.java StringUtilsTests.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: StringUtilsTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/util/StringUtilsTests.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -d -r1.7.2.1 -r1.7.2.2
*** StringUtilsTests.java	2 Jan 2006 15:17:19 -0000	1.7.2.1
--- StringUtilsTests.java	21 Apr 2006 00:13:51 -0000	1.7.2.2
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 158,174 ****
  
  
! 	public void testUnqualify() throws Exception {
  		String qualified = "i.am.not.unqualified";
  		assertEquals("unqualified", StringUtils.unqualify(qualified));
  	}
  
! 	public void testUncapitalize() throws Exception {
  		String capitalized = "I am capitalized";
  		assertEquals("i am capitalized", StringUtils.uncapitalize(capitalized));
  	}
  
! 	public void testCapitalize() throws Exception {
! 		String capitalized = "i am not capitalized";
! 		assertEquals("I am not capitalized", StringUtils.capitalize(capitalized));
  	}
  
--- 158,230 ----
  
  
! 	public void testQuote() {
! 		assertEquals("'myString'", StringUtils.quote("myString"));
! 		assertEquals("''", StringUtils.quote(""));
! 		assertNull(StringUtils.quote(null));
! 	}
! 
! 	public void testQuoteIfString() {
! 		assertEquals("'myString'", StringUtils.quoteIfString("myString"));
! 		assertEquals("''", StringUtils.quoteIfString(""));
! 		assertEquals(new Integer(5), StringUtils.quoteIfString(new Integer(5)));
! 		assertNull(StringUtils.quoteIfString(null));
! 	}
! 
! 	public void testUnqualify() {
  		String qualified = "i.am.not.unqualified";
  		assertEquals("unqualified", StringUtils.unqualify(qualified));
  	}
  
! 	public void testCapitalize() {
! 		String capitalized = "i am not capitalized";
! 		assertEquals("I am not capitalized", StringUtils.capitalize(capitalized));
! 	}
! 
! 	public void testUncapitalize() {
  		String capitalized = "I am capitalized";
  		assertEquals("i am capitalized", StringUtils.uncapitalize(capitalized));
  	}
  
! 	public void testGetFilename() {
! 		assertEquals(null, StringUtils.getFilename(null));
! 		assertEquals("", StringUtils.getFilename(""));
! 		assertEquals("myfile", StringUtils.getFilename("myfile"));
! 		assertEquals("myfile", StringUtils.getFilename("mypath/myfile"));
! 		assertEquals("myfile.", StringUtils.getFilename("myfile."));
! 		assertEquals("myfile.", StringUtils.getFilename("mypath/myfile."));
! 		assertEquals("myfile.txt", StringUtils.getFilename("myfile.txt"));
! 		assertEquals("myfile.txt", StringUtils.getFilename("mypath/myfile.txt"));
! 	}
! 
! 	public void testGetFilenameExtension() {
! 		assertEquals(null, StringUtils.getFilenameExtension(null));
! 		assertEquals(null, StringUtils.getFilenameExtension(""));
! 		assertEquals(null, StringUtils.getFilenameExtension("myfile"));
! 		assertEquals(null, StringUtils.getFilenameExtension("myPath/myfile"));
! 		assertEquals("", StringUtils.getFilenameExtension("myfile."));
! 		assertEquals("", StringUtils.getFilenameExtension("myPath/myfile."));
! 		assertEquals("txt", StringUtils.getFilenameExtension("myfile.txt"));
! 		assertEquals("txt", StringUtils.getFilenameExtension("mypath/myfile.txt"));
! 	}
! 
! 	public void testStripFilenameExtension() {
! 		assertEquals(null, StringUtils.stripFilenameExtension(null));
! 		assertEquals("", StringUtils.stripFilenameExtension(""));
! 		assertEquals("myfile", StringUtils.stripFilenameExtension("myfile"));
! 		assertEquals("mypath/myfile", StringUtils.stripFilenameExtension("mypath/myfile"));
! 		assertEquals("myfile", StringUtils.stripFilenameExtension("myfile."));
! 		assertEquals("mypath/myfile", StringUtils.stripFilenameExtension("mypath/myfile."));
! 		assertEquals("myfile", StringUtils.stripFilenameExtension("myfile.txt"));
! 		assertEquals("mypath/myfile", StringUtils.stripFilenameExtension("mypath/myfile.txt"));
! 	}
! 
! 	public void testCleanPath() {
! 		assertEquals("mypath/myfile", StringUtils.cleanPath("mypath/myfile"));
! 		assertEquals("mypath/myfile", StringUtils.cleanPath("mypath\\myfile"));
! 		assertEquals("mypath/myfile", StringUtils.cleanPath("mypath/../mypath/myfile"));
! 		assertEquals("mypath/myfile", StringUtils.cleanPath("mypath/myfile/../../mypath/myfile"));
! 		assertEquals("../mypath/myfile", StringUtils.cleanPath("../mypath/myfile"));
! 		assertEquals("../mypath/myfile", StringUtils.cleanPath("../mypath/../mypath/myfile"));
! 		assertEquals("../mypath/myfile", StringUtils.cleanPath("mypath/../../mypath/myfile"));
  	}
  
***************
*** 219,222 ****
--- 275,296 ----
  
  
+ 	public void testSortStringArray() {
+ 		String[] input = new String[] {"myString2"};
+ 		input = StringUtils.addStringToArray(input, "myString1");
+ 		assertEquals("myString2", input[0]);
+ 		assertEquals("myString1", input[1]);
+ 
+ 		StringUtils.sortStringArray(input);
+ 		assertEquals("myString1", input[0]);
+ 		assertEquals("myString2", input[1]);
+ 	}
+ 
+ 	public void testRemoveDuplicateStrings() {
+ 		String[] input = new String[] {"myString2", "myString1", "myString2"};
+ 		input = StringUtils.removeDuplicateStrings(input);
+ 		assertEquals("myString1", input[0]);
+ 		assertEquals("myString2", input[1]);
+ 	}
+ 
  	public void testSplitArrayElementsIntoProperties() {
  		String[] input = new String[] {"key1=value1 ", "key2 =\"value2\""};
***************
*** 350,355 ****
--- 424,433 ----
  		String suffix = "fOo";
  
+ 		assertTrue(StringUtils.endsWithIgnoreCase("foo", suffix));
+ 		assertTrue(StringUtils.endsWithIgnoreCase("Foo", suffix));
  		assertTrue(StringUtils.endsWithIgnoreCase("barfoo", suffix));
+ 		assertTrue(StringUtils.endsWithIgnoreCase("barbarfoo", suffix));
  		assertTrue(StringUtils.endsWithIgnoreCase("barFoo", suffix));
+ 		assertTrue(StringUtils.endsWithIgnoreCase("barBarFoo", suffix));
  		assertTrue(StringUtils.endsWithIgnoreCase("barfoO", suffix));
  		assertTrue(StringUtils.endsWithIgnoreCase("barFOO", suffix));

Index: CollectionUtilsTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/util/CollectionUtilsTests.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -d -r1.1.4.1 -r1.1.4.2
*** CollectionUtilsTests.java	9 Jan 2006 22:48:23 -0000	1.1.4.1
--- CollectionUtilsTests.java	21 Apr 2006 00:13:51 -0000	1.1.4.2
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 17,23 ****
  package org.springframework.util;
  
! import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.HashSet;
  import java.util.List;
  import java.util.Map;
--- 17,26 ----
  package org.springframework.util;
  
! import java.util.Enumeration;
  import java.util.HashMap;
  import java.util.HashSet;
+ import java.util.Hashtable;
+ import java.util.Iterator;
+ import java.util.LinkedList;
  import java.util.List;
  import java.util.Map;
***************
*** 28,41 ****
  /**
   * @author Rob Harrop
   */
  public class CollectionUtilsTests extends TestCase {
  
  	public void testIsEmpty() {
! 		assertTrue(CollectionUtils.isEmpty((Set)null));
! 		assertTrue(CollectionUtils.isEmpty((Map)null));
  		assertTrue(CollectionUtils.isEmpty(new HashMap()));
  		assertTrue(CollectionUtils.isEmpty(new HashSet()));
  
! 		List list = new ArrayList();
  		list.add(new Object());
  		assertFalse(CollectionUtils.isEmpty(list));
--- 31,45 ----
  /**
   * @author Rob Harrop
+  * @author Juergen Hoeller
   */
  public class CollectionUtilsTests extends TestCase {
  
  	public void testIsEmpty() {
! 		assertTrue(CollectionUtils.isEmpty((Set) null));
! 		assertTrue(CollectionUtils.isEmpty((Map) null));
  		assertTrue(CollectionUtils.isEmpty(new HashMap()));
  		assertTrue(CollectionUtils.isEmpty(new HashSet()));
  
! 		List list = new LinkedList();
  		list.add(new Object());
  		assertFalse(CollectionUtils.isEmpty(list));
***************
*** 46,48 ****
--- 50,85 ----
  	}
  
+ 	public void testHasUniqueObject() {
+ 		List list = new LinkedList();
+ 		list.add("myElement");
+ 		list.add("myOtherElement");
+ 		assertFalse(CollectionUtils.hasUniqueObject(list));
+ 
+ 		list = new LinkedList();
+ 		list.add("myElement");
+ 		assertTrue(CollectionUtils.hasUniqueObject(list));
+ 
+ 		list = new LinkedList();
+ 		list.add("myElement");
+ 		list.add(null);
+ 		assertFalse(CollectionUtils.hasUniqueObject(list));
+ 
+ 		list = new LinkedList();
+ 		list.add(null);
+ 		list.add("myElement");
+ 		assertFalse(CollectionUtils.hasUniqueObject(list));
+ 
+ 		list = new LinkedList();
+ 		list.add(null);
+ 		list.add(null);
+ 		assertTrue(CollectionUtils.hasUniqueObject(list));
+ 
+ 		list = new LinkedList();
+ 		list.add(null);
+ 		assertTrue(CollectionUtils.hasUniqueObject(list));
+ 
+ 		list = new LinkedList();
+ 		assertFalse(CollectionUtils.hasUniqueObject(list));
+ 	}
+ 
  }