cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Fixing Jwe tests in 3.0.x/Java6
Date Tue, 30 Jun 2015 14:27:05 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 012dc0d80 -> d83590f5f


Fixing Jwe tests in 3.0.x/Java6


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

Branch: refs/heads/3.0.x-fixes
Commit: d83590f5fc1e9900acc5c12a3d78a118f3f41196
Parents: 012dc0d
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Tue Jun 30 15:26:34 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Tue Jun 30 15:26:34 2015 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d83590f5/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
b/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
index 397d10a..c3435bf 100644
--- a/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
+++ b/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
@@ -222,7 +222,7 @@ public class JweJsonProducerTest extends Assert {
                                          final byte[] iv,
                                          final byte[] cek,
                                          boolean canBeFlat) throws Exception {
-        if (contentEncryptionAlgo.equals(AlgorithmUtils.A128GCM_ALGO) && SKIP_AES_GCM_TESTS)
{
+        if (contentEncryptionAlgo.equals(ContentAlgorithm.A128GCM) && SKIP_AES_GCM_TESTS)
{
             return null;
         }
         JweHeaders headers = new JweHeaders(KeyAlgorithm.A128KW,


Mime
View raw message