diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2012-06-14 00:20:22 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2012-06-14 00:20:48 +0200 |
| commit | 221554e35ffc8ac261a333091df2c9b33db34cd7 (patch) | |
| tree | 7162c1c2c1d8dfe7780bfd100a7f614991d0e74d /org.eclipse.jgit.pgm.test | |
| parent | 55f42a8c1d77c6cf6d85a773d2b1f6153ff2fc7f (diff) | |
| parent | 2f27d5ae12ef0dbb8c493573e389bf9f6a10f570 (diff) | |
| download | jgit-221554e35ffc8ac261a333091df2c9b33db34cd7.tar.gz jgit-221554e35ffc8ac261a333091df2c9b33db34cd7.zip | |
Merge branch 'stable-2.0'
* stable-2.0:
Prepare post v2.0.0.201206130900-r builds
JGit v2.0.0.201206130900-r
Add org.eclipse.jgit.pgm.feature to enable consumption via p2
Do not set core.autocrlf when creating repo
Change-Id: Ifdd71a6bc14d9c79f4433ebc3b53bf0042a4d4c8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm.test')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java index 23dd2600b9..fe423da166 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java @@ -42,7 +42,8 @@ */ package org.eclipse.jgit.pgm; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.lib.CLIRepositoryTestCase; @@ -60,11 +61,11 @@ public class ConfigTest extends CLIRepositoryTestCase { @Test public void testListConfig() throws Exception { String[] output = execute("git config --list"); - assertArrayEquals("expected default configuration", // - new String[] { "core.autocrlf=false", // - "core.filemode=true", // - "core.logallrefupdates=true", // - "core.repositoryformatversion=0", // - "" /* ends with LF (last line empty) */}, output); + // value depends on platform + assertTrue(output[0].startsWith("core.filemode=")); + assertTrue(output[0].endsWith("true") || output[0].endsWith("false")); + assertEquals("core.logallrefupdates=true", output[1]); + assertEquals("core.repositoryformatversion=0", output[2]); + assertEquals("", output[3]); /* ends with LF (last line empty) */ } } |