Author: j16sdiz
Date: 2008-11-07 18:37:39 +0000 (Fri, 07 Nov 2008)
New Revision: 23381
Modified:
trunk/freenet/test/freenet/crypt/MockRandomSource.java
trunk/freenet/test/freenet/crypt/ciphers/RijndaelTest.java
trunk/freenet/test/freenet/support/Base64Test.java
trunk/freenet/test/freenet/support/BloomFilterTest.java
trunk/freenet/test/freenet/support/MultiValueTableTest.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:
and seed from a constant
Modified: trunk/freenet/test/freenet/crypt/MockRandomSource.java
===================================================================
--- trunk/freenet/test/freenet/crypt/MockRandomSource.java 2008-11-07
18:28:00 UTC (rev 23380)
+++ trunk/freenet/test/freenet/crypt/MockRandomSource.java 2008-11-07
18:37:39 UTC (rev 23381)
@@ -9,6 +9,10 @@
* @author sdiz
*/
public class MockRandomSource extends RandomSource {
+ public MockRandomSource(long seed) {
+ setSeed(seed);
+ }
+
@Override
public int acceptEntropy(EntropySource source, long data, int
entropyGuess) {
return 0;
Modified: trunk/freenet/test/freenet/crypt/ciphers/RijndaelTest.java
===================================================================
--- trunk/freenet/test/freenet/crypt/ciphers/RijndaelTest.java 2008-11-07
18:28:00 UTC (rev 23380)
+++ trunk/freenet/test/freenet/crypt/ciphers/RijndaelTest.java 2008-11-07
18:37:39 UTC (rev 23381)
@@ -6,11 +6,9 @@
import java.util.Arrays;
import java.util.Random;
-import javax.crypto.Cipher;
-
+import junit.framework.TestCase;
import freenet.crypt.UnsupportedCipherException;
import freenet.support.HexUtil;
-import junit.framework.TestCase;
/**
* @author sdiz
@@ -31,7 +29,7 @@
private final byte[] CIPHER256_1 = HexUtil
.hexToBytes("6fcbc68fc938e5f5a7c24d7422f4b5f153257b6fb53e0bca26770497dd65078c");
- private static final Random rand = new Random();
+ private static final Random rand = new Random(12345);
public void testKnownValue() throws UnsupportedCipherException {
Rijndael aes128 = new Rijndael(128, 128);
Modified: trunk/freenet/test/freenet/support/Base64Test.java
===================================================================
--- trunk/freenet/test/freenet/support/Base64Test.java 2008-11-07 18:28:00 UTC
(rev 23380)
+++ trunk/freenet/test/freenet/support/Base64Test.java 2008-11-07 18:37:39 UTC
(rev 23381)
@@ -16,10 +16,11 @@
package freenet.support;
-import junit.framework.TestCase;
import java.util.Arrays;
import java.util.Random;
+import junit.framework.TestCase;
+
/**
* Test case for {@link freenet.support.Base64} class.
*
@@ -165,7 +166,7 @@
*/
public void testRandom() throws IllegalBase64Exception {
int iter;
- Random r = new Random();
+ Random r = new Random(1234);
for (iter = 0; iter < 1000; iter++) {
byte[] b = new byte[r.nextInt(64)];
for (int i = 0; i < b.length; i++)
Modified: trunk/freenet/test/freenet/support/BloomFilterTest.java
===================================================================
--- trunk/freenet/test/freenet/support/BloomFilterTest.java 2008-11-07
18:28:00 UTC (rev 23380)
+++ trunk/freenet/test/freenet/support/BloomFilterTest.java 2008-11-07
18:37:39 UTC (rev 23381)
@@ -15,7 +15,7 @@
private static final int PASS_POS = 256;
private static final int PASS_FALSE = 8192;
- private final Random rand = new Random();
+ private final Random rand = new Random(12345);
private void _testFilterPositive(BloomFilter filter) {
byte[][] list = new byte[PASS_POS][];
Modified: trunk/freenet/test/freenet/support/MultiValueTableTest.java
===================================================================
--- trunk/freenet/test/freenet/support/MultiValueTableTest.java 2008-11-07
18:28:00 UTC (rev 23380)
+++ trunk/freenet/test/freenet/support/MultiValueTableTest.java 2008-11-07
18:37:39 UTC (rev 23381)
@@ -34,6 +34,7 @@
private final int sampleKeyNumber = 100;
private final int sampleMaxValueNumber = 3;
private final boolean sampleIsRandom = true;
+ private Random rnd = new Random(12345);
/**
* Create a Object[][] filled with increasing Integers as keys
@@ -47,7 +48,6 @@
private Object[][] createSampleKeyMultiVal(int keysNumber, int
valuesNumber, boolean isRandom) {
Object[][] sampleObjects = new Object[keysNumber][valuesNumber];
int methodValuesNumber = valuesNumber;
- Random rnd = new Random();
for (int i=0; i<sampleObjects.length;i++) {
if (isRandom)
methodValuesNumber =
1+rnd.nextInt(valuesNumber);
Modified:
trunk/freenet/test/freenet/support/io/PaddedEphemerallyEncryptedBucketTest.java
===================================================================
---
trunk/freenet/test/freenet/support/io/PaddedEphemerallyEncryptedBucketTest.java
2008-11-07 18:28:00 UTC (rev 23380)
+++
trunk/freenet/test/freenet/support/io/PaddedEphemerallyEncryptedBucketTest.java
2008-11-07 18:37:39 UTC (rev 23381)
@@ -11,8 +11,8 @@
import freenet.support.api.Bucket;
public class PaddedEphemerallyEncryptedBucketTest extends BucketTestBase {
- private RandomSource strongPRNG = new MockRandomSource();
- private Random weakPRNG = new Random();
+ private RandomSource strongPRNG = new MockRandomSource(12345);
+ private Random weakPRNG = new MockRandomSource(54321);
@Override
protected Bucket makeBucket(long size) throws IOException {
Modified: trunk/freenet/test/freenet/support/io/TempBucketTest.java
===================================================================
--- trunk/freenet/test/freenet/support/io/TempBucketTest.java 2008-11-07
18:28:00 UTC (rev 23380)
+++ trunk/freenet/test/freenet/support/io/TempBucketTest.java 2008-11-07
18:37:39 UTC (rev 23381)
@@ -20,8 +20,8 @@
public class TempBucketTest extends TestSuite {
public static class TempBucketMigrationTest extends TestCase {
- private RandomSource strongPRNG = new MockRandomSource();
- private Random weakPRNG = new Random();
+ private RandomSource strongPRNG = new MockRandomSource(43210);
+ private Random weakPRNG = new Random(12340);
private Executor exec = new
SerialExecutor(NativeThread.NORM_PRIORITY);
private FilenameGenerator fg;
@@ -104,8 +104,8 @@
}
public static class RealTempBucketTest_ extends BucketTestBase {
- private RandomSource strongPRNG = new MockRandomSource();
- private Random weakPRNG = new Random();
+ private RandomSource strongPRNG = new MockRandomSource(12345);
+ private Random weakPRNG = new MockRandomSource(54321);
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 18:28:00 UTC (rev 23380)
+++ trunk/freenet/test/freenet/support/io/TempFileBucketTest.java
2008-11-07 18:37:39 UTC (rev 23381)
@@ -10,7 +10,7 @@
import freenet.support.api.Bucket;
public class TempFileBucketTest extends BucketTestBase {
- private Random weakPRNG = new Random();
+ private Random weakPRNG = new Random(12345);
@Override
protected Bucket makeBucket(long size) throws IOException {
