Here is a patch which including conditional valve
Thanks.
Youngho
Index: src/test/org/apache/turbine/pipeline/PipelineCreationTest.java
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-3/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java,v
retrieving revision 1.1
diff -u -r1.1 PipelineCreationTest.java
--- src/test/org/apache/turbine/pipeline/PipelineCreationTest.java 1 Nov
2004 19:10:15 -0000 1.1
+++ src/test/org/apache/turbine/pipeline/PipelineCreationTest.java 29 Nov
2004 09:38:59 -0000
@@ -83,6 +83,9 @@
pipeline = new TurbinePipeline();
pipeline.addValve(new SimpleValve());
pipeline.addValve(new DetermineActionValve());
+ TargetExtensionConditionalValve cValve = new
TargetExtensionConditionalValve();
+ cValve.setExtension(".vm");
+ pipeline.addValve(cValve);
}
@@ -91,19 +94,35 @@
XStream xstream = new XStream(new DomDriver()); // does not require
XPP3 library
String xml = xstream.toXML(pipeline);
- //System.out.println(xml);
+ // System.out.println(xml);
//Pipeline pipeline = (Pipeline)xstream.fromXML(xml);
}
public void testReadingPipelineWXstream() throws Exception{
- String xml="<org.apache.turbine.pipeline.TurbinePipeline> <valves>
<org.apache.turbine.pipeline.SimpleValve/>
<org.apache.turbine.pipeline.DetermineActionValve/>
</valves></org.apache.turbine.pipeline.TurbinePipeline>";
+ String xml="<org.apache.turbine.pipeline.TurbinePipeline> <valves>
<org.apache.turbine.pipeline.SimpleValve/>
<org.apache.turbine.pipeline.DetermineActionValve/>"
+ +
"<org.apache.turbine.pipeline.TargetExtensionConditionalValve>
<extension>.vm</extension>"
+ + "<pipelines>"
+ +
"<org.apache.turbine.pipeline.TurbinePipeline> <valves>
<org.apache.turbine.pipeline.SimpleValve/> </valves>
</org.apache.turbine.pipeline.TurbinePipeline>"
+ + "</pipelines>"
+ +
"</org.apache.turbine.pipeline.TargetExtensionConditionalValve>"
+ +
"<org.apache.turbine.pipeline.TargetExtensionConditionalValve>
<extension>.xml</extension>"
+ + "<pipelines>"
+ +
"<org.apache.turbine.pipeline.TurbinePipeline> <valves>
<org.apache.turbine.pipeline.SimpleValve/> </valves>
</org.apache.turbine.pipeline.TurbinePipeline>"
+ + "</pipelines>"
+ +
"</org.apache.turbine.pipeline.TargetExtensionConditionalValve>"
+ + "
</valves></org.apache.turbine.pipeline.TurbinePipeline>";
XStream xstream = new XStream(new DomDriver()); // does not require
XPP3 library
Object o = xstream.fromXML(xml);
Pipeline pipeline = (Pipeline)o;
- assertEquals(pipeline.getValves().length,2);
+ assertEquals(pipeline.getValves().length,4);
assertTrue(pipeline.getValves()[0] instanceof SimpleValve);
assertTrue(pipeline.getValves()[1] instanceof DetermineActionValve);
+ assertTrue(pipeline.getValves()[2] instanceof
TargetExtensionConditionalValve);
+ assertTrue(pipeline.getValves()[3] instanceof
TargetExtensionConditionalValve);
+
+ // String xmlString = xstream.toXML(pipeline);
+ // System.out.println(xmlString);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
