[freenet-cvs] r18610 - trunk/freenet/src/freenet/node/simulator

[t...@freenetproject.org]

Author: toad
Date: 2008-03-19 16:29:02 +0000 (Wed, 19 Mar 2008)
New Revision: 18610

Modified:
   trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
Log:
Test with new type of messages only

Modified: 
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-03-19 16:16:38 UTC (rev 18609)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-03-19 16:29:02 UTC (rev 18610)
@@ -59,6 +59,7 @@
                System.exit(EXIT_CANNOT_DELETE_OLD_DATA);
         }
         wd.mkdir();
+       freenet.node.RequestHandler.SEND_OLD_FORMAT_SSK = false;
         //NOTE: globalTestInit returns in ignored random source
         //NodeStarter.globalTestInit(name, false, Logger.ERROR, 
"freenet.node.Location:normal,freenet.node.simulator.RealNode:minor,freenet.node.Insert:MINOR,freenet.node.Request:MINOR,freenet.node.Node:MINOR");
         //NodeStarter.globalTestInit(name, false, Logger.ERROR, 
"freenet.node.Location:MINOR,freenet.io.comm:MINOR,freenet.node.NodeDispatcher:MINOR,freenet.node.simulator:MINOR,freenet.node.PeerManager:MINOR,freenet.node.RequestSender:MINOR");
@@ -113,7 +114,8 @@
                 Node randomNode = nodes[node1];
                 //Logger.error(RealNodeRequestInsertTest.class,"Inserting: 
\""+dataString+"\" to "+node1);

-                boolean isSSK = requestNumber % 2 == 1;
+                //boolean isSSK = requestNumber % 2 == 1;
+                boolean isSSK = true;

                 FreenetURI testKey;
                 ClientKey insertKey;
@@ -170,7 +172,7 @@
                     if(Arrays.equals(results, data)) {
                                                fetchSuccesses++;
                                                int 
percentSuccess=100*fetchSuccesses/insertAttempts;
-                        Logger.error(RealNodeRequestInsertTest.class, "Fetch 
#"+requestNumber+" succeeded ("+percentSuccess+"%): "+new String(results));
+                        Logger.error(RealNodeRequestInsertTest.class, "Fetch 
#"+requestNumber+" from node "+node2+" succeeded ("+percentSuccess+"%): "+new 
String(results));
                         System.err.println("Fetch #"+requestNumber+" succeeded 
("+percentSuccess+"%): \""+new String(results)+'\"');
                         if(fetchSuccesses == TARGET_SUCCESSES) {
                                System.err.println("Succeeded, 
"+TARGET_SUCCESSES+" successful fetches");