You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/05/10 13:34:27 UTC
svn commit: r1336605 - in
/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts:
asymmetric/ bearer/ intermediary_transformation/ issueunit/ sendervouches/
symmetric/ transport/ username_actas/ username_onbehalf...
Author: coheigea
Date: Thu May 10 11:34:26 2012
New Revision: 1336605
URL: http://svn.apache.org/viewvc?rev=1336605&view=rev
Log:
Merged revisions 1336600 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1336600 | coheigea | 2012-05-10 12:24:27 +0100 (Thu, 10 May 2012) | 2 lines
Did some cleanup of the STS basic systests
........
Modified:
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java Thu May 10 11:34:26 2012
@@ -73,8 +73,9 @@ public class AsymmetricBindingTest exten
}
@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/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java Thu May 10 11:34:26 2012
@@ -84,8 +84,9 @@ public class BearerTest extends Abstract
}
@org.junit.AfterClass
- public static void cleanup() {
+ public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
+ stopAllServers();
}
@org.junit.Test
@@ -109,6 +110,8 @@ public class BearerTest extends Abstract
}
doubleIt(transportSaml2Port, 45);
+
+ bus.shutdown(true);
}
@org.junit.Test
@@ -156,6 +159,8 @@ public class BearerTest extends Abstract
store.add(tok);
doubleIt(transportSaml2Port, 50);
+
+ bus.shutdown(true);
}
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java Thu May 10 11:34:26 2012
@@ -82,8 +82,9 @@ public class IntermediaryTransformationC
}
@org.junit.AfterClass
- public static void cleanup() {
+ public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
+ stopAllServers();
}
@org.junit.Test
@@ -112,6 +113,8 @@ public class IntermediaryTransformationC
// Make another invocation - this should work as the intermediary caches the token
// even though its STSClient is disabled after the first invocation
doubleIt(transportPort, 30);
+
+ bus.shutdown(true);
}
private static void doubleIt(DoubleItPortType port, int numToDouble) {
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java Thu May 10 11:34:26 2012
@@ -83,8 +83,9 @@ public class IntermediaryTransformationT
}
@org.junit.AfterClass
- public static void cleanup() {
+ public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
+ stopAllServers();
}
@org.junit.Test
@@ -108,6 +109,8 @@ public class IntermediaryTransformationT
}
doubleIt(transportPort, 25);
+
+ bus.shutdown(true);
}
@org.junit.Test
@@ -136,6 +139,8 @@ public class IntermediaryTransformationT
} catch (Exception ex) {
// expected
}
+
+ bus.shutdown(true);
}
private static void doubleIt(DoubleItPortType port, int numToDouble) {
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java Thu May 10 11:34:26 2012
@@ -92,8 +92,9 @@ public class IssueUnitTest extends Abstr
}
@org.junit.AfterClass
- public static void cleanup() {
+ public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
+ stopAllServers();
}
/**
@@ -133,6 +134,8 @@ public class IssueUnitTest extends Abstr
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
SAMLKeyInfo subjectKeyInfo = assertion.getSubjectKeyInfo();
assertTrue(subjectKeyInfo.getSecret() != null);
+
+ bus.shutdown(true);
}
/**
@@ -171,6 +174,8 @@ public class IssueUnitTest extends Abstr
assertTrue(OpenSAMLUtil.isMethodHolderOfKey(confirmMethod));
SAMLKeyInfo subjectKeyInfo = assertion.getSubjectKeyInfo();
assertTrue(subjectKeyInfo.getCerts() != null);
+
+ bus.shutdown(true);
}
/**
@@ -206,6 +211,8 @@ public class IssueUnitTest extends Abstr
confirmMethod = methods.get(0);
}
assertTrue(confirmMethod.contains("bearer"));
+
+ bus.shutdown(true);
}
/**
@@ -254,6 +261,8 @@ public class IssueUnitTest extends Abstr
confirmMethod = methods.get(0);
}
assertNotNull(confirmMethod);
+
+ bus.shutdown(true);
}
/**
@@ -274,6 +283,8 @@ public class IssueUnitTest extends Abstr
} catch (Exception ex) {
// expected
}
+
+ bus.shutdown(true);
}
/**
@@ -310,6 +321,8 @@ public class IssueUnitTest extends Abstr
confirmMethod = methods.get(0);
}
assertTrue(confirmMethod.contains("bearer"));
+
+ bus.shutdown(true);
}
/**
@@ -345,6 +358,8 @@ public class IssueUnitTest extends Abstr
confirmMethod = methods.get(0);
}
assertTrue(confirmMethod.contains("bearer"));
+
+ bus.shutdown(true);
}
private SecurityToken requestSecurityToken(
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java Thu May 10 11:34:26 2012
@@ -62,8 +62,9 @@ public class SenderVouchesTest 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 SenderVouchesTest extends A
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/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java Thu May 10 11:34:26 2012
@@ -73,8 +73,9 @@ public class SymmetricBindingTest extend
}
@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 SymmetricBindingTest extend
doubleIt(symmetricSaml1Port, 25);
TokenTestUtils.verifyToken(symmetricSaml1Port);
+
+ bus.shutdown(true);
}
@org.junit.Test
@@ -124,6 +127,8 @@ public class SymmetricBindingTest extend
doubleIt(symmetricSaml2Port, 30);
TokenTestUtils.verifyToken(symmetricSaml2Port);
+
+ bus.shutdown(true);
}
private static void doubleIt(DoubleItPortType port, int numToDouble) {
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java Thu May 10 11:34:26 2012
@@ -71,8 +71,9 @@ public class TransportBindingTest extend
}
@org.junit.AfterClass
- public static void cleanup() {
+ public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
+ stopAllServers();
}
@org.junit.Test
@@ -97,6 +98,7 @@ public class TransportBindingTest extend
doubleIt(transportSaml1Port, 25);
+ bus.shutdown(true);
}
@org.junit.Test
@@ -120,6 +122,8 @@ public class TransportBindingTest extend
}
doubleIt(transportSaml2Port, 30);
+
+ bus.shutdown(true);
}
/**
@@ -154,6 +158,8 @@ public class TransportBindingTest extend
} catch (javax.xml.ws.soap.SOAPFaultException fault) {
// expected
}
+
+ bus.shutdown(true);
}
@org.junit.Test
@@ -177,6 +183,8 @@ public class TransportBindingTest extend
}
doubleIt(transportSaml1Port, 40);
+
+ bus.shutdown(true);
}
/**
@@ -210,6 +218,8 @@ public class TransportBindingTest extend
} catch (javax.xml.ws.soap.SOAPFaultException fault) {
// expected
}
+
+ bus.shutdown(true);
}
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java Thu May 10 11:34:26 2012
@@ -78,8 +78,9 @@ public class UsernameActAsTest extends A
}
@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 UsernameActAsTest extends A
} catch (Exception ex) {
// expected
}
+
+ bus.shutdown(true);
}
/**
@@ -213,6 +216,8 @@ public class UsernameActAsTest extends A
} catch (Exception ex) {
// expected
}
+
+ bus.shutdown(true);
}
/**
@@ -303,6 +308,8 @@ public class UsernameActAsTest extends A
} catch (Exception ex) {
//
}
+
+ bus.shutdown(true);
}
/**
@@ -394,6 +401,8 @@ public class UsernameActAsTest extends A
} catch (Exception ex) {
//
}
+
+ bus.shutdown(true);
}
/**
@@ -454,6 +463,8 @@ public class UsernameActAsTest extends A
} catch (Exception ex) {
//
}
+
+ bus.shutdown(true);
}
private static void doubleIt(DoubleItPortType port, int numToDouble) {
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java Thu May 10 11:34:26 2012
@@ -77,8 +77,9 @@ public class UsernameOnBehalfOfTest exte
}
@org.junit.AfterClass
- public static void cleanup() {
+ public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
+ stopAllServers();
}
@org.junit.Test
@@ -123,6 +124,8 @@ public class UsernameOnBehalfOfTest exte
} catch (Exception ex) {
// expected
}
+
+ bus.shutdown(true);
}
/**
@@ -211,6 +214,8 @@ public class UsernameOnBehalfOfTest exte
} catch (Exception ex) {
// expected
}
+
+ bus.shutdown(true);
}
/**
@@ -301,6 +306,8 @@ public class UsernameOnBehalfOfTest exte
} catch (Exception ex) {
//
}
+
+ bus.shutdown(true);
}
/**
@@ -392,6 +399,8 @@ public class UsernameOnBehalfOfTest exte
} catch (Exception ex) {
//
}
+
+ bus.shutdown(true);
}
/**
@@ -452,6 +461,8 @@ public class UsernameOnBehalfOfTest exte
} catch (Exception ex) {
//
}
+
+ bus.shutdown(true);
}
private static void doubleIt(DoubleItPortType port, int numToDouble) {
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java?rev=1336605&r1=1336604&r2=1336605&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java Thu May 10 11:34:26 2012
@@ -73,8 +73,9 @@ public class X509SymmetricBindingTest ex
}
@org.junit.AfterClass
- public static void cleanup() {
+ public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
+ stopAllServers();
}
@org.junit.Test
@@ -98,6 +99,8 @@ public class X509SymmetricBindingTest ex
}
doubleIt(symmetricSaml1Port, 25);
+
+ bus.shutdown(true);
}
@org.junit.Test
@@ -123,6 +126,8 @@ public class X509SymmetricBindingTest ex
doubleIt(symmetricSaml2Port, 30);
TokenTestUtils.verifyToken(symmetricSaml2Port);
+
+ bus.shutdown(true);
}
private static void doubleIt(DoubleItPortType port, int numToDouble) {