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/10/09 16:46:57 UTC
svn commit: r1396050 - in /cxf/trunk/services/sts/systests:
advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/
advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/
advanced/src/test/java/org/apache/cxf/systest/sts/caching/ ...
Author: coheigea
Date: Tue Oct 9 14:46:56 2012
New Revision: 1396050
URL: http://svn.apache.org/viewvc?rev=1396050&view=rev
Log:
Explicitly close ports in the STS system tests
Modified:
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxwsBasicAuthTest.java Tue Oct 9 14:46:56 2012
@@ -87,6 +87,7 @@ public class JaxwsBasicAuthTest extends
doubleIt(port, 25);
+ ((java.io.Closeable)port).close();
bus.shutdown(true);
}
@@ -116,6 +117,7 @@ public class JaxwsBasicAuthTest extends
|| message.contains("Validation of security token failed"));
}
+ ((java.io.Closeable)port).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/binarysecuritytoken/BinarySecurityTokenTest.java Tue Oct 9 14:46:56 2012
@@ -87,6 +87,7 @@ public class BinarySecurityTokenTest ext
doubleIt(asymmetricBSTPort, 25);
+ ((java.io.Closeable)asymmetricBSTPort).close();
bus.shutdown(true);
}
@@ -116,6 +117,7 @@ public class BinarySecurityTokenTest ext
|| message.contains("Validation of security token failed"));
}
+ ((java.io.Closeable)asymmetricBSTPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java Tue Oct 9 14:46:56 2012
@@ -130,6 +130,7 @@ public class CachingTest extends Abstrac
// Expected
}
+ ((java.io.Closeable)transportSaml1Port).close();
bus.shutdown(true);
}
@@ -170,6 +171,7 @@ public class CachingTest extends Abstrac
// Expected
}
+ ((java.io.Closeable)transportSaml1Port).close();
bus.shutdown(true);
}
@@ -220,6 +222,7 @@ public class CachingTest extends Abstrac
tok.setToken(storedToken);
doubleIt(transportSaml1Port, 35);
+ ((java.io.Closeable)transportSaml1Port).close();
bus.shutdown(true);
}
@@ -257,6 +260,7 @@ public class CachingTest extends Abstrac
p.getRequestContext().put(SecurityConstants.USERNAME, "alice");
doubleIt(transportUTPort, 35);
+ ((java.io.Closeable)transportUTPort).close();
bus.shutdown(true);
}
@@ -296,6 +300,7 @@ public class CachingTest extends Abstrac
p.getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, "clientKeystore.properties");
doubleIt(bstPort, 35);
+ ((java.io.Closeable)bstPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/claims/ClaimsTest.java Tue Oct 9 14:46:56 2012
@@ -88,6 +88,7 @@ public class ClaimsTest extends Abstract
doubleIt(transportClaimsPort, 25);
+ ((java.io.Closeable)transportClaimsPort).close();
bus.shutdown(true);
}
@@ -110,6 +111,7 @@ public class ClaimsTest extends Abstract
doubleIt(transportClaimsPort, 25);
+ ((java.io.Closeable)transportClaimsPort).close();
bus.shutdown(true);
}
@@ -137,6 +139,7 @@ public class ClaimsTest extends Abstract
// expected
}
+ ((java.io.Closeable)transportClaimsPort).close();
bus.shutdown(true);
}
@@ -164,6 +167,7 @@ public class ClaimsTest extends Abstract
// expected
}
+ ((java.io.Closeable)transportClaimsPort).close();
bus.shutdown(true);
}
@@ -186,6 +190,7 @@ public class ClaimsTest extends Abstract
doubleIt(transportClaimsPort, 25);
+ ((java.io.Closeable)transportClaimsPort).close();
bus.shutdown(true);
}
@@ -213,7 +218,7 @@ public class ClaimsTest extends Abstract
// expected
}
-
+ ((java.io.Closeable)transportClaimsPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/CrossDomainTest.java Tue Oct 9 14:46:56 2012
@@ -96,6 +96,7 @@ public class CrossDomainTest extends Abs
// Transport port
doubleIt(transportPort, 25);
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java Tue Oct 9 14:46:56 2012
@@ -94,6 +94,7 @@ public class CustomOnBehalfOfTest extend
);
doubleIt(transportPort, 25);
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/DistributedCachingTest.java Tue Oct 9 14:46:56 2012
@@ -96,6 +96,7 @@ public class DistributedCachingTest exte
// Transport port
doubleIt(transportPort, 25);
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
@@ -118,6 +119,7 @@ public class DistributedCachingTest exte
// Transport port
doubleIt(transportPort, 25);
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
@@ -140,6 +142,7 @@ public class DistributedCachingTest exte
// Transport port
doubleIt(transportPort, 25);
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java Tue Oct 9 14:46:56 2012
@@ -93,6 +93,7 @@ public class KerberosTokenTest extends A
doubleIt(transportSaml2Port, 25);
+ ((java.io.Closeable)transportSaml2Port).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/DifferentRealmTest.java Tue Oct 9 14:46:56 2012
@@ -95,7 +95,8 @@ public class DifferentRealmTest extends
// Transport port
doubleIt(transportPort, 25);
-
+
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
@@ -123,6 +124,7 @@ public class DifferentRealmTest extends
// Transport port
doubleIt(transportPort, 25);
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
@@ -153,6 +155,7 @@ public class DifferentRealmTest extends
// expected
}
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
@@ -181,6 +184,7 @@ public class DifferentRealmTest extends
// Transport port
doubleIt(transportPort, 25);
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewTest.java Tue Oct 9 14:46:56 2012
@@ -129,6 +129,9 @@ public class SAMLRenewTest extends Abstr
stsClient.setTtl(300);
doubleIt(saml2Port, 35);
+ ((java.io.Closeable)saml1Port).close();
+ ((java.io.Closeable)saml1BearerPort).close();
+ ((java.io.Closeable)saml2Port).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java Tue Oct 9 14:46:56 2012
@@ -101,6 +101,7 @@ public class Soap12Test extends Abstract
doubleIt(transportSaml2Port, 30);
+ ((java.io.Closeable)transportSaml2Port).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java Tue Oct 9 14:46:56 2012
@@ -88,6 +88,7 @@ public class TransformationTest extends
doubleIt(transportUTPort, 25);
+ ((java.io.Closeable)transportUTPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java (original)
+++ cxf/trunk/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java Tue Oct 9 14:46:56 2012
@@ -86,6 +86,7 @@ public class UsernameTokenTest extends A
doubleIt(transportUTPort, 25);
+ ((java.io.Closeable)transportUTPort).close();
bus.shutdown(true);
}
@@ -115,6 +116,7 @@ public class UsernameTokenTest extends A
|| message.contains("Validation of security token failed"));
}
+ ((java.io.Closeable)transportUTPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java Tue Oct 9 14:46:56 2012
@@ -99,6 +99,8 @@ public class AsymmetricBindingTest exten
}
doubleIt(asymmetricSaml1Port, 25);
+
+ ((java.io.Closeable)asymmetricSaml1Port).close();
bus.shutdown(true);
}
@@ -125,6 +127,8 @@ public class AsymmetricBindingTest exten
doubleIt(asymmetricSaml2Port, 30);
TokenTestUtils.verifyToken(asymmetricSaml2Port);
+
+ ((java.io.Closeable)asymmetricSaml2Port).close();
bus.shutdown(true);
}
@@ -149,6 +153,8 @@ public class AsymmetricBindingTest exten
}
doubleIt(asymmetricSaml1EncryptedPort, 40);
+
+ ((java.io.Closeable)asymmetricSaml1EncryptedPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java Tue Oct 9 14:46:56 2012
@@ -111,6 +111,7 @@ public class BearerTest extends Abstract
doubleIt(transportSaml2Port, 45);
+ ((java.io.Closeable)transportSaml2Port).close();
bus.shutdown(true);
}
@@ -160,6 +161,7 @@ public class BearerTest extends Abstract
doubleIt(transportSaml2Port, 50);
+ ((java.io.Closeable)transportSaml2Port).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java Tue Oct 9 14:46:56 2012
@@ -114,6 +114,7 @@ public class IntermediaryTransformationC
// even though its STSClient is disabled after the first invocation
doubleIt(transportPort, 30);
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java Tue Oct 9 14:46:56 2012
@@ -110,6 +110,7 @@ public class IntermediaryTransformationT
doubleIt(transportPort, 25);
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
@@ -140,6 +141,7 @@ public class IntermediaryTransformationT
// expected
}
+ ((java.io.Closeable)transportPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java Tue Oct 9 14:46:56 2012
@@ -86,6 +86,7 @@ public class SenderVouchesTest extends A
doubleIt(transportUTPort, 25);
+ ((java.io.Closeable)transportUTPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java Tue Oct 9 14:46:56 2012
@@ -101,6 +101,7 @@ public class SymmetricBindingTest extend
TokenTestUtils.verifyToken(symmetricSaml1Port);
+ ((java.io.Closeable)symmetricSaml1Port).close();
bus.shutdown(true);
}
@@ -128,12 +129,11 @@ public class SymmetricBindingTest extend
TokenTestUtils.verifyToken(symmetricSaml2Port);
+ ((java.io.Closeable)symmetricSaml2Port).close();
bus.shutdown(true);
}
- // TODO Re-enable this when we pick up WSS4J 1.6.7
@org.junit.Test
- @org.junit.Ignore
public void testUsernameTokenSAML1Encrypted() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml");
@@ -154,6 +154,7 @@ public class SymmetricBindingTest extend
doubleIt(symmetricSaml1Port, 25);
+ ((java.io.Closeable)symmetricSaml1Port).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java Tue Oct 9 14:46:56 2012
@@ -98,6 +98,7 @@ public class TransportBindingTest extend
doubleIt(transportSaml1Port, 25);
+ ((java.io.Closeable)transportSaml1Port).close();
bus.shutdown(true);
}
@@ -123,6 +124,7 @@ public class TransportBindingTest extend
doubleIt(transportSaml2Port, 30);
+ ((java.io.Closeable)transportSaml2Port).close();
bus.shutdown(true);
}
@@ -159,6 +161,7 @@ public class TransportBindingTest extend
// expected
}
+ ((java.io.Closeable)transportSaml1Port).close();
bus.shutdown(true);
}
@@ -184,6 +187,7 @@ public class TransportBindingTest extend
doubleIt(transportSaml1Port, 40);
+ ((java.io.Closeable)transportSaml1Port).close();
bus.shutdown(true);
}
@@ -219,6 +223,7 @@ public class TransportBindingTest extend
// expected
}
+ ((java.io.Closeable)transportSaml1Port).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java Tue Oct 9 14:46:56 2012
@@ -111,6 +111,8 @@ public class UsernameActAsTest extends A
);
doubleIt(bearerPort, 25);
+ ((java.io.Closeable)bearerPort).close();
+
DoubleItPortType bearerPort2 =
service.getPort(portQName, DoubleItPortType.class);
updateAddressPort(bearerPort2, PORT);
@@ -129,6 +131,7 @@ public class UsernameActAsTest extends A
// expected
}
+ ((java.io.Closeable)bearerPort2).close();
bus.shutdown(true);
}
@@ -216,6 +219,7 @@ public class UsernameActAsTest extends A
// expected
}
+ ((java.io.Closeable)bearerPort).close();
bus.shutdown(true);
}
@@ -306,6 +310,7 @@ public class UsernameActAsTest extends A
//
}
+ ((java.io.Closeable)bearerPort).close();
bus.shutdown(true);
}
@@ -397,6 +402,7 @@ public class UsernameActAsTest extends A
//
}
+ ((java.io.Closeable)bearerPort).close();
bus.shutdown(true);
}
@@ -456,6 +462,7 @@ public class UsernameActAsTest extends A
//
}
+ ((java.io.Closeable)bearerPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java Tue Oct 9 14:46:56 2012
@@ -114,6 +114,8 @@ public class UsernameOnBehalfOfTest exte
);
doubleIt(bearerPort, 25);
+ ((java.io.Closeable)bearerPort).close();
+
DoubleItPortType bearerPort2 =
service.getPort(portQName, DoubleItPortType.class);
updateAddressPort(bearerPort2, PORT);
@@ -131,6 +133,7 @@ public class UsernameOnBehalfOfTest exte
// expected
}
+ ((java.io.Closeable)bearerPort2).close();
bus.shutdown(true);
}
@@ -183,6 +186,7 @@ public class UsernameOnBehalfOfTest exte
// This invocation should be successful as the token is cached
doubleIt(bearerPort, 25);
+ ((java.io.Closeable)bearerPort).close();
//
// Proxy no. 2
//
@@ -222,6 +226,7 @@ public class UsernameOnBehalfOfTest exte
// expected
}
+ ((java.io.Closeable)bearerPort2).close();
bus.shutdown(true);
}
@@ -316,6 +321,7 @@ public class UsernameOnBehalfOfTest exte
//
}
+ ((java.io.Closeable)bearerPort).close();
bus.shutdown(true);
}
@@ -411,6 +417,7 @@ public class UsernameOnBehalfOfTest exte
//
}
+ ((java.io.Closeable)bearerPort).close();
bus.shutdown(true);
}
@@ -474,6 +481,7 @@ public class UsernameOnBehalfOfTest exte
//
}
+ ((java.io.Closeable)bearerPort).close();
bus.shutdown(true);
}
Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java?rev=1396050&r1=1396049&r2=1396050&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java (original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java Tue Oct 9 14:46:56 2012
@@ -100,6 +100,7 @@ public class X509SymmetricBindingTest ex
doubleIt(symmetricSaml1Port, 25);
+ ((java.io.Closeable)symmetricSaml1Port).close();
bus.shutdown(true);
}
@@ -127,6 +128,7 @@ public class X509SymmetricBindingTest ex
TokenTestUtils.verifyToken(symmetricSaml2Port);
+ ((java.io.Closeable)symmetricSaml2Port).close();
bus.shutdown(true);
}
@@ -152,6 +154,7 @@ public class X509SymmetricBindingTest ex
doubleIt(symmetricSaml2Port, 30);
+ ((java.io.Closeable)symmetricSaml2Port).close();
bus.shutdown(true);
}