Author: nextgens
Date: 2008-11-20 21:57:59 +0000 (Thu, 20 Nov 2008)
New Revision: 23758

Modified:
   trunk/freenet/test/freenet/support/FieldsTest.java
Log:
Add a unit test to ensure Fields.bytesToInt and MersenneTwister.bytesToInt 
remain consistent

Modified: trunk/freenet/test/freenet/support/FieldsTest.java
===================================================================
--- trunk/freenet/test/freenet/support/FieldsTest.java  2008-11-20 21:57:06 UTC 
(rev 23757)
+++ trunk/freenet/test/freenet/support/FieldsTest.java  2008-11-20 21:57:59 UTC 
(rev 23758)
@@ -4,12 +4,9 @@
 
 package freenet.support;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.omg.CORBA.LongHolder;
-
+import freenet.node.ExtVersion;
 import junit.framework.TestCase;
+import org.spaceroots.mantissa.random.MersenneTwister;
 
 /**
  * Test case for [EMAIL PROTECTED] freenet.support.Fields} class.
@@ -282,7 +279,9 @@
                byte[] bytes = new byte[] { 0, 1, 2, 2 };
                
                int outLong = Fields.bytesToInt(bytes, 0);
-               assertEquals(outLong, 33685760);
+               // We did dupplicate the code to avoid cross-dependancies
+               int outLongMT = MersenneTwister.bytesToInt(bytes, 0);
+               assertEquals(outLong, outLongMT, 33685760);
                
                doTestRoundTripBytesArrayToInt(bytes);
                
@@ -297,12 +296,12 @@
                
                bytes = new byte[] {1, 1, 1, 1};
                doTestRoundTripBytesArrayToInt(bytes);
-               
        }
        
        private void doTestRoundTripBytesArrayToInt(byte[] inBytes) {
 
                int outLong = Fields.bytesToInt(inBytes, 0);
+               assertEquals(inBytes, MersenneTwister.bytesToInt(inBytes, 0));
                byte[] outBytes = Fields.intToBytes(outLong);
                for(int i = 0; i < inBytes.length; i++) {
                        assertEquals(outBytes[i], inBytes[i]);

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to