aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2014-08-03 07:33:28 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2014-08-03 07:33:28 -0400
commitd97558fb1ccf47473fefe22b53b18a3d27438d82 (patch)
tree7d2696ef85b63f00c8beb2c7f4b37797e33b5a8d /org.eclipse.jgit.test/tst
parentb397e7b6e02a3fa446f3f08aadfb97675c1af48e (diff)
parentf5494c186f4fb54d13527944bd1b59ff8c291364 (diff)
downloadjgit-d97558fb1ccf47473fefe22b53b18a3d27438d82.tar.gz
jgit-d97558fb1ccf47473fefe22b53b18a3d27438d82.zip
Merge "Add isRebase to API of BranchConfig"
Diffstat (limited to 'org.eclipse.jgit.test/tst')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java
index 63441bfe90..87bb082485 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java
@@ -45,7 +45,9 @@
package org.eclipse.jgit.lib;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.junit.Test;
@@ -144,6 +146,20 @@ public class BranchConfigTest {
branchConfig.getTrackingBranch());
}
+ @Test
+ public void isRebase() {
+ Config c = parse("" //
+ + "[branch \"undefined\"]\n"
+ + "[branch \"false\"]\n"
+ + " rebase = false\n"
+ + "[branch \"true\"]\n"
+ + " rebase = true\n");
+
+ assertFalse(new BranchConfig(c, "undefined").isRebase());
+ assertFalse(new BranchConfig(c, "false").isRebase());
+ assertTrue(new BranchConfig(c, "true").isRebase());
+ }
+
private static Config parse(final String content) {
final Config c = new Config(null);
try {