You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/05/12 11:04:30 UTC
cvs commit: jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/webxml TestWebXmlVersion.java TestAll.java TestWebXml.java
cmlenz 2003/05/12 02:04:30
Modified: integration/ant/src/test/org/apache/cactus/integration/ant/webxml
TestAll.java TestWebXml.java
Added: integration/ant/src/test/org/apache/cactus/integration/ant/webxml
TestWebXmlVersion.java
Log:
Starting the merge from CACTUS_14_ANT_BRANCH
- Merge the changes to the <webxmlmerge> tests
Revision Changes Path
1.3 +2 -2 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/webxml/TestAll.java
Index: TestAll.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/webxml/TestAll.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestAll.java 21 Apr 2003 21:30:51 -0000 1.2
+++ TestAll.java 12 May 2003 09:04:30 -0000 1.3
@@ -96,7 +96,7 @@
public static Test suite()
{
TestSuite suite = new TestSuite(
- "Cactus unit tests for the web.xml support classes");
+ "Unit tests for the web.xml support classes");
suite.addTestSuite(TestWebXml.class);
suite.addTestSuite(TestWebXmlMerger.class);
1.9 +3 -3 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/webxml/TestWebXml.java
Index: TestWebXml.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/webxml/TestWebXml.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestWebXml.java 24 Apr 2003 22:12:06 -0000 1.8
+++ TestWebXml.java 12 May 2003 09:04:30 -0000 1.9
@@ -154,7 +154,7 @@
+ "<web-app></web-app>";
Document doc = builder.parse(new ByteArrayInputStream(xml.getBytes()));
WebXml webXml = new WebXml(doc);
- assertEquals(WebXml.SERVLET_VERSION_2_2, webXml.getVersion());
+ assertEquals(WebXmlVersion.V2_2, webXml.getVersion());
}
/**
@@ -170,7 +170,7 @@
+ "<web-app></web-app>";
Document doc = builder.parse(new ByteArrayInputStream(xml.getBytes()));
WebXml webXml = new WebXml(doc);
- assertEquals(WebXml.SERVLET_VERSION_2_3, webXml.getVersion());
+ assertEquals(WebXmlVersion.V2_3, webXml.getVersion());
}
/**
1.2 +202 -0 jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/webxml/TestWebXmlVersion.java
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org