[jbossws-commits] JBossWS SVN: r15901 - 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-08 11:24:43 -0500 (Thu, 08 Mar 2012)
New Revision: 15901

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] test username/pwd support


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-08 12:14:52 UTC (rev 15900)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java	2012-03-08 16:24:43 UTC (rev 15901)
@@ -69,6 +69,8 @@
    private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address";
    private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory";
    private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory";
+   private static final String TEST_USERNAME = "test.username";
+   private static final String TEST_PASSWORD = "test.password";
    private static final boolean DEPLOY_PROCESS_ENABLED = !Boolean.getBoolean("disable.test.archive.deployment");
    private static Deployer DEPLOYER;
 
@@ -407,6 +409,22 @@
       return testResourcesDir;
    }
    
+   public static String getTestUsername() {
+      String prop = System.getProperty(TEST_USERNAME);
+      if (prop == null || "".equals(prop)) {
+         prop = "kermit";
+      }
+      return prop; 
+   }
+
+   public static String getTestPassword() {
+      String prop = System.getProperty(TEST_PASSWORD);
+      if (prop == null || "".equals(prop)) {
+         prop = "thefrog";
+      }
+      return prop; 
+   }
+
    public static void addSecurityDomain(String name, Map<String,String> authenticationOptions) throws Exception
    {
       getDeployer().addSecurityDomain(name, authenticationOptions);

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-08 12:14:52 UTC (rev 15900)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml	2012-03-08 16:24:43 UTC (rev 15901)
@@ -595,6 +595,8 @@
       <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/>
       <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="binary.distribution" value="true"/>
       <classpath>
         <path refid="tests.client.classpath"/>
@@ -659,6 +661,8 @@
       <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/>
       <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="binary.distribution" value="true"/>
       <classpath>
         <path refid="tests.client.classpath"/>