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/11/22 17:13:31 UTC

svn commit: r1412600 - /cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java

Author: coheigea
Date: Thu Nov 22 16:13:30 2012
New Revision: 1412600

URL: http://svn.apache.org/viewvc?rev=1412600&view=rev
Log:
Merged revisions 1412592 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1412592 | coheigea | 2012-11-22 15:46:57 +0000 (Thu, 22 Nov 2012) | 2 lines

  Re-enabling unit test

........

Modified:
    cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java

Modified: cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java?rev=1412600&r1=1412599&r2=1412600&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java (original)
+++ cxf/branches/2.6.x-fixes/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java Thu Nov 22 16:13:30 2012
@@ -105,10 +105,8 @@ public class SAMLProviderCustomTest exte
     
     /**
      * Create a custom Saml1 Authentication Assertion.
-     * TODO re-enable when we pick up WSS4J 1.6.5.
      */
     @org.junit.Test
-    @org.junit.Ignore
     public void testCustomSaml1AuthenticationAssertion() throws Exception {
         TokenProvider samlTokenProvider = new SAMLTokenProvider();
         TokenProviderParameters providerParameters =