dion 2002/06/12 02:44:02
Modified: src/java/org/apache/maven/build PropertyResolver.java
src/test/org/apache/maven/build PropertyResolverTest.java
Log:
- More tests.
- changed property set to just place the object in the context regardless, as
it made strings inconsistent from other objects, and stopped the ability to
get a string length
Revision Changes Path
1.3 +4 -12
jakarta-turbine-maven/src/java/org/apache/maven/build/PropertyResolver.java
Index: PropertyResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/build/PropertyResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertyResolver.java 12 Jun 2002 02:49:15 -0000 1.2
+++ PropertyResolver.java 12 Jun 2002 09:44:02 -0000 1.3
@@ -110,22 +110,14 @@
}
/**
- * Set a named property to the given value. If the value is a string,
- * simply pass it to the resolver's setProperty method.
- * If it is any other object, place it in the resolver's context
+ * Set a named property to the given value by placing it in the resolver's
+ * context
*
* @param name the name of the property
* @param value the object ot be associated with the name
*/
public void setProperty(String name, Object value)
{
- if (value instanceof String)
- {
- resolver.setProperty(name, (String)value);
- }
- else
- {
- resolver.getJexlContext().getVars().put(name, value);
- }
+ resolver.getJexlContext().getVars().put(name, value);
}
}
1.2 +20 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyResolverTest.java 12 Jun 2002 02:49:15 -0000 1.1
+++ PropertyResolverTest.java 12 Jun 2002 09:44:02 -0000 1.2
@@ -104,4 +104,23 @@
assertEquals("get or set of property failed for: " + name, value,
instance.getProperty(name));
}
+
+ /** test object properties */
+ public void testObjectProperties()
+ {
+ 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);
+ // simple property value
+ assertEquals("property wasn't set", object, instance.getProperty(name));
+ // method call
+ assertEquals("string length was wrong", length,
+ instance.getProperty(name+".length()"));
+ // nested properties
+ assertEquals("string class name is wrong", "java.lang.String",
+ instance.getProperty(name + ".class.name"));
+ }
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
