You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/11/29 11:11:36 UTC
cvs commit: jakarta-turbine-3/src/test/org/apache/turbine/pipeline PipelineCreationTest.java
epugh 2004/11/29 02:11:36
Modified: src/test/org/apache/turbine/pipeline
PipelineCreationTest.java
Log:
Enhance unit test with ConditionalValve test
Revision Changes Path
1.2 +23 -4 jakarta-turbine-3/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java
Index: PipelineCreationTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PipelineCreationTest.java 1 Nov 2004 19:10:15 -0000 1.1
+++ PipelineCreationTest.java 29 Nov 2004 10:11:36 -0000 1.2
@@ -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: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org