Browse Source

renamed VertexValidator codes and methods

Axel Terfloth 7 years ago
parent
commit
7094b4c628

+ 7 - 4
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/validation/VertexValidator.java

@@ -30,14 +30,16 @@ import org.yakindu.sct.model.sgraph.util.DFS;
  * 
  * All validation constraints for the meta model element {@link Vertex}
  * 
+ * @author terfloth
+ * 
  */
 public class VertexValidator extends AbstractSGraphValidator {
 
-	private static final String VERTEX_REACHABLE_MSG = "Node is not reachable.";
-	public static final String VERTEX_REACHABLE_CODE = "vertex.reachable";
+	private static final String VERTEX_MUST_BE_REACHABLE_MSG = "Node is not reachable.";
+	public static final String VERTEX_MUST_BE_REACHABLE_CODE = "vertex.MustBeReachable";
 
 	@Check(CheckType.FAST)
-	public void vertexNotReachable(final Vertex vertex) {
+	public void checkVertexMustBeReachable(final Vertex vertex) {
 		if (!(vertex instanceof Entry)) {
 			final Set<Object> stateScopeSet = new HashSet<>();
 			for (EObject obj : EcoreUtil2.eAllContents(vertex)) {
@@ -45,6 +47,7 @@ public class VertexValidator extends AbstractSGraphValidator {
 			}
 			stateScopeSet.add(vertex);
 			final List<Object> externalPredecessors = new ArrayList<>();
+			
 			DFS dfs = new DFS() {
 
 				@Override
@@ -83,7 +86,7 @@ public class VertexValidator extends AbstractSGraphValidator {
 			dfs.perform(vertex);
 
 			if (externalPredecessors.size() == 0) {
-				error(VERTEX_REACHABLE_MSG, vertex, null, -1, VERTEX_REACHABLE_CODE);
+				error(VERTEX_MUST_BE_REACHABLE_MSG, vertex, null, -1, VERTEX_MUST_BE_REACHABLE_CODE);
 			}
 		}
 	}

+ 7 - 5
test-plugins/org.yakindu.sct.model.sgraph.test/src/org/yakindu/sct/model/sgraph/test/validation/VertexValidatorTest.java

@@ -10,7 +10,7 @@
  */
 package org.yakindu.sct.model.sgraph.test.validation;
 
-import static org.yakindu.sct.model.sgraph.validation.VertexValidator.VERTEX_REACHABLE_CODE;
+import static org.yakindu.sct.model.sgraph.validation.VertexValidator.VERTEX_MUST_BE_REACHABLE_CODE;
 
 import org.junit.Test;
 import org.yakindu.sct.model.sgraph.Choice;
@@ -28,6 +28,8 @@ import com.google.inject.Inject;
 /**
  *
  * Tests for {@link VertexValidator}
+ * 
+ * @author terfloth
  *
  */
 public class VertexValidatorTest extends AbstractSGraphValidatorTest {
@@ -41,7 +43,7 @@ public class VertexValidatorTest extends AbstractSGraphValidatorTest {
 	@Test
 	public void vertexNotReachable() {
 		State state = createState();
-		tester.validate(state).assertError(VERTEX_REACHABLE_CODE);
+		tester.validate(state).assertError(VERTEX_MUST_BE_REACHABLE_CODE);
 	}
 
 	/**
@@ -119,7 +121,7 @@ public class VertexValidatorTest extends AbstractSGraphValidatorTest {
 		((Region) state.eContainer()).getVertices().add(choice);
 		createTransition(state, choice);
 		createTransition(choice, state);
-		tester.validate(state).assertError(VERTEX_REACHABLE_CODE);
+		tester.validate(state).assertError(VERTEX_MUST_BE_REACHABLE_CODE);
 	}
 
 	/**
@@ -143,7 +145,7 @@ public class VertexValidatorTest extends AbstractSGraphValidatorTest {
 		createTransition(stateA, choice);
 		createTransition(choice, stateA);
 
-		tester.validate(state).assertError(VERTEX_REACHABLE_CODE);
+		tester.validate(state).assertError(VERTEX_MUST_BE_REACHABLE_CODE);
 	}
 
 	/**
@@ -157,7 +159,7 @@ public class VertexValidatorTest extends AbstractSGraphValidatorTest {
 		FinalState finalState = factory.createFinalState();
 		region.getVertices().add(finalState);
 
-		tester.validate(finalState).assertError(VERTEX_REACHABLE_CODE);
+		tester.validate(finalState).assertError(VERTEX_MUST_BE_REACHABLE_CODE);
 	}
 
 }