You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2011/01/07 12:23:13 UTC
svn commit: r1056263 [10/10] - in /santuario/xml-security-java/trunk: ./
src/test/java/javax/xml/crypto/test/
src/test/java/javax/xml/crypto/test/dsig/
src/test/java/javax/xml/crypto/test/dsig/dom/
src/test/java/javax/xml/crypto/test/dsig/keyinfo/ src/...
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/AllTests.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/AllTests.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/AllTests.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/AllTests.java Fri Jan 7 11:23:09 2011
@@ -21,16 +21,16 @@ import junit.framework.TestSuite;
public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for org.apache.xml.security.test.utils");
- //$JUnit-BEGIN$
- suite.addTest(IdResolverTest.suite());
- suite.addTest(Base64Test.suite());
- suite.addTestSuite(OldApiTest.class);
- //$JUnit-END$
- suite.addTest(org.apache.xml.security.test.utils.resolver.AllTests.suite());
- return suite;
- }
+ public static Test suite() {
+ TestSuite suite = new TestSuite(
+ "Test for org.apache.xml.security.test.utils");
+ //$JUnit-BEGIN$
+ suite.addTest(IdResolverTest.suite());
+ suite.addTest(Base64Test.suite());
+ suite.addTestSuite(OldApiTest.class);
+ //$JUnit-END$
+ suite.addTest(org.apache.xml.security.test.utils.resolver.AllTests.suite());
+ return suite;
+ }
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/Base64Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/Base64Test.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/Base64Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/Base64Test.java Fri Jan 7 11:23:09 2011
@@ -97,58 +97,58 @@ public class Base64Test extends TestCase
/**
* Method testWrap1
*
- * Test for correct line wrapping at end of an exactly 76 char string
- *
+ * Test for correct line wrapping at end of an exactly 76 char string
+ *
* @throws java.io.UnsupportedEncodingException
* @throws Exception
*/
- public static void testWrap1()
- throws java.io.UnsupportedEncodingException,Exception {
+ public static void testWrap1()
+ throws java.io.UnsupportedEncodingException,Exception {
- String inputData = "The quick brown fox jumps over the lazy dog and some extr";
- String expectedResult = "VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZyBhbmQgc29tZSBleHRy";
- String result = Base64.encode(inputData.getBytes("UTF-8"));
- assertEquals("Result of encoding", result, expectedResult);
+ String inputData = "The quick brown fox jumps over the lazy dog and some extr";
+ String expectedResult = "VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZyBhbmQgc29tZSBleHRy";
+ String result = Base64.encode(inputData.getBytes("UTF-8"));
+ assertEquals("Result of encoding", result, expectedResult);
- String result2 = new String(Base64.decode(result), "UTF-8");
- assertEquals("Result of encoding", result2, inputData);
+ String result2 = new String(Base64.decode(result), "UTF-8");
+ assertEquals("Result of encoding", result2, inputData);
ByteArrayOutputStream os=new ByteArrayOutputStream();
Base64.decode(expectedResult.getBytes(),os);
result2 = new String(os.toByteArray(), "UTF-8");
assertEquals("Result of encoding", result2, inputData);
- }
+ }
/**
* Method testWrap2
*
- * Test for correct line wrapping after more than 76 characters
- *
+ * Test for correct line wrapping after more than 76 characters
+ *
* @throws java.io.UnsupportedEncodingException
* @throws Exception
*/
- public static void testWrap2()
- throws java.io.UnsupportedEncodingException, Exception {
+ public static void testWrap2()
+ throws java.io.UnsupportedEncodingException, Exception {
- String inputData = "The quick brown fox jumps over the lazy dog and some extra text that will cause a line wrap";
- String expectedResult = null;
- if (XMLUtils.ignoreLineBreaks()) {
- expectedResult = "VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZyBhbmQgc29tZSBleHRyYSB0ZXh0IHRoYXQgd2lsbCBjYXVzZSBhIGxpbmUgd3JhcA==";
- } else {
- expectedResult = "VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZyBhbmQgc29tZSBleHRy\nYSB0ZXh0IHRoYXQgd2lsbCBjYXVzZSBhIGxpbmUgd3JhcA==";
- }
- String result = Base64.encode(inputData.getBytes("UTF-8"));
- assertEquals("Result of encoding", result, expectedResult);
+ String inputData = "The quick brown fox jumps over the lazy dog and some extra text that will cause a line wrap";
+ String expectedResult = null;
+ if (XMLUtils.ignoreLineBreaks()) {
+ expectedResult = "VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZyBhbmQgc29tZSBleHRyYSB0ZXh0IHRoYXQgd2lsbCBjYXVzZSBhIGxpbmUgd3JhcA==";
+ } else {
+ expectedResult = "VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZyBhbmQgc29tZSBleHRy\nYSB0ZXh0IHRoYXQgd2lsbCBjYXVzZSBhIGxpbmUgd3JhcA==";
+ }
+ String result = Base64.encode(inputData.getBytes("UTF-8"));
+ assertEquals("Result of encoding", result, expectedResult);
- String result2 = new String(Base64.decode(result), "UTF-8");
- assertEquals("Result of encoding", result2, inputData);
+ String result2 = new String(Base64.decode(result), "UTF-8");
+ assertEquals("Result of encoding", result2, inputData);
ByteArrayOutputStream os=new ByteArrayOutputStream();
Base64.decode(expectedResult.getBytes(),os);
result2 = new String(os.toByteArray(), "UTF-8");
assertEquals("Result of encoding", result2, inputData);
- }
+ }
static {
org.apache.xml.security.Init.init();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/IdResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/IdResolverTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/IdResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/IdResolverTest.java Fri Jan 7 11:23:09 2011
@@ -29,43 +29,43 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
public class IdResolverTest extends TestCase {
- public static Test suite() {
- return new TestSuite(IdResolverTest.class);
- }
- public void testIdSoap() throws Exception {
- String s="<env:Envelope xmlns:SOAP-SEC=\"http://schemas.xmlsoap.org/soap/security/2000-12\" xmlns:env=\"http://www.w3.org/2001/12/soap-envelope\" actor=\"some-uri\" mustUnderstand=\"1\">\r\n" +
- "<env:Header><SOAP-SEC:Signature>xxxx</SOAP-SEC:Signature></env:Header>\r\n" +
- "<env:Body SOAP-SEC:id=\"Body\">This is signed together with it\'s Body ancestor</env:Body>\r\n" +
- "</env:Envelope>";
- DocumentBuilderFactory dbf=DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- Document doc=dbf.newDocumentBuilder().parse(new ByteArrayInputStream(s.getBytes()));
- Element el=IdResolver.getElementById(doc, "Body");
- assertNotNull(el);
- assertEquals("Body",el.getLocalName());
- }
- public void testIdWithOtherIdSoap() throws Exception {
- String s="<env:Envelope xmlns:SOAP-SEC=\"http://schemas.xmlsoap.org/soap/security/2000-12\" xmlns:env=\"http://www.w3.org/2001/12/soap-envelope\" actor=\"some-uri\" mustUnderstand=\"1\">\r\n" +
- "<env:Header><SOAP-SEC:Signature>xxxx</SOAP-SEC:Signature></env:Header>\r\n" +
- "<a id=\"Body\"/><env:Body SOAP-SEC:id=\"Body\">This is signed together with it\'s Body ancestor</env:Body>\r\n" +
- "</env:Envelope>";
- DocumentBuilderFactory dbf=DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- Document doc=dbf.newDocumentBuilder().parse(new ByteArrayInputStream(s.getBytes()));
- Element el=IdResolver.getElementById(doc, "Body");
- assertNotNull(el);
- assertEquals("Body",el.getLocalName());
- }
- public void testANoId() throws Exception {
- String s="<env:Envelope xmlns:SOAP-SEC=\"http://schemas.xmlsoap.org/soap/security/2000-12\" xmlns:env=\"http://www.w3.org/2001/12/soap-envelope\" actor=\"some-uri\" mustUnderstand=\"1\">\r\n" +
- "<env:Header><SOAP-SEC:Signature>xxxx</SOAP-SEC:Signature></env:Header>\r\n" +
- "<a id=\"Body\"/>" +
- "</env:Envelope>";
- DocumentBuilderFactory dbf=DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- Document doc=dbf.newDocumentBuilder().parse(new ByteArrayInputStream(s.getBytes()));
- Element el=IdResolver.getElementById(doc, "Body");
- assertNotNull(el);
- assertEquals("a",el.getLocalName());
- }
+ public static Test suite() {
+ return new TestSuite(IdResolverTest.class);
+ }
+ public void testIdSoap() throws Exception {
+ String s="<env:Envelope xmlns:SOAP-SEC=\"http://schemas.xmlsoap.org/soap/security/2000-12\" xmlns:env=\"http://www.w3.org/2001/12/soap-envelope\" actor=\"some-uri\" mustUnderstand=\"1\">\r\n" +
+ "<env:Header><SOAP-SEC:Signature>xxxx</SOAP-SEC:Signature></env:Header>\r\n" +
+ "<env:Body SOAP-SEC:id=\"Body\">This is signed together with it\'s Body ancestor</env:Body>\r\n" +
+ "</env:Envelope>";
+ DocumentBuilderFactory dbf=DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ Document doc=dbf.newDocumentBuilder().parse(new ByteArrayInputStream(s.getBytes()));
+ Element el=IdResolver.getElementById(doc, "Body");
+ assertNotNull(el);
+ assertEquals("Body",el.getLocalName());
+ }
+ public void testIdWithOtherIdSoap() throws Exception {
+ String s="<env:Envelope xmlns:SOAP-SEC=\"http://schemas.xmlsoap.org/soap/security/2000-12\" xmlns:env=\"http://www.w3.org/2001/12/soap-envelope\" actor=\"some-uri\" mustUnderstand=\"1\">\r\n" +
+ "<env:Header><SOAP-SEC:Signature>xxxx</SOAP-SEC:Signature></env:Header>\r\n" +
+ "<a id=\"Body\"/><env:Body SOAP-SEC:id=\"Body\">This is signed together with it\'s Body ancestor</env:Body>\r\n" +
+ "</env:Envelope>";
+ DocumentBuilderFactory dbf=DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ Document doc=dbf.newDocumentBuilder().parse(new ByteArrayInputStream(s.getBytes()));
+ Element el=IdResolver.getElementById(doc, "Body");
+ assertNotNull(el);
+ assertEquals("Body",el.getLocalName());
+ }
+ public void testANoId() throws Exception {
+ String s="<env:Envelope xmlns:SOAP-SEC=\"http://schemas.xmlsoap.org/soap/security/2000-12\" xmlns:env=\"http://www.w3.org/2001/12/soap-envelope\" actor=\"some-uri\" mustUnderstand=\"1\">\r\n" +
+ "<env:Header><SOAP-SEC:Signature>xxxx</SOAP-SEC:Signature></env:Header>\r\n" +
+ "<a id=\"Body\"/>" +
+ "</env:Envelope>";
+ DocumentBuilderFactory dbf=DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ Document doc=dbf.newDocumentBuilder().parse(new ByteArrayInputStream(s.getBytes()));
+ Element el=IdResolver.getElementById(doc, "Body");
+ assertNotNull(el);
+ assertEquals("a",el.getLocalName());
+ }
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/OldApiTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/OldApiTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/OldApiTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/OldApiTest.java Fri Jan 7 11:23:09 2011
@@ -47,152 +47,152 @@ import org.w3c.dom.Element;
import org.xml.sax.SAXException;
public class OldApiTest extends TestCase {
-
- public static class OldTransform extends TransformSpi {
- static Transform compare;
- protected XMLSignatureInput enginePerformTransform(
- XMLSignatureInput input)
- throws IOException,
- CanonicalizationException, InvalidCanonicalizerException,
- TransformationException, ParserConfigurationException,
- SAXException {
- assertEquals(compare,_transformObject);
- return null ;
- }
-
- protected String engineGetURI() {
- // TODO Auto-generated method stub
- return null;
- };
- };
- public void testOldTransformSpiApi() throws Exception {
- Init.init();
- Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Transform.register("old", OldTransform.class.getName());
-
- Transform a=new Transform(doc,"old",null);
- OldTransform.compare=a;
- a.performTransform(null);
- };
-
- public static class OldResourceResolverSpi extends ResourceResolverSpi {
- Attr uriCompare;
- String baseCompare;
- public boolean engineCanResolve(Attr uri, String BaseURI) {
- if (uri.getValue().indexOf("!!!test=")!=0) {
- return false;
- }
- uriCompare=uri;
- baseCompare=BaseURI;
- return true;
- }
-
- public XMLSignatureInput engineResolve(Attr uri, String BaseURI) throws ResourceResolverException {
- assertEquals(uriCompare, uri);
- assertEquals(baseCompare,BaseURI);
- return null;
- }
-
- };
- public void testOldResourceResolverSpi() throws Exception {
- Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Attr uri=doc.createAttribute("id");
- uri.setNodeValue("!!!test=1");
- ((Element)doc.createElement("test")).setAttributeNode(uri);
- Attr uri1=doc.createAttribute("id");
- uri1.setNodeValue("!!!test=2");
- doc.createElement("test1").setAttributeNode(uri1);
- ResourceResolver.registerAtStart(OldResourceResolverSpi.class.getName());
- ResourceResolver resolver=ResourceResolver.getInstance(uri, "test");
- ResourceResolver resolver1=ResourceResolver.getInstance(uri1, "test1");
- ResourceResolver resolver2=ResourceResolver.getInstance(uri1, "test2");
-
- resolver2.resolve(uri1, "test2");
- resolver.resolve(uri, "test");
- resolver1.resolve(uri1, "test1");
-
-
- };
- static class PublicKeyMock implements PublicKey {
-
- public String getAlgorithm() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public byte[] getEncoded() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getFormat() {
- // TODO Auto-generated method stub
- return null;
- }
- };
- static public class OldKeyResolverSpi extends KeyResolverSpi {
- static int number=0;
- PublicKey pk=null;
- public OldKeyResolverSpi() {
- number++;
- };
- public boolean engineCanResolve(Element element, String BaseURI,
- StorageResolver storage) {
- if ("!!!testUri".equals(BaseURI))
- return true;
- return false;
- }
- public PublicKey engineResolvePublicKey(
- Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException {
- if (pk==null)
- pk=new PublicKeyMock();
- return pk;
- };
-
-
- public X509Certificate engineResolveX509Certificate(
- Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException{
- return null;
- };
-
- public SecretKey engineResolveSecretKey(
- Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException{
- return null;
- };
- };
-
- public void testOldKeyResolverSpi() throws Exception{
- KeyResolver.register(OldKeyResolverSpi.class.getName());
- Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Element el=((Element)doc.createElement("test"));
- PublicKey pk=KeyResolver.getPublicKey(el, "!!!testUri", null);
- assertNotNull(pk);
- assertTrue(pk instanceof PublicKeyMock);
- assertEquals(2, OldKeyResolverSpi.number);
- PublicKey pk1=KeyResolver.getPublicKey(el, "!!!testUri", null);
- assertNotSame(pk,pk1);
- assertEquals(3, OldKeyResolverSpi.number);
- }
- static public class OldKeyResolverNoPublicConsSpi extends OldKeyResolverSpi {
- protected OldKeyResolverNoPublicConsSpi() {
- };
- public OldKeyResolverNoPublicConsSpi(PublicKey pk) {
- this.pk=pk;
- }
- };
-
-
- public void testOldKeyResolverSpiInKeyInfo() throws Exception{
- Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Element el=(Element)doc.createElementNS("http://www.w3.org/2000/09/xmldsig#","KeyInfo");
- el.appendChild((Element)doc.createElementNS("http://www.w3.org/2000/09/xmldsig#","KeyInfo"));
- KeyInfo ki=new KeyInfo(el,"!!!testUri");
- PublicKey pk=new PublicKeyMock();
- ki.registerInternalKeyResolver(new OldKeyResolverNoPublicConsSpi(pk));
- assertNotNull(ki.getPublicKey());
-
- }
+
+ public static class OldTransform extends TransformSpi {
+ static Transform compare;
+ protected XMLSignatureInput enginePerformTransform(
+ XMLSignatureInput input)
+ throws IOException,
+ CanonicalizationException, InvalidCanonicalizerException,
+ TransformationException, ParserConfigurationException,
+ SAXException {
+ assertEquals(compare,_transformObject);
+ return null ;
+ }
+
+ protected String engineGetURI() {
+ // TODO Auto-generated method stub
+ return null;
+ };
+ };
+ public void testOldTransformSpiApi() throws Exception {
+ Init.init();
+ Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Transform.register("old", OldTransform.class.getName());
+
+ Transform a=new Transform(doc,"old",null);
+ OldTransform.compare=a;
+ a.performTransform(null);
+ };
+
+ public static class OldResourceResolverSpi extends ResourceResolverSpi {
+ Attr uriCompare;
+ String baseCompare;
+ public boolean engineCanResolve(Attr uri, String BaseURI) {
+ if (uri.getValue().indexOf("!!!test=")!=0) {
+ return false;
+ }
+ uriCompare=uri;
+ baseCompare=BaseURI;
+ return true;
+ }
+
+ public XMLSignatureInput engineResolve(Attr uri, String BaseURI) throws ResourceResolverException {
+ assertEquals(uriCompare, uri);
+ assertEquals(baseCompare,BaseURI);
+ return null;
+ }
+
+ };
+ public void testOldResourceResolverSpi() throws Exception {
+ Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Attr uri=doc.createAttribute("id");
+ uri.setNodeValue("!!!test=1");
+ ((Element)doc.createElement("test")).setAttributeNode(uri);
+ Attr uri1=doc.createAttribute("id");
+ uri1.setNodeValue("!!!test=2");
+ doc.createElement("test1").setAttributeNode(uri1);
+ ResourceResolver.registerAtStart(OldResourceResolverSpi.class.getName());
+ ResourceResolver resolver=ResourceResolver.getInstance(uri, "test");
+ ResourceResolver resolver1=ResourceResolver.getInstance(uri1, "test1");
+ ResourceResolver resolver2=ResourceResolver.getInstance(uri1, "test2");
+
+ resolver2.resolve(uri1, "test2");
+ resolver.resolve(uri, "test");
+ resolver1.resolve(uri1, "test1");
+
+
+ };
+ static class PublicKeyMock implements PublicKey {
+
+ public String getAlgorithm() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public byte[] getEncoded() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getFormat() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ };
+ static public class OldKeyResolverSpi extends KeyResolverSpi {
+ static int number=0;
+ PublicKey pk=null;
+ public OldKeyResolverSpi() {
+ number++;
+ };
+ public boolean engineCanResolve(Element element, String BaseURI,
+ StorageResolver storage) {
+ if ("!!!testUri".equals(BaseURI))
+ return true;
+ return false;
+ }
+ public PublicKey engineResolvePublicKey(
+ Element element, String BaseURI, StorageResolver storage)
+ throws KeyResolverException {
+ if (pk==null)
+ pk=new PublicKeyMock();
+ return pk;
+ };
+
+
+ public X509Certificate engineResolveX509Certificate(
+ Element element, String BaseURI, StorageResolver storage)
+ throws KeyResolverException{
+ return null;
+ };
+
+ public SecretKey engineResolveSecretKey(
+ Element element, String BaseURI, StorageResolver storage)
+ throws KeyResolverException{
+ return null;
+ };
+ };
+
+ public void testOldKeyResolverSpi() throws Exception{
+ KeyResolver.register(OldKeyResolverSpi.class.getName());
+ Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Element el=((Element)doc.createElement("test"));
+ PublicKey pk=KeyResolver.getPublicKey(el, "!!!testUri", null);
+ assertNotNull(pk);
+ assertTrue(pk instanceof PublicKeyMock);
+ assertEquals(2, OldKeyResolverSpi.number);
+ PublicKey pk1=KeyResolver.getPublicKey(el, "!!!testUri", null);
+ assertNotSame(pk,pk1);
+ assertEquals(3, OldKeyResolverSpi.number);
+ }
+ static public class OldKeyResolverNoPublicConsSpi extends OldKeyResolverSpi {
+ protected OldKeyResolverNoPublicConsSpi() {
+ };
+ public OldKeyResolverNoPublicConsSpi(PublicKey pk) {
+ this.pk=pk;
+ }
+ };
+
+
+ public void testOldKeyResolverSpiInKeyInfo() throws Exception{
+ Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Element el=(Element)doc.createElementNS("http://www.w3.org/2000/09/xmldsig#","KeyInfo");
+ el.appendChild((Element)doc.createElementNS("http://www.w3.org/2000/09/xmldsig#","KeyInfo"));
+ KeyInfo ki=new KeyInfo(el,"!!!testUri");
+ PublicKey pk=new PublicKeyMock();
+ ki.registerInternalKeyResolver(new OldKeyResolverNoPublicConsSpi(pk));
+ assertNotNull(ki.getPublicKey());
+
+ }
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/AllTests.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/AllTests.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/AllTests.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/AllTests.java Fri Jan 7 11:23:09 2011
@@ -21,14 +21,14 @@ import junit.framework.TestSuite;
public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for org.apache.xml.security.test.utils.resolver");
- //$JUnit-BEGIN$
- suite.addTest(ResourceResolverTest.suite());
- suite.addTestSuite(ResolverDirectHTTP.class);
- //$JUnit-END$
- return suite;
- }
+ public static Test suite() {
+ TestSuite suite = new TestSuite(
+ "Test for org.apache.xml.security.test.utils.resolver");
+ //$JUnit-BEGIN$
+ suite.addTest(ResourceResolverTest.suite());
+ suite.addTestSuite(ResolverDirectHTTP.class);
+ //$JUnit-END$
+ return suite;
+ }
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/ResolverDirectHTTP.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/ResolverDirectHTTP.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/ResolverDirectHTTP.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/ResolverDirectHTTP.java Fri Jan 7 11:23:09 2011
@@ -29,17 +29,17 @@ import org.w3c.dom.Element;
public class ResolverDirectHTTP extends TestCase {
public void testBug40783() throws Exception{
- Init.init();
- Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Attr uri=doc.createAttribute("id");
- uri.setNodeValue("urn:ddd:uuu");
- ((Element)doc.createElement("test")).setAttributeNode(uri);
- try {
- ResourceResolver resolver=ResourceResolver.getInstance(uri, null);
- fail("No exception throw, but resolver found:"+resolver);
- } catch (ResourceResolverException e) {
-
- }
- }
+ Init.init();
+ Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Attr uri=doc.createAttribute("id");
+ uri.setNodeValue("urn:ddd:uuu");
+ ((Element)doc.createElement("test")).setAttributeNode(uri);
+ try {
+ ResourceResolver resolver=ResourceResolver.getInstance(uri, null);
+ fail("No exception throw, but resolver found:"+resolver);
+ } catch (ResourceResolverException e) {
+
+ }
+ }
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/ResourceResolverTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/ResourceResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/resolver/ResourceResolverTest.java Fri Jan 7 11:23:09 2011
@@ -38,7 +38,7 @@ public class ResourceResolverTest extend
/** {@link org.apache.commons.logging} logging facility */
static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog
- (ResourceResolverTest.class.getName());
+ (ResourceResolverTest.class.getName());
public static Test suite() {
return new TestSuite(ResourceResolverTest.class);
@@ -50,7 +50,7 @@ public class ResourceResolverTest extend
public static void main(String[] args) {
String[] testCaseName =
- { "-noloading", ResourceResolverTest.class.getName() };
+ { "-noloading", ResourceResolverTest.class.getName() };
junit.textui.TestRunner.main(testCaseName);
@@ -61,47 +61,47 @@ public class ResourceResolverTest extend
* Tests registering a custom resolver implementation.
*/
public static void testCustomResolver() throws Exception {
- String className =
- "org.apache.xml.security.test.utils.resolver.OfflineResolver";
- ResourceResolver.registerAtStart(className);
- Document doc =
+ String className =
+ "org.apache.xml.security.test.utils.resolver.OfflineResolver";
+ ResourceResolver.registerAtStart(className);
+ Document doc =
DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Attr uriAttr = doc.createAttribute("URI");
- uriAttr.setValue("http://www.apache.org");
- ResourceResolver res =
- ResourceResolver.getInstance(uriAttr, "http://www.apache.org");
- try {
- uriAttr.setValue("http://xmldsig.pothole.com/xml-stylesheet.txt");
- res.resolve(uriAttr, null);
- } catch (Exception e) {
- e.printStackTrace();
- fail(uriAttr.getValue()
- + " should be resolvable by the OfflineResolver");
- }
- try {
- uriAttr.setValue("http://www.apache.org");
- res.resolve(uriAttr, null);
- fail(uriAttr.getValue()
- + " should not be resolvable by the OfflineResolver");
- } catch (Exception e) { }
+ Attr uriAttr = doc.createAttribute("URI");
+ uriAttr.setValue("http://www.apache.org");
+ ResourceResolver res =
+ ResourceResolver.getInstance(uriAttr, "http://www.apache.org");
+ try {
+ uriAttr.setValue("http://xmldsig.pothole.com/xml-stylesheet.txt");
+ res.resolve(uriAttr, null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(uriAttr.getValue()
+ + " should be resolvable by the OfflineResolver");
+ }
+ try {
+ uriAttr.setValue("http://www.apache.org");
+ res.resolve(uriAttr, null);
+ fail(uriAttr.getValue()
+ + " should not be resolvable by the OfflineResolver");
+ } catch (Exception e) { }
}
public static void testLocalFileWithEmptyBaseURI() throws Exception {
- Document doc =
+ Document doc =
DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Attr uriAttr = doc.createAttribute("URI");
- String basedir = System.getProperty("basedir");
- String file = new File(basedir, "build.xml").toURI().toString();
- uriAttr.setValue(file);
- ResourceResolver res = ResourceResolver.getInstance(uriAttr, file);
- try {
- res.resolve(uriAttr, "");
- } catch (Exception e) {
- fail(e.getMessage());
- }
+ Attr uriAttr = doc.createAttribute("URI");
+ String basedir = System.getProperty("basedir");
+ String file = new File(basedir, "build.xml").toURI().toString();
+ uriAttr.setValue(file);
+ ResourceResolver res = ResourceResolver.getInstance(uriAttr, file);
+ try {
+ res.resolve(uriAttr, "");
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
}
static {
- org.apache.xml.security.Init.init();
+ org.apache.xml.security.Init.init();
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/version/VersionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/version/VersionTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/version/VersionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/version/VersionTest.java Fri Jan 7 11:23:09 2011
@@ -28,61 +28,61 @@ import java.security.Security;
*/
public class VersionTest extends TestCase {
- public VersionTest() {
- super("VersionTest");
- }
+ public VersionTest() {
+ super("VersionTest");
+ }
- public VersionTest(String name) {
- super(name);
- }
+ public VersionTest(String name) {
+ super(name);
+ }
- public static Test suite() {
- return new TestSuite(VersionTest.class);
- }
-
- /**
- * A unit test for the algorithm below to convert a version number
- * to a double.
- */
- public void testConvertVersion() throws Exception {
- String version = convertVersion("1.4.4");
- assertTrue("1.44".equals(version));
-
- version = convertVersion("1.4.4-SNAPSHOT");
+ public static Test suite() {
+ return new TestSuite(VersionTest.class);
+ }
+
+ /**
+ * A unit test for the algorithm below to convert a version number
+ * to a double.
+ */
+ public void testConvertVersion() throws Exception {
+ String version = convertVersion("1.4.4");
+ assertTrue("1.44".equals(version));
+
+ version = convertVersion("1.4.4-SNAPSHOT");
assertTrue("1.44".equals(version));
version = convertVersion("1.4");
assertTrue("1.4".equals(version));
- }
+ }
- public void testVersion() throws Exception {
- Security.addProvider(new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
-
- Provider provider = Security.getProvider("XMLDSig");
+ public void testVersion() throws Exception {
+ Security.addProvider(new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
+
+ Provider provider = Security.getProvider("XMLDSig");
assertTrue(provider != null);
- String version = System.getProperty("product.version");
- assertTrue(version != null);
-
- version = convertVersion(version);
-
- double versionD = Double.parseDouble(version);
- assertTrue(versionD == provider.getVersion());
-
- String info = "Apache Santuario XMLDSig " +
+ String version = System.getProperty("product.version");
+ assertTrue(version != null);
+
+ version = convertVersion(version);
+
+ double versionD = Double.parseDouble(version);
+ assertTrue(versionD == provider.getVersion());
+
+ String info = "Apache Santuario XMLDSig " +
"(DOM XMLSignatureFactory; DOM KeyInfoFactory)";
-
- assertTrue(info.equals(provider.getInfo()));
- }
-
- /**
- * Convert the version to a number that can be parsed to a double.
- * Namely, remove the "-SNAPSHOT" from the end, and convert version
- * numbers like 1.4.4 to 1.44.
- */
- private String convertVersion(String version) {
-
- // Remove the "-SNAPSHOT" version if it exists
+
+ assertTrue(info.equals(provider.getInfo()));
+ }
+
+ /**
+ * Convert the version to a number that can be parsed to a double.
+ * Namely, remove the "-SNAPSHOT" from the end, and convert version
+ * numbers like 1.4.4 to 1.44.
+ */
+ private String convertVersion(String version) {
+
+ // Remove the "-SNAPSHOT" version if it exists
int dash = version.indexOf('-');
if (dash != -1) {
version = version.substring(0, dash);
@@ -97,6 +97,6 @@ public class VersionTest extends TestCas
}
return version;
- }
-
+ }
+
}