diff options
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java index a526fdaa7e..823516b99b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java @@ -346,6 +346,7 @@ public class PullCommandTest extends RepositoryTestCase { /** global rebase config should be respected */ public void testPullWithRebasePreserve1Config() throws Exception { Callable<PullResult> setup = new Callable<PullResult>() { + @Override public PullResult call() throws Exception { StoredConfig config = dbTarget.getConfig(); config.setString("pull", null, "rebase", "preserve"); @@ -360,6 +361,7 @@ public class PullCommandTest extends RepositoryTestCase { /** the branch-local config should win over the global config */ public void testPullWithRebasePreserveConfig2() throws Exception { Callable<PullResult> setup = new Callable<PullResult>() { + @Override public PullResult call() throws Exception { StoredConfig config = dbTarget.getConfig(); config.setString("pull", null, "rebase", "false"); @@ -375,6 +377,7 @@ public class PullCommandTest extends RepositoryTestCase { /** the branch-local config should be respected */ public void testPullWithRebasePreserveConfig3() throws Exception { Callable<PullResult> setup = new Callable<PullResult>() { + @Override public PullResult call() throws Exception { StoredConfig config = dbTarget.getConfig(); config.setString("branch", "master", "rebase", "preserve"); @@ -389,6 +392,7 @@ public class PullCommandTest extends RepositoryTestCase { /** global rebase config should be respected */ public void testPullWithRebaseConfig1() throws Exception { Callable<PullResult> setup = new Callable<PullResult>() { + @Override public PullResult call() throws Exception { StoredConfig config = dbTarget.getConfig(); config.setString("pull", null, "rebase", "true"); @@ -403,6 +407,7 @@ public class PullCommandTest extends RepositoryTestCase { /** the branch-local config should win over the global config */ public void testPullWithRebaseConfig2() throws Exception { Callable<PullResult> setup = new Callable<PullResult>() { + @Override public PullResult call() throws Exception { StoredConfig config = dbTarget.getConfig(); config.setString("pull", null, "rebase", "preserve"); @@ -418,6 +423,7 @@ public class PullCommandTest extends RepositoryTestCase { /** the branch-local config should be respected */ public void testPullWithRebaseConfig3() throws Exception { Callable<PullResult> setup = new Callable<PullResult>() { + @Override public PullResult call() throws Exception { StoredConfig config = dbTarget.getConfig(); config.setString("branch", "master", "rebase", "true"); @@ -432,6 +438,7 @@ public class PullCommandTest extends RepositoryTestCase { /** without config it should merge */ public void testPullWithoutConfig() throws Exception { Callable<PullResult> setup = new Callable<PullResult>() { + @Override public PullResult call() throws Exception { return target.pull().call(); } @@ -443,6 +450,7 @@ public class PullCommandTest extends RepositoryTestCase { /** the branch local config should win over the global config */ public void testPullWithMergeConfig() throws Exception { Callable<PullResult> setup = new Callable<PullResult>() { + @Override public PullResult call() throws Exception { StoredConfig config = dbTarget.getConfig(); config.setString("pull", null, "rebase", "true"); @@ -458,6 +466,7 @@ public class PullCommandTest extends RepositoryTestCase { /** the branch local config should win over the global config */ public void testPullWithMergeConfig2() throws Exception { Callable<PullResult> setup = new Callable<PullResult>() { + @Override public PullResult call() throws Exception { StoredConfig config = dbTarget.getConfig(); config.setString("pull", null, "rebase", "false"); |