Mercurial > hg > RemoteEditor > Eclipse

changeset 177:723f5b466768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author tkaito
date Sat, 30 Aug 2008 16:28:27 +0900
parents 9e38daf60905
children bf0ca6c43834
files src/pathfinder/mergetest/test/RepCommandOptimizeTest.java
diffstat 1 files changed, 13 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/src/pathfinder/mergetest/test/RepCommandOptimizeTest.java	Sat Aug 30 15:01:49 2008 +0900
+++ b/src/pathfinder/mergetest/test/RepCommandOptimizeTest.java	Sat Aug 30 16:28:27 2008 +0900
@@ -10,41 +10,18 @@
 
 
 public class RepCommandOptimizeTest {
-	//テストコマンド (command,string,lineno,id)
+	//テストコマンド (command,string,lineno,eid)
 	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),"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",
+		Integer.toString(REP.REPCMD_DELETE),"d","1","1",
 		Integer.toString(REP.REPCMD_INSERT),"B","3","2",
-		Integer.toString(REP.REPCMD_INSERT),"d","2","3",
-		Integer.toString(REP.REPCMD_INSERT),"B","3","4",
-		Integer.toString(REP.REPCMD_DELETE),"A","3","5",
-		Integer.toString(REP.REPCMD_DELETE),"A","1","6",
-		Integer.toString(REP.REPCMD_INSERT),"d","3","7",
-		Integer.toString(REP.REPCMD_DELETE),"d","1","8"
-		
+		Integer.toString(REP.REPCMD_INSERT),"B","3","3",
+		Integer.toString(REP.REPCMD_INSERT),"C","2","4",
+		Integer.toString(REP.REPCMD_DELETE),"d","3","5",
+		Integer.toString(REP.REPCMD_DELETE),"d","2","6",
+		Integer.toString(REP.REPCMD_INSERT),"A","3","7",
+		Integer.toString(REP.REPCMD_INSERT),"A","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",
 		"fff", "ggg", "hhh", "iii", "jjj",
@@ -111,14 +88,13 @@
 			if(s.cmd==REP.REPCMD_INSERT) {
 				if(s.lineno < lineno){
 					lineno --;
-					//System.out.println(ln);
 				}else if(s.lineno == lineno){
 					if(s.lineno < minln){
 						minln = s.lineno;
 					}
+					lineNumberCorrection(output,minln,i,ln);
 					output.remove(r);
 					output.remove(s);
-					lineNumberCorrection(output,minln,i);
 					break;
 				}
 				
@@ -134,16 +110,11 @@
 		
 	}
 	
-	private void lineNumberCorrection(LinkedList<REPCommand> opt, int ln, int count){
-		for(int i = 0; i < count; i++){
+	private void lineNumberCorrection(LinkedList<REPCommand> opt, int ln, int count, int r){
+		for(int i = r; i < count; i++){
 			REPCommand o = opt.get(i);
 			if(ln < o.lineno) o.lineno -= 1;
 		}
-		/*if(i == opt.size()){
-			for(REPCommand c : opt){
-				c.lineno -= 1;
-			}
-		}*/
 	}
 
 	void printCmdList(LinkedList<REPCommand> before){
@@ -151,10 +122,6 @@
 		for(REPCommand r: before){
 			System.out.println(r.toString());
 		}
-		/*System.out.println("---------- CmdList2 ----------");
-		for(REPCommand s: after){
-			System.out.println(s.toString());
-		}*/
 	}
 	
 	static Text text1 = new Text(text1d);
@@ -164,9 +131,6 @@
 		for(REPCommand r : before){
 			txt.edit(r);
 		}
-		/*for(REPCommand s : after){
-			text2.edit(s);
-		}*/
 	}
 	
 	void printText(){
@@ -190,7 +154,7 @@
 		
 		RepCommandOptimizeTest rco = new RepCommandOptimizeTest();
 		LinkedList<REPCommand> result = new LinkedList<REPCommand>();
-		rco.makeCommand(test3);
+		rco.makeCommand(test1);
 		java.util.Collections.shuffle(cmdlist);
 		rco.printCmdList(cmdlist);
 		rco.edit(cmdlist,text1);