diff test/org/tmatesoft/hg/test/TestStatus.java @ 93:d55d4eedfc57

Switch to Path instead of String in filenames returned by various status operations
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 27 Jan 2011 21:15:21 +0100
parents 61eedab3eb3e
children af1f3b78b918
line wrap: on
line diff
--- a/test/org/tmatesoft/hg/test/TestStatus.java	Thu Jan 27 06:31:58 2011 +0100
+++ b/test/org/tmatesoft/hg/test/TestStatus.java	Thu Jan 27 21:15:21 2011 +0100
@@ -22,8 +22,8 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
+import org.tmatesoft.hg.core.Path;
 import org.tmatesoft.hg.core.StatusCommand;
 import org.tmatesoft.hg.repo.HgRepository;
 import org.tmatesoft.hg.repo.Lookup;
@@ -121,13 +121,13 @@
 		reportNotEqual("IGNORED", r.getIgnored(), statusParser.getIgnored());
 		reportNotEqual("MISSING", r.getMissing(), statusParser.getMissing());
 		reportNotEqual("UNKNOWN", r.getUnknown(), statusParser.getUnknown());
-		List<String> copiedKeyDiff = difference(r.getCopied().keySet(), statusParser.getCopied().keySet());
-		HashMap<String, String> copyDiff = new HashMap<String,String>();
+		List<Path> copiedKeyDiff = difference(r.getCopied().keySet(), statusParser.getCopied().keySet());
+		HashMap<Path, String> copyDiff = new HashMap<Path,String>();
 		if (copiedKeyDiff.isEmpty()) {
-			for (String jk : r.getCopied().keySet()) {
-				String jv = r.getCopied().get(jk);
+			for (Path jk : r.getCopied().keySet()) {
+				Path jv = r.getCopied().get(jk);
 				if (statusParser.getCopied().containsKey(jk)) {
-					String cmdv = statusParser.getCopied().get(jk);
+					Path cmdv = statusParser.getCopied().get(jk);
 					if (!jv.equals(cmdv)) {
 						copyDiff.put(jk, jv + " instead of " + cmdv);
 					}
@@ -137,10 +137,10 @@
 			}
 		}
 		System.out.println("COPIED" + (copiedKeyDiff.isEmpty() && copyDiff.isEmpty() ? " are the same" : " are NOT the same:"));
-		for (String s : copiedKeyDiff) {
+		for (Path s : copiedKeyDiff) {
 			System.out.println("\tNon-matching key:" + s);
 		}
-		for (String s : copyDiff.keySet()) {
+		for (Path s : copyDiff.keySet()) {
 			System.out.println(s + " : " + copyDiff.get(s));
 		}
 		// TODO compare equals