[freenet-cvs] r23442 - in trunk/freenet: src/freenet/crypt test/freenet/crypt test/freenet/support/io

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-11-09 12:16:53 +0000 (Sun, 09 Nov 2008)
New Revision: 23442

Removed:
   trunk/freenet/test/freenet/crypt/MockRandomSource.java
Modified:
   trunk/freenet/src/freenet/crypt/DummyRandomSource.java
   
trunk/freenet/test/freenet/support/io/PaddedEphemerallyEncryptedBucketTest.java
   trunk/freenet/test/freenet/support/io/TempBucketTest.java
Log:
MockRandomSource -> DummyRandomSource

Modified: trunk/freenet/src/freenet/crypt/DummyRandomSource.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DummyRandomSource.java      2008-11-09 
12:06:20 UTC (rev 23441)
+++ trunk/freenet/src/freenet/crypt/DummyRandomSource.java      2008-11-09 
12:16:53 UTC (rev 23442)
@@ -10,6 +10,13 @@
  */
 public class DummyRandomSource extends RandomSource {
        private static final long serialVersionUID = -1;
+
+       public DummyRandomSource() {}
+
+       public DummyRandomSource(long seed) {
+               setSeed(seed);
+       }
+
     @Override
        public int acceptEntropy(EntropySource source, long data, int 
entropyGuess) {
         return 0;

Deleted: trunk/freenet/test/freenet/crypt/MockRandomSource.java
===================================================================
--- trunk/freenet/test/freenet/crypt/MockRandomSource.java      2008-11-09 
12:06:20 UTC (rev 23441)
+++ trunk/freenet/test/freenet/crypt/MockRandomSource.java      2008-11-09 
12:16:53 UTC (rev 23442)
@@ -1,39 +0,0 @@
-/* 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 {
-       public MockRandomSource(long seed) {
-               setSeed(seed);
-       }
-       
-       @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/io/PaddedEphemerallyEncryptedBucketTest.java
===================================================================
--- 
trunk/freenet/test/freenet/support/io/PaddedEphemerallyEncryptedBucketTest.java 
    2008-11-09 12:06:20 UTC (rev 23441)
+++ 
trunk/freenet/test/freenet/support/io/PaddedEphemerallyEncryptedBucketTest.java 
    2008-11-09 12:16:53 UTC (rev 23442)
@@ -6,13 +6,13 @@
 import java.io.IOException;
 import java.util.Random;

-import freenet.crypt.MockRandomSource;
+import freenet.crypt.DummyRandomSource;
 import freenet.crypt.RandomSource;
 import freenet.support.api.Bucket;

 public class PaddedEphemerallyEncryptedBucketTest extends BucketTestBase {
-       private RandomSource strongPRNG = new MockRandomSource(12345);
-       private Random weakPRNG = new MockRandomSource(54321);
+       private RandomSource strongPRNG = new DummyRandomSource(12345);
+       private Random weakPRNG = new DummyRandomSource(54321);

        @Override
        protected Bucket makeBucket(long size) throws IOException {
@@ -25,4 +25,4 @@
        protected void freeBucket(Bucket bucket) throws IOException {
                bucket.free();
        }
-}
\ No newline at end of file
+}

Modified: trunk/freenet/test/freenet/support/io/TempBucketTest.java
===================================================================
--- trunk/freenet/test/freenet/support/io/TempBucketTest.java   2008-11-09 
12:06:20 UTC (rev 23441)
+++ trunk/freenet/test/freenet/support/io/TempBucketTest.java   2008-11-09 
12:16:53 UTC (rev 23442)
@@ -10,7 +10,7 @@
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import freenet.crypt.MockRandomSource;
+import freenet.crypt.DummyRandomSource;
 import freenet.crypt.RandomSource;
 import freenet.support.Executor;
 import freenet.support.SerialExecutor;
@@ -20,7 +20,7 @@
 public class TempBucketTest extends TestSuite {

        public static class TempBucketMigrationTest extends TestCase {
-               private RandomSource strongPRNG = new MockRandomSource(43210);
+               private RandomSource strongPRNG = new DummyRandomSource(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(12345);
-               private Random weakPRNG = new MockRandomSource(54321);
+               private RandomSource strongPRNG = new DummyRandomSource(12345);
+               private Random weakPRNG = new DummyRandomSource(54321);
                private Executor exec = new 
SerialExecutor(NativeThread.NORM_PRIORITY);
                private FilenameGenerator fg;