cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [6/6] cxf git commit: Fixing some tests
Date Fri, 06 Nov 2015 15:13:47 GMT
Fixing some tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8feb7e5c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8feb7e5c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8feb7e5c

Branch: refs/heads/master
Commit: 8feb7e5cafb7da2b60bdcdbd280f4e448596e070
Parents: 6a1010f
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Nov 6 14:58:30 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Nov 6 14:59:00 2015 +0000

----------------------------------------------------------------------
 osgi/karaf/features/src/main/resources/features.xml              | 2 ++
 .../test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java    | 2 +-
 .../apache/cxf/systest/sts/delegation/SAMLDelegationTest.java    | 4 ++--
 .../java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/8feb7e5c/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 80c339c..7c1681e 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -402,6 +402,8 @@
     <feature name="cxf-sts" version="${project.version}" resolver="(obr)">
         <bundle start-level="40" dependency="true">mvn:com.hazelcast/hazelcast/${cxf.hazelcast.version}</bundle>
         <bundle start-level="40" dependency="true">mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}</bundle>
+        <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-json-basic/${project.version}</bundle>
+        <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-jose/${project.version}</bundle>
         <feature version="${project.version}">cxf-core</feature>
         <feature version="${project.version}">cxf-ws-security</feature>
         <bundle>mvn:org.apache.cxf.services.sts/cxf-services-sts-core/${project.version}</bundle>

http://git-wip-us.apache.org/repos/asf/cxf/blob/8feb7e5c/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
index 9a17e6c..837db43 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java
@@ -98,7 +98,7 @@ public class JWTUnitTest extends AbstractBusClientServerTestBase {
             properties.put(
                            SecurityConstants.CALLBACK_HANDLER, 
                            "org.apache.cxf.systest.sts.common.CommonCallbackHandler"
-                );
+            );
         }
 
         stsClient.setProperties(properties);

http://git-wip-us.apache.org/repos/asf/cxf/blob/8feb7e5c/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
index 4126a44..502fb55 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java
@@ -326,7 +326,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase
{
         assertTrue(providerResponse != null);
         assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId()
!= null);
 
-        return providerResponse.getToken();
+        return (Element)providerResponse.getToken();
     }
     
     private Element createUnsignedSAMLAssertion(
@@ -344,7 +344,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase
{
         assertTrue(providerResponse != null);
         assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId()
!= null);
 
-        return providerResponse.getToken();
+        return (Element)providerResponse.getToken();
     }
     
     private TokenProviderParameters createProviderParameters(

http://git-wip-us.apache.org/repos/asf/cxf/blob/8feb7e5c/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
index 1046336..d3ea738 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
@@ -571,7 +571,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase {
         assertTrue(providerResponse != null);
         assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId()
!= null);
 
-        return providerResponse.getToken();
+        return (Element)providerResponse.getToken();
     }
             
     private TokenProviderParameters createProviderParameters(


Mime
View raw message