diff options
| author | Andrey Loskutov <loskutov@gmx.de> | 2016-01-02 17:32:11 +0100 |
|---|---|---|
| committer | Andrey Loskutov <loskutov@gmx.de> | 2016-01-02 17:41:58 +0100 |
| commit | 35db319e8a10a26f08bad3f66ebf6f51008d9735 (patch) | |
| tree | 9861445e25f7a7ec4018be174d1acc5a833e00b4 /org.eclipse.jgit.pgm.test/tst/org/eclipse | |
| parent | da3174a812d07b03dd0738f572e187412911e925 (diff) | |
| download | jgit-35db319e8a10a26f08bad3f66ebf6f51008d9735.tar.gz jgit-35db319e8a10a26f08bad3f66ebf6f51008d9735.zip | |
Fixed few locale dependent pgm tests
See https://dev.eclipse.org/mhonarc/lists/jgit-dev/msg03040.html
Change-Id: If51f3c750684d82cb6443f1578636c9f5ca56e2b
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.jgit.pgm.test/tst/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java | 9 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RepoTest.java | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java index 5970913693..3edd9b88e8 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java @@ -45,6 +45,7 @@ package org.eclipse.jgit.pgm; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.dircache.DirCache; @@ -64,8 +65,12 @@ public class AddTest extends CLIRepositoryTestCase { @Test public void testAddNothing() throws Exception { - assertEquals("fatal: Argument \"filepattern\" is required", // - executeUnchecked("git add")[0]); + try { + execute("git add"); + fail("Must die"); + } catch (Die e) { + // expected, requires argument + } } @Test diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RepoTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RepoTest.java index 715682755c..0eee771d2c 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RepoTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RepoTest.java @@ -42,9 +42,9 @@ */ package org.eclipse.jgit.pgm; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.File; import java.util.Arrays; @@ -102,8 +102,12 @@ public class RepoTest extends CLIRepositoryTestCase { @Test public void testMissingPath() throws Exception { - assertEquals("fatal: Argument \"path\" is required", - executeUnchecked("git repo")[0]); + try { + execute("git repo"); + fail("Must die"); + } catch (Die e) { + // expected, requires argument + } } /** |