JBossWS SVN: r9657 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-23 11:18:25 -0400 (Mon, 23 Mar 2009)
New Revision: 9657
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2584] Excluding test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-23 15:09:13 UTC (rev 9656)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-23 15:18:25 UTC (rev 9657)
@@ -90,6 +90,8 @@
# used when wsdl contains mutiple schemas
org/jboss/test/ws/jaxws/complex/**
+# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor
+org/jboss/test/ws/jaxws/jbws1815/**
+
# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
-
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-23 15:09:13 UTC (rev 9656)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-23 15:18:25 UTC (rev 9657)
@@ -66,6 +66,8 @@
# used when wsdl contains mutiple schemas
org/jboss/test/ws/jaxws/complex/**
+# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor
+org/jboss/test/ws/jaxws/jbws1815/**
+
# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
-
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-23 15:09:13 UTC (rev 9656)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-23 15:18:25 UTC (rev 9657)
@@ -66,6 +66,8 @@
# used when wsdl contains mutiple schemas
org/jboss/test/ws/jaxws/complex/**
+# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor
+org/jboss/test/ws/jaxws/jbws1815/**
+
# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
-
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-23 15:09:13 UTC (rev 9656)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-23 15:18:25 UTC (rev 9657)
@@ -66,6 +66,8 @@
# used when wsdl contains mutiple schemas
org/jboss/test/ws/jaxws/complex/**
+# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor
+org/jboss/test/ws/jaxws/jbws1815/**
+
# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
-
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-23 15:09:13 UTC (rev 9656)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-23 15:18:25 UTC (rev 9657)
@@ -66,6 +66,8 @@
# used when wsdl contains mutiple schemas
org/jboss/test/ws/jaxws/complex/**
+# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor
+org/jboss/test/ws/jaxws/jbws1815/**
+
# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
-
17 years, 1 month
JBossWS SVN: r9656 - in framework/trunk/testsuite/test: resources/jaxws/smoke/tools/wsrunclient and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-23 11:09:13 -0400 (Mon, 23 Mar 2009)
New Revision: 9656
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt
Log:
[JBWS-2327] always validate propagated properties
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-03-23 15:07:34 UTC (rev 9655)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-03-23 15:09:13 UTC (rev 9656)
@@ -120,11 +120,9 @@
for (String key : properties)
{
String value = System.getProperty(key);
- if (value != null)
- {
- assertFalse("Space found in property '" + key + "'", value.contains(SP));
- sb.append("-D").append(key).append("=").append(value).append(SP);
- }
+ assertNotNull("Undefined property '" + key + "'", value);
+ assertFalse("Space found in property '" + key + "'", value.contains(SP));
+ sb.append("-D").append(key).append("=").append(value).append(SP);
}
return sb.toString();
Modified: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt 2009-03-23 15:07:34 UTC (rev 9655)
+++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt 2009-03-23 15:09:13 UTC (rev 9656)
@@ -1,5 +1,4 @@
java.naming.provider.url
-jboss.bind.address
jboss.home
jbossws.integration.target
log4j.output.dir
17 years, 1 month
JBossWS SVN: r9655 - in stack/metro/trunk/modules/testsuite/framework-tests: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-23 11:07:34 -0400 (Mon, 23 Mar 2009)
New Revision: 9655
Added:
stack/metro/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml
Modified:
stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
Log:
[JBWS-2327] providing junit jar for non binary distribution
Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2009-03-23 15:07:06 UTC (rev 9654)
+++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2009-03-23 15:07:34 UTC (rev 9655)
@@ -1,11 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBoss Web Services - Stack Metro Framework Tests</name>
<artifactId>jbossws-metro-framework-tests</artifactId>
<packaging>jar</packaging>
-
+
<!-- Parent -->
<parent>
<groupId>org.jboss.ws.metro</groupId>
@@ -13,7 +13,7 @@
<version>3.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -23,7 +23,7 @@
<type>zip</type>
</dependency>
</dependencies>
-
+
<!-- Plugins -->
<build>
<plugins>
@@ -44,11 +44,11 @@
</plugin>
</plugins>
</build>
-
+
<!-- Profiles -->
<profiles>
-
- <!--
+
+ <!--
Name: noprepare
Descr: Skip test preparation with -Dnoprepare
-->
@@ -117,10 +117,30 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>junit-libs</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-junit-artifacts.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>directory-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
-
+
</profiles>
-
+
</project>
Added: stack/metro/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml (rev 0)
+++ stack/metro/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml 2009-03-23 15:07:34 UTC (rev 9655)
@@ -0,0 +1,22 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>junit-libs</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>test</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:junit:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
17 years, 1 month
JBossWS SVN: r9654 - in stack/cxf/trunk/modules/testsuite/framework-tests: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-23 11:07:06 -0400 (Mon, 23 Mar 2009)
New Revision: 9654
Added:
stack/cxf/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml
Modified:
stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
Log:
[JBWS-2327] providing junit jar for non binary distribution
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-03-23 14:49:12 UTC (rev 9653)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-03-23 15:07:06 UTC (rev 9654)
@@ -1,11 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBoss Web Services - Stack CXF Framework Tests</name>
<artifactId>jbossws-cxf-framework-tests</artifactId>
<packaging>jar</packaging>
-
+
<!-- Parent -->
<parent>
<groupId>org.jboss.ws.cxf</groupId>
@@ -13,7 +13,7 @@
<version>3.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -23,7 +23,7 @@
<type>zip</type>
</dependency>
</dependencies>
-
+
<!-- Plugins -->
<build>
<plugins>
@@ -44,11 +44,11 @@
</plugin>
</plugins>
</build>
-
+
<!-- Profiles -->
<profiles>
-
- <!--
+
+ <!--
Name: noprepare
Descr: Skip test preparation with -Dnoprepare
-->
@@ -117,10 +117,30 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>junit-libs</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-junit-artifacts.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>directory-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
-
+
</profiles>
-
+
</project>
Added: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml 2009-03-23 15:07:06 UTC (rev 9654)
@@ -0,0 +1,22 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>junit-libs</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>test</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:junit:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
17 years, 1 month
JBossWS SVN: r9653 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-23 10:49:12 -0400 (Mon, 23 Mar 2009)
New Revision: 9653
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
Log:
[JBWS-2327] fix binary distribution tests
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-03-23 14:13:38 UTC (rev 9652)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-03-23 14:49:12 UTC (rev 9653)
@@ -1,17 +1,18 @@
package org.jboss.test.ws.jaxws.smoke.tools;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.BufferedReader;
import java.io.FileReader;
+import java.util.Enumeration;
import java.util.LinkedList;
import java.util.List;
+import java.util.Properties;
import org.jboss.wsf.test.JBossWSTest;
/**
* [JBWS-2327] Provide tests for wsrunclient shell script
- *
+ *
* @author richard.opalka(a)jboss.com
*/
public final class WSRunClientTestCase extends JBossWSTest
@@ -26,7 +27,7 @@
private String additionalClasspath;
private List<String> testsToExecute;
private String jbossHome = System.getProperty("jboss.home");
-
+
/**
* Initialization
*/
@@ -56,15 +57,13 @@
String commandWithoutTestParam = sb.toString();
for (String test : testsToExecute)
{
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- executeCommand(commandWithoutTestParam + test, baos, "wsrunclient");
- System.out.println("Test output: " + new String(baos.toByteArray()));
+ executeCommand(commandWithoutTestParam + test, "wsrunclient");
// There's no need to verify the test output.
// If test that is executed fails executeCommand will fail (because of SC != 0)
// The same applies to wrongly configured wsrunclient classpath.
}
}
-
+
/**
* Cleanup
*/
@@ -76,17 +75,28 @@
this.testsToExecute = null;
this.integrationJars = null;
}
-
+
+ /**
+ * Prepares additional classpath containing junit lib, test classes directory and jbossws integration jars
+ */
private String prepareAdditionalClasspath()
{
StringBuilder sb = new StringBuilder();
// setup test classes dir
sb.append(PS).append(System.getProperty("test.classes.directory"));
-
+
// setup junit lib
- sb.append(PS).append(System.getProperty("basedir"));
- sb.append(FS).append("target").append(FS).append("junit-libs").append(FS).append("junit.jar");
+ if (isDistroTest())
+ {
+ sb.append(PS).append(System.getProperty("user.dir")).append(FS).append("..");
+ sb.append(FS).append("deploy").append(FS).append("lib").append(FS).append("junit.jar");
+ }
+ else
+ {
+ sb.append(PS).append(System.getProperty("basedir"));
+ sb.append(FS).append("target").append(FS).append("junit-libs").append(FS).append("junit.jar");
+ }
// setup jbossws integration jars
String jbossClientDir = System.getProperty("jboss.home") + FS + "client" + FS;
@@ -94,10 +104,10 @@
{
sb.append(PS).append(jbossClientDir).append(jar);
}
-
+
return sb.toString();
}
-
+
/**
* Prepares properties list for commandline execution
* @param properties to be configured
@@ -106,7 +116,7 @@
private String prepareEnvProperties(List<String> properties)
{
StringBuilder sb = new StringBuilder();
-
+
for (String key : properties)
{
String value = System.getProperty(key);
@@ -116,28 +126,11 @@
sb.append("-D").append(key).append("=").append(value).append(SP);
}
}
-
+
return sb.toString();
}
-
+
/**
- * Prepares test list to be executed via wsrunclient
- * @param tests tests list
- * @return test list ready for commandline execution
- */
- private String prepareTests(List<String> tests)
- {
- StringBuilder sb = new StringBuilder();
-
- for (String test : tests)
- {
- sb.append(SP).append(test);
- }
-
- return sb.toString();
- }
-
- /**
* Returns content of text file
* @param resource to be parsed
* @return list of values
@@ -168,5 +161,10 @@
return retVal;
}
-
+
+ private boolean isDistroTest()
+ {
+ return Boolean.getBoolean("binary.distribution");
+ }
+
}
17 years, 1 month
JBossWS SVN: r9652 - in stack/native/trunk/modules/testsuite/framework-tests: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-23 10:13:38 -0400 (Mon, 23 Mar 2009)
New Revision: 9652
Added:
stack/native/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml
Modified:
stack/native/trunk/modules/testsuite/framework-tests/pom.xml
Log:
[JBWS-2327] providing junit jar for non binary distribution tests
Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2009-03-23 13:28:07 UTC (rev 9651)
+++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2009-03-23 14:13:38 UTC (rev 9652)
@@ -117,6 +117,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>junit-libs</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-junit-artifacts.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>directory-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Added: stack/native/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/framework-tests/scripts/assembly-junit-artifacts.xml 2009-03-23 14:13:38 UTC (rev 9652)
@@ -0,0 +1,22 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>junit-libs</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>test</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:junit:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
17 years, 1 month
JBossWS SVN: r9651 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-23 09:28:07 -0400 (Mon, 23 Mar 2009)
New Revision: 9651
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2151] excluding test
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-23 13:26:32 UTC (rev 9650)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-23 13:28:07 UTC (rev 9651)
@@ -62,4 +62,8 @@
org/jboss/test/ws/jaxws/jbws2527/**
# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
-org/jboss/test/ws/jaxws/jbws2419/**
\ No newline at end of file
+org/jboss/test/ws/jaxws/jbws2419/**
+
+# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
+org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
+
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-23 13:26:32 UTC (rev 9650)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-23 13:28:07 UTC (rev 9651)
@@ -50,3 +50,7 @@
# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
+
+# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
+org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
+
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-23 13:26:32 UTC (rev 9650)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-23 13:28:07 UTC (rev 9651)
@@ -47,3 +47,7 @@
# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
+
+# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
+org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
+
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-23 13:26:32 UTC (rev 9650)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-23 13:28:07 UTC (rev 9651)
@@ -47,3 +47,7 @@
# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
+
+# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
+org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
+
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-23 13:26:32 UTC (rev 9650)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-23 13:28:07 UTC (rev 9651)
@@ -47,3 +47,7 @@
# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
org/jboss/test/ws/jaxws/jbws2419/**
+
+# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
+org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
+
17 years, 1 month
JBossWS SVN: r9650 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-23 09:26:32 -0400 (Mon, 23 Mar 2009)
New Revision: 9650
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2151] excluding test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-23 13:15:33 UTC (rev 9649)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-23 13:26:32 UTC (rev 9650)
@@ -89,3 +89,7 @@
# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
# used when wsdl contains mutiple schemas
org/jboss/test/ws/jaxws/complex/**
+
+# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
+org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
+
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-23 13:15:33 UTC (rev 9649)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-23 13:26:32 UTC (rev 9650)
@@ -65,3 +65,7 @@
# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
# used when wsdl contains mutiple schemas
org/jboss/test/ws/jaxws/complex/**
+
+# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
+org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
+
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-23 13:15:33 UTC (rev 9649)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-23 13:26:32 UTC (rev 9650)
@@ -65,3 +65,7 @@
# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
# used when wsdl contains mutiple schemas
org/jboss/test/ws/jaxws/complex/**
+
+# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
+org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
+
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-23 13:15:33 UTC (rev 9649)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-23 13:26:32 UTC (rev 9650)
@@ -65,3 +65,7 @@
# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
# used when wsdl contains mutiple schemas
org/jboss/test/ws/jaxws/complex/**
+
+# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
+org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
+
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-23 13:15:33 UTC (rev 9649)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-23 13:26:32 UTC (rev 9650)
@@ -65,3 +65,7 @@
# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
# used when wsdl contains mutiple schemas
org/jboss/test/ws/jaxws/complex/**
+
+# [JBWS-2151] Provide wsrunclient.sh(.bat) for Metro and CXF
+org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.*
+
17 years, 1 month
JBossWS SVN: r9649 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-23 09:15:33 -0400 (Mon, 23 Mar 2009)
New Revision: 9649
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
Log:
[JBWS-2327] removing useles variable
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-03-23 13:12:39 UTC (rev 9648)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-03-23 13:15:33 UTC (rev 9649)
@@ -54,7 +54,6 @@
sb.append(SP).append(commandLineProperties);
sb.append(SP).append("junit.textui.TestRunner").append(SP);
String commandWithoutTestParam = sb.toString();
- String testOutput = null;
for (String test : testsToExecute)
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
17 years, 1 month
JBossWS SVN: r9648 - in framework/trunk/testsuite/test: resources/jaxws/smoke/tools and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-23 09:12:39 -0400 (Mon, 23 Mar 2009)
New Revision: 9648
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/
framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt
framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt
framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/tests.txt
Log:
[JBWS-2327] providing test case
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-03-23 13:12:39 UTC (rev 9648)
@@ -0,0 +1,173 @@
+package org.jboss.test.ws.jaxws.smoke.tools;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-2327] Provide tests for wsrunclient shell script
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public final class WSRunClientTestCase extends JBossWSTest
+{
+
+ private static final String FS = System.getProperty("file.separator");
+ private static final String PS = System.getProperty("path.separator");
+ private static final String SP = " ";
+ private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat";
+ private List<String> integrationJars;
+ private String commandLineProperties;
+ private String additionalClasspath;
+ private List<String> testsToExecute;
+ private String jbossHome = System.getProperty("jboss.home");
+
+ /**
+ * Initialization
+ */
+ public void setUp() throws Exception
+ {
+ List<String> properties = getContent("jaxws/smoke/tools/wsrunclient/properties.txt");
+ assertTrue(properties.size() > 0);
+ this.commandLineProperties = prepareEnvProperties(properties);
+ this.testsToExecute = getContent("jaxws/smoke/tools/wsrunclient/tests.txt");
+ assertTrue(this.testsToExecute.size() > 0);
+ this.integrationJars = getContent("jaxws/smoke/tools/wsrunclient/jars.txt");
+ assertTrue(this.integrationJars.size() > 0);
+ this.additionalClasspath = prepareAdditionalClasspath();
+ }
+
+ /**
+ * Executing wsrunclient commandline script
+ * @throws Exception if any error occurs
+ */
+ public void test() throws Exception
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append(jbossHome).append(FS).append("bin").append(FS).append("wsrunclient").append(EXT);
+ sb.append(SP).append("-classpath").append(SP).append(additionalClasspath);
+ sb.append(SP).append(commandLineProperties);
+ sb.append(SP).append("junit.textui.TestRunner").append(SP);
+ String commandWithoutTestParam = sb.toString();
+ String testOutput = null;
+ for (String test : testsToExecute)
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ executeCommand(commandWithoutTestParam + test, baos, "wsrunclient");
+ System.out.println("Test output: " + new String(baos.toByteArray()));
+ // There's no need to verify the test output.
+ // If test that is executed fails executeCommand will fail (because of SC != 0)
+ // The same applies to wrongly configured wsrunclient classpath.
+ }
+ }
+
+ /**
+ * Cleanup
+ */
+ public void tearDown() throws Exception
+ {
+ this.additionalClasspath = null;
+ this.commandLineProperties = null;
+ this.jbossHome = null;
+ this.testsToExecute = null;
+ this.integrationJars = null;
+ }
+
+ private String prepareAdditionalClasspath()
+ {
+ StringBuilder sb = new StringBuilder();
+
+ // setup test classes dir
+ sb.append(PS).append(System.getProperty("test.classes.directory"));
+
+ // setup junit lib
+ sb.append(PS).append(System.getProperty("basedir"));
+ sb.append(FS).append("target").append(FS).append("junit-libs").append(FS).append("junit.jar");
+
+ // setup jbossws integration jars
+ String jbossClientDir = System.getProperty("jboss.home") + FS + "client" + FS;
+ for (String jar : this.integrationJars)
+ {
+ sb.append(PS).append(jbossClientDir).append(jar);
+ }
+
+ return sb.toString();
+ }
+
+ /**
+ * Prepares properties list for commandline execution
+ * @param properties to be configured
+ * @return commandline ready list of properties
+ */
+ private String prepareEnvProperties(List<String> properties)
+ {
+ StringBuilder sb = new StringBuilder();
+
+ for (String key : properties)
+ {
+ String value = System.getProperty(key);
+ if (value != null)
+ {
+ assertFalse("Space found in property '" + key + "'", value.contains(SP));
+ sb.append("-D").append(key).append("=").append(value).append(SP);
+ }
+ }
+
+ return sb.toString();
+ }
+
+ /**
+ * Prepares test list to be executed via wsrunclient
+ * @param tests tests list
+ * @return test list ready for commandline execution
+ */
+ private String prepareTests(List<String> tests)
+ {
+ StringBuilder sb = new StringBuilder();
+
+ for (String test : tests)
+ {
+ sb.append(SP).append(test);
+ }
+
+ return sb.toString();
+ }
+
+ /**
+ * Returns content of text file
+ * @param resource to be parsed
+ * @return list of values
+ * @throws Exception if any I/O error ocurs
+ */
+ private List<String> getContent(String resource) throws Exception
+ {
+ File f = this.getResourceFile(resource);
+ assertTrue(f.exists());
+ List<String> retVal = new LinkedList<String>();
+ BufferedReader br = null;
+ try
+ {
+ br = new BufferedReader(new FileReader(f));
+ String line = null;
+ while ((line = br.readLine()) != null)
+ {
+ retVal.add(line.trim());
+ }
+ }
+ finally
+ {
+ if (br != null)
+ {
+ br.close();
+ }
+ }
+
+ return retVal;
+ }
+
+}
Added: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt 2009-03-23 13:12:39 UTC (rev 9648)
@@ -0,0 +1,7 @@
+jbossws-jboss423.jar
+jbossws-jboss50.jar
+jbossws-jboss500.jar
+jbossws-jboss501.jar
+jbossws-jboss510.jar
+jbossws-jboss60.jar
+jbossws-jboss600.jar
Added: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/properties.txt 2009-03-23 13:12:39 UTC (rev 9648)
@@ -0,0 +1,9 @@
+java.naming.provider.url
+jboss.bind.address
+jboss.home
+jbossws.integration.target
+log4j.output.dir
+test.classes.directory
+test.resources.directory
+test.archive.directory
+wsdl.publish.location
Added: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/tests.txt
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/tests.txt (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/tests.txt 2009-03-23 13:12:39 UTC (rev 9648)
@@ -0,0 +1,20 @@
+org.jboss.test.ws.jaxws.samples.oneway.OneWayTestCase
+org.jboss.test.ws.jaxws.samples.webparam.WebParamTestCase
+org.jboss.test.ws.jaxws.samples.webmethod.WebMethodTestCase
+org.jboss.test.ws.jaxws.samples.webresult.WebResultTestCase
+org.jboss.test.ws.jaxws.samples.asynchronous.AsynchronousDispatchTestCase
+org.jboss.test.ws.jaxws.samples.asynchronous.AsynchronousProxyTestCase
+org.jboss.test.ws.jaxws.samples.context.WebServiceContextEJBTestCase
+org.jboss.test.ws.jaxws.samples.context.WebServiceContextJSETestCase
+org.jboss.test.ws.jaxws.samples.eardeployment.EarTestCase
+org.jboss.test.ws.jaxws.samples.exception.ExceptionEJB3TestCase
+org.jboss.test.ws.jaxws.samples.exception.ExceptionTestCase
+org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalHandlerJAXBTestCase
+org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalHandlerSourceTestCase
+org.jboss.test.ws.jaxws.samples.provider.ProviderJAXBTestCase
+org.jboss.test.ws.jaxws.samples.provider.ProviderMessageTestCase
+org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase
+org.jboss.test.ws.jaxws.samples.swaref.SWARefTestCase
+org.jboss.test.ws.jaxws.samples.webservice.WebServiceJSETestCase
+org.jboss.test.ws.jaxws.samples.webservice.WebServiceEJB3TestCase
+org.jboss.test.ws.jaxws.samples.advanced.retail.RetailSampleTestCase
17 years, 1 month