[jbossws-commits] JBossWS SVN: r15964 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-03-15 07:58:08 -0400 (Thu, 15 Mar 2012)
New Revision: 15964

Modified:
   shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3454] Fixing issues with test username/pwd (a leftover typo in build-testuite.xml and an issue with  Maven 2.2.x and 3.0.x having different behaviours)


Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java	2012-03-15 11:55:04 UTC (rev 15963)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java	2012-03-15 11:58:08 UTC (rev 15964)
@@ -341,7 +341,7 @@
    
    public static String getTestUsername() {
       String prop = System.getProperty(TEST_USERNAME);
-      if (prop == null || "".equals(prop)) {
+      if (prop == null || "".equals(prop) || ("${" + TEST_USERNAME + "}").equals(prop)) {
          prop = "kermit";
       }
       return prop; 
@@ -349,7 +349,7 @@
 
    public static String getTestPassword() {
       String prop = System.getProperty(TEST_PASSWORD);
-      if (prop == null || "".equals(prop)) {
+      if (prop == null || "".equals(prop) || ("${" + TEST_PASSWORD + "}").equals(prop)) {
          prop = "thefrog";
       }
       return prop; 

Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml	2012-03-15 11:55:04 UTC (rev 15963)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml	2012-03-15 11:58:08 UTC (rev 15964)
@@ -660,7 +660,7 @@
       <sysproperty key="test.classes.directory" value="${tests.output.dir}/test-classes"/>
       <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/>
       <sysproperty key="test.username" value="${test.username}"/>
-      <sysproperty key="test.password" value="${test.password"/>
+      <sysproperty key="test.password" value="${test.password}"/>
       <sysproperty key="binary.distribution" value="true"/>
       <classpath>
         <path refid="tests.client.classpath"/>