# HG changeset patch
# User kent
# Date 1194698503 -32400
# Node ID 9d060c0c96580f2c6e6bf2d78d343ec5894fd8a0
# Parent  a14d4b7337d9c6014c7fabfacc872ec202a1f6ea
*** empty log message ***

diff -r a14d4b7337d9 -r 9d060c0c9658 src/pathfinder/NetworkSimulator.java
--- a/src/pathfinder/NetworkSimulator.java	Sat Nov 10 17:02:18 2007 +0900
+++ b/src/pathfinder/NetworkSimulator.java	Sat Nov 10 21:41:43 2007 +0900
@@ -37,11 +37,6 @@
 		acceptList.offer(cs);
 		return cs;
 	}
-/*
-	public void connect(ChannelSimulator<P> cs){
-		acceptList.offer(cs);
-	}
-*/
 
 	public synchronized P read(Queue<P>q) {
 		return q.poll();
diff -r a14d4b7337d9 -r 9d060c0c9658 src/pathfinder/Test.java
--- a/src/pathfinder/Test.java	Sat Nov 10 17:02:18 2007 +0900
+++ b/src/pathfinder/Test.java	Sat Nov 10 21:41:43 2007 +0900
@@ -1,5 +1,6 @@
 package pathfinder;
 
+
 public class Test {
 	private NetworkSimulator<String> ns;
 	
diff -r a14d4b7337d9 -r 9d060c0c9658 src/pathfinder/TestMerger.java
--- a/src/pathfinder/TestMerger.java	Sat Nov 10 17:02:18 2007 +0900
+++ b/src/pathfinder/TestMerger.java	Sat Nov 10 21:41:43 2007 +0900
@@ -1,6 +1,5 @@
 package pathfinder;
 
-
 import java.util.LinkedList;
 
 import remoteeditor.command.REPCommand;
diff -r a14d4b7337d9 -r 9d060c0c9658 src/pathfinder/TestMerger2.java
--- a/src/pathfinder/TestMerger2.java	Sat Nov 10 17:02:18 2007 +0900
+++ b/src/pathfinder/TestMerger2.java	Sat Nov 10 21:41:43 2007 +0900
@@ -1,10 +1,6 @@
 package pathfinder;
 
-
-import gov.nasa.jpf.jvm.Verify;
-
 import java.util.LinkedList;
-
 import remoteeditor.command.REPCommand;
 import remoteeditor.network.REP;
 
@@ -27,11 +23,16 @@
 	public static void main(String[] args){
 		TestMerger2 tm;
 		tm = new TestMerger2(2, 3);
-		tm.init();
+		//tm.init();
+		//tm.test2cmd();
+		tm.test1cmd();
 		tm.startTest();
+
+		tm.printAllTexts();
+		assert tm.checkEquality();
 	}
 	
-	private void init(){
+/*	private void init(){
 		for (int i=0; i<N_editor; i++){
 			int j;
 			LinkedList<REPCommand> cmds = new LinkedList<REPCommand>();
@@ -47,7 +48,48 @@
 			editors.add(ee);
 		}
 	}
+*/	
+	private void test2cmd(){
+		for (int i=0; i<N_editor; i++){
+			int j=0;
+			LinkedList<REPCommand> cmds = new LinkedList<REPCommand>();
+			// 各エディタが送信するコマンド列を生成
+			String str = "Editor"+i+":"+j;
+			REPCommand cmd = new REPCommand(REP.REPCMD_INSERT,
+					0, i, j++,
+					10, //Verify.random(text.size()-1), //size-1?
+					str.length(), str);
+			cmds.add( cmd);
+			str = "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);
+			EditorEmulator2 ee = new EditorEmulator2(i, ns, cmds, "Editor"+i); 
+			editors.add(ee);
+		}
+	}
 
+
+	private void test1cmd(){
+		for (int i=0; i<N_editor; i++){
+			int j=0;
+			LinkedList<REPCommand> cmds = new LinkedList<REPCommand>();
+			//各エディタが送信するコマンド列を生成
+			String str = "Editor"+i+":"+j;
+			REPCommand cmd = new REPCommand(REP.REPCMD_INSERT,
+					0, i, j++,
+					10, //Verify.random(text.size()-1), //size-1?
+					str.length(), str);
+			cmds.add( cmd);
+			EditorEmulator2 ee = new EditorEmulator2(i, ns, cmds, "Editor"+i); 
+			editors.add(ee);
+		}
+	}
+
+   
+    
 	private void startTest() {
 		for (EditorEmulator2 ee: editors){
 			ee.start();
@@ -66,4 +108,18 @@
 		}
 	}
 
+	private void printAllTexts(){
+		for(EditorEmulator2 ee: editors){
+			System.out.println(ee.getName());
+			ee.getText().printAllText();
+		}
+	}
+	
+	private boolean checkEquality(){
+		EditorEmulator2 ee0 = editors.element();
+		for(EditorEmulator2 ee: editors){
+			if (!ee0.equals(ee)) return false;
+		}
+		return true;
+	}
 }