10:40 a.m.
Author: jim.ma
Date: 2015-01-28 04:40:38 -0500 (Wed, 28 Jan 2015)
New Revision: 19433
Modified:
stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java
stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java
Log:
Fix UsernameTestCase
Modified:
stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
---
stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2015-01-27
21:31:24 UTC (rev 19432)
+++
stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2015-01-28
09:40:38 UTC (rev 19433)
@@ -66,6 +66,7 @@
public static final String SYSPROP_COPY_JOB_TIMEOUT =
"test.copy.job.timeout";
public static final String CXF_TESTS_GROUP_QUALIFIER = "cxf-tests";
public static final String SHARED_TESTS_GROUP_QUALIFIER = "shared-tests";
+ public static final String SPRING_TESTS_GROUP_QUALIFIER =
"cxf-spring-tests";
private static final int COPY_JOB_TIMEOUT =
Integer.getInteger(SYSPROP_COPY_JOB_TIMEOUT, File.pathSeparatorChar == ':' ? 5000
: 60000); //60s on Windows, 5s on UNIX and Mac
public JBossWSTest()
@@ -235,6 +236,11 @@
{
return JBossWSTestHelper.getServerPort(groupQualifier, containerQualifier);
}
+
+ public static int getSecureServerPort(String groupQualifier, String
containerQualifier)
+ {
+ return JBossWSTestHelper.getSecureServerPort(groupQualifier, containerQualifier);
+ }
public static File getArchiveFile(String archive)
{
Modified:
stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
---
stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2015-01-27
21:31:24 UTC (rev 19432)
+++
stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2015-01-28
09:40:38 UTC (rev 19433)
@@ -217,6 +217,11 @@
return 8080 + getContainerPortOffset(groupQualifier, containerQualifier);
}
+ public static int getSecureServerPort(String groupQualifier, String
containerQualifier)
+ {
+ return 8443 + getContainerPortOffset(groupQualifier, containerQualifier);
+ }
+
protected static int getContainerPortOffset(String groupQualifier, String
containerQualifier)
{
Hashtable<String, String> env = getContainerEnvironment();
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-27
21:31:24 UTC (rev 19432)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-28
09:40:38 UTC (rev 19433)
@@ -107,7 +107,6 @@
<!-- This copies jbossws-cxf-factories jar to endorsed dir before the
integration-tests are run -->
- <!-- rls start old stuff
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -131,7 +130,6 @@
</execution>
</executions>
</plugin>
- rls end -->
</plugins>
</build>
</profile>
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-01-27
21:31:24 UTC (rev 19432)
+++
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-01-28
09:40:38 UTC (rev 19433)
@@ -37,6 +37,7 @@
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -50,7 +51,7 @@
public final class UsernameTestCase extends JBossWSTest
{
final int serverPort = getServerPort();
- final int serverSecurePort = serverPort + 363; //8080 + 363 = 8443
+ final int serverSecurePort =
JBossWSTest.getSecureServerPort(JBossWSTest.SPRING_TESTS_GROUP_QUALIFIER,
"jboss");
private final String serviceURL = "https://" + getServerHost() +
":" + serverSecurePort + "/jaxws-samples-wssePolicy-username";
@Deployment(testable = false)
@@ -70,6 +71,7 @@
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() +
"/jaxws/samples/wssePolicy/username/WEB-INF/web.xml"));
return archive;
}
+
/****
public static Test suite()
{