Fix test and create own all upper check

Author: MelleD

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/AspectModelJavaUtil.java

@@ -344,14 +344,18 @@ public static Class<?> getDataTypeClass( final Type dataType ) {
     * Convert a string given as upper or lower camel case into a constant format. For example {@code someVariable} would become
     * {@code SOME_VARIABLE}.
     *
-    * @param upperOrLowerCamelString the string to convert
+    * @param upperOrLowerCamel the string to convert
     * @return the string formatted as a constant.
     */
-   public static String toConstant( final String upperOrLowerCamelString ) {
-      if ( StringUtils.isAllUpperCase( upperOrLowerCamelString ) ) {
-         return upperOrLowerCamelString;
+   public static String toConstant( final String upperOrLowerCamel ) {
+      if ( isAllUppercaseWithUnderscore( upperOrLowerCamel ) ) {
+         return upperOrLowerCamel;
       }
-      return TO_CONSTANT.convert( StringUtils.capitalize( upperOrLowerCamelString ) );
+      return TO_CONSTANT.convert( StringUtils.capitalize( upperOrLowerCamel ) );
+   }
+   
+   public static boolean isAllUppercaseWithUnderscore( final String upperOrLowerCamel ) {
+      return upperOrLowerCamel != null && upperOrLowerCamel.matches( "[A-Z0-9_]+" );
    }
 
    /**

core/esmf-aspect-model-java-generator/src/test/java/org/eclipse/esmf/aspectmodel/java/AspectModelJavaUtilTest.java

@@ -64,7 +64,7 @@ static Stream<Arguments> generatedEnumKeysAreExpectedEnumNames() {
             Arguments.arguments( "SOME_ENUM", "SOME_ENUM" ),
             Arguments.arguments( "SomeEnum", "SOME_ENUM" ),
             Arguments.arguments( "aB", "A_B" ),
-            Arguments.arguments( "aBc", "A_B_C" ),
+            Arguments.arguments( "aBc", "AB_C" ),
             Arguments.arguments( "a_b_c", "A_B_C" )
       );
    }