Mercurial > hg > RemoteEditor > Eclipse

changeset 90:0206b5e0fcd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author kent
date Fri, 21 Dec 2007 17:45:43 +0900
parents 2d9d35298631
children 0a483aa8cf71
files src/pathfinder/BlockingQ/TestMerger.java
diffstat 1 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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<N_editor; i++){
 			int j;
 			LinkedList<REPCommand> cmds = new LinkedList<REPCommand>();
-			// ŠeƒGƒfƒBƒ^‚ช‘—M‚ท‚้ƒRƒ}ƒ“ƒh—๑‚๐ถฌ
+			// ๅ„ใ‚จใƒ‡ใ‚ฃใ‚ฟใŒ้€ไฟกใ™ใ‚‹ใ‚ณใƒžใƒณใƒ‰ๅˆ—ใ‚’็”Ÿๆˆ
 			for(j=0; j<N_packet; j++) {
 				REPCommand cmd = new REPCommand(cmdNO[Verify.random(2)],
 				                                0, i, j,
@@ -60,7 +60,7 @@
 		for (int i=0; i<N_editor; i++){
 			int j=0;
 			LinkedList<REPCommand> cmds = new LinkedList<REPCommand>();
-			// Š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<N_editor; i++){
 			int j=0;
 			LinkedList<REPCommand> cmds = new LinkedList<REPCommand>();
-			//Š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<N_editor; i++){
 			int j=0;
 			LinkedList<REPCommand> cmds = new LinkedList<REPCommand>();
-			//Š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);