|
From: Pelle B. <pe...@us...> - 2004-04-14 23:44:55
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3790/src/test/org/neuclear/id Modified Files: IdentityTests.java NeuClearBenchmark.java SignedNamedCoreTest.java Log Message: Got the cactus tests working and the sample web app Index: SignedNamedCoreTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/SignedNamedCoreTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SignedNamedCoreTest.java 1 Apr 2004 23:19:51 -0000 1.9 --- SignedNamedCoreTest.java 14 Apr 2004 23:44:46 -0000 1.10 *************** *** 33,36 **** --- 33,39 ---- $Id$ $Log$ + Revision 1.10 2004/04/14 23:44:46 pelle + Got the cactus tests working and the sample web app + Revision 1.9 2004/04/01 23:19:51 pelle Split Identity into Signatory and Identity class. *************** *** 93,97 **** assertNotNull(bobx); assertNotNull(bobx.getName()); ! System.out.println(bobx.getName()); assertNotNull(bobx.getPublicKey()); } --- 96,100 ---- assertNotNull(bobx); assertNotNull(bobx.getName()); ! // System.out.println(bobx.getName()); assertNotNull(bobx.getPublicKey()); } *************** *** 99,108 **** public final void testRead() throws NeuClearException, GeneralSecurityException, XMLException, FileNotFoundException { final String name = "neu://bob@test"; ! final Builder builder = new AuthenticationTicketBuilder(name, "neu://test", "http://slashdot.org"); ! System.out.println("====="); ! System.out.println(builder.asXML()); builder.sign(name, signer); ! System.out.println(builder.asXML()); assertTrue(builder.verify()); --- 102,111 ---- public final void testRead() throws NeuClearException, GeneralSecurityException, XMLException, FileNotFoundException { final String name = "neu://bob@test"; ! final Builder builder = new AuthenticationTicketBuilder("http://slashdot.org"); ! // System.out.println("====="); ! // System.out.println(builder.asXML()); builder.sign(name, signer); ! // System.out.println(builder.asXML()); assertTrue(builder.verify()); Index: NeuClearBenchmark.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/NeuClearBenchmark.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NeuClearBenchmark.java 3 Mar 2004 23:26:44 -0000 1.4 --- NeuClearBenchmark.java 14 Apr 2004 23:44:46 -0000 1.5 *************** *** 1,8 **** package org.neuclear.id; - import org.neuclear.id.auth.AuthenticationTicket; import org.neuclear.commons.crypto.signers.InvalidPassphraseException; import org.neuclear.commons.crypto.signers.Signer; import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.builders.AuthenticationTicketBuilder; --- 1,8 ---- package org.neuclear.id; import org.neuclear.commons.crypto.signers.InvalidPassphraseException; import org.neuclear.commons.crypto.signers.Signer; import org.neuclear.commons.crypto.signers.TestCaseSigner; + import org.neuclear.id.auth.AuthenticationTicket; import org.neuclear.id.builders.AuthenticationTicketBuilder; *************** *** 14,30 **** * To change this template use Options | File Templates. */ ! public class NeuClearBenchmark implements Runnable{ private static final int RUNS = 100; private static final int THREADS = 10; public NeuClearBenchmark() throws InvalidPassphraseException { ! signer=new TestCaseSigner(); } ! public static void main(String args[]){ try { ! NeuClearBenchmark bench=new NeuClearBenchmark(); bench.startTimer(); ! for (int i=0;i<THREADS;i++) new Thread(bench).start(); --- 14,31 ---- * To change this template use Options | File Templates. */ ! public class NeuClearBenchmark implements Runnable { private static final int RUNS = 100; private static final int THREADS = 10; public NeuClearBenchmark() throws InvalidPassphraseException { ! signer = new TestCaseSigner(); } ! ! public static void main(String args[]) { try { ! NeuClearBenchmark bench = new NeuClearBenchmark(); bench.startTimer(); ! for (int i = 0; i < THREADS; i++) new Thread(bench).start(); *************** *** 35,57 **** } ! public void startTimer(){ ! start=System.currentTimeMillis(); ! startMemory=Runtime.getRuntime().totalMemory(); } - long start=0; - long end=0; - long startMemory=0; - long endMemory=0; ! public synchronized void finished(){ ! if (++count==THREADS) { ! long end=System.currentTimeMillis(); ! long endMemory=Runtime.getRuntime().totalMemory(); //long postGC=Ru ! System.out.println("Amount of runs:"+RUNS*THREADS); ! System.out.println("Total Time: "+(end-start)/1000+" seconds"); ! System.out.println("Time per Transaction: "+(end-start)/(THREADS+RUNS)+" ms."); ! System.out.println("Memory Increase: "+(endMemory-startMemory)); ! System.out.println("Memory Increase per Transaction: "+(endMemory-startMemory)/(THREADS+RUNS)); notifyAll(); } --- 36,59 ---- } ! public void startTimer() { ! start = System.currentTimeMillis(); ! startMemory = Runtime.getRuntime().totalMemory(); } ! long start = 0; ! long end = 0; ! long startMemory = 0; ! long endMemory = 0; ! ! public synchronized void finished() { ! if (++count == THREADS) { ! long end = System.currentTimeMillis(); ! long endMemory = Runtime.getRuntime().totalMemory(); //long postGC=Ru ! System.out.println("Amount of runs:" + RUNS * THREADS); ! System.out.println("Total Time: " + (end - start) / 1000 + " seconds"); ! System.out.println("Time per Transaction: " + (end - start) / (THREADS + RUNS) + " ms."); ! System.out.println("Memory Increase: " + (endMemory - startMemory)); ! System.out.println("Memory Increase per Transaction: " + (endMemory - startMemory) / (THREADS + RUNS)); notifyAll(); } *************** *** 59,68 **** } ! public void run() { try { ! for (int i=0;i<RUNS;i++) { ! AuthenticationTicketBuilder builder=new AuthenticationTicketBuilder("neu://alice@test","neu://test","http://test.com"); ! AuthenticationTicket ticket=(AuthenticationTicket) builder.convert("neu://bob@test",signer); } finished(); --- 61,71 ---- } ! ! public void run() { try { ! for (int i = 0; i < RUNS; i++) { ! AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("http://test.com"); ! AuthenticationTicket ticket = (AuthenticationTicket) builder.convert("neu://bob@test", signer); } finished(); *************** *** 71,75 **** } } private Signer signer; ! private int count=0; } --- 74,79 ---- } } + private Signer signer; ! private int count = 0; } Index: IdentityTests.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/IdentityTests.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** IdentityTests.java 1 Apr 2004 23:19:51 -0000 1.9 --- IdentityTests.java 14 Apr 2004 23:44:46 -0000 1.10 *************** *** 38,44 **** Identity id = (Identity) obj; assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())), ! obj.getName().substring(5, 37)); assertEquals(new String(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())), ! new String(Base32.decode(obj.getName().substring(5, 37)))); assertEquals(id.getSigner(), SIGNER); assertNotNull(id.getSignatory().getPublicKey()); --- 38,44 ---- Identity id = (Identity) obj; assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())), ! obj.getName().substring(4, 36)); assertEquals(new String(CryptoTools.digest(signer.getPublicKey(NAME).getEncoded())), ! new String(Base32.decode(obj.getName().substring(4, 36)))); assertEquals(id.getSigner(), SIGNER); assertNotNull(id.getSignatory().getPublicKey()); *************** *** 58,63 **** assertNotNull(id); assertNotNull(id.getName()); ! assertEquals("sha1:", id.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), id.getName().substring(5)); assertEquals(kp.getPublic(), id.getPublicKey()); --- 58,63 ---- assertNotNull(id); assertNotNull(id.getName()); ! // assertEquals("sha1:", id.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), id.getName()); assertEquals(kp.getPublic(), id.getPublicKey()); *************** *** 72,77 **** SignedNamedObject obj = VerifyingReader.getInstance().read(elem); System.out.println("Name: " + obj.getName()); ! assertEquals("sha1:", obj.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), obj.getName().substring(5, 37)); assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())), obj.getName().substring(obj.getName().length() - 32)); --- 72,77 ---- SignedNamedObject obj = VerifyingReader.getInstance().read(elem); System.out.println("Name: " + obj.getName()); ! // assertEquals("sha1:", obj.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), obj.getName().substring(4, 36)); assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())), obj.getName().substring(obj.getName().length() - 32)); *************** *** 80,85 **** assertNotNull(id); assertNotNull(id.getName()); ! assertEquals("sha1:", id.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), id.getName().substring(5)); assertEquals(kp.getPublic(), id.getPublicKey()); --- 80,85 ---- assertNotNull(id); assertNotNull(id.getName()); ! // assertEquals("sha1:", id.getName().substring(0, 5)); ! assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), id.getName()); assertEquals(kp.getPublic(), id.getPublicKey()); |