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/05/04 21:22:25 UTC
svn commit: r535358 - in /velocity/tools/branches/2.x:
src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
test/conf/whiteboxtest-toolbox.xml
Author: nbubna
Date: Fri May 4 12:22:24 2007
New Revision: 535358
URL: http://svn.apache.org/viewvc?view=rev&rev=535358
Log:
convert generic tool tests to use ToolManager
Modified:
velocity/tools/branches/2.x/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
velocity/tools/branches/2.x/test/conf/whiteboxtest-toolbox.xml
Modified: velocity/tools/branches/2.x/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java?view=diff&rev=535358&r1=535357&r2=535358
==============================================================================
--- velocity/tools/branches/2.x/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java (original)
+++ velocity/tools/branches/2.x/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java Fri May 4 12:22:24 2007
@@ -36,8 +36,8 @@
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;
-
+import org.apache.velocity.tools.ToolManager;
+import org.apache.velocity.tools.ToolContext;
/**
* <p>Generic tools whitebox tests.</p>
@@ -52,12 +52,12 @@
private static final String TOOLBOX_PATH = "@test.conf.dir@/whiteboxtest-toolbox.xml";
- private static Map toolbox = null;
+ private static ToolContext toolbox = null;
public static @BeforeClass void initGenericToolsTests() throws Exception {
- XMLToolboxManager manager = new XMLToolboxManager();
- manager.load(TOOLBOX_PATH);
- toolbox = manager.getToolbox(null);
+ ToolManager manager = new ToolManager(false);
+ manager.configure(TOOLBOX_PATH);
+ toolbox = manager.createContext();
}
public @Test void testAlternatorTool() {
Modified: velocity/tools/branches/2.x/test/conf/whiteboxtest-toolbox.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/test/conf/whiteboxtest-toolbox.xml?view=diff&rev=535358&r1=535357&r2=535358
==============================================================================
--- velocity/tools/branches/2.x/test/conf/whiteboxtest-toolbox.xml (original)
+++ velocity/tools/branches/2.x/test/conf/whiteboxtest-toolbox.xml Fri May 4 12:22:24 2007
@@ -18,7 +18,18 @@
specific language governing permissions and limitations
under the License.
-->
-
+<tools>
+ <toolbox scope="application">
+ <tool class="org.apache.velocity.tools.generic.AlternatorTool" auto-alternate="false"/>
+ <tool class="org.apache.velocity.tools.generic.ComparisonDateTool"
+ format="yyyy-MM-dd" skip="month"/>
+ <tool class="org.apache.velocity.tools.generic.EscapeTool"/>
+ <tool class="org.apache.velocity.tools.generic.MathTool"/>
+ <tool class="org.apache.velocity.tools.generic.NumberTool"/>
+ <tool class="org.apache.velocity.tools.generic.ResourceTool" locale="en_US"/>
+ </toolbox>
+</tools>
+<!--
<toolbox>
<tool>
@@ -56,3 +67,4 @@
</tool>
</toolbox>
+-->
\ No newline at end of file