[jbossws-commits] JBossWS SVN: r9653 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at 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 at 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");
+   }
+
 }