svn commit: r1516768 - in /cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws: action/ActionTest.java x509/StaxX509TokenTest.java x509/X509TokenTest.java

[coheigea]

Author: coheigea
Date: Fri Aug 23 09:17:23 2013
New Revision: 1516768

URL: http://svn.apache.org/r1516768
Log:
Fixing failing tests with restricted security policies

Modified:
    
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
    
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
    
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java

Modified: 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java?rev=1516768&r1=1516767&r2=1516768&view=diff
==============================================================================
--- 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
 (original)
+++ 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
 Fri Aug 23 09:17:23 2013
@@ -39,6 +39,9 @@ public class ActionTest extends Abstract
 
     private static final String NAMESPACE = 
"http://www.example.org/contract/DoubleIt";;
     private static final QName SERVICE_QNAME = new QName(NAMESPACE, 
"DoubleItService");
+    
+    private static boolean unrestrictedPoliciesInstalled = 
+        SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
 
     @BeforeClass
     public static void startServers() throws Exception {
@@ -118,6 +121,10 @@ public class ActionTest extends Abstract
     
     @org.junit.Test
     public void testEncryptedPassword() throws Exception {
+        
+        if (!unrestrictedPoliciesInstalled) {
+            return;
+        }
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = ActionTest.class.getResource("client.xml");

Modified: 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java?rev=1516768&r1=1516767&r2=1516768&view=diff
==============================================================================
--- 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
 (original)
+++ 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
 Fri Aug 23 09:17:23 2013
@@ -51,6 +51,9 @@ public class StaxX509TokenTest extends A
 
     private static final String NAMESPACE = 
"http://www.example.org/contract/DoubleIt";;
     private static final QName SERVICE_QNAME = new QName(NAMESPACE, 
"DoubleItService");
+    
+    private static boolean unrestrictedPoliciesInstalled = 
+        SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
 
     @BeforeClass
     public static void startServers() throws Exception {
@@ -303,6 +306,10 @@ public class StaxX509TokenTest extends A
     @org.junit.Test
     public void testAsymmetricEncryptedPassword() throws Exception {
 
+        if (!unrestrictedPoliciesInstalled) {
+            return;
+        }
+        
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = StaxX509TokenTest.class.getResource("client.xml");
 

Modified: 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1516768&r1=1516767&r2=1516768&view=diff
==============================================================================
--- 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
 (original)
+++ 
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
 Fri Aug 23 09:17:23 2013
@@ -52,6 +52,9 @@ public class X509TokenTest extends Abstr
 
     private static final String NAMESPACE = 
"http://www.example.org/contract/DoubleIt";;
     private static final QName SERVICE_QNAME = new QName(NAMESPACE, 
"DoubleItService");
+    
+    private static boolean unrestrictedPoliciesInstalled = 
+        SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
 
     @BeforeClass
     public static void startServers() throws Exception {
@@ -357,6 +360,10 @@ public class X509TokenTest extends Abstr
     
     @org.junit.Test
     public void testAsymmetricEncryptedPassword() throws Exception {
+        
+        if (!unrestrictedPoliciesInstalled) {
+            return;
+        }
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = X509TokenTest.class.getResource("client.xml");