Author: veithen
Date: Thu Feb 5 10:28:35 2009
New Revision: 741064
URL: http://svn.apache.org/viewvc?rev=741064&view=rev
Log:
WSCOMMONS-419: Moved some test cases and resources from axiom-tests to the
appropriate modules.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/AbstractTestCase.java
(props changed)
- copied unchanged from r740841,
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractTestCase.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/OMElementTestBase.java
(contents, props changed)
- copied, changed from r740829,
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMElementTestBase.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/xml/
(props changed)
- copied from r740829,
webservices/commons/trunk/modules/axiom/modules/axiom-tests/test-resources/xml/
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/ElementImplTest.java
(props changed)
- copied unchanged from r740829,
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/dom/ElementImplTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/om/impl/llom/OMElementTest.java
(props changed)
- copied unchanged from r740829,
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMElementTest.java
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractTestCase.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMElementTestBase.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/dom/ElementImplTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMElementTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/test-resources/xml/
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-tests/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/xpath/XPathTestBase.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml?rev=741064&r1=741063&r2=741064&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml Thu Feb
5 10:28:35 2009
@@ -57,6 +57,10 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ </dependency>
</dependencies>
<build>
<resources>
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/AbstractTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/AbstractTestCase.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/OMElementTestBase.java
(from r740829,
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMElementTestBase.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/OMElementTestBase.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/OMElementTestBase.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMElementTestBase.java&r1=740829&r2=741064&rev=741064&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMElementTestBase.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/OMElementTestBase.java
Thu Feb 5 10:28:35 2009
@@ -24,7 +24,7 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
-import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
+import org.apache.axiom.om.util.AXIOMUtil;
public abstract class OMElementTestBase extends AbstractTestCase {
protected abstract OMFactory getOMFactory();
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/OMElementTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/OMElementTestBase.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/xml/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml?rev=741064&r1=741063&r2=741064&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml Thu Feb
5 10:28:35 2009
@@ -51,6 +51,10 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/ElementImplTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/ElementImplTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml?rev=741064&r1=741063&r2=741064&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml Thu Feb
5 10:28:35 2009
@@ -55,6 +55,10 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/om/impl/llom/OMElementTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/om/impl/llom/OMElementTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/pom.xml?rev=741064&r1=741063&r2=741064&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/pom.xml Thu Feb
5 10:28:35 2009
@@ -103,6 +103,13 @@
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <classifier>tests</classifier>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<classifier>tests</classifier>
<version>${version}</version>
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/xpath/XPathTestBase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/xpath/XPathTestBase.java?rev=741064&r1=741063&r2=741064&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/xpath/XPathTestBase.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/xpath/XPathTestBase.java
Thu Feb 5 10:28:35 2009
@@ -1207,7 +1207,7 @@
Object context = iter.next();
try {
Object result =
- assertCountXPath2(1, context,
"document('test-resources/xml/web.xml')");
+ assertCountXPath2(1, context, "document('" +
TESTS_ROOT + "xml/web.xml')");
assertValueOfXPath("snoop", result,
"/web-app/servlet[1]/servlet-name");
assertValueOfXPath("snoop", result,
"/web-app/servlet[1]/servlet-name/text()");
}
@@ -1215,7 +1215,7 @@
log(debug, " ## SKIPPED -- Unsupported Axis");
}
assertValueOfXPath("snoop", context,
-
"document('test-resources/xml/web.xml')/web-app/servlet[1]/servlet-name");
+ "document('" + TESTS_ROOT +
"xml/web.xml')/web-app/servlet[1]/servlet-name");
}
}
@@ -1236,7 +1236,7 @@
Object context = iter.next();
assertValueOfXPath("3foo3", context, "concat(./@id,'foo',@id)");
assertValueOfXPath("3snoop3", context,
-
"concat(./@id,document('test-resources/xml/web.xml')/web-app/servlet[1]/servlet-name,./@id)");
+ "concat(./@id,document('" + TESTS_ROOT +
"xml/web.xml')/web-app/servlet[1]/servlet-name,./@id)");
}
}
@@ -1254,7 +1254,7 @@
assertValueOfXPath("Pruefgebiete", context,
"/message/body/data/items/item[name/text()='parentinfo']/value");
assertValueOfXPath("Pruefgebiete", context,
-
"document('test-resources/xml/message.xml')/message/body/data/items/item[name/text()='parentinfo']/value");
+ "document('" + TESTS_ROOT +
"xml/message.xml')/message/body/data/items/item[name/text()='parentinfo']/value");
}
}
