#883: Adjusted tests.

plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/refactor/impl/FoldIncomingActionsRefactoring.java

@@ -39,9 +39,8 @@
  * </ul>
  * Preconditions:
  * <ul>
- * <li>Each incoming transition has at least one action.</li>
- * <li>No incoming transition enters a composite state which has entry actions.</li>
  * <li>At least one action is foldable.</li>
+ * <li>No incoming transition enters a composite state which has entry actions.</li>
  * </ul>
  * @author thomas kutz - Initial contribution and API
  * 
@@ -60,18 +59,13 @@ protected void internalExecute() {
 	@Override
 	public boolean isExecutable() {
 		return super.isExecutable()
-				&& allIncomingTransitionsHaveAtLeastOneAction()
-				&& noIncomingTransitionEntersCompositeWithEntryActions()
-				&& atLeastOneActionIsFoldable();
+				&& atLeastOneActionIsFoldable()
+				&& noIncomingTransitionEntersCompositeWithEntryActions();
 	}
 
 	private boolean noIncomingTransitionEntersCompositeWithEntryActions() {
 		return !helper.oneIncomingTransitionEntersCompositeWithEntryActions(getContextObject());
 	}
-
-	private boolean allIncomingTransitionsHaveAtLeastOneAction() {
-		return helper.haveAllAtLeastOneAction(getContextObject().getIncomingTransitions());
-	}
 
 	private boolean atLeastOneActionIsFoldable() {
 		EList<Transition> transitions = getContextObject().getIncomingTransitions();

plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/refactor/impl/FoldOutgoingActionsRefactoring.java

@@ -37,9 +37,8 @@
  * </ul>
  * Preconditions:
  * <ul>
- * <li>Each outgoing transition has at least one action.</li>
- * <li>No outgoing transition leaves a composite state which has exit actions.</li>
  * <li>At least one action is foldable.</li>
+ * <li>No outgoing transition leaves a composite state which has exit actions.</li>
  * </ul>
  * @author thomas kutz - Initial contribution and API
  * 
@@ -60,18 +59,13 @@ protected void internalExecute() {
 	@Override
 	public boolean isExecutable() {
 		return super.isExecutable()
-				&& allOutgoingTransitionsHaveAtLeastOneAction()
-				&& noOutgoingTransitionLeavesCompositeWithExitActions()
-				&& atLeastOneFoldableAction();
+				&& atLeastOneFoldableAction()
+				&& noOutgoingTransitionLeavesCompositeWithExitActions();
 	}
 
 	private boolean noOutgoingTransitionLeavesCompositeWithExitActions() {
 		return !helper.oneOutgoingTransitionLeavesCompositeWithExitActions(getContextObject());
 	}
-
-	private boolean allOutgoingTransitionsHaveAtLeastOneAction() {
-		return helper.haveAllAtLeastOneAction(getContextObject().getOutgoingTransitions());
-	}
 
 	private boolean atLeastOneFoldableAction() {
 		EList<Transition> transitions = getContextObject().getOutgoingTransitions();

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/impl/FoldIncomingActionsRefactoringTest.java

@@ -48,6 +48,9 @@ public void testIsExecutable() {
 
 		testRefactoringIsExecutableOnState(FOLD_INCOMING_ACTIONS + INITIAL_STATECHART,
 				FOLD_INCOMING_ACTIONS + EXPECTED_STATECHART, "InnerState", false);
+
+		testRefactoringIsExecutableOnState(FOLD_INCOMING_ACTIONS + INITIAL_STATECHART,
+				FOLD_INCOMING_ACTIONS + EXPECTED_STATECHART, "D", false);
 	}
 
 	protected AbstractRefactoring<?> getRefactoring(State state) {

test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/impl/FoldOutgoingActionsRefactoringTest.java

@@ -50,6 +50,9 @@ public void testIsExecutable() {
 
 		testRefactoringIsExecutableOnState(FOLD_OUTGOING_ACTIONS + INITIAL_STATECHART,
 				FOLD_OUTGOING_ACTIONS + EXPECTED_STATECHART, "E", false);
+
+		testRefactoringIsExecutableOnState(FOLD_OUTGOING_ACTIONS + INITIAL_STATECHART,
+				FOLD_OUTGOING_ACTIONS + EXPECTED_STATECHART, "F", false);
 	}
 
 	@Override