cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: Fix the validator tests on OSX. For some reason, the wss40CACRL.cer key is interfering with the validation of the other tests so just copy it for the test that needs t.
Date Fri, 31 Oct 2014 17:28:50 GMT
Repository: cxf
Updated Branches:
  refs/heads/master d20d51801 -> 277607da2


Fix the validator tests on OSX.  For some reason, the wss40CACRL.cer key is interfering with
the validation of the other tests so just copy it for the test that needs t.


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

Branch: refs/heads/master
Commit: 277607da223830529ae4a37cbbf00a16d20980bc
Parents: d20d518
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Oct 31 13:27:59 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Oct 31 13:27:59 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java     | 3 +--
 .../cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java      | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/277607da/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
index cb34030..583bc78 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
@@ -81,7 +81,6 @@ public class BasicIntegrationTest {
             copy("data/xkms/certificates/cas/alice.cer"),
             copy("data/xkms/certificates/dave.cer"),
             copy("data/xkms/certificates/http___localhost_8080_services_TestService.cer"),
-            copy("data/xkms/certificates/crls/wss40CACRL.cer"),
             copy("etc/org.ops4j.pax.logging.cfg"),
             editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories",
REPOS),
             editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port",
HTTP_PORT),
@@ -98,7 +97,7 @@ public class BasicIntegrationTest {
         };
     }
 
-    private Option copy(String path) {
+    protected Option copy(String path) {
         return replaceConfigurationFile(path, new File("src/test/resources/" + path));
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/277607da/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
index 4994531..9439ca5 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/handlers/validator/ValidatorCRLTest.java
@@ -64,6 +64,7 @@ public class ValidatorCRLTest extends BasicIntegrationTest {
     public Option[] getConfig() {
         return new Option[] {
             CoreOptions.composite(super.getConfig()),
+            copy("data/xkms/certificates/crls/wss40CACRL.cer"),
             editConfigurationFilePut("etc/org.apache.cxf.xkms.cfg", "xkms.enableRevocation",
"true")
         };
     }


Mime
View raw message