diff options
| author | Matthias Sohn | 2016-12-27 23:26:40 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2016-12-27 23:26:40 +0000 |
| commit | 14f34b4891159b16762adb91fa0b935cef008501 (patch) | |
| tree | bd15994e1cf9ddb39ff93ee17cf15024aba5088d /org.eclipse.egit.ui.test/src/org/eclipse | |
| parent | 7cd545246358d694099abf947473428185e813ec (diff) | |
| download | egit-14f34b4891159b16762adb91fa0b935cef008501.tar.gz egit-14f34b4891159b16762adb91fa0b935cef008501.tar.xz egit-14f34b4891159b16762adb91fa0b935cef008501.zip | |
[findBugs] Fix warning "writing static from instance method"
Change-Id: I9952f9047bff73497d10a2efcc6164bbdc7685ca
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse')
| -rw-r--r-- | org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureRebaseHandlerTest.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureRebaseHandlerTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureRebaseHandlerTest.java index a97ae116a0..1100b0d313 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureRebaseHandlerTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureRebaseHandlerTest.java @@ -37,11 +37,15 @@ import org.junit.runner.RunWith; @RunWith(SWTBotJunit4ClassRunner.class) public class FeatureRebaseHandlerTest extends AbstractGitflowHandlerTest { - @Test - public void testRebaseFailOnConflict() throws Exception { + private static void disableAutomatedMode() { // if AUTOMATED_MODE is true, we wouldn't get the error // dialog which is part of what we want to test here ErrorDialog.AUTOMATED_MODE = false; + } + + @Test + public void testRebaseFailOnConflict() throws Exception { + disableAutomatedMode(); Git git = Git.wrap(repository); @@ -75,9 +79,7 @@ public class FeatureRebaseHandlerTest extends AbstractGitflowHandlerTest { @Test public void testRebaseFailOnDirtyWorkingDirectory() throws Exception { - // if AUTOMATED_MODE is true, we wouldn't get the error - // dialog which is part of what we want to test here - ErrorDialog.AUTOMATED_MODE = false; + disableAutomatedMode(); Git git = Git.wrap(repository); |