comparison test/org/tmatesoft/hg/test/TestManifest.java @ 249:4c3b9f679412

Deprecated HgLogCommand.FileRevision gone, top-level HgFileRevision is bright and shiny replacement
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 12 Aug 2011 18:58:16 +0200
parents f4fa4456fa50
children e51dd9a14b6f
comparison
equal deleted inserted replaced
248:3fbfce107f94 249:4c3b9f679412
26 import java.util.LinkedList; 26 import java.util.LinkedList;
27 import java.util.Map; 27 import java.util.Map;
28 28
29 import org.junit.Rule; 29 import org.junit.Rule;
30 import org.junit.Test; 30 import org.junit.Test;
31 import org.tmatesoft.hg.core.HgLogCommand.FileRevision; 31 import org.tmatesoft.hg.core.HgFileRevision;
32 import org.tmatesoft.hg.core.HgManifestCommand; 32 import org.tmatesoft.hg.core.HgManifestCommand;
33 import org.tmatesoft.hg.core.Nodeid; 33 import org.tmatesoft.hg.core.Nodeid;
34 import org.tmatesoft.hg.repo.HgLookup; 34 import org.tmatesoft.hg.repo.HgLookup;
35 import org.tmatesoft.hg.repo.HgRepository; 35 import org.tmatesoft.hg.repo.HgRepository;
36 import org.tmatesoft.hg.util.Path; 36 import org.tmatesoft.hg.util.Path;
47 public ErrorCollectorExt errorCollector = new ErrorCollectorExt(); 47 public ErrorCollectorExt errorCollector = new ErrorCollectorExt();
48 48
49 private final HgRepository repo; 49 private final HgRepository repo;
50 private ManifestOutputParser manifestParser; 50 private ManifestOutputParser manifestParser;
51 private ExecHelper eh; 51 private ExecHelper eh;
52 final LinkedList<FileRevision> revisions = new LinkedList<FileRevision>(); 52 final LinkedList<HgFileRevision> revisions = new LinkedList<HgFileRevision>();
53 private HgManifestCommand.Handler handler = new HgManifestCommand.Handler() { 53 private HgManifestCommand.Handler handler = new HgManifestCommand.Handler() {
54 54
55 public void file(FileRevision fileRevision) { 55 public void file(HgFileRevision fileRevision) {
56 revisions.add(fileRevision); 56 revisions.add(fileRevision);
57 } 57 }
58 58
59 public void end(Nodeid manifestRevision) {} 59 public void end(Nodeid manifestRevision) {}
60 public void dir(Path p) {} 60 public void dir(Path p) {}
106 report("manifest " + (rev == TIP ? "TIP:" : "--rev " + rev)); 106 report("manifest " + (rev == TIP ? "TIP:" : "--rev " + rev));
107 } 107 }
108 108
109 private void report(String what) throws Exception { 109 private void report(String what) throws Exception {
110 final Map<Path, Nodeid> cmdLineResult = new LinkedHashMap<Path, Nodeid>(manifestParser.getResult()); 110 final Map<Path, Nodeid> cmdLineResult = new LinkedHashMap<Path, Nodeid>(manifestParser.getResult());
111 for (FileRevision fr : revisions) { 111 for (HgFileRevision fr : revisions) {
112 Nodeid nid = cmdLineResult.remove(fr.getPath()); 112 Nodeid nid = cmdLineResult.remove(fr.getPath());
113 errorCollector.checkThat("Extra " + fr.getPath() + " in Java result", nid, notNullValue()); 113 errorCollector.checkThat("Extra " + fr.getPath() + " in Java result", nid, notNullValue());
114 if (nid != null) { 114 if (nid != null) {
115 errorCollector.checkThat("Non-matching nodeid:" + nid, nid, equalTo(fr.getRevision())); 115 errorCollector.checkThat("Non-matching nodeid:" + nid, nid, equalTo(fr.getRevision()));
116 } 116 }