dlr 02/01/02 20:59:28
Modified: src/test/org/apache/turbine/pipeline TestPipelineMapper.java
Log:
Tweaked formatting and updated for changes.
Revision Changes Path
1.2 +18 -15
jakarta-turbine-3/src/test/org/apache/turbine/pipeline/TestPipelineMapper.java
Index: TestPipelineMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/test/org/apache/turbine/pipeline/TestPipelineMapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- TestPipelineMapper.java 31 Dec 2001 15:30:19 -0000 1.1
+++ TestPipelineMapper.java 3 Jan 2002 04:59:28 -0000 1.2
@@ -67,7 +67,7 @@
* Test Pipeline and valve definitions.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TestPipelineMapper.java,v 1.1 2001/12/31 15:30:19 jvanzyl Exp $
+ * @version $Id: TestPipelineMapper.java,v 1.2 2002/01/03 04:59:28 dlr Exp $
*/
public class TestPipelineMapper
extends TestCase
@@ -76,7 +76,7 @@
* Test document which starts the whole mapping process.
*/
private static String TEST_DOCUMENT =
- "src/test/org/apache/turbine/pipeline/classic-turbine-pipeline.xml";
+ "src/java/org/apache/turbine/pipeline/turbine-classic-pipeline.xml";
/**
* Test class which is populated with the contents and
@@ -120,38 +120,41 @@
/**
* Test the mapping performed by the mapper.
*/
- public void testPersonMapping()
+ public void testPipelineMapping()
{
try
{
Mapper m = new Mapper();
m.setDebug(true);
- // We want to pull in valve definition by reference. This was
- // originally setup for the Maven project object model where XML
- // are located in different directories but I will change the
- // default behaviour to look in the same directory first without
- // having to define an inclusion rule. This can be done automatically.
- // This rule just says that when we encounter a "valveDefinition"
- // element to look in the same directory as the parent XML file
+ // We want to pull in valve definition by reference. This
+ // was originally setup for the Maven project object model
+ // where XML are located in different directories but I
+ // will change the default behaviour to look in the same
+ // directory first without having to define an inclusion
+ // rule. This can be done automatically. This rule just
+ // says that when we encounter a "valveDefinition" element
+ // to look in the same directory as the parent XML file
// for the description of the object to be consumed.
m.setInclusionRule("valveDefinition", ".");
- TurbinePipeline p = (TurbinePipeline) m.map(TEST_DOCUMENT, TEST_CLASS);
+ TurbinePipeline p = (TurbinePipeline) m.map(TEST_DOCUMENT,
+ TEST_CLASS);
// For our test so far we have a pipeline with two valve
// definitions. So lets make sure that the XML was consumed
// correctly and that our objects were created accordingly.
- assertEquals("ClassicTurbinePipeline",p.getName());
+ assertEquals("TurbineClassicPipeline", p.getName());
- assertEquals("DefaultActionValve",p.getValveDefinition(0).getName());
+ assertEquals("DefaultActionValve",
+ p.getValveDefinition(0).getName());
assertEquals("org.apache.turbine.pipeline.DefaultActionValve",
p.getValveDefinition(0).getClassName());
- assertEquals("DefaultTargetValve",p.getValveDefinition(1).getName());
+ assertEquals("DefaultTargetValve",
+ p.getValveDefinition(1).getName());
assertEquals("org.apache.turbine.pipeline.DefaultTargetValve",
p.getValveDefinition(1).getClassName());
-
}
catch (Exception e)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
