From bcbf7e6270e4edb727e05e71f33120be9564949f Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 4 Jan 2013 00:31:28 +0000 Subject: [PATCH] - Speed up crypto tests, reduce memory usage, use common context --- core/java/test/junit/net/i2p/crypto/AES256Test.java | 4 ++-- core/java/test/junit/net/i2p/crypto/DSATest.java | 6 +++--- core/java/test/junit/net/i2p/crypto/ElGamalTest.java | 10 +++++----- .../java/test/junit/net/i2p/crypto/HMACSHA256Test.java | 6 +++--- .../test/junit/net/i2p/crypto/KeyGeneratorTest.java | 4 ++-- core/java/test/junit/net/i2p/crypto/SHA1HashTest.java | 4 ++-- core/java/test/junit/net/i2p/crypto/SHA256Test.java | 4 ++-- .../junit/net/i2p/crypto/SessionEncryptionTest.java | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/java/test/junit/net/i2p/crypto/AES256Test.java b/core/java/test/junit/net/i2p/crypto/AES256Test.java index eddf1cb01..eae3a0ec9 100644 --- a/core/java/test/junit/net/i2p/crypto/AES256Test.java +++ b/core/java/test/junit/net/i2p/crypto/AES256Test.java @@ -22,7 +22,7 @@ public class AES256Test extends TestCase{ private byte[] iv; protected void setUp() { - _context = new I2PAppContext(); + _context = I2PAppContext.getGlobalContext(); } public void testMultiple(){ @@ -73,4 +73,4 @@ public class AES256Test extends TestCase{ ctx.aes().decrypt(se, 0, sd, 0, key, iv, se.length); assertTrue(DataHelper.eq(sd, sbuf)); } -} \ No newline at end of file +} diff --git a/core/java/test/junit/net/i2p/crypto/DSATest.java b/core/java/test/junit/net/i2p/crypto/DSATest.java index b2fbfab73..6f3bae41c 100644 --- a/core/java/test/junit/net/i2p/crypto/DSATest.java +++ b/core/java/test/junit/net/i2p/crypto/DSATest.java @@ -20,11 +20,11 @@ public class DSATest extends TestCase{ private I2PAppContext _context; protected void setUp() { - _context = new I2PAppContext(); + _context = I2PAppContext.getGlobalContext(); } public void testMultiple(){ - for(int i = 0; i < 100; i++){ + for(int i = 0; i < 25; i++){ byte[] message = new byte[256]; _context.random().nextBytes(message); @@ -41,4 +41,4 @@ public class DSATest extends TestCase{ assertTrue(DSAEngine.getInstance().verifySignature(s, new ByteArrayInputStream(message), pubkey)); } } -} \ No newline at end of file +} diff --git a/core/java/test/junit/net/i2p/crypto/ElGamalTest.java b/core/java/test/junit/net/i2p/crypto/ElGamalTest.java index c917219ad..337dec380 100644 --- a/core/java/test/junit/net/i2p/crypto/ElGamalTest.java +++ b/core/java/test/junit/net/i2p/crypto/ElGamalTest.java @@ -125,7 +125,7 @@ public class ElGamalTest extends TestCase{ }; protected void setUp() { - _context = new I2PAppContext(); + _context = I2PAppContext.getGlobalContext(); Object o = YKGenerator.class; } @@ -331,7 +331,7 @@ public class ElGamalTest extends TestCase{ } public void testElGamalAESEngine() throws Exception{ - I2PAppContext ctx = new I2PAppContext(); + I2PAppContext ctx = I2PAppContext.getGlobalContext(); ElGamalAESEngine e = new ElGamalAESEngine(ctx); Object kp[] = ctx.keyGenerator().generatePKIKeypair(); PublicKey pubKey = (PublicKey)kp[0]; @@ -352,9 +352,9 @@ public class ElGamalTest extends TestCase{ } public void testElGamalEngine(){ - int numRuns = 100; + int numRuns = 10; RandomSource.getInstance().nextBoolean(); - I2PAppContext context = new I2PAppContext(); + I2PAppContext context = I2PAppContext.getGlobalContext(); for (int i = 0; i < numRuns; i++) { Object pair[] = KeyGenerator.getInstance().generatePKIKeypair(); @@ -372,7 +372,7 @@ public class ElGamalTest extends TestCase{ public void testYKGen(){ RandomSource.getInstance().nextBoolean(); - I2PAppContext context = new I2PAppContext(); + I2PAppContext context = I2PAppContext.getGlobalContext(); YKGenerator ykgen = new YKGenerator(context); for (int i = 0; i < 5; i++) { ykgen.getNextYK(); diff --git a/core/java/test/junit/net/i2p/crypto/HMACSHA256Test.java b/core/java/test/junit/net/i2p/crypto/HMACSHA256Test.java index 67e4721cd..74bd75453 100644 --- a/core/java/test/junit/net/i2p/crypto/HMACSHA256Test.java +++ b/core/java/test/junit/net/i2p/crypto/HMACSHA256Test.java @@ -16,12 +16,12 @@ public class HMACSHA256Test extends TestCase{ private I2PAppContext _context; protected void setUp() { - _context = new I2PAppContext(); + _context = I2PAppContext.getGlobalContext(); } public void testMultiple(){ int size = 1; - for(int i = 0; i < 24; i++){ + for(int i = 0; i < 16; i++){ SessionKey key = _context.keyGenerator().generateSessionKey(); byte[] message = new byte[size]; @@ -31,4 +31,4 @@ public class HMACSHA256Test extends TestCase{ _context.hmac().calculate(key, message); } } -} \ No newline at end of file +} diff --git a/core/java/test/junit/net/i2p/crypto/KeyGeneratorTest.java b/core/java/test/junit/net/i2p/crypto/KeyGeneratorTest.java index ce644bb40..22242a6b1 100644 --- a/core/java/test/junit/net/i2p/crypto/KeyGeneratorTest.java +++ b/core/java/test/junit/net/i2p/crypto/KeyGeneratorTest.java @@ -24,7 +24,7 @@ public class KeyGeneratorTest extends TestCase{ byte src[] = new byte[200]; RandomSource.getInstance().nextBytes(src); - I2PAppContext ctx = new I2PAppContext(); + I2PAppContext ctx = I2PAppContext.getGlobalContext(); for (int i = 0; i < 10; i++) { Object keys[] = KeyGenerator.getInstance().generatePKIKeypair(); byte ctext[] = ctx.elGamalEngine().encrypt(src, (PublicKey) keys[0]); @@ -46,4 +46,4 @@ public class KeyGeneratorTest extends TestCase{ KeyGenerator.getInstance().generateSessionKey(); } } -} \ No newline at end of file +} diff --git a/core/java/test/junit/net/i2p/crypto/SHA1HashTest.java b/core/java/test/junit/net/i2p/crypto/SHA1HashTest.java index b83883821..3609adc8b 100644 --- a/core/java/test/junit/net/i2p/crypto/SHA1HashTest.java +++ b/core/java/test/junit/net/i2p/crypto/SHA1HashTest.java @@ -70,8 +70,8 @@ public class SHA1HashTest extends TestCase{ "cb0082c8 f197d260 991ba6a4 60e76e20 2bad27b3"); { - final int RETRIES = 10; - final int ITERATIONS = 2000; + final int RETRIES = 4; + final int ITERATIONS = 200; final int BLOCKSIZE = 65536; byte[] input = new byte[BLOCKSIZE]; for (int i = BLOCKSIZE; --i >= 0; ) diff --git a/core/java/test/junit/net/i2p/crypto/SHA256Test.java b/core/java/test/junit/net/i2p/crypto/SHA256Test.java index 4e6d1a032..7d98b29ee 100644 --- a/core/java/test/junit/net/i2p/crypto/SHA256Test.java +++ b/core/java/test/junit/net/i2p/crypto/SHA256Test.java @@ -19,12 +19,12 @@ public class SHA256Test extends TestCase{ private I2PAppContext _context; protected void setUp() { - _context = new I2PAppContext(); + _context = I2PAppContext.getGlobalContext(); } public void testMultiple(){ int size = 1; - for(int i = 0; i < 24; i++){ + for(int i = 0; i < 16; i++){ byte[] message = new byte[size]; size*=2; _context.random().nextBytes(message); diff --git a/core/java/test/junit/net/i2p/crypto/SessionEncryptionTest.java b/core/java/test/junit/net/i2p/crypto/SessionEncryptionTest.java index 0641db6ab..b86188937 100644 --- a/core/java/test/junit/net/i2p/crypto/SessionEncryptionTest.java +++ b/core/java/test/junit/net/i2p/crypto/SessionEncryptionTest.java @@ -25,7 +25,7 @@ import net.i2p.data.SessionTag; * */ public class SessionEncryptionTest extends TestCase{ - private static I2PAppContext _context = new I2PAppContext(); + private static I2PAppContext _context = I2PAppContext.getGlobalContext(); protected void setUp(){ _context = new I2PAppContext();