[Springframework-cvs] spring/test/org/springframework/beans BeanWrapperTests.java,1.13.4.2,1.13.4.3

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

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

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

Index: BeanWrapperTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/beans/BeanWrapperTests.java,v
retrieving revision 1.13.4.2
retrieving revision 1.13.4.3
diff -C2 -d -r1.13.4.2 -r1.13.4.3
*** BeanWrapperTests.java	20 Feb 2006 11:58:27 -0000	1.13.4.2
--- BeanWrapperTests.java	21 Apr 2006 00:13:51 -0000	1.13.4.3
***************
*** 375,382 ****
  		assertTrue("stringArray elt is ok", pt.stringArray[0].equals("one"));
  
! 		bw.setPropertyValue("stringArray", "foo,fi,fi,fum");
! 		assertTrue("stringArray length = 4", pt.stringArray.length == 4);
! 		assertTrue("correct values", pt.stringArray[0].equals("foo") && pt.stringArray[1].equals("fi") &&
! 				pt.stringArray[2].equals("fi") && pt.stringArray[3].equals("fum"));
  	}
  
--- 375,380 ----
  		assertTrue("stringArray elt is ok", pt.stringArray[0].equals("one"));
  
! 		bw.setPropertyValue("stringArray", null);
! 		assertTrue("stringArray is null", pt.stringArray == null);
  	}
  
***************
*** 417,425 ****
  		assertTrue("stringArray length = 1", pt.stringArray.length == 1);
  		assertTrue("correct values", pt.stringArray[0].equals("one"));
  
! 		bw.setPropertyValue("stringArray", "1foo,3fi,2fi,1fum");
! 		assertTrue("stringArray length = 4", pt.stringArray.length == 4);
! 		assertTrue("correct values", pt.stringArray[0].equals("foo") && pt.stringArray[1].equals("fi") &&
! 				pt.stringArray[2].equals("fi") && pt.stringArray[3].equals("fum"));
  	}
  
--- 415,427 ----
  		assertTrue("stringArray length = 1", pt.stringArray.length == 1);
  		assertTrue("correct values", pt.stringArray[0].equals("one"));
+ 	}
  
! 	public void testStringArrayPropertyWithStringSplitting() throws Exception {
! 		PropsTest pt = new PropsTest();
! 		BeanWrapper bw = new BeanWrapperImpl(pt);
! 		bw.registerCustomEditor(String[].class, "stringArray", new StringArrayPropertyEditor());
! 		bw.setPropertyValue("stringArray", "a1,b2");
! 		assertTrue("stringArray length = 2", pt.stringArray.length == 2);
! 		assertTrue("correct values", pt.stringArray[0].equals("a1") && pt.stringArray[1].equals("b2"));
  	}