# HG changeset patch
# User tkaito
# Date 1220076109 -32400
# Node ID 9e38daf6090582ca981b8d1be60673316ae345c8
# Parent  db798192c9664154a71b282c69de911b234fd42a
*** empty log message ***

diff -r db798192c966 -r 9e38daf60905 src/pathfinder/mergetest/test/RepCommandOptimizeTest.java
--- a/src/pathfinder/mergetest/test/RepCommandOptimizeTest.java	Sat Aug 30 11:44:32 2008 +0900
+++ b/src/pathfinder/mergetest/test/RepCommandOptimizeTest.java	Sat Aug 30 15:01:49 2008 +0900
@@ -12,15 +12,15 @@
 public class RepCommandOptimizeTest {
 	//テストコマンド (command,string,lineno,id)
 	static String[] test1 = {
-			Integer.toString(REP.REPCMD_INSERT),"A","1","1",
-			Integer.toString(REP.REPCMD_INSERT),"C","2","2",
-			Integer.toString(REP.REPCMD_INSERT),"A","3","3",
-			Integer.toString(REP.REPCMD_INSERT),"B","3","4",
-			Integer.toString(REP.REPCMD_DELETE),"?","2","5",
-			Integer.toString(REP.REPCMD_DELETE),"?","3","6",
-			Integer.toString(REP.REPCMD_INSERT),"B","3","7",
-			Integer.toString(REP.REPCMD_DELETE),"?","1","8"
-			
+		Integer.toString(REP.REPCMD_INSERT),"A","1","1",
+		Integer.toString(REP.REPCMD_INSERT),"C","2","2",
+		Integer.toString(REP.REPCMD_INSERT),"A","3","3",
+		Integer.toString(REP.REPCMD_INSERT),"B","3","4",
+		Integer.toString(REP.REPCMD_DELETE),"d","2","5",
+		Integer.toString(REP.REPCMD_DELETE),"d","3","6",
+		Integer.toString(REP.REPCMD_INSERT),"B","3","7",
+		Integer.toString(REP.REPCMD_DELETE),"d","1","8"
+
 	};
 	static String[] test2 = {
 		Integer.toString(REP.REPCMD_INSERT),"C","2","1",
@@ -32,7 +32,18 @@
 		Integer.toString(REP.REPCMD_INSERT),"d","3","7",
 		Integer.toString(REP.REPCMD_DELETE),"d","1","8"
 		
-};
+	};
+	static String[] test3 = {
+		Integer.toString(REP.REPCMD_DELETE),"d","2","1",
+		Integer.toString(REP.REPCMD_DELETE),"d","1","2",
+		Integer.toString(REP.REPCMD_INSERT),"C","2","3",
+		Integer.toString(REP.REPCMD_INSERT),"B","3","4",
+		Integer.toString(REP.REPCMD_INSERT),"A","3","5",
+		Integer.toString(REP.REPCMD_INSERT),"B","3","6",
+		Integer.toString(REP.REPCMD_INSERT),"A","1","7",
+		Integer.toString(REP.REPCMD_DELETE),"d","3","8"
+		
+	};
 
 	static private String[] text1d = {
 		"aaa", "bbb", "ccc", "ddd", "eee",
@@ -178,12 +189,15 @@
 	public static void main(String[] s){
 		
 		RepCommandOptimizeTest rco = new RepCommandOptimizeTest();
-		rco.makeCommand(test2);
-		//java.util.Collections.shuffle(cmdlist);
+		LinkedList<REPCommand> result = new LinkedList<REPCommand>();
+		rco.makeCommand(test3);
+		java.util.Collections.shuffle(cmdlist);
 		rco.printCmdList(cmdlist);
 		rco.edit(cmdlist,text1);
-		rco.printCmdList(rco.optimize(cmdlist));
-		rco.edit(rco.optimize(cmdlist),text2);
+		
+		result = rco.optimize(cmdlist);
+		rco.printCmdList(result);
+		rco.edit(result,text2);
 		rco.printText();
 		rco.checkText();
 	}