Mercurial > hg4j

changeset 410:df5009d67be2 smartgit3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed test to pass in a branch other than default
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 16 Mar 2012 20:19:51 +0100
parents 0f5696623512
children 464b4404e75d
files test/org/tmatesoft/hg/test/OutputParser.java test/org/tmatesoft/hg/test/TestDirstate.java
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/test/org/tmatesoft/hg/test/OutputParser.java	Fri Mar 16 20:14:47 2012 +0100
+++ b/test/org/tmatesoft/hg/test/OutputParser.java	Fri Mar 16 20:19:51 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 TMate Software Ltd
+ * Copyright (c) 2011-2012 TMate Software Ltd
  *  
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@
 
 	public class Stub implements OutputParser {
 		private boolean shallDump;
+		private CharSequence result;
+
 		public Stub() {
 			this(false);
 		}
@@ -34,10 +36,14 @@
 			shallDump = dump;
 		}
 		public void parse(CharSequence seq) {
+			result = seq;
 			if (shallDump) {
 				System.out.println(seq);
 			} 
 			// else no-op
 		}
+		public CharSequence result() {
+			return result;
+		}
 	}
 }
--- a/test/org/tmatesoft/hg/test/TestDirstate.java	Fri Mar 16 20:14:47 2012 +0100
+++ b/test/org/tmatesoft/hg/test/TestDirstate.java	Fri Mar 16 20:19:51 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 TMate Software Ltd
+ * Copyright (c) 2011-2012 TMate Software Ltd
  *  
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -66,7 +66,11 @@
 		repo = Configuration.get().find("log-branches");
 		Assert.assertEquals("test", repo.getWorkingCopyBranchName());
 		repo = Configuration.get().own();
-		Assert.assertEquals("default", repo.getWorkingCopyBranchName());
+		OutputParser.Stub output = new OutputParser.Stub();
+		ExecHelper eh = new ExecHelper(output, repo.getWorkingDir());
+		eh.run("hg", "branch");
+		String branchName = output.result().toString().trim();
+		Assert.assertEquals(branchName, repo.getWorkingCopyBranchName());
 	}
 
 	@Test