You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2008/11/07 18:55:38 UTC
svn commit: r712210 -
/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/
Author: raul
Date: Fri Nov 7 09:55:10 2008
New Revision: 712210
URL: http://svn.apache.org/viewvc?rev=712210&view=rev
Log:
Added AllTest suite and make it run with one click in eclipse without basedir property
Added:
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java (with props)
Modified:
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Baltimore18Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Baltimore23Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/C14N11Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ComRSASecurityTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikTransformsTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/InteropC14nTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SecureXSLTTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ValidateSignatureTest.java
xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
Added: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java?rev=712210&view=auto
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java (added)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java Fri Nov 7 09:55:10 2008
@@ -0,0 +1,49 @@
+package javax.xml.crypto.test.dsig;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for javax.xml.crypto.test.dsig");
+ //$JUnit-BEGIN$
+ suite.addTestSuite(IaikCoreFeaturesTest.class);
+ suite.addTestSuite(SignatureMethodTest.class);
+ suite.addTestSuite(SignaturePropertyTest.class);
+ suite.addTestSuite(BaltimoreXPathFilter2ThreeTest.class);
+ suite.addTestSuite(ClassLoaderTest.class);
+ suite.addTestSuite(XMLValidateContextTest.class);
+ suite.addTestSuite(BaltimoreIaik2Test.class);
+ suite.addTestSuite(C14N11Test.class);
+ suite.addTestSuite(Baltimore23Test.class);
+ suite.addTestSuite(XMLSignContextTest.class);
+ suite.addTestSuite(DetachedTest.class);
+ suite.addTestSuite(SignaturePropertiesTest.class);
+ suite.addTestSuite(ValidateSignatureTest.class);
+ suite.addTestSuite(SecureXSLTTest.class);
+ suite.addTestSuite(CreateBaltimore23Test.class);
+ suite.addTestSuite(ManifestTest.class);
+ suite.addTestSuite(DigestMethodTest.class);
+ suite.addTestSuite(IaikTransformsTest.class);
+ suite.addTestSuite(BaltimoreExcC14n1Test.class);
+ suite.addTestSuite(XMLObjectTest.class);
+ suite.addTestSuite(PhaosXMLDSig3Test.class);
+ suite.addTestSuite(CreateInteropXFilter2Test.class);
+ suite.addTestSuite(XMLSignatureFactoryTest.class);
+ suite.addTestSuite(SignedInfoTest.class);
+ suite.addTestSuite(IaikSignatureAlgosTest.class);
+ suite.addTestSuite(CreateInteropExcC14NTest.class);
+ suite.addTestSuite(CreatePhaosXMLDSig3Test.class);
+ suite.addTestSuite(XMLSignatureTest.class);
+ suite.addTestSuite(ReferenceTest.class);
+ suite.addTestSuite(CanonicalizationMethodTest.class);
+ suite.addTestSuite(Baltimore18Test.class);
+ suite.addTestSuite(ComRSASecurityTest.class);
+ suite.addTestSuite(InteropC14nTest.class);
+ suite.addTestSuite(TransformTest.class);
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Propchange: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/AllTests.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Baltimore18Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Baltimore18Test.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Baltimore18Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Baltimore18Test.java Fri Nov 7 09:55:10 2008
@@ -46,8 +46,10 @@
public Baltimore18Test(String name) {
super(name);
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
String fs = System.getProperty("file.separator");
- dir = new File(System.getProperty("basedir") + fs + "data" + fs + "ie" +
+ dir = new File(base + fs + "data" + fs + "ie" +
fs + "baltimore" + fs + "merlin-examples",
"merlin-xmldsig-eighteen");
validator = new SignatureValidator(dir);
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Baltimore23Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Baltimore23Test.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Baltimore23Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/Baltimore23Test.java Fri Nov 7 09:55:10 2008
@@ -48,7 +48,9 @@
public Baltimore23Test(String name) {
super(name);
String fs = System.getProperty("file.separator");
- dir = new File(System.getProperty("basedir") + fs + "data" + fs
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
+ dir = new File(base + fs + "data" + fs
+ "ie" + fs + "baltimore" + fs + "merlin-examples",
"merlin-xmldsig-twenty-three");
validator = new SignatureValidator(dir);
@@ -179,7 +181,9 @@
public void test_signature() throws Exception {
String file = "signature.xml";
String fs = System.getProperty("file.separator");
- String keystore = System.getProperty("basedir") + fs + "data" + fs +
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
+ String keystore = base + fs + "data" + fs +
"ie" + fs + "baltimore" + fs + "merlin-examples" + fs +
"merlin-xmldsig-twenty-three" + fs + "certs" + fs + "xmldsig.jks";
KeyStore ks = KeyStore.getInstance("JKS");
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreExcC14n1Test.java Fri Nov 7 09:55:10 2008
@@ -44,7 +44,9 @@
public BaltimoreExcC14n1Test(String name) {
super(name);
String fs = System.getProperty("file.separator");
- String base = System.getProperty("basedir") + fs + "data" + fs + "ie" +
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
+ base += fs + "data" + fs + "ie" +
fs + "baltimore" + fs + "merlin-examples";
validator = new SignatureValidator(new File
(base, "merlin-exc-c14n-one"));
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreIaik2Test.java Fri Nov 7 09:55:10 2008
@@ -45,7 +45,9 @@
public BaltimoreIaik2Test(String name) {
super(name);
String fs = System.getProperty("file.separator");
- dir = new File(System.getProperty("basedir") + fs + "data" + fs +
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
+ dir = new File(base + fs + "data" + fs +
"ie" + fs + "baltimore" + fs + "merlin-examples",
"ec-merlin-iaikTests-two");
validator = new SignatureValidator(dir);
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/BaltimoreXPathFilter2ThreeTest.java Fri Nov 7 09:55:10 2008
@@ -44,7 +44,8 @@
public BaltimoreXPathFilter2ThreeTest(String name) {
super(name);
String fs = System.getProperty("file.separator");
- String base = System.getProperty("basedir") + fs + "data"
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+ base += fs + "data"
+ fs + "interop" + fs + "xfilter2";
validator = new SignatureValidator(new File
(base, "merlin-xpath-filter2-three"));
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/C14N11Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/C14N11Test.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/C14N11Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/C14N11Test.java Fri Nov 7 09:55:10 2008
@@ -46,7 +46,8 @@
public C14N11Test(String name) throws Exception {
super(name);
String fs = System.getProperty("file.separator");
- dir = new File(System.getProperty("basedir") + fs + "data" + fs
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+ dir = new File(base + fs + "data" + fs
+ "org" + fs + "w3c" + fs + "www" + fs
+ "interop" + fs + "xmldsig" + fs + "c14n11");
validator = new SignatureValidator(dir);
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ComRSASecurityTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ComRSASecurityTest.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ComRSASecurityTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ComRSASecurityTest.java Fri Nov 7 09:55:10 2008
@@ -44,7 +44,9 @@
public ComRSASecurityTest(String name) {
super(name);
String fs = System.getProperty("file.separator");
- String base = System.getProperty("basedir") + fs + "data" + fs + "com";
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
+ base += fs + "data" + fs + "com";
validator = new SignatureValidator(new File
(base, "rsasecurity/bdournaee"));
}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java Fri Nov 7 09:55:10 2008
@@ -93,8 +93,10 @@
// get key & self-signed certificate from keystore
String fs = System.getProperty("file.separator");
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
FileInputStream fis = new FileInputStream
- (System.getProperty("basedir") + fs + "data" + fs + "test.jks");
+ (base + fs + "data" + fs + "test.jks");
ks = KeyStore.getInstance("JKS");
ks.load(fis, "changeit".toCharArray());
signingKey = ks.getKey("mullan", "changeit".toCharArray());
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java Fri Nov 7 09:55:10 2008
@@ -71,9 +71,11 @@
db = dbf.newDocumentBuilder();
// get key & self-signed certificate from keystore
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
String fs = System.getProperty("file.separator");
FileInputStream fis = new FileInputStream
- (System.getProperty("basedir") + fs + "data" + fs + "test.jks");
+ (base + fs + "data" + fs + "test.jks");
ks = KeyStore.getInstance("JKS");
ks.load(fis, "changeit".toCharArray());
Certificate signingCert = ks.getCertificate("mullan");
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java Fri Nov 7 09:55:10 2008
@@ -72,8 +72,10 @@
// get key & self-signed certificate from keystore
String fs = System.getProperty("file.separator");
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
FileInputStream fis = new FileInputStream
- (System.getProperty("basedir") + fs + "data" + fs + "test.jks");
+ (base + fs + "data" + fs + "test.jks");
ks = KeyStore.getInstance("JKS");
ks.load(fis, "changeit".toCharArray());
signingKey = ks.getKey("mullan", "changeit".toCharArray());
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikCoreFeaturesTest.java Fri Nov 7 09:55:10 2008
@@ -47,7 +47,8 @@
public IaikCoreFeaturesTest(String name) {
super(name);
String fs = System.getProperty("file.separator");
- base = System.getProperty("basedir") + fs + "data" + fs +
+ base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+ base = base + fs + "data" + fs +
"at" + fs + "iaik" + fs + "ixsil";
validator = new SignatureValidator(new File
(base, "coreFeatures/signatures"));
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java Fri Nov 7 09:55:10 2008
@@ -44,7 +44,8 @@
public IaikSignatureAlgosTest(String name) {
super(name);
String fs = System.getProperty("file.separator");
- String base = System.getProperty("basedir") + fs + "data" + fs
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+ base += fs + "data" + fs
+ "at" + fs + "iaik" + fs + "ixsil";
validator = new SignatureValidator(new File
(base, "signatureAlgorithms/signatures"));
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikTransformsTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikTransformsTest.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikTransformsTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/IaikTransformsTest.java Fri Nov 7 09:55:10 2008
@@ -44,7 +44,8 @@
public IaikTransformsTest(String name) {
super(name);
String fs = System.getProperty("file.separator");
- String base = System.getProperty("basedir") + fs + "data" + fs +
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+ base += fs + "data" + fs +
"at" + fs + "iaik" + fs + "ixsil";
validator = new SignatureValidator(new File
(base, "transforms/signatures"));
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/InteropC14nTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/InteropC14nTest.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/InteropC14nTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/InteropC14nTest.java Fri Nov 7 09:55:10 2008
@@ -45,7 +45,8 @@
public InteropC14nTest(String name) {
super(name);
String fs = System.getProperty("file.separator");
- base = System.getProperty("basedir") + fs + "data" + fs + "interop";
+ base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+ base = base + fs + "data" + fs + "interop";
}
public void test_y1_exc_signature() throws Exception {
validator = new SignatureValidator(new File(base, "c14n/Y1"));
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java Fri Nov 7 09:55:10 2008
@@ -48,7 +48,8 @@
super(name);
String fs = System.getProperty("file.separator");
- base = new File(System.getProperty("basedir") + fs + "data" + fs +
+ String basedir = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+ base = new File(basedir + fs + "data" + fs +
"com" + fs + "phaos", "phaos-xmldsig-three");
validator = new SignatureValidator(base);
}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SecureXSLTTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SecureXSLTTest.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SecureXSLTTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/SecureXSLTTest.java Fri Nov 7 09:55:10 2008
@@ -24,7 +24,9 @@
public void test() throws Exception {
String fs = System.getProperty("file.separator");
- File baseDir = new File(System.getProperty("basedir") + fs + "data"
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
+ File baseDir = new File(base + fs + "data"
+ fs + "javax" + fs + "xml" + fs + "crypto", "dsig");
String[] signatures =
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ValidateSignatureTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ValidateSignatureTest.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ValidateSignatureTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/ValidateSignatureTest.java Fri Nov 7 09:55:10 2008
@@ -51,7 +51,9 @@
public ValidateSignatureTest(String name) {
super(name);
String fs = System.getProperty("file.separator");
- dir = new File(System.getProperty("basedir") + fs + "data" + fs
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+
+ dir = new File(base + fs + "data" + fs
+ "javax" + fs + "xml" + fs + "crypto", "dsig");
validator = new SignatureValidator(dir);
}
Modified: xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java?rev=712210&r1=712209&r2=712210&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java (original)
+++ xml/security/trunk/src_unitTests/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java Fri Nov 7 09:55:10 2008
@@ -165,7 +165,8 @@
docFactory.setNamespaceAware(true);
DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
String fs = System.getProperty("file.separator");
- File dir = new File(System.getProperty("basedir") + fs +
+ String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+ File dir = new File(base + fs +
"data" + fs + "ie" + fs + "baltimore" + fs + "merlin-examples",
"merlin-xmldsig-twenty-three");
Document doc = docBuilder.parse(new File(dir, "signature.xml"));