Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2016-01-02 12:24:02 +0000
committerAndrey Loskutov2016-01-02 16:41:58 +0000
commitd6deb190e61b9b891af2fe67198a18b4ddb2057f (patch)
treed4fe3e41057320b06043b938903143479f58fd4a /org.eclipse.jgit.pgm.test/tst
parent35db319e8a10a26f08bad3f66ebf6f51008d9735 (diff)
downloadjgit-d6deb190e61b9b891af2fe67198a18b4ddb2057f.tar.gz
jgit-d6deb190e61b9b891af2fe67198a18b4ddb2057f.tar.xz
jgit-d6deb190e61b9b891af2fe67198a18b4ddb2057f.zip
Simplify pgm tests: allow varargs and trim output for toString()
Change-Id: Ia5bcd9e560b90cf872fef75c2800c889ef1cc85a Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.jgit.pgm.test/tst')
-rw-r--r--org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CommitTest.java39
1 files changed, 19 insertions, 20 deletions
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CommitTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CommitTest.java
index 721ed15695..6bccb6d4a7 100644
--- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CommitTest.java
+++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CommitTest.java
@@ -42,7 +42,7 @@
*/
package org.eclipse.jgit.pgm;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import org.eclipse.jgit.lib.CLIRepositoryTestCase;
import org.junit.Test;
@@ -54,26 +54,27 @@ public class CommitTest extends CLIRepositoryTestCase {
writeTrashFile("a", "a");
writeTrashFile("b", "a");
String result = toString(execute("git add a"));
- assertTrue("Unexpected output: " + result, result.isEmpty());
+ assertEquals("", result);
result = toString(execute("git status -- a"));
- assertTrue("Unexpected output: " + result,
- result.contains("new file: a"));
+ assertEquals(toString("On branch master", "Changes to be committed:",
+ "new file: a"), result);
result = toString(execute("git status -- b"));
- assertTrue("Unexpected output: " + result,
- result.trim().contains("Untracked files:\n b"));
+ assertEquals(toString("On branch master", "Untracked files:", "b"),
+ result);
result = toString(execute("git commit a -m 'added a'"));
- assertTrue("Unexpected output: " + result, result.contains("added a"));
+ assertEquals(
+ "[master 8cb3ef7e5171aaee1792df6302a5a0cd30425f7a] added a",
+ result);
result = toString(execute("git status -- a"));
- assertTrue("Unexpected output: " + result,
- result.trim().equals("On branch master"));
+ assertEquals("On branch master", result);
result = toString(execute("git status -- b"));
- assertTrue("Unexpected output: " + result,
- result.trim().contains("Untracked files:\n b"));
+ assertEquals(toString("On branch master", "Untracked files:", "b"),
+ result);
}
@Test
@@ -81,21 +82,19 @@ public class CommitTest extends CLIRepositoryTestCase {
writeTrashFile("a", "a");
writeTrashFile("b", "a");
String result = toString(execute("git add a b"));
- assertTrue("Unexpected output: " + result, result.isEmpty());
+ assertEquals("", result);
result = toString(execute("git status -- a b"));
- assertTrue("Unexpected output: " + result,
- result.contains("new file: a"));
- assertTrue("Unexpected output: " + result,
- result.contains("new file: b"));
+ assertEquals(toString("On branch master", "Changes to be committed:",
+ "new file: a", "new file: b"), result);
result = toString(execute("git commit -m 'added a b'"));
- assertTrue("Unexpected output: " + result,
- result.contains("added a b"));
+ assertEquals(
+ "[master 3c93fa8e3a28ee26690498be78016edcb3a38c73] added a b",
+ result);
result = toString(execute("git status -- a b"));
- assertTrue("Unexpected output: " + result,
- result.trim().equals("On branch master"));
+ assertEquals("On branch master", result);
}
}

Back to the top