瀏覽代碼

Added comments and fixed small bug.

tomqc86@googlemail.com 12 年之前
父節點
當前提交
d1aebc2a07
共有 19 個文件被更改,包括 8 次插入68 次删除
  1. 1 1
      plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/refactor/impl/FoldIncomingActionsRefactoring.java
  2. 1 1
      plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/refactor/impl/UnfoldEntryActionsRefactoring.java
  3. 二進制
      test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/AllTests.class
  4. 二進制
      test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/FoldIncomingActionsRefactoringTest.class
  5. 二進制
      test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/FoldOutgoingActionsRefactoringTest.class
  6. 二進制
      test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/RefactoringTest.class
  7. 二進制
      test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/RenameRefactoringTest.class
  8. 二進制
      test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/StateBasedRefactoringTest.class
  9. 二進制
      test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/UnfoldEntryActionsRefactoringTest.class
  10. 二進制
      test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/UnfoldExitActionsRefactoringTest.class
  11. 二進制
      test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/util/TestHelper.class
  12. 二進制
      test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/util/TestInjectorProvider.class
  13. 1 0
      test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/FoldIncomingActionsRefactoringTest.java
  14. 1 0
      test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/FoldOutgoingActionsRefactoringTest.java
  15. 0 66
      test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/RefactoringTest.java
  16. 1 0
      test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/RenameRefactoringTest.java
  17. 1 0
      test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/StateBasedRefactoringTest.java
  18. 1 0
      test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/UnfoldEntryActionsRefactoringTest.java
  19. 1 0
      test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/UnfoldExitActionsRefactoringTest.java

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

@@ -64,7 +64,7 @@ public class FoldIncomingActionsRefactoring extends AbstractRefactoring<State> {
 	public boolean isExecutable() {
 		// TODO check if there is at least one action on each transition
 		return super.isExecutable()
-				&& helper.oneIncomingTransitionEntersCompositeWithEntryActions(getContextObject());
+				&& !helper.oneIncomingTransitionEntersCompositeWithEntryActions(getContextObject());
 	}
 
 

+ 1 - 1
plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/refactor/impl/UnfoldEntryActionsRefactoring.java

@@ -56,7 +56,7 @@ public class UnfoldEntryActionsRefactoring extends AbstractRefactoring<State> {
 	@Override
 	public boolean isExecutable() {
 		return super.isExecutable()
-				&& helper.oneIncomingTransitionEntersCompositeWithEntryActions(getContextObject());
+				&& !helper.oneIncomingTransitionEntersCompositeWithEntryActions(getContextObject());
 	}
 
 	private void unfoldEntryActions() {

二進制
test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/AllTests.class


二進制
test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/FoldIncomingActionsRefactoringTest.class


二進制
test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/FoldOutgoingActionsRefactoringTest.class


二進制
test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/RefactoringTest.class


二進制
test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/RenameRefactoringTest.class


二進制
test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/StateBasedRefactoringTest.class


二進制
test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/UnfoldEntryActionsRefactoringTest.class


二進制
test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/UnfoldExitActionsRefactoringTest.class


二進制
test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/util/TestHelper.class


二進制
test-plugins/org.yakindu.sct.refactoring.tests/bin/org/yakindu/sct/refactoring/refactor/util/TestInjectorProvider.class


+ 1 - 0
test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/FoldIncomingActionsRefactoringTest.java

@@ -21,6 +21,7 @@ import org.yakindu.sct.refactoring.refactor.impl.FoldIncomingActionsRefactoring;
 import com.google.common.collect.Lists;
 
 /**
+ * Test for {@link FoldIncomingActionsRefactoring}.
  * 
  * @author thomas kutz - Initial contribution and API
  * 

+ 1 - 0
test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/FoldOutgoingActionsRefactoringTest.java

@@ -21,6 +21,7 @@ import org.yakindu.sct.refactoring.refactor.impl.FoldOutgoingActionsRefactoring;
 import com.google.common.collect.Lists;
 
 /**
+ * Tests for {@link FoldOutgoingActionsRefactoring}.
  * 
  * @author thomas kutz - Initial contribution and API
  * 

+ 0 - 66
test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/RefactoringTest.java

@@ -1,66 +0,0 @@
-/**
- * Copyright (c) 2013 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * 	committers of YAKINDU - initial API and implementation
- * 
- */
-package org.yakindu.sct.refactoring.refactor;
-
-import junit.framework.Assert;
-
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.XtextRunner;
-import org.junit.runner.RunWith;
-import org.yakindu.sct.model.sgraph.State;
-import org.yakindu.sct.model.sgraph.Statechart;
-import org.yakindu.sct.model.sgraph.resource.AbstractSCTResource;
-import org.yakindu.sct.refactoring.refactor.util.TestHelper;
-import org.yakindu.sct.refactoring.refactor.util.TestInjectorProvider;
-import org.yakindu.sct.test.models.RefactoringTestModels;
-
-import com.google.inject.Inject;
-
-/**
- * 
- * @author thomas kutz - Initial contribution and API
- * 
- */
-@RunWith(XtextRunner.class)
-@InjectWith(TestInjectorProvider.class)
-public abstract class RefactoringTest {
-
-	@Inject
-	protected RefactoringTestModels models;
-
-	protected TestHelper helper = new TestHelper();
-
-	protected void compareStatecharts(Statechart initial, Statechart expected) {
-		if (!EcoreUtil.equals(initial, expected)) {
-			Assert.fail("Equality check on statecharts failed!");
-		}
-	}
-
-	protected void testRefactoringOnState(String pathToInitialSct,
-			String pathToExpectedSct, String stateName) {
-		Statechart initial = models
-				.loadStatechartFromResource(pathToInitialSct);
-		State stateB = helper.getStateByName(initial, stateName);
-
-		AbstractRefactoring<?> refactoring = getRefactoring(stateB);
-		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(true);
-		refactoring.internalExecute();
-		((AbstractSCTResource) initial.eResource()).setSerializerEnabled(false);
-
-		Statechart expected = models
-				.loadStatechartFromResource(pathToExpectedSct);
-
-		compareStatecharts(initial, expected);
-	}
-
-	protected abstract AbstractRefactoring<?> getRefactoring(State state);
-}

+ 1 - 0
test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/RenameRefactoringTest.java

@@ -36,6 +36,7 @@ import org.yakindu.sct.test.models.RefactoringTestModels;
 import com.google.inject.Inject;
 
 /**
+ * Tests for {@link RenameRefactoring}.
  * 
  * @author thomas kutz - Initial contribution and API
  * 

+ 1 - 0
test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/StateBasedRefactoringTest.java

@@ -27,6 +27,7 @@ import org.yakindu.sct.test.models.RefactoringTestModels;
 import com.google.inject.Inject;
 
 /**
+ * Base test class for state based refactorings.
  * 
  * @author thomas kutz - Initial contribution and API
  * 

+ 1 - 0
test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/UnfoldEntryActionsRefactoringTest.java

@@ -20,6 +20,7 @@ import org.yakindu.sct.refactoring.refactor.impl.UnfoldEntryActionsRefactoring;
 
 import com.google.common.collect.Lists;
 /**
+ * Tests for {@link UnfoldEntryActionsRefactoring}.
  * 
  * @author thomas kutz - Initial contribution and API
  * 

+ 1 - 0
test-plugins/org.yakindu.sct.refactoring.tests/src/org/yakindu/sct/refactoring/refactor/UnfoldExitActionsRefactoringTest.java

@@ -21,6 +21,7 @@ import org.yakindu.sct.refactoring.refactor.impl.UnfoldExitActionsRefactoring;
 import com.google.common.collect.Lists;
 
 /**
+ * Tests for {@link UnfoldExitActionsRefactoring}.
  * 
  * @author thomas kutz - Initial contribution and API
  *