CVS: plexus-components/formica/src/test/org/codehaus/plexus/formica DefaultFormManagerTest.java,1.2,1.3 DefaultFormManagerTest.xml,1.2,1.3

Update of /cvsroot/plexus/plexus-components/formica/src/test/org/codehaus/plexus/formica
In directory eng.werken.com:/tmp/cvs-serv8909/src/test/org/codehaus/plexus/formica

Modified Files:
	DefaultFormManagerTest.java DefaultFormManagerTest.xml 
Log Message:
o cleaning up some tests
o changing from property expression to populator expression as eventually
someone might want to use jexl, jxpath or something else to populate
target objects.


Index: DefaultFormManagerTest.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/formica/src/test/org/codehaus/plexus/formica/DefaultFormManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DefaultFormManagerTest.java	1 Jun 2003 20:55:01 -0000	1.2
+++ DefaultFormManagerTest.java	1 Jun 2003 21:54:10 -0000	1.3
@@ -9,7 +9,7 @@
 
 /**
  *
- * 
+ *
  * @author <a href="mailto:[email protected]">Jason van Zyl</a>
  *
  * @version $Id$
@@ -58,9 +58,10 @@
 
         FormElement fe3 = (FormElement) formElements.get( 3);
         assertEquals( "form element id incorrect", "field-3", fe3.getId() );
-        assertEquals( "form element label incorrect", "label.san", fe3.getLabelKey() );
-        assertEquals( "form element message incorrect", "message.san", fe3.getMessageKey() );
+        assertEquals( "form element label key incorrect", "label.san", fe3.getLabelKey() );
+        assertEquals( "form element message key incorrect", "message.san", fe3.getMessageKey() );
         assertEquals( "form element default value incorrect", "0000000", fe3.getDefaultValue() );
+        assertEquals( "form element populator expression incorrect", "role.san", fe3.getPopulatorExpression() );
         assertFalse( "form element optional should be false", fe3.isOptional() );
 
         // Validator

Index: DefaultFormManagerTest.xml
===================================================================
RCS file: /cvsroot/plexus/plexus-components/formica/src/test/org/codehaus/plexus/formica/DefaultFormManagerTest.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DefaultFormManagerTest.xml	1 Jun 2003 20:55:01 -0000	1.2
+++ DefaultFormManagerTest.xml	1 Jun 2003 21:54:10 -0000	1.3
@@ -30,6 +30,7 @@
               <label-key>label.san</label-key>
               <message-key>message.san</message-key>
               <default>0000000</default>
+              <populator-expression>role.san</populator-expression>
               <validator id="regex">
                 <parameter name="pattern" value="[0-9]+"/>
               </validator>