dion        2002/06/12 08:38:25

  Modified:    src/test/org/apache/maven/build PropertyResolverTest.java
  Log:
  More tests for using Jelly
  
  Revision  Changes    Path
  1.3       +24 -10    
jakarta-turbine-maven/src/test/org/apache/maven/build/PropertyResolverTest.java
  
  Index: PropertyResolverTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/build/PropertyResolverTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PropertyResolverTest.java 12 Jun 2002 09:44:02 -0000      1.2
  +++ PropertyResolverTest.java 12 Jun 2002 15:38:25 -0000      1.3
  @@ -89,8 +89,8 @@
       /** test that properties can't be found */
       public void testNoProperties()
       {
  -        assertNull("get property for non-existing one returns a value",
  -            instance.getProperty("foobar"));
  +        assertEquals("get property for non-existing one the wrong value",
  +            "foobar", instance.getProperty("foobar"));
       }
       
       /** test simple string properties can be added and retrieved */
  @@ -98,8 +98,8 @@
       {
           String name = "dummyName";
           String value = "dummyValue";
  -        assertNull(name + " property already exists", 
  -            instance.getProperty(name));
  +        assertTrue(name + " property already exists with other value", 
  +            instance.getProperty(name).equals(name));
           instance.setProperty(name, value);
           assertEquals("get or set of property failed for: " + name, value,
               instance.getProperty(name));
  @@ -111,16 +111,30 @@
           Object object = "new Object()";
           String length = String.valueOf(((String) object).length());
           String name = "dummyName";
  -        assertNull(name + " property already exists",
  -            instance.getProperty(name));
  -        instance.setProperty(name, object);
  +        // make sure value defaults to the property name
  +        assertTrue(name + " property already exists",
  +            instance.getProperty(name).equals(name));
  +        
           // simple property value
  +        instance.setProperty(name, object);
           assertEquals("property wasn't set", object, instance.getProperty(name));
  +        
           // method call
           assertEquals("string length was wrong", length,
  -            instance.getProperty(name+".length()"));
  +            instance.getProperty("${" + name+".length()}"));
  +        
           // nested properties
           assertEquals("string class name is wrong", "java.lang.String",
  -            instance.getProperty(name + ".class.name"));
  +            instance.getProperty("${" + name + ".class.name}"));
  +        
  +        // expression using previously defined variable
  +        instance.setProperty("test.length", "${" + name + ".length()}");
  +        assertEquals("test length not correct", length, 
  +            instance.getProperty("test.length"));
  +        
  +        // test re-evaluating of property after source variable changes
  +        instance.setProperty(name, "12345678901234567890");
  +        assertEquals("test length not correct after change", "20", 
  +            instance.getProperty("test.length"));
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to