# HG changeset patch # User kent # Date 1198226743 -32400 # Node ID 0206b5e0fcd212cc329ec2e43eea218765ef8c89 # Parent 2d9d352986318c3328d171c109028ab929689b6b *** empty log message *** diff -r 2d9d35298631 -r 0206b5e0fcd2 src/pathfinder/BlockingQ/TestMerger.java --- a/src/pathfinder/BlockingQ/TestMerger.java Sat Nov 17 06:06:32 2007 +0900 +++ b/src/pathfinder/BlockingQ/TestMerger.java Fri Dec 21 17:45:43 2007 +0900 @@ -25,16 +25,16 @@ TestMerger tm; tm = new TestMerger(2, 3); //tm.init(); - //tm.test2cmd(); - tm.test1cmd(); + tm.test2cmd(); + //tm.test1cmd(); //tm.test0cmd(); tm.startTest(); //tm.printAllTexts(); //if (!tm.checkCS()) // System.out.println("Error!! :some ChannelSimulator still have packet!"); - if (!tm.checkEquality()) - System.out.println("Error!! :all Editor's text is NOT mutch!"); + //if (!tm.checkEquality()) + // System.out.println("Error!! :all Editor's text is NOT mutch!"); } @@ -43,7 +43,7 @@ for (int i=0; i cmds = new LinkedList(); - // ŠeƒGƒfƒBƒ^‚ช‘—M‚ท‚้ƒRƒ}ƒ“ƒh—๑‚๐ถฌ + // ๅ„ใ‚จใƒ‡ใ‚ฃใ‚ฟใŒ้€ไฟกใ™ใ‚‹ใ‚ณใƒžใƒณใƒ‰ๅˆ—ใ‚’็”Ÿๆˆ for(j=0; j cmds = new LinkedList(); - // ŠeƒGƒfƒBƒ^‚ช‘—M‚ท‚้ƒRƒ}ƒ“ƒh—๑‚๐ถฌ + // ๅ„ใ‚จใƒ‡ใ‚ฃใ‚ฟใŒ้€ไฟกใ™ใ‚‹ใ‚ณใƒžใƒณใƒ‰ๅˆ—ใ‚’็”Ÿๆˆ String str = "created by Editor"+i+":"+j; REPCommand cmd = new REPCommand(REP.REPCMD_INSERT, @@ -74,6 +74,12 @@ 10, //Verify.random(text.size()-1), //size-1? str.length(), str); cmds.add( cmd); + str = "created by Editor"+i+":"+j; + cmd = new REPCommand(REP.REPCMD_INSERT, + 0, i, j++, + 10, //Verify.random(text.size()-1), //size-1? + str.length(), str); + cmds.add( cmd); EditorSimulator ee = new EditorSimulator(i, ns, cmds, "Editor"+i); if(i==0) ee.setOwner(true); @@ -86,7 +92,7 @@ for (int i=0; i cmds = new LinkedList(); - //ŠeƒGƒfƒBƒ^‚ช‘—M‚ท‚้ƒRƒ}ƒ“ƒh—๑‚๐ถฌ + //ๅ„ใ‚จใƒ‡ใ‚ฃใ‚ฟใŒ้€ไฟกใ™ใ‚‹ใ‚ณใƒžใƒณใƒ‰ๅˆ—ใ‚’็”Ÿๆˆ String str = "Editor"+i+":"+j; REPCommand cmd = new REPCommand(REP.REPCMD_INSERT, 0, i, j++, @@ -103,7 +109,7 @@ for (int i=0; i cmds = new LinkedList(); - //ŠeƒGƒfƒBƒ^‚ช‘—M‚ท‚้ƒRƒ}ƒ“ƒh—๑‚๐ถฌ + //ๅ„ใ‚จใƒ‡ใ‚ฃใ‚ฟใŒ้€ไฟกใ™ใ‚‹ใ‚ณใƒžใƒณใƒ‰ๅˆ—ใ‚’็”Ÿๆˆ EditorSimulator ee = new EditorSimulator(i, ns, cmds, "Editor"+i); if(i==0) ee.setOwner(true); editors.add(ee);