[Springframework-cvs] spring/test/org/springframework/beans/propertyeditors CustomEditorTests.java,1.5,1.5.2.1

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

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

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

Index: CustomEditorTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/beans/propertyeditors/CustomEditorTests.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** CustomEditorTests.java	14 Oct 2005 11:03:07 -0000	1.5
--- CustomEditorTests.java	21 Apr 2006 00:13:51 -0000	1.5.2.1
***************
*** 402,409 ****
  
  	public void testByteArrayPropertyEditor() {
! 		ByteArrayBean bean = new ByteArrayBean();
  		BeanWrapper bw = new BeanWrapperImpl(bean);
! 		bw.setPropertyValue("array", "myvalue");
! 		assertEquals("myvalue", new String(bean.getArray()));
  	}
  
--- 402,416 ----
  
  	public void testByteArrayPropertyEditor() {
! 		PrimitiveArrayBean bean = new PrimitiveArrayBean();
  		BeanWrapper bw = new BeanWrapperImpl(bean);
! 		bw.setPropertyValue("byteArray", "myvalue");
! 		assertEquals("myvalue", new String(bean.getByteArray()));
! 	}
! 
! 	public void testCharArrayPropertyEditor() {
! 		PrimitiveArrayBean bean = new PrimitiveArrayBean();
! 		BeanWrapper bw = new BeanWrapperImpl(bean);
! 		bw.setPropertyValue("charArray", "myvalue");
! 		assertEquals("myvalue", new String(bean.getCharArray()));
  	}
  
***************
*** 417,420 ****
--- 424,433 ----
  		bw.setPropertyValue("myChar", "c");
  		assertEquals('c', cb.getMyChar());
+ 
+ 		bw.setPropertyValue("myChar", "\u0041");
+ 		assertEquals('A', cb.getMyChar());
+ 
+ 		bw.setPropertyValue("myChar", "\\u0022");
+ 		assertEquals('"', cb.getMyChar());
  	}
  
***************
*** 430,433 ****
--- 443,449 ----
  		assertEquals(new Character('c'), cb.getMyCharacter());
  
+ 		bw.setPropertyValue("myCharacter", "\u0041");
+ 		assertEquals(new Character('A'), cb.getMyCharacter());
+ 
  		bw.setPropertyValue("myCharacter", "");
  		assertNull(cb.getMyCharacter());
***************
*** 1139,1152 ****
  
  
! 	private static class ByteArrayBean {
  
! 		private byte[] array;
  
! 		public byte[] getArray() {
! 			return array;
  		}
  
! 		public void setArray(byte[] array) {
! 			this.array = array;
  		}
  	}
--- 1155,1178 ----
  
  
! 	private static class PrimitiveArrayBean {
  
! 		private byte[] byteArray;
  
! 		private char[] charArray;
! 
! 		public byte[] getByteArray() {
! 			return byteArray;
  		}
  
! 		public void setByteArray(byte[] byteArray) {
! 			this.byteArray = byteArray;
! 		}
! 
! 		public char[] getCharArray() {
! 			return charArray;
! 		}
! 
! 		public void setCharArray(char[] charArray) {
! 			this.charArray = charArray;
  		}
  	}