Author: richard.opalka(a)jboss.com
Date: 2011-04-14 07:45:13 -0400 (Thu, 14 Apr 2011)
New Revision: 14088
Modified:
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
Log:
[JBWS-3222] updating tests - wstools.sh(.bat) & wsrunclient.sh(.bat) are not available
since AS7
Modified:
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
===================================================================
---
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2011-04-14
10:29:46 UTC (rev 14087)
+++
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2011-04-14
11:45:13 UTC (rev 14088)
@@ -76,6 +76,9 @@
assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsprovide"
+ ".bat").exists());
assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume"
+ ".sh").exists());
assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume"
+ ".bat").exists());
+
+ if (!isTargetJBoss6()) return; // wsrunclient not available since AS7x
+
assertTrue(new File(JBOSS_HOME + FS + "bin" + FS +
"wsrunclient" + ".sh").exists());
assertTrue(new File(JBOSS_HOME + FS + "bin" + FS +
"wsrunclient" + ".bat").exists());
}
Modified:
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
===================================================================
---
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2011-04-14
10:29:46 UTC (rev 14087)
+++
shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2011-04-14
11:45:13 UTC (rev 14088)
@@ -53,6 +53,8 @@
*/
public void test() throws Exception
{
+ if (!isTargetJBoss6()) return; // wsrunclient not available since AS7x
+
StringBuilder sb = new StringBuilder();
Map<String, String> env = new HashMap<String, String>();
env.put("WSRUNCLIENT_CLASSPATH", additionalClasspath);
@@ -141,7 +143,7 @@
*/
private List<String> getContent(String resource) throws Exception
{
- File f = this.getResourceFile(resource);
+ File f = getResourceFile(resource);
assertTrue(f.exists());
List<String> retVal = new LinkedList<String>();
BufferedReader br = null;
Show replies by date