Mercurial > hg4j
comparison 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 |
comparison
equal
deleted
inserted
replaced
92:bf304cb14247 | 93:d55d4eedfc57 |
---|---|
20 | 20 |
21 import java.util.Collection; | 21 import java.util.Collection; |
22 import java.util.HashMap; | 22 import java.util.HashMap; |
23 import java.util.LinkedList; | 23 import java.util.LinkedList; |
24 import java.util.List; | 24 import java.util.List; |
25 import java.util.Map; | |
26 | 25 |
26 import org.tmatesoft.hg.core.Path; | |
27 import org.tmatesoft.hg.core.StatusCommand; | 27 import org.tmatesoft.hg.core.StatusCommand; |
28 import org.tmatesoft.hg.repo.HgRepository; | 28 import org.tmatesoft.hg.repo.HgRepository; |
29 import org.tmatesoft.hg.repo.Lookup; | 29 import org.tmatesoft.hg.repo.Lookup; |
30 import org.tmatesoft.hg.repo.StatusCollector; | 30 import org.tmatesoft.hg.repo.StatusCollector; |
31 import org.tmatesoft.hg.repo.WorkingCopyStatusCollector; | 31 import org.tmatesoft.hg.repo.WorkingCopyStatusCollector; |
119 reportNotEqual("REMOVED", r.getRemoved(), statusParser.getRemoved()); | 119 reportNotEqual("REMOVED", r.getRemoved(), statusParser.getRemoved()); |
120 reportNotEqual("CLEAN", r.getClean(), statusParser.getClean()); | 120 reportNotEqual("CLEAN", r.getClean(), statusParser.getClean()); |
121 reportNotEqual("IGNORED", r.getIgnored(), statusParser.getIgnored()); | 121 reportNotEqual("IGNORED", r.getIgnored(), statusParser.getIgnored()); |
122 reportNotEqual("MISSING", r.getMissing(), statusParser.getMissing()); | 122 reportNotEqual("MISSING", r.getMissing(), statusParser.getMissing()); |
123 reportNotEqual("UNKNOWN", r.getUnknown(), statusParser.getUnknown()); | 123 reportNotEqual("UNKNOWN", r.getUnknown(), statusParser.getUnknown()); |
124 List<String> copiedKeyDiff = difference(r.getCopied().keySet(), statusParser.getCopied().keySet()); | 124 List<Path> copiedKeyDiff = difference(r.getCopied().keySet(), statusParser.getCopied().keySet()); |
125 HashMap<String, String> copyDiff = new HashMap<String,String>(); | 125 HashMap<Path, String> copyDiff = new HashMap<Path,String>(); |
126 if (copiedKeyDiff.isEmpty()) { | 126 if (copiedKeyDiff.isEmpty()) { |
127 for (String jk : r.getCopied().keySet()) { | 127 for (Path jk : r.getCopied().keySet()) { |
128 String jv = r.getCopied().get(jk); | 128 Path jv = r.getCopied().get(jk); |
129 if (statusParser.getCopied().containsKey(jk)) { | 129 if (statusParser.getCopied().containsKey(jk)) { |
130 String cmdv = statusParser.getCopied().get(jk); | 130 Path cmdv = statusParser.getCopied().get(jk); |
131 if (!jv.equals(cmdv)) { | 131 if (!jv.equals(cmdv)) { |
132 copyDiff.put(jk, jv + " instead of " + cmdv); | 132 copyDiff.put(jk, jv + " instead of " + cmdv); |
133 } | 133 } |
134 } else { | 134 } else { |
135 copyDiff.put(jk, "ERRONEOUSLY REPORTED IN JAVA"); | 135 copyDiff.put(jk, "ERRONEOUSLY REPORTED IN JAVA"); |
136 } | 136 } |
137 } | 137 } |
138 } | 138 } |
139 System.out.println("COPIED" + (copiedKeyDiff.isEmpty() && copyDiff.isEmpty() ? " are the same" : " are NOT the same:")); | 139 System.out.println("COPIED" + (copiedKeyDiff.isEmpty() && copyDiff.isEmpty() ? " are the same" : " are NOT the same:")); |
140 for (String s : copiedKeyDiff) { | 140 for (Path s : copiedKeyDiff) { |
141 System.out.println("\tNon-matching key:" + s); | 141 System.out.println("\tNon-matching key:" + s); |
142 } | 142 } |
143 for (String s : copyDiff.keySet()) { | 143 for (Path s : copyDiff.keySet()) { |
144 System.out.println(s + " : " + copyDiff.get(s)); | 144 System.out.println(s + " : " + copyDiff.get(s)); |
145 } | 145 } |
146 // TODO compare equals | 146 // TODO compare equals |
147 System.out.println("<<<\n"); | 147 System.out.println("<<<\n"); |
148 } | 148 } |