# HG changeset patch # User Artem Tikhomirov # Date 1295371969 -3600 # Node ID fac8e7fcc8b0767eaadb30f02565a96c78826e9c # Parent 613c936d74e45208ec8114511329d7e5fc7f86c5 Simple test framework - capable of parsing Hg cmdline output to compare with Java result diff -r 613c936d74e4 -r fac8e7fcc8b0 .classpath --- a/.classpath Tue Jan 18 00:30:41 2011 +0100 +++ b/.classpath Tue Jan 18 18:32:49 2011 +0100 @@ -1,6 +1,7 @@ + diff -r 613c936d74e4 -r fac8e7fcc8b0 design.txt --- a/design.txt Tue Jan 18 00:30:41 2011 +0100 +++ b/design.txt Tue Jan 18 18:32:49 2011 +0100 @@ -65,4 +65,6 @@ <<<<< Tests: -DataAccess - readBytes(length > memBufferSize, length*2 > memBufferSize) - to check impl is capable to read huge chunks of data, regardless of own buffer size \ No newline at end of file +DataAccess - readBytes(length > memBufferSize, length*2 > memBufferSize) - to check impl is capable to read huge chunks of data, regardless of own buffer size + +ExecHelper('cmd', OutputParser()).run(). StatusOutputParser, LogOutputParser extends OutputParser. construct java result similar to that of cmd, compare results \ No newline at end of file diff -r 613c936d74e4 -r fac8e7fcc8b0 test/com/tmate/hgkit/ExecHelper.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/tmate/hgkit/ExecHelper.java Tue Jan 18 18:32:49 2011 +0100 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2011 Artem Tikhomirov + */ +package com.tmate.hgkit; + +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.CharBuffer; +import java.util.LinkedList; + +/** + * + * @author artem + */ +public class ExecHelper { + + private final OutputParser parser; + private final File dir; + + public ExecHelper(OutputParser outParser, File workingDir) { + parser = outParser; + dir = workingDir; + } + + public void run(String... cmd) throws IOException, InterruptedException { + Process p = new ProcessBuilder(cmd).directory(dir).redirectErrorStream(true).start(); +// Process p = Runtime.getRuntime().exec(cmd, null, dir); + InputStreamReader stdOut = new InputStreamReader(p.getInputStream()); + LinkedList l = new LinkedList(); + int r = -1; + CharBuffer b = null; + do { + if (b == null || b.remaining() < b.capacity() / 3) { + b = CharBuffer.allocate(512); + l.add(b); + } + r = stdOut.read(b); + } while (r != -1); + int total = 0; + for (CharBuffer cb : l) { + total += cb.position(); + cb.flip(); + } + CharBuffer res = CharBuffer.allocate(total); + for (CharBuffer cb : l) { + res.put(cb); + } + res.flip(); + p.waitFor(); + parser.parse(res); + } +} diff -r 613c936d74e4 -r fac8e7fcc8b0 test/com/tmate/hgkit/OutputParser.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/tmate/hgkit/OutputParser.java Tue Jan 18 18:32:49 2011 +0100 @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2011 Artem Tikhomirov + */ +package com.tmate.hgkit; + +/** + * + * @author artem + */ +public interface OutputParser { + + public void parse(CharSequence seq); +} diff -r 613c936d74e4 -r fac8e7fcc8b0 test/com/tmate/hgkit/StatusOutputParser.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/tmate/hgkit/StatusOutputParser.java Tue Jan 18 18:32:49 2011 +0100 @@ -0,0 +1,137 @@ +/* + * Copyright (c) 2011 Artem Tikhomirov + */ +package com.tmate.hgkit; + +import java.io.File; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * + * @author artem + */ +public class StatusOutputParser implements OutputParser { + + private final Pattern pattern; + private List modified, added, removed, clean, missing, unknown, ignored; + private Map copied; + private final boolean winPathSeparator; + + public StatusOutputParser() { +// pattern = Pattern.compile("^([MAR?IC! ]) ([\\w \\.-/\\\\]+)$", Pattern.MULTILINE); + pattern = Pattern.compile("^([MAR?IC! ]) (.+)$", Pattern.MULTILINE); + winPathSeparator = File.separatorChar == '\\'; + } + + public void reset() { + modified = added = removed = clean = missing = unknown = ignored = null; + copied = null; + } + + public void parse(CharSequence seq) { + Matcher m = pattern.matcher(seq); + while (m.find()) { + String fname = m.group(2); + switch ((int) m.group(1).charAt(0)) { + case (int) 'M' : { + modified = doAdd(modified, fname); + break; + } + case (int) 'A' : { + added = doAdd(added, fname); + break; + } + case (int) 'R' : { + removed = doAdd(removed, fname); + break; + } + case (int) '?' : { + unknown = doAdd(unknown, fname); + break; + } + case (int) 'I' : { + ignored = doAdd(ignored, fname); + break; + } + case (int) 'C' : { + clean = doAdd(clean, fname); + break; + } + case (int) '!' : { + missing = doAdd(missing, fname); + break; + } + case (int) ' ' : { + if (copied == null) { + copied = new TreeMap(); + } + // last added is copy destination + // to get or to remove it - depends on what StatusCollector does in this case + copied.put(fname, added.get(added.size() - 1)); + break; + } + } + } + } + + // + public List getModified() { + return proper(modified); + } + + public List getAdded() { + return proper(added); + } + + public List getRemoved() { + return proper(removed); + } + + public Map getCopied() { + if (copied == null) { + return Collections.emptyMap(); + } + return Collections.unmodifiableMap(copied); + } + + public List getClean() { + return proper(clean); + } + + public List getMissing() { + return proper(missing); + } + + public List getUnknown() { + return proper(unknown); + } + + public List getIgnored() { + return proper(ignored); + } + + private List proper(List l) { + if (l == null) { + return Collections.emptyList(); + } + return Collections.unmodifiableList(l); + } + + private List doAdd(List l, String s) { + if (l == null) { + l = new LinkedList(); + } + if (winPathSeparator) { + // Java impl always give slashed path, while Hg uses local, os-specific convention + s = s.replace('\\', '/'); + } + l.add(s); + return l; + } +} diff -r 613c936d74e4 -r fac8e7fcc8b0 test/com/tmate/hgkit/TestStatus.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/tmate/hgkit/TestStatus.java Tue Jan 18 18:32:49 2011 +0100 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2011 Artem Tikhomirov + */ +package com.tmate.hgkit; + +import java.io.File; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +import com.tmate.hgkit.fs.FileWalker; +import com.tmate.hgkit.fs.RepositoryLookup; +import com.tmate.hgkit.ll.HgRepository; +import com.tmate.hgkit.ll.StatusCollector; +import com.tmate.hgkit.ll.WorkingCopyStatusCollector; + +/** + * + * @author artem + */ +public class TestStatus { + + public static void main(String[] args) throws Exception { + final StatusOutputParser statusParser = new StatusOutputParser(); + ExecHelper eh = new ExecHelper(statusParser, null); + eh.run("hg", "status", "-A"); + // run java equivalent + HgRepository repo = new RepositoryLookup().detectFromWorkingDir(); + final WorkingCopyStatusCollector wcc = new WorkingCopyStatusCollector(repo, new FileWalker(new File(System.getProperty("user.dir")))); + StatusCollector.Record r = wcc.status(HgRepository.TIP); + // compare result + reportNotEqual("MODIFIED", r.getModified(), statusParser.getModified()); + reportNotEqual("ADDED", r.getAdded(), statusParser.getAdded()); + reportNotEqual("REMOVED", r.getRemoved(), statusParser.getRemoved()); + reportNotEqual("CLEAN", r.getClean(), statusParser.getClean()); + reportNotEqual("IGNORED", r.getIgnored(), statusParser.getIgnored()); + reportNotEqual("MISSING", r.getMissing(), statusParser.getMissing()); + reportNotEqual("UNKNOWN", r.getUnknown(), statusParser.getUnknown()); + // TODO compare equals + } + + private static void reportNotEqual(String what, Collection l1, Collection l2) { + List diff = difference(l1, l2); + System.out.print(what); + if (!diff.isEmpty()) { + System.out.print(" are NOT the same: "); + for (T t : diff) { + System.out.print(t); + System.out.print(", "); + } + System.out.println(); + } else { + System.out.println(" are the same"); + } + } + + private static List difference(Collection l1, Collection l2) { + LinkedList result = new LinkedList(l2); + for (T t : l1) { + if (l2.contains(t)) { + result.remove(t); + } else { + result.add(t); + } + } + return result; + } +}