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/556c2384 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/556c2384 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/556c2384 Branch: refs/heads/3.0.x-fixes Commit: 556c23841a6d49d7c8f5b103a7abc336f944e717 Parents: 9e0dcd9 Author: Daniel Kulp <[email protected]> Authored: Fri Oct 31 13:27:59 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Fri Nov 7 13:50:26 2014 -0500 ---------------------------------------------------------------------- .../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/556c2384/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 ea0feac..1d5e92a 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/556c2384/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") }; }
