You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2016/07/26 00:41:26 UTC

[21/42] cxf git commit: Fixing failing test

Fixing failing test


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

Branch: refs/heads/master-jaxrs-2.1
Commit: b06f6e2cb2989cf280f59976457777cf13a6bcbe
Parents: b90b956
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jul 22 16:30:18 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jul 22 16:30:18 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/b06f6e2c/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
index 20e4492..02de7f8 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java
@@ -548,7 +548,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert {
         if (unrestrictedPoliciesInstalled) {
             properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/stsstore.jks");
         } else {
-            properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "restricted/keys/stsstore.jks");
+            properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "restricted/stsstore.jks");
         }
         
         return properties;