You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2007/01/22 19:11:53 UTC
svn commit: r498730 - in /velocity/tools/trunk: ./ src/test/
src/test/org/apache/velocity/tools/test/whitebox/ test/conf/
Author: nbubna
Date: Mon Jan 22 10:11:51 2007
New Revision: 498730
URL: http://svn.apache.org/viewvc?view=rev&rev=498730
Log:
add test for ResourceTool
Added:
velocity/tools/trunk/src/test/resources.properties (with props)
velocity/tools/trunk/src/test/resources2.properties (with props)
velocity/tools/trunk/src/test/resources_fr.properties (with props)
Modified:
velocity/tools/trunk/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
velocity/tools/trunk/test.xml
velocity/tools/trunk/test/conf/whiteboxtest-toolbox.xml
Modified: velocity/tools/trunk/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java?view=diff&rev=498730&r1=498729&r2=498730
==============================================================================
--- velocity/tools/trunk/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java (original)
+++ velocity/tools/trunk/src/test/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java Mon Jan 22 10:11:51 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-
+import java.util.Locale;
import java.util.Map;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -33,6 +33,7 @@
import org.apache.velocity.tools.generic.EscapeTool;
import org.apache.velocity.tools.generic.MathTool;
import org.apache.velocity.tools.generic.NumberTool;
+import org.apache.velocity.tools.generic.ResourceTool;
import org.apache.velocity.tools.view.XMLToolboxManager;
@@ -40,6 +41,7 @@
* <p>Generic tools whitebox tests.</p>
*
* @author <a href="mailto:cbrisson@apache.org">Claude Brisson</a>
+ * @author Nathan Bubna
* @since Velocity Tools 1.3
* @version $Id$
*/
@@ -139,5 +141,33 @@
NumberTool numberTool = (NumberTool)toolbox.get("number");
assertNotNull(numberTool);
// assertEquals()
+ }
+
+ public @Test void testResourceTool() {
+ ResourceTool textTool = (ResourceTool)toolbox.get("text");
+ assertNotNull(textTool);
+
+ ResourceTool.Key foo = textTool.get("foo");
+ assertEquals("bar", foo.toString());
+
+ ResourceTool.Key frenchFoo = foo.locale(Locale.FRENCH);
+ assertEquals("barre", frenchFoo.toString());
+
+ ResourceTool.Key otherFoo = foo.bundle("resources2");
+ assertEquals("woogie", otherFoo.toString());
+
+ ResourceTool.Key helloWhoever = textTool.get("hello").get("whoever");
+ assertEquals("Hello {0}!", helloWhoever.toString());
+
+ ResourceTool.Key helloWorld = helloWhoever.insert(textTool.get("world"));
+ assertEquals("Hello World!", helloWorld.toString());
+
+ ResourceTool.Key halfFrenchHelloWorld = helloWorld.locale(Locale.FRENCH);
+ assertEquals("Bonjour World!", halfFrenchHelloWorld.toString());
+
+ ResourceTool.Key frenchTool = textTool.locale(Locale.FRENCH);
+ ResourceTool.Key frenchHelloWorld =
+ frenchTool.get("hello.whoever").insert(frenchTool.get("world"));
+ assertEquals("Bonjour Monde!", frenchHelloWorld.toString());
}
}
Added: velocity/tools/trunk/src/test/resources.properties
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/test/resources.properties?view=auto&rev=498730
==============================================================================
--- velocity/tools/trunk/src/test/resources.properties (added)
+++ velocity/tools/trunk/src/test/resources.properties Mon Jan 22 10:11:51 2007
@@ -0,0 +1,3 @@
+foo = bar
+hello.whoever = Hello {0}!
+world = World
Propchange: velocity/tools/trunk/src/test/resources.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: velocity/tools/trunk/src/test/resources2.properties
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/test/resources2.properties?view=auto&rev=498730
==============================================================================
--- velocity/tools/trunk/src/test/resources2.properties (added)
+++ velocity/tools/trunk/src/test/resources2.properties Mon Jan 22 10:11:51 2007
@@ -0,0 +1 @@
+foo = woogie
Propchange: velocity/tools/trunk/src/test/resources2.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: velocity/tools/trunk/src/test/resources_fr.properties
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/test/resources_fr.properties?view=auto&rev=498730
==============================================================================
--- velocity/tools/trunk/src/test/resources_fr.properties (added)
+++ velocity/tools/trunk/src/test/resources_fr.properties Mon Jan 22 10:11:51 2007
@@ -0,0 +1,3 @@
+foo = barre
+hello.whoever = Bonjour {0}!
+world = Monde
Propchange: velocity/tools/trunk/src/test/resources_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: velocity/tools/trunk/test.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/test.xml?view=diff&rev=498730&r1=498729&r2=498730
==============================================================================
--- velocity/tools/trunk/test.xml (original)
+++ velocity/tools/trunk/test.xml Mon Jan 22 10:11:51 2007
@@ -69,6 +69,7 @@
<copy todir="${test.build.src.dir}" filtering="yes">
<fileset dir="${test.src.dir}">
<include name="**/*.java"/>
+ <include name="**/*.properties"/>
</fileset>
</copy>
<copy tofile="${test.dir}/etc/jetty.xml" file="${test.dir}/etc/jetty.xml.tmpl" filtering="yes"/>
@@ -106,6 +107,10 @@
optimize="${compile.optimize}"
includes="**/whitebox/*.java"
classpathref="test.classpath"/>
+ <!-- copy non-java resources -->
+ <copy todir="${test.classes.dir}">
+ <fileset dir="${test.build.src.dir}" excludes="**/*.java"/>
+ </copy>
</target>
<!-- compile blackbox tests -->
Modified: velocity/tools/trunk/test/conf/whiteboxtest-toolbox.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/test/conf/whiteboxtest-toolbox.xml?view=diff&rev=498730&r1=498729&r2=498730
==============================================================================
--- velocity/tools/trunk/test/conf/whiteboxtest-toolbox.xml (original)
+++ velocity/tools/trunk/test/conf/whiteboxtest-toolbox.xml Mon Jan 22 10:11:51 2007
@@ -48,4 +48,9 @@
<class>org.apache.velocity.tools.generic.NumberTool</class>
</tool>
+ <tool>
+ <key>text</key>
+ <class>org.apache.velocity.tools.generic.ResourceTool</class>
+ </tool>
+
</toolbox>