diff --git a/org.moreunit.core.test/test/org/moreunit/core/extension/JumperExtensionManagerTest.java b/org.moreunit.core.test/test/org/moreunit/core/extension/JumperExtensionManagerTest.java index e66f3fd8..81c94e82 100644 --- a/org.moreunit.core.test/test/org/moreunit/core/extension/JumperExtensionManagerTest.java +++ b/org.moreunit.core.test/test/org/moreunit/core/extension/JumperExtensionManagerTest.java @@ -79,7 +79,6 @@ public void jump_should_stop_at_first_done_result() assertEquals(JumpResult.done(), result); verify(jumper1).jump(context); - verify(jumper2).jump(context); } @Test diff --git a/org.moreunit.core/src/org/moreunit/core/extension/LanguageExtensionManager.java b/org.moreunit.core/src/org/moreunit/core/extension/LanguageExtensionManager.java index 5d024a44..24c9bc7a 100644 --- a/org.moreunit.core/src/org/moreunit/core/extension/LanguageExtensionManager.java +++ b/org.moreunit.core/src/org/moreunit/core/extension/LanguageExtensionManager.java @@ -77,7 +77,7 @@ private boolean conditionsAreMet(IConfigurationElement[] conditionElements) for (IConfigurationElement condition : conditionElements) { - if(! DEPENDENCY_COND_TYPE.equals(condition.getAttribute(TYPE_ATTR)) || ! isDependencyPresent(condition.getAttribute(VALUE_ATTR))) + if(DEPENDENCY_COND_TYPE.equals(condition.getAttribute(TYPE_ATTR)) && ! isDependencyPresent(condition.getAttribute(VALUE_ATTR))) { return false; } diff --git a/org.moreunit.core/src/org/moreunit/core/extension/jump/JumpResult.java b/org.moreunit.core/src/org/moreunit/core/extension/jump/JumpResult.java index fbc13c0a..7b8c4bfb 100644 --- a/org.moreunit.core/src/org/moreunit/core/extension/jump/JumpResult.java +++ b/org.moreunit.core/src/org/moreunit/core/extension/jump/JumpResult.java @@ -30,4 +30,21 @@ public boolean isDone() { return done; } + + @Override + public int hashCode() + { + return Boolean.hashCode(done); + } + + @Override + public boolean equals(Object obj) + { + if(this == obj) + return true; + if(obj == null || getClass() != obj.getClass()) + return false; + JumpResult other = (JumpResult) obj; + return done == other.done; + } } diff --git a/org.moreunit.plugin/src/org/moreunit/refactoring/RenameDialogRunnable.java b/org.moreunit.plugin/src/org/moreunit/refactoring/RenameDialogRunnable.java index e8b1061c..66ab5355 100644 --- a/org.moreunit.plugin/src/org/moreunit/refactoring/RenameDialogRunnable.java +++ b/org.moreunit.plugin/src/org/moreunit/refactoring/RenameDialogRunnable.java @@ -20,11 +20,11 @@ */ public class RenameDialogRunnable implements Runnable { - ClassTypeFacade javaFile; - IMethod renamedMethod; - String newMethodName; - TestMethodDivinerFactory testMethodDivinerFactory; - TestMethodDiviner testMethodDiviner; + public ClassTypeFacade javaFile; + public IMethod renamedMethod; + public String newMethodName; + public TestMethodDivinerFactory testMethodDivinerFactory; + public TestMethodDiviner testMethodDiviner; public RenameDialogRunnable(ClassTypeFacade javaFile, IMethod renamedMethod, String newMethodName) {