[Neuclear-develop] neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec RefTest.java,1.6,1.7

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30922/src/test/org/neuclear/xml/xmlsec

Modified Files:
	RefTest.java 
Log Message:
Attempting to make Reference and SignedInfo more compliant with the standard.
SignedInfo can now contain more than one reference. 
Reference is on the way to becoming more flexible and two support more than one transform. 
I am adding Crypto Channels to commons to help this out and to hopefully speed things up as well.

Index: RefTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/RefTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RefTest.java	2 Mar 2004 18:39:57 -0000	1.6
--- RefTest.java	5 Mar 2004 23:47:17 -0000	1.7
***************
*** 10,14 ****
  
  import java.io.File;
! import java.net.MalformedURLException;
  
  /*
--- 10,14 ----
  
  import java.io.File;
! import java.io.IOException;
  
  /*
***************
*** 32,35 ****
--- 32,41 ----
  $Id$
  $Log$
+ Revision 1.7  2004/03/05 23:47:17  pelle
+ Attempting to make Reference and SignedInfo more compliant with the standard.
+ SignedInfo can now contain more than one reference.
+ Reference is on the way to becoming more flexible and two support more than one transform.
+ I am adding Crypto Channels to commons to help this out and to hopefully speed things up as well.
+ 
  Revision 1.6  2004/03/02 18:39:57  pelle
  Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
***************
*** 65,102 ****
      }
  
!     public void testExternalReference() throws XMLException, CryptoException, MalformedURLException {
!         File rfile=new File("project.xml");
          final String uri = rfile.toURL().toExternalForm();
!         Reference ref=new Reference(uri);
          assertNotNull(ref);
  //        assertNotNull(ref.getDigest());
!         assertEquals(uri,ref.getUri());
          System.out.println(ref.asXML());
      }
  
      public void testEnvelopedReference() throws DocumentException, XMLException, CryptoException {
!         Document doc=DocumentHelper.parseText("<test>hello</test>");
!         Reference ref=new Reference(doc.getRootElement(),Reference.XMLSIGTYPE_ENVELOPED);
          assertNotNull(ref);
  //        assertNotNull(ref.getDigest());
!         assertEquals("",ref.getUri());
  //        assertEquals(ref.);
          System.out.println(ref.asXML());
  
      }
      public void testEnvelopingReference() throws DocumentException, XMLException, CryptoException, InvalidSignatureException {
!         Document doc=DocumentHelper.parseText("<Signature><SignedInfo/><Object Id=\"one\"><test>hello</test></Object></Signature>");
!         Reference ref=new Reference(doc.getRootElement().element("Object"),Reference.XMLSIGTYPE_ENVELOPING);
          doc.getRootElement().element("SignedInfo").add(ref.getElement());
!         assertNotNull(XMLTools.getByID(doc,"one"));
          assertNotNull(ref);
  //        assertNotNull(ref.getDigest());
!         assertEquals("#one",ref.getUri());
          System.out.println(doc.asXML());
  
!         Document doc2=DocumentHelper.parseText(doc.asXML());
!         Reference ref2=new Reference(doc2.getRootElement().element("SignedInfo").element("Reference"));
  //        assertEquals(ref.getDigest(),ref2.getDigest());
!         assertEquals(ref.getUri(),ref2.getUri());
  
  
--- 71,109 ----
      }
  
!     public void testExternalReference() throws XMLException, CryptoException, IOException {
!         File rfile = new File("project.xml");
          final String uri = rfile.toURL().toExternalForm();
!         Reference ref = new Reference(uri);
          assertNotNull(ref);
  //        assertNotNull(ref.getDigest());
!         assertEquals(uri, ref.getUri());
          System.out.println(ref.asXML());
      }
  
      public void testEnvelopedReference() throws DocumentException, XMLException, CryptoException {
!         Document doc = DocumentHelper.parseText("<test>hello</test>");
!         Reference ref = new Reference(doc.getRootElement(), Reference.XMLSIGTYPE_ENVELOPED);
          assertNotNull(ref);
  //        assertNotNull(ref.getDigest());
!         assertEquals("", ref.getUri());
  //        assertEquals(ref.);
          System.out.println(ref.asXML());
  
      }
+ 
      public void testEnvelopingReference() throws DocumentException, XMLException, CryptoException, InvalidSignatureException {
!         Document doc = DocumentHelper.parseText("<Signature><SignedInfo/><Object Id=\"one\"><test>hello</test></Object></Signature>");
!         Reference ref = new Reference(doc.getRootElement().element("Object"), Reference.XMLSIGTYPE_ENVELOPING);
          doc.getRootElement().element("SignedInfo").add(ref.getElement());
!         assertNotNull(XMLTools.getByID(doc, "one"));
          assertNotNull(ref);
  //        assertNotNull(ref.getDigest());
!         assertEquals("#one", ref.getUri());
          System.out.println(doc.asXML());
  
!         Document doc2 = DocumentHelper.parseText(doc.asXML());
!         Reference ref2 = new Reference(doc2.getRootElement().element("SignedInfo").element("Reference"));
  //        assertEquals(ref.getDigest(),ref2.getDigest());
!         assertEquals(ref.getUri(), ref2.getUri());