Browse Source

Fixed StatechartValidator naming

Axel Terfloth 7 years ago
parent
commit
c56fb4b0cc

+ 6 - 5
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/validation/StatechartValidator.java

@@ -21,18 +21,19 @@ import org.yakindu.sct.model.sgraph.Statechart;
  */
 public class StatechartValidator extends AbstractSGraphValidator {
 
-	private static final String STATECHART_NAME_VALID_IDENTIFIER_MSG = "%s is not a valid identifier!";
-	public static final String STATECHART_NAME_VALID_IDENTIFIER_CODE = "statechart.name";
+	private static final String STATECHART_NAME_MUST_BE_IDENTIFIER_MSG = "%s is not a valid identifier!";
+	public static final String STATECHART_NAME_MUST_BE_IDENTIFIER_CODE = "statechart.name.MustBeIdentifier";
 
 	@Check
-	public void checkStatechartNameIsIdentifier(Statechart statechart) {
+	public void checkStatechartNameMustBeIdentifier(Statechart statechart) {
 		if (!isValidJavaIdentifier(statechart.getName())) {
-			error(String.format(STATECHART_NAME_VALID_IDENTIFIER_MSG, statechart.getName()), statechart,
-					BasePackage.Literals.NAMED_ELEMENT__NAME, -1, STATECHART_NAME_VALID_IDENTIFIER_CODE);
+			error(String.format(STATECHART_NAME_MUST_BE_IDENTIFIER_MSG, statechart.getName()), statechart,
+					BasePackage.Literals.NAMED_ELEMENT__NAME, -1, STATECHART_NAME_MUST_BE_IDENTIFIER_CODE);
 
 		}
 	}
 
+	
 	protected boolean isValidJavaIdentifier(String s) {
 		if (s == null || s.length() == 0) {
 			return false;

+ 6 - 3
test-plugins/org.yakindu.sct.model.sgraph.test/src/org/yakindu/sct/model/sgraph/test/validation/StatechartValidatorTest.java

@@ -10,7 +10,7 @@
  */
 package org.yakindu.sct.model.sgraph.test.validation;
 
-import static org.yakindu.sct.model.sgraph.validation.StatechartValidator.STATECHART_NAME_VALID_IDENTIFIER_CODE;
+import static org.yakindu.sct.model.sgraph.validation.StatechartValidator.STATECHART_NAME_MUST_BE_IDENTIFIER_CODE;
 
 import org.junit.Test;
 import org.yakindu.sct.model.sgraph.SGraphFactory;
@@ -30,14 +30,17 @@ public class StatechartValidatorTest extends AbstractSGraphValidatorTest {
 	@Inject
 	protected SGraphJavaValidatorTester<StatechartValidator> tester;
 
+	/** 
+	 * TODO: Test is not complete.
+	 */
 	@Test
 	public void checkStatechartNameIsIdentifier() {
 		Statechart statechart = SGraphFactory.eINSTANCE.createStatechart();
 		statechart.setName("Not a valid identifier");
-		tester.validate(statechart).assertError(STATECHART_NAME_VALID_IDENTIFIER_CODE);
+		tester.validate(statechart).assertError(STATECHART_NAME_MUST_BE_IDENTIFIER_CODE);
 
 		statechart.setName("0Notavalididentifier");
-		tester.validate(statechart).assertError(STATECHART_NAME_VALID_IDENTIFIER_CODE);
+		tester.validate(statechart).assertError(STATECHART_NAME_MUST_BE_IDENTIFIER_CODE);
 
 		statechart.setName("ValidIdentifier");
 		tester.validate(statechart).assertOK();