Author: danielf Date: Wed Jan 19 15:02:51 2005 New Revision: 125681 URL: http://svn.apache.org/viewcvs?view=rev&rev=125681 Log: Test cases for macros. Didn't get the dynamic macro invocation to work. Added: cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxMacro.xml Modified: cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Modified: cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java?view=diff&rev=125681&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java&r1=125680&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java&r2=125681 ============================================================================== --- cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java (original) +++ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java Wed Jan 19 15:02:51 2005 @@ -37,8 +37,6 @@ super.setUp(); // Make the FOM objects available to the view layer - FOM_JavaScriptFlowHelper.setFOM_Request(getObjectModel(), - new FOM_Cocoon.FOM_Request(getRequest())); FlowHelper.setContextObject(getObjectModel(), flowContext); } @@ -87,6 +85,7 @@ Parameters parameters = new Parameters(); parameters.setParameter("test", "foo"); getFlowContext().put("test", "bar"); + assertEquals("HTTP/1.1", getRequest().getProtocol()); assertEqual(load(outputURI), generate(JX, inputURI, parameters)); } @@ -103,6 +102,20 @@ String[] array = {"one", "two", "three"}; getFlowContext().put("test", array); + assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS)); + } + + public void testJXMacro() throws Exception { + String inputURI = docBase + "jxMacro.xml"; + String outputURI = docBase + "jxMacro-output.xml"; + + assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS)); + } + + public void testJXDynamicMacro() throws Exception { + String inputURI = docBase + "jxDynamicMacro.xml"; + String outputURI = docBase + "jxDynamicMacro-output.xml"; + assertEqual(load(outputURI), generate(JX, inputURI, EMPTY_PARAMS)); } } Added: cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml?view=auto&rev=125681 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxDynamicMacro-output.xml Wed Jan 19 15:02:51 2005 @@ -0,0 +1,8 @@ +<?xml version="1.0"?> + +<root> + + <p>I'm about to invoke a dynamic tag:</p> + <em>This tag was invoked dynamically</em> + +</root> Added: cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml?view=auto&rev=125681 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxDynamicMacro.xml Wed Jan 19 15:02:51 2005 @@ -0,0 +1,19 @@ +<?xml version="1.0"?> + +<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";> + + <jx:set var="tags" value="${java.util.HashMap()}"/> + + <jx:macro name="dynamic-tag"> + <jx:parameter name="id"/> + <jx:set var="ignored" value="${tags.put(id, macro.body)}"/> + </jx:macro> + + <dynamic-tag id="example"> + <em>This tag was invoked dynamically</em> + </dynamic-tag> + + <p>I'm about to invoke a dynamic tag:</p> + <jx:eval select="${tags.example}"/> + +</root> Added: cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml?view=auto&rev=125681 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxMacro-output.xml Wed Jan 19 15:02:51 2005 @@ -0,0 +1,9 @@ +<?xml version="1.0"?> + +<root> + <m> + <macroTest a="foo"> + <content b="3"/> + </macroTest> + </m> +</root> Added: cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxMacro.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxMacro.xml?view=auto&rev=125681 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/jxMacro.xml Wed Jan 19 15:02:51 2005 @@ -0,0 +1,15 @@ +<?xml version="1.0"?> + +<root xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";> + <jx:macro name="d"> + <jx:parameter name="p"/> + <macroTest a="${p}"> + <jx:evalBody/> + </macroTest> + </jx:macro> + <m> + <d p="foo"> + <content b="${1+2}"/> + </d> + </m> +</root>
