Author: j16sdiz
Date: 2008-11-07 18:28:00 +0000 (Fri, 07 Nov 2008)
New Revision: 23380
Added:
trunk/freenet/test/freenet/crypt/MockRandomSource.java
Modified:
trunk/freenet/test/freenet/support/BloomFilterTest.java
trunk/freenet/test/freenet/support/io/PaddedEphemerallyEncryptedBucketTest.java
trunk/freenet/test/freenet/support/io/TempBucketTest.java
trunk/freenet/test/freenet/support/io/TempFileBucketTest.java
Log:
use java.util.Random for unit test
Added: trunk/freenet/test/freenet/crypt/MockRandomSource.java
===================================================================
--- trunk/freenet/test/freenet/crypt/MockRandomSource.java
(rev 0)
+++ trunk/freenet/test/freenet/crypt/MockRandomSource.java 2008-11-07
18:28:00 UTC (rev 23380)
@@ -0,0 +1,35 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+package freenet.crypt;
+
+/**
+ * A fake StrongPRNG that is just java.util.Random
+ *
+ * @author sdiz
+ */
+public class MockRandomSource extends RandomSource {
+ @Override
+ public int acceptEntropy(EntropySource source, long data, int
entropyGuess) {
+ return 0;
+ }
+
+ @Override
+ public int acceptEntropyBytes(EntropySource myPacketDataSource, byte[]
buf, int offset, int length, double bias) {
+ return 0;
+ }
+
+ @Override
+ public int acceptTimerEntropy(EntropySource timer) {
+ return 0;
+ }
+
+ @Override
+ public int acceptTimerEntropy(EntropySource fnpTimingSource, double
bias) {
+ return 0;
+ }
+
+ @Override
+ public void close() {
+ }
+}
Modified: trunk/freenet/test/freenet/support/BloomFilterTest.java
===================================================================
--- trunk/freenet/test/freenet/support/BloomFilterTest.java 2008-11-07
17:19:49 UTC (rev 23379)
+++ trunk/freenet/test/freenet/support/BloomFilterTest.java 2008-11-07
18:28:00 UTC (rev 23380)
@@ -8,8 +8,6 @@
import junit.framework.TestCase;
-import org.spaceroots.mantissa.random.MersenneTwister;
-
public class BloomFilterTest extends TestCase {
private static final int FILTER_SIZE = 4 * 1024; // MUST be > PASS,
private static final int PASS = 2048;
@@ -17,7 +15,7 @@
private static final int PASS_POS = 256;
private static final int PASS_FALSE = 8192;
- private final Random rand = new MersenneTwister();
+ private final Random rand = new Random();
private void _testFilterPositive(BloomFilter filter) {
byte[][] list = new byte[PASS_POS][];
Modified:
trunk/freenet/test/freenet/support/io/PaddedEphemerallyEncryptedBucketTest.java
===================================================================
---
trunk/freenet/test/freenet/support/io/PaddedEphemerallyEncryptedBucketTest.java
2008-11-07 17:19:49 UTC (rev 23379)
+++
trunk/freenet/test/freenet/support/io/PaddedEphemerallyEncryptedBucketTest.java
2008-11-07 18:28:00 UTC (rev 23380)
@@ -6,16 +6,14 @@
import java.io.IOException;
import java.util.Random;
-import org.spaceroots.mantissa.random.MersenneTwister;
-
+import freenet.crypt.MockRandomSource;
import freenet.crypt.RandomSource;
-import freenet.crypt.Yarrow;
import freenet.support.api.Bucket;
public class PaddedEphemerallyEncryptedBucketTest extends BucketTestBase {
- private RandomSource strongPRNG = new Yarrow();
- private Random weakPRNG = new MersenneTwister();
-
+ private RandomSource strongPRNG = new MockRandomSource();
+ private Random weakPRNG = new Random();
+
@Override
protected Bucket makeBucket(long size) throws IOException {
FilenameGenerator filenameGenerator = new
FilenameGenerator(weakPRNG, false, null, "junit");
Modified: trunk/freenet/test/freenet/support/io/TempBucketTest.java
===================================================================
--- trunk/freenet/test/freenet/support/io/TempBucketTest.java 2008-11-07
17:19:49 UTC (rev 23379)
+++ trunk/freenet/test/freenet/support/io/TempBucketTest.java 2008-11-07
18:28:00 UTC (rev 23380)
@@ -10,11 +10,8 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
-import org.spaceroots.mantissa.random.MersenneTwister;
-
+import freenet.crypt.MockRandomSource;
import freenet.crypt.RandomSource;
-import freenet.crypt.Yarrow;
import freenet.support.Executor;
import freenet.support.SerialExecutor;
import freenet.support.api.Bucket;
@@ -23,8 +20,8 @@
public class TempBucketTest extends TestSuite {
public static class TempBucketMigrationTest extends TestCase {
- private RandomSource strongPRNG = new Yarrow();
- private Random weakPRNG = new MersenneTwister();
+ private RandomSource strongPRNG = new MockRandomSource();
+ private Random weakPRNG = new Random();
private Executor exec = new
SerialExecutor(NativeThread.NORM_PRIORITY);
private FilenameGenerator fg;
@@ -107,8 +104,8 @@
}
public static class RealTempBucketTest_ extends BucketTestBase {
- private RandomSource strongPRNG = new Yarrow();
- private Random weakPRNG = new MersenneTwister();
+ private RandomSource strongPRNG = new MockRandomSource();
+ private Random weakPRNG = new Random();
private Executor exec = new
SerialExecutor(NativeThread.NORM_PRIORITY);
private FilenameGenerator fg;
Modified: trunk/freenet/test/freenet/support/io/TempFileBucketTest.java
===================================================================
--- trunk/freenet/test/freenet/support/io/TempFileBucketTest.java
2008-11-07 17:19:49 UTC (rev 23379)
+++ trunk/freenet/test/freenet/support/io/TempFileBucketTest.java
2008-11-07 18:28:00 UTC (rev 23380)
@@ -7,12 +7,10 @@
import java.io.IOException;
import java.util.Random;
-import org.spaceroots.mantissa.random.MersenneTwister;
-
import freenet.support.api.Bucket;
public class TempFileBucketTest extends BucketTestBase {
- private Random weakPRNG = new MersenneTwister();
+ private Random weakPRNG = new Random();
@Override
protected Bucket makeBucket(long size) throws IOException {
