Author: veithen
Date: Sat Dec 31 13:32:18 2011
New Revision: 1226082
URL: http://svn.apache.org/viewvc?rev=1226082&view=rev
Log:
More mavenized tests.
Added:
axis/axis1/java/trunk/axis/src/test/java/test/faults/
- copied from r1226076, axis/axis1/java/trunk/test/faults/
axis/axis1/java/trunk/axis/src/test/java/test/jaxrpc/
- copied from r1226076, axis/axis1/java/trunk/test/jaxrpc/
axis/axis1/java/trunk/axis/src/test/java/test/message/
- copied from r1226076, axis/axis1/java/trunk/test/message/
axis/axis1/java/trunk/axis/src/test/java/test/outparams/
- copied from r1226076, axis/axis1/java/trunk/test/outparams/
axis/axis1/java/trunk/axis/src/test/java/test/outparams2/
- copied from r1226076, axis/axis1/java/trunk/test/outparams2/
axis/axis1/java/trunk/axis/src/test/java/test/properties/
- copied from r1226076, axis/axis1/java/trunk/test/properties/
axis/axis1/java/trunk/axis/src/test/java/test/providers/
- copied from r1226076, axis/axis1/java/trunk/test/providers/
axis/axis1/java/trunk/axis/src/test/java/test/session/
- copied from r1226076, axis/axis1/java/trunk/test/session/
axis/axis1/java/trunk/axis/src/test/java/test/soap/
- copied from r1226076, axis/axis1/java/trunk/test/soap/
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/
- copied from r1226073, axis/axis1/java/trunk/test/dynamic/
Removed:
axis/axis1/java/trunk/axis/src/test/java/test/faults/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/faults/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/jaxrpc/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/jaxrpc/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/message/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/message/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/outparams/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/outparams/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/outparams2/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/outparams2/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/properties/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/properties/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/providers/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/providers/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/session/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/session/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/soap/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/soap/build.xml
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/PackageTests.java
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/build.xml
axis/axis1/java/trunk/test/dynamic/
axis/axis1/java/trunk/test/faults/
axis/axis1/java/trunk/test/jaxrpc/
axis/axis1/java/trunk/test/message/
axis/axis1/java/trunk/test/outparams/
axis/axis1/java/trunk/test/outparams2/
axis/axis1/java/trunk/test/properties/
axis/axis1/java/trunk/test/providers/
axis/axis1/java/trunk/test/session/
axis/axis1/java/trunk/test/soap/
Modified:
axis/axis1/java/trunk/axis/pom.xml
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java
Modified: axis/axis1/java/trunk/axis/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/pom.xml?rev=1226082&r1=1226081&r2=1226082&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/pom.xml (original)
+++ axis/axis1/java/trunk/axis/pom.xml Sat Dec 31 13:32:18 2011
@@ -203,6 +203,13 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
+ <!-- TODO: tests that don't follow standard naming
convention -->
+ <include>test/faults/FaultDecode.java</include>
+ <include>test/faults/FaultEncode.java</include>
+ </includes>
<excludes>
<!-- Quote: "comment out for now - this class is a
mess" -->
<exclude>test/utils/TestOptions.java</exclude>
@@ -212,6 +219,8 @@
<!-- These are actually not unit tests -->
<exclude>test/concurrency/TestService.java</exclude>
<exclude>test/MSGDispatch/TestService.java</exclude>
+ <exclude>test/soap/TestFaultHandler.java</exclude>
+ <exclude>test/soap/TestHandler.java</exclude>
</excludes>
<!-- TODO: this is bad; it could mean that Axis is not
working properly on modern JREs -->
<argLine>-Xbootclasspath/p:${project.build.directory}/endorsed/xmlParserAPIs.jar</argLine>
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1226082&r1=1226081&r2=1226082&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Sat Dec 31 13:32:18 2011
@@ -52,6 +52,7 @@
<version>${project.version}</version>
<executions>
<execution>
+ <id>echo</id>
<goals>
<goal>wsdl2java</goal>
</goals>
@@ -71,12 +72,61 @@
</mappings>
</configuration>
</execution>
+ <execution>
+ <id>addr</id>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ <configuration>
+ <file>../samples/addr/AddressBook.wsdl</file>
+ <output>${project.build.directory}/work</output>
+ <typeMappingVersion>1.1</typeMappingVersion>
+ <mappings>
+ <mapping>
+ <namespace>urn:AddressFetcher2</namespace>
+ <package>samples.addr</package>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- TODO: quick and dirty hack to be able to
compile all tests -->
+ <mkdir
dir="${project.build.directory}/work/samples/client"/>
+ <copy
file="../samples/client/DynamicInvoker.java"
todir="${project.build.directory}/work/samples/client"/>
+ </target>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
+ <!-- TODO: test doesn't follow standard naming
convention -->
+ <include>test/dynamic/ServiceGetPort.java</include>
+ </includes>
<excludes>
+ <!-- Quote:
+ // FIX BUILD 05/27/03 : "junit" tests should NOT
be accessing the
+ // network at all - these tests should move to
test.wsdl.dynamic
+ // and should not reference services which might
go down. ~~gdaniels
+ -->
+ <exclude>test/dynamic/TestDynamicInvoker.java</exclude>
+ <exclude>test/dynamic/TestJAXRPCDII.java</exclude>
<!-- TODO: this test causes an OOM error; investigate
why -->
<exclude>test/encoding/TestSer.java</exclude>
</excludes>
Modified:
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java?rev=1226082&r1=1226073&r2=1226082&view=diff
==============================================================================
---
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java
(original)
+++
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java
Sat Dec 31 13:32:18 2011
@@ -39,7 +39,7 @@ public class ServiceGetPort extends Test
public void testGetGeneratedStub() throws Exception {
Service service = ServiceFactory.newInstance().createService(
- new URL("file:samples/addr/AddressBook.wsdl"),
+ new URL("file:../samples/addr/AddressBook.wsdl"),
new QName("urn:AddressFetcher2", "AddressBookService"));
QName portName = new QName("urn:AddressFetcher2", "AddressBook");
Remote stub = service.getPort(portName, AddressBook.class);
