cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1337096 - in /cxf/branches/2.5.x-fixes/services/sts/systests/advanced: ./ src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/ src/test/java/org/apache/cxf/systest/sts/basic_auth/ src/test/java/org/apache/cxf/systest/sts/binarysecurit...
Date Fri, 11 May 2012 10:00:51 GMT
Author: coheigea
Date: Fri May 11 10:00:50 2012
New Revision: 1337096

URL: http://svn.apache.org/viewvc?rev=1337096&view=rev
Log:
Systests/advanced refactor + using fork mode "once"


Conflicts:

	services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java
	services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
	services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java

Modified:
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/pom.xml
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
    cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/pom.xml?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/pom.xml Fri May 11 10:00:50 2012
@@ -150,11 +150,7 @@
                 </executions>
             </plugin>
         </plugins>
-    </build>
-    
-   <properties>
-        <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
-   </properties>
+   </build>
     
    <profiles>
         <profile>

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java
Fri May 11 10:00:50 2012
@@ -53,8 +53,9 @@ public class AsymmetricEncryptionTest ex
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -68,6 +69,8 @@ public class AsymmetricEncryptionTest ex
         
         SecurityToken token = requestSecurityToken(bus);
         assertTrue(token != null);
+        
+        bus.shutdown(true);
     }
 
     private SecurityToken requestSecurityToken(Bus bus) throws Exception {

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java
Fri May 11 10:00:50 2012
@@ -54,8 +54,9 @@ public class JaxrsBasicAuthTest extends 
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
Fri May 11 10:00:50 2012
@@ -63,8 +63,9 @@ public class JaxwsBasicAuthTest extends 
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -85,6 +86,8 @@ public class JaxwsBasicAuthTest extends 
         updateAddressPort(port, PORT);
         
         doubleIt(port, 25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -112,6 +115,8 @@ public class JaxwsBasicAuthTest extends 
             assertTrue(message.contains("STS Authentication failed")
                 || message.contains("Validation of security token failed"));
         }
+        
+        bus.shutdown(true);
     }
 
     private static void doubleIt(DoubleItPortType port, int numToDouble) {

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
Fri May 11 10:00:50 2012
@@ -63,8 +63,9 @@ public class BinarySecurityTokenTest ext
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -85,6 +86,8 @@ public class BinarySecurityTokenTest ext
         updateAddressPort(asymmetricBSTPort, PORT);
         
         doubleIt(asymmetricBSTPort, 25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -112,6 +115,8 @@ public class BinarySecurityTokenTest ext
             assertTrue(message.contains("STS Authentication failed")
                 || message.contains("Validation of security token failed"));
         }
+        
+        bus.shutdown(true);
     }
     
     private static void doubleIt(DoubleItPortType port, int numToDouble) {

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
Fri May 11 10:00:50 2012
@@ -83,8 +83,9 @@ public class CachingTest extends Abstrac
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -125,6 +126,8 @@ public class CachingTest extends Abstrac
         } catch (SOAPFaultException ex) {
             // Expected
         }
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -163,6 +166,8 @@ public class CachingTest extends Abstrac
         } catch (SOAPFaultException ex) {
             // Expected
         }
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -211,6 +216,8 @@ public class CachingTest extends Abstrac
         // Try again using the original SAML token - this should work as it should be cached
by the service
         tok.setToken(storedToken);
         doubleIt(transportSaml1Port, 35);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -246,6 +253,8 @@ public class CachingTest extends Abstrac
         // This will pass as the UsernameToken should be cached
         p.getRequestContext().put(SecurityConstants.USERNAME, "alice");
         doubleIt(transportUTPort, 35);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -283,6 +292,8 @@ public class CachingTest extends Abstrac
         p.getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "myclientkey");
         p.getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, "clientKeystore.properties");
         doubleIt(bstPort, 35);
+        
+        bus.shutdown(true);
     }
     
     private SecurityToken requestSecurityToken(

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
Fri May 11 10:00:50 2012
@@ -64,8 +64,9 @@ public class ClaimsTest extends Abstract
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -86,6 +87,8 @@ public class ClaimsTest extends Abstract
         updateAddressPort(transportClaimsPort, PORT);
         
         doubleIt(transportClaimsPort, 25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -111,6 +114,8 @@ public class ClaimsTest extends Abstract
         } catch (Exception ex) {
             // expected
         }
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -131,6 +136,8 @@ public class ClaimsTest extends Abstract
         updateAddressPort(transportClaimsPort, PORT);
         
         doubleIt(transportClaimsPort, 25);
+        
+        bus.shutdown(true);
     }
     
     private static void doubleIt(DoubleItPortType port, int numToDouble) {

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
Fri May 11 10:00:50 2012
@@ -67,8 +67,9 @@ public class CustomOnBehalfOfTest extend
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -92,6 +93,8 @@ public class CustomOnBehalfOfTest extend
             "ws-security.username", "alice"
         );
         doubleIt(transportPort, 25);
+        
+        bus.shutdown(true);
     }
 
     private static void doubleIt(DoubleItPortType port, int numToDouble) {

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
Fri May 11 10:00:50 2012
@@ -72,8 +72,9 @@ public class DistributedCachingTest exte
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -94,6 +95,8 @@ public class DistributedCachingTest exte
 
         // Transport port
         doubleIt(transportPort, 25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -114,6 +117,8 @@ public class DistributedCachingTest exte
 
         // Transport port
         doubleIt(transportPort, 25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -134,6 +139,8 @@ public class DistributedCachingTest exte
 
         // Transport port
         doubleIt(transportPort, 25);
+        
+        bus.shutdown(true);
     }
 
     private static void doubleIt(DoubleItPortType port, int numToDouble) {

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
Fri May 11 10:00:50 2012
@@ -68,8 +68,9 @@ public class KerberosTokenTest extends A
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -91,6 +92,8 @@ public class KerberosTokenTest extends A
         updateAddressPort(transportSaml2Port, PORT);
 
         doubleIt(transportSaml2Port, 25);
+        
+        bus.shutdown(true);
     }
     
     private static void doubleIt(DoubleItPortType port, int numToDouble) {

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
Fri May 11 10:00:50 2012
@@ -68,8 +68,9 @@ public class DifferentRealmTest extends 
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     /**
@@ -94,6 +95,8 @@ public class DifferentRealmTest extends 
 
         // Transport port
         doubleIt(transportPort, 25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -119,6 +122,8 @@ public class DifferentRealmTest extends 
 
         // Transport port
         doubleIt(transportPort, 25);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -147,6 +152,8 @@ public class DifferentRealmTest extends 
         } catch (Exception ex) {
             // expected
         }
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -173,6 +180,8 @@ public class DifferentRealmTest extends 
 
         // Transport port
         doubleIt(transportPort, 25);
+        
+        bus.shutdown(true);
     }
 
     private static void doubleIt(DoubleItPortType port, int numToDouble) {

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
Fri May 11 10:00:50 2012
@@ -63,8 +63,9 @@ public class SecureConversationTest exte
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -84,6 +85,8 @@ public class SecureConversationTest exte
         updateAddressPort(transportPort, PORT);
 
         doubleIt(transportPort, 25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -103,6 +106,8 @@ public class SecureConversationTest exte
         updateAddressPort(symmetricPort, PORT2);
 
         doubleIt(symmetricPort, 30);
+        
+        bus.shutdown(true);
     }
 
     private static void doubleIt(DoubleItPortType port, int numToDouble) {

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
Fri May 11 10:00:50 2012
@@ -53,8 +53,9 @@ public class SecurityContextTokenCancelT
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -81,6 +82,8 @@ public class SecurityContextTokenCancelT
         String endorsingPort = "{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Endorsing_Port";
         cancelled = cancelSecurityToken(bus, wsdlLocation, endorsingPort, true, token);
         assertTrue(cancelled);
+        
+        bus.shutdown(true);
     }
     
     private SecurityToken requestSecurityToken(

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
Fri May 11 10:00:50 2012
@@ -50,8 +50,9 @@ public class SecurityContextTokenUnitTes
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -68,6 +69,8 @@ public class SecurityContextTokenUnitTes
         SecurityToken token = 
             requestSecurityToken(bus, wsdlLocation, true);
         assertTrue(token.getSecret() != null && token.getSecret().length > 0);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -84,6 +87,8 @@ public class SecurityContextTokenUnitTes
         SecurityToken token = 
             requestSecurityToken(bus, wsdlLocation, false);
         assertTrue(token.getSecret() != null && token.getSecret().length > 0);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -100,6 +105,8 @@ public class SecurityContextTokenUnitTes
         SecurityToken token = 
             requestSecurityToken(bus, wsdlLocation, true);
         assertTrue(token.getSecret() != null && token.getSecret().length > 0);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -116,6 +123,8 @@ public class SecurityContextTokenUnitTes
         SecurityToken token = 
             requestSecurityToken(bus, wsdlLocation, false);
         assertTrue(token.getSecret() != null && token.getSecret().length > 0);
+        
+        bus.shutdown(true);
     }
     
     private SecurityToken requestSecurityToken(

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
Fri May 11 10:00:50 2012
@@ -77,8 +77,9 @@ public class Soap12Test extends Abstract
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -99,6 +100,8 @@ public class Soap12Test extends Abstract
         updateAddressPort(transportSaml2Port, PORT);
         
         doubleIt(transportSaml2Port, 30);
+        
+        bus.shutdown(true);
     }
     
     /**
@@ -122,6 +125,8 @@ public class Soap12Test extends Abstract
         } catch (SoapFault ex) {
             // expected
         }
+        
+        bus.shutdown(true);
     }
     
     private SecurityToken requestSecurityToken(

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
Fri May 11 10:00:50 2012
@@ -64,8 +64,9 @@ public class TransformationTest extends 
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -86,6 +87,8 @@ public class TransformationTest extends 
         updateAddressPort(transportUTPort, PORT);
         
         doubleIt(transportUTPort, 25);
+        
+        bus.shutdown(true);
     }
     
     private static void doubleIt(DoubleItPortType port, int numToDouble) {

Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java?rev=1337096&r1=1337095&r2=1337096&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
Fri May 11 10:00:50 2012
@@ -62,8 +62,9 @@ public class UsernameTokenTest extends A
     }
     
     @org.junit.AfterClass
-    public static void cleanup() {
+    public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
+        stopAllServers();
     }
 
     @org.junit.Test
@@ -84,6 +85,8 @@ public class UsernameTokenTest extends A
         updateAddressPort(transportUTPort, PORT);
 
         doubleIt(transportUTPort, 25);
+        
+        bus.shutdown(true);
     }
     
     @org.junit.Test
@@ -111,6 +114,8 @@ public class UsernameTokenTest extends A
             assertTrue(message.contains("STS Authentication failed")
                 || message.contains("Validation of security token failed"));
         }
+        
+        bus.shutdown(true);
     }
 
     private static void doubleIt(DoubleItPortType port, int numToDouble) {



Mime
View raw message