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

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

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

Modified Files:
	RefTest.java SimpleXMLSigTest.java XMLSignerTest.java 
Log Message:
Got rid of the verifyXXX() methods

Index: RefTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/RefTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RefTest.java	13 Jan 2004 23:37:59 -0000	1.1
--- RefTest.java	14 Jan 2004 06:42:38 -0000	1.2
***************
*** 31,34 ****
--- 31,37 ----
  $Id$
  $Log$
+ Revision 1.2  2004/01/14 06:42:38  pelle
+ Got rid of the verifyXXX() methods
+ 
  Revision 1.1  2004/01/13 23:37:59  pelle
  Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
***************
*** 63,66 ****
--- 66,86 ----
          assertEquals("#one",ref.getUri());
          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>");
+         Reference ref=new Reference(doc.getRootElement().element("Object"),Reference.XMLSIGTYPE_ENVELOPED);
+         doc.getRootElement().element("SignedInfo").add(ref.getElement());
+         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());
+ 
+ 
      }
  

Index: SimpleXMLSigTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SimpleXMLSigTest.java	13 Jan 2004 23:37:59 -0000	1.6
--- SimpleXMLSigTest.java	14 Jan 2004 06:42:38 -0000	1.7
***************
*** 22,25 ****
--- 22,28 ----
   * $Id$
   * $Log$
+  * Revision 1.7  2004/01/14 06:42:38  pelle
+  * Got rid of the verifyXXX() methods
+  *
   * Revision 1.6  2004/01/13 23:37:59  pelle
   * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
***************
*** 113,117 ****
      public final void testRSASignXML() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(signer, doc.getRootElement(), "http://testsigs");
          final File outputFile = new File("target/testdata/homegrown/signature-enveloped-rsa.xml");
          XMLTools.writeFile(outputFile, doc);
--- 116,120 ----
      public final void testRSASignXML() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(signer, doc.getRootElement());
          final File outputFile = new File("target/testdata/homegrown/signature-enveloped-rsa.xml");
          XMLTools.writeFile(outputFile, doc);
***************
*** 123,127 ****
      public final void testRSAEnvelopingSignXML() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(signer, doc.getRootElement(), "http://testsigs", Reference.XMLSIGTYPE_ENVELOPING);
          final File outputFile = new File("target/testdata/homegrown/signature-enveloping-rsa.xml");
          XMLTools.writeFile(outputFile, sig.getElement());
--- 126,130 ----
      public final void testRSAEnvelopingSignXML() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(signer, doc.getRootElement(), Reference.XMLSIGTYPE_ENVELOPING);
          final File outputFile = new File("target/testdata/homegrown/signature-enveloping-rsa.xml");
          XMLTools.writeFile(outputFile, sig.getElement());
***************
*** 133,137 ****
      public final void testDSAEnvelopingSignXML() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(dsaSigner, doc.getRootElement(), "http://testsigs", Reference.XMLSIGTYPE_ENVELOPING);
          final File outputFile = new File("target/testdata/homegrown/signature-enveloping-dsa.xml");
          XMLTools.writeFile(outputFile, sig.getElement());
--- 136,140 ----
      public final void testDSAEnvelopingSignXML() throws DocumentException, XMLException, CryptoException {
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(dsaSigner, doc.getRootElement(), Reference.XMLSIGTYPE_ENVELOPING);
          final File outputFile = new File("target/testdata/homegrown/signature-enveloping-dsa.xml");
          XMLTools.writeFile(outputFile, sig.getElement());
***************
*** 145,149 ****
          assertTrue("Test if public key is really DSA", dsaSigner.getPublic() instanceof DSAPublicKey);
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(dsaSigner, doc.getRootElement(), "http://testDSAsigs");
  
          final File outputFile = new File("target/testdata/homegrown/signature-enveloped-dsa.xml");
--- 148,152 ----
          assertTrue("Test if public key is really DSA", dsaSigner.getPublic() instanceof DSAPublicKey);
          Document doc = DocumentHelper.parseText(TESTXML);
!         final XMLSignature sig = new XMLSignature(dsaSigner, doc.getRootElement());
  
          final File outputFile = new File("target/testdata/homegrown/signature-enveloped-dsa.xml");

Index: XMLSignerTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/XMLSignerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XMLSignerTest.java	13 Jan 2004 23:37:59 -0000	1.1
--- XMLSignerTest.java	14 Jan 2004 06:42:38 -0000	1.2
***************
*** 30,33 ****
--- 30,36 ----
  $Id$
  $Log$
+ Revision 1.2  2004/01/14 06:42:38  pelle
+ Got rid of the verifyXXX() methods
+ 
  Revision 1.1  2004/01/13 23:37:59  pelle
  Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
***************
*** 49,54 ****
          Document doc=DocumentHelper.parseText("<hello>test</hello>");
  
!         XMLSignature sig=new QuickEmbeddedSignature("neu://bob@test",signer,doc.getRootElement());
!         assertTrue(sig.verifySignature());
      }
  
--- 52,57 ----
          Document doc=DocumentHelper.parseText("<hello>test</hello>");
  
!         XMLSignature sig=new XMLSignature("neu://bob@test",signer,doc.getRootElement(),Reference.XMLSIGTYPE_ENVELOPED);
!         assertTrue(true);
      }