Improve guard not boolean error msg, formatting, and more spcific const names

Author: schmalzing

src/main/java/de/monticore/sctransitions4code/_cocos/TransitionPreconditionsAreBoolean.java

@@ -9,14 +9,22 @@
 import de.monticore.types3.TypeCheck3;
 import de.se_rwth.commons.logging.Log;
 
+import static de.monticore.symbols.basicsymbols.BasicSymbolsMill.BOOLEAN;
+
 /**
  * Checks that the preconditions of transitions evaluate to boolean values.
  */
 public class TransitionPreconditionsAreBoolean implements SCTransitions4CodeASTTransitionBodyCoCo {
 
-  public static final String ERROR_CODE = "0xCC111";
+  public static final String GUARD_NOT_BOOLEAN_ERROR_CODE = "0xCC111";
+
+  public static final String GUARD_NOT_BOOLEAN_ERROR_MSG = "Expected '%s' but provided '%s'.";
 
-  protected static final String MESSAGE = "Guard expressions must be boolean. Your guard expression is of type '%s'.";
+  @Deprecated
+  public static final String ERROR_CODE = GUARD_NOT_BOOLEAN_ERROR_CODE;
+
+  @Deprecated
+  protected static final String MESSAGE = GUARD_NOT_BOOLEAN_ERROR_MSG;
 
   /**
    * Used to extract the type to which the transition precondition evaluates to.
@@ -36,14 +44,18 @@ public TransitionPreconditionsAreBoolean(IDerive typeDeriver) {
 
   @Override
   public void check(ASTTransitionBody node) {
-    if(node.isPresentPre()) {
+    if (node.isPresentPre()) {
       SymTypeExpression preType = TypeCheck3.typeOf(node.getPre());
       if (preType.isObscureType()) {
-        Log.debug(String.format("Coco '%s' is not checked on transition guard expression at %s, because the " +
-          "expression is malformed.", this.getClass().getSimpleName(), node.get_SourcePositionStart()), "Cocos");
-      } else if(!SymTypeRelations.isBoolean(preType)) {
+        Log.debug(() -> String.format(
+          "Coco '%s' skipped for transition guard at %s. The type is obscure, an error should already have been logged.",
+          this.getClass().getSimpleName(),
+          node.get_SourcePositionStart()),
+          "Cocos"
+        );
+      } else if (!SymTypeRelations.isBoolean(preType)) {
         Log.error(
-          String.format(ERROR_CODE + " " + MESSAGE, preType.print()),
+          String.format(ERROR_CODE + " " + GUARD_NOT_BOOLEAN_ERROR_MSG, BOOLEAN, preType.print()),
           node.get_SourcePositionStart(), node.get_SourcePositionEnd()
         );
       }

src/test/java/de/monticore/cocos/TransitionPreconditionsAreBooleanTest.java

@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static de.monticore.sctransitions4code._cocos.TransitionPreconditionsAreBoolean.GUARD_NOT_BOOLEAN_ERROR_CODE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TransitionPreconditionsAreBooleanTest extends GeneralAbstractTest {
@@ -75,11 +76,11 @@ public void testCocoInvalidNotBoolean() throws IOException {
     // Then
     List<String> findings = Log.getFindings().stream()
       .filter(Finding::isError)
-      .map(finding -> finding.getMsg().substring(0, TransitionPreconditionsAreBoolean.ERROR_CODE.length()))
+      .map(finding -> finding.getMsg().substring(0, GUARD_NOT_BOOLEAN_ERROR_CODE.length()))
       .collect(Collectors.toList());
 
     assertEquals(
-      Lists.newArrayList(TransitionPreconditionsAreBoolean.ERROR_CODE, TransitionPreconditionsAreBoolean.ERROR_CODE),
+      Lists.newArrayList(GUARD_NOT_BOOLEAN_ERROR_CODE, GUARD_NOT_BOOLEAN_ERROR_CODE),
       findings);
   }