[Neuclear-develop] neuclear-id/src/test/org/neuclear/id NSToolsTest.java,1.15,1.16 SignedNamedCoreTest.java,1.3,1.4

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

Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id
In directory sc8-pr-cvs1:/tmp/cvs-serv1620/src/test/org/neuclear/id

Modified Files:
	NSToolsTest.java SignedNamedCoreTest.java 
Log Message:
Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
Cleaned up some missing fluff in the ElementProxy interface. getTagName(), getQName() and getNameSpace() have been killed.

Index: NSToolsTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/NSToolsTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** NSToolsTest.java	11 Dec 2003 16:16:14 -0000	1.15
--- NSToolsTest.java	11 Dec 2003 23:57:30 -0000	1.16
***************
*** 2,5 ****
--- 2,9 ----
    $Id$
    $Log$
+   Revision 1.16  2003/12/11 23:57:30  pelle
+   Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
+   Cleaned up some missing fluff in the ElementProxy interface. getTagName(), getQName() and getNameSpace() have been killed.
+ 
    Revision 1.15  2003/12/11 16:16:14  pelle
    Some changes to make the xml a bit more readable.
***************
*** 127,138 ****
  
  import junit.framework.TestCase;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.CryptoTools;
- import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.id.builders.AuthenticationTicketBuilder;
- import org.neuclear.id.builders.SignatureRequestBuilder;
  import org.neuclear.id.builders.IdentityBuilder;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
- import org.dom4j.DocumentHelper;
  
  
--- 131,141 ----
  
  import junit.framework.TestCase;
+ import org.dom4j.DocumentHelper;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.CryptoTools;
  import org.neuclear.id.builders.AuthenticationTicketBuilder;
  import org.neuclear.id.builders.IdentityBuilder;
+ import org.neuclear.id.builders.SignatureRequestBuilder;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
  
  
***************
*** 218,222 ****
      }
  
!     public static void testURL2Path() throws InvalidNamedObject {
          assertEquals("/", NSTools.name2path("neu://"));
          assertEquals("/test", NSTools.name2path("neu://test"));
--- 221,225 ----
      }
  
!     public static void testURL2Path() throws InvalidNamedObjectException {
          assertEquals("/", NSTools.name2path("neu://"));
          assertEquals("/test", NSTools.name2path("neu://test"));
***************
*** 252,259 ****
  
      public static void testIsNamedObject() throws NeuClearException, XMLSecurityException {
!         AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("neu://test","neu://neuclear.org","http://neuclear.org");
          assertTrue(NSTools.isNamedObject(builder.getElement()));
!         assertTrue(NSTools.isNamedObject(new SignatureRequestBuilder("neu://neuclear.org","neu://bob@test",builder,"Test").getElement()));
!         assertTrue(NSTools.isNamedObject(new IdentityBuilder("neu://test",Identity.getRootPK()).getElement()));
          assertFalse(NSTools.isNamedObject(DocumentHelper.createElement("test")));
          assertFalse(NSTools.isNamedObject(null));
--- 255,262 ----
  
      public static void testIsNamedObject() throws NeuClearException, XMLSecurityException {
!         AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("neu://test", "neu://neuclear.org", "http://neuclear.org");
          assertTrue(NSTools.isNamedObject(builder.getElement()));
!         assertTrue(NSTools.isNamedObject(new SignatureRequestBuilder("neu://neuclear.org", "neu://bob@test", builder, "Test").getElement()));
!         assertTrue(NSTools.isNamedObject(new IdentityBuilder("neu://test", Identity.getRootPK()).getElement()));
          assertFalse(NSTools.isNamedObject(DocumentHelper.createElement("test")));
          assertFalse(NSTools.isNamedObject(null));

Index: SignedNamedCoreTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/SignedNamedCoreTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SignedNamedCoreTest.java	22 Nov 2003 00:23:48 -0000	1.3
--- SignedNamedCoreTest.java	11 Dec 2003 23:57:30 -0000	1.4
***************
*** 32,35 ****
--- 32,39 ----
  $Id$
  $Log$
+ Revision 1.4  2003/12/11 23:57:30  pelle
+ Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
+ Cleaned up some missing fluff in the ElementProxy interface. getTagName(), getQName() and getNameSpace() have been killed.
+ 
  Revision 1.3  2003/11/22 00:23:48  pelle
  All unit tests in commons, id and xmlsec now work.
***************
*** 75,79 ****
              final SignedNamedCore core = SignedNamedCore.read(builder.getElement());
              assertEquals(core.getSignatory().getName(), name);
!         } catch (InvalidNamedObject e) {
              assertTrue(e.getLocalizedMessage(), false);
          }
--- 79,83 ----
              final SignedNamedCore core = SignedNamedCore.read(builder.getElement());
              assertEquals(core.getSignatory().getName(), name);
!         } catch (InvalidNamedObjectException e) {
              assertTrue(e.getLocalizedMessage(), false);
          }