Add unit test

Author: atextor

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

@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+
 import javax.xml.datatype.Duration;
 import javax.xml.datatype.XMLGregorianCalendar;
 
@@ -63,16 +64,20 @@
 import org.junit.jupiter.params.provider.EnumSource;
 
 public class AspectModelJavaGeneratorTest {
-   private Collection<JavaGenerator> getGenerators( final TestAspect testAspect, final String customJavaPackageName ) {
+   private Collection<JavaGenerator> getGenerators( final TestAspect testAspect, final JavaCodeGenerationConfig config ) {
       final Aspect aspect = TestResources.load( testAspect ).aspect();
-      final JavaCodeGenerationConfig config = JavaCodeGenerationConfigBuilder.builder()
-            .packageName( customJavaPackageName )
-            .enableJacksonAnnotations( true )
-            .executeLibraryMacros( false )
-            .build();
       return List.of( new AspectModelJavaGenerator( aspect, config ) );
    }
 
+   private Collection<JavaGenerator> getGenerators( final TestAspect testAspect, final String customJavaPackageName ) {
+      return getGenerators( testAspect,
+            JavaCodeGenerationConfigBuilder.builder()
+                  .packageName( customJavaPackageName )
+                  .enableJacksonAnnotations( true )
+                  .executeLibraryMacros( false )
+                  .build() );
+   }
+
    private Collection<JavaGenerator> getGenerators( final TestAspect testAspect, final boolean enableJacksonAnnotations,
          final boolean executeLibraryMacros, final File templateLibPath ) {
       final Aspect aspect = TestResources.load( testAspect ).aspect();
@@ -524,6 +529,34 @@ ImmutableMap.<String, String> builder()
 
       result.assertFields( "YesNo", ImmutableMap.<String, Object> builder().put( "value", String.class ).build(), new HashMap<>() );
       result.assertEnumConstants( "YesNo", ImmutableSet.of( "YES", "NO" ), Collections.emptyMap() );
+
+      assertThat( result.getGeneratedSource( new QualifiedName( "EvaluationResults", "org.eclipse.esmf.test" ) ) )
+            .contains( "@JsonFormat" );
+   }
+
+   @Test
+   void testGenerateAspectModelWithEnumerationDisableJsonFormatAnnotation() throws IOException {
+      final ImmutableMap<String, Object> expectedFieldsForAspectClass = ImmutableMap.<String, Object> builder()
+            .put( "result", "EvaluationResults" )
+            .put( "simpleResult", "YesNo" )
+            .build();
+
+      final ImmutableMap<String, Object> expectedFieldsForEvaluationResult = ImmutableMap.<String, Object> builder()
+            .put( "numericCode", Short.class.getSimpleName() )
+            .put( "description", String.class.getSimpleName() )
+            .build();
+
+      final TestAspect aspect = TestAspect.ASPECT_WITH_COMPLEX_ENUM;
+      final JavaCodeGenerationConfig codeGenerationConfig = JavaCodeGenerationConfigBuilder.builder()
+            .enableJacksonAnnotations( true )
+            .executeLibraryMacros( false )
+            .packageName( aspect.getUrn().getNamespaceMainPart() )
+            .enableJacksonAnnotationJsonFormatShapeObject( false )
+            .build();
+      final GenerationResult result = TestContext.generateAspectCode().apply( getGenerators( aspect, codeGenerationConfig ) );
+
+      assertThat( result.getGeneratedSource( new QualifiedName( "EvaluationResults", "org.eclipse.esmf.test" ) ) )
+            .doesNotContain( "@JsonFormat" );
    }
 
    @Test

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

@@ -65,10 +65,12 @@ class GenerationResult {
    private final long numFailedCompilationUnits;
    private final Collection<Problem> parseProblems;
    private final Map<QualifiedName, Class<?>> generatedClasses;
-
+   private final Map<QualifiedName, String> sources;
    final Map<String, CompilationUnit> compilationUnits;
 
-   GenerationResult( final File outputDirectory, final Map<QualifiedName, Class<?>> generatedClasses ) throws IOException {
+   GenerationResult( final File outputDirectory, final Map<QualifiedName, Class<?>> generatedClasses,
+         final Map<QualifiedName, String> sources ) throws IOException {
+      this.sources = sources;
       combinedTypeSolver.add( new ReflectionTypeSolver() );
       combinedTypeSolver.add( new JavaParserTypeSolver( outputDirectory ) );
       combinedTypeSolver.add( new ClassLoaderTypeSolver( getClass().getClassLoader() ) );
@@ -374,4 +376,8 @@ void assertCopyright( final String className, final String expectedCopyright ) {
    Class<?> getGeneratedClass( final QualifiedName qualifiedName ) {
       return generatedClasses.get( qualifiedName );
    }
+
+   String getGeneratedSource( final QualifiedName qualifiedName ) {
+      return sources.get( qualifiedName );
+   }
 }

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

@@ -36,9 +36,9 @@
 
 public class StaticClassGenerationResult extends GenerationResult {
 
-   public StaticClassGenerationResult( final File outputDirectory, final Map<QualifiedName, Class<?>> generatedClasses )
-         throws IOException {
-      super( outputDirectory, generatedClasses );
+   public StaticClassGenerationResult( final File outputDirectory, final Map<QualifiedName, Class<?>> generatedClasses,
+         final Map<QualifiedName, String> sources ) throws IOException {
+      super( outputDirectory, generatedClasses, sources );
    }
 
    /**

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

@@ -37,20 +37,25 @@ public class TestContext {
    public static ThrowingFunction<Collection<JavaGenerator>, GenerationResult, IOException> generateAspectCode() {
       return generators -> {
          final File tempDirectory = Files.createTempDirectory( "junit" ).toFile();
-         final Map<QualifiedName, Class<?>> generatedClasses = generateJavaCode( tempDirectory, generators );
-         return new GenerationResult( tempDirectory, generatedClasses );
+         final GeneratedCodeAndClasses generatedCodeAndClasses = generateJavaCode( tempDirectory, generators );
+         return new GenerationResult( tempDirectory, generatedCodeAndClasses.classes(), generatedCodeAndClasses.sources() );
       };
    }
 
    public static ThrowingFunction<Collection<JavaGenerator>, StaticClassGenerationResult, IOException> generateStaticAspectCode() {
       return generators -> {
          final File tempDirectory = Files.createTempDirectory( "junit" ).toFile();
-         final Map<QualifiedName, Class<?>> generatedClasses = generateJavaCode( tempDirectory, generators );
-         return new StaticClassGenerationResult( tempDirectory, generatedClasses );
+         final GeneratedCodeAndClasses generatedCodeAndClasses = generateJavaCode( tempDirectory, generators );
+         return new StaticClassGenerationResult( tempDirectory, generatedCodeAndClasses.classes(), generatedCodeAndClasses.sources() );
       };
    }
 
-   private static Map<QualifiedName, Class<?>> generateJavaCode( final File tempDirectory, final Collection<JavaGenerator> generators )
+   private record GeneratedCodeAndClasses(
+         Map<QualifiedName, Class<?>> classes,
+         Map<QualifiedName, String> sources
+   ) {}
+
+   private static GeneratedCodeAndClasses generateJavaCode( final File tempDirectory, final Collection<JavaGenerator> generators )
          throws IOException {
       final File subFolder = new File(
             tempDirectory.getAbsolutePath() + File.separator + generators.iterator().next().getConfig().packageName()
@@ -79,7 +84,7 @@ private static Map<QualifiedName, Class<?>> generateJavaCode( final File tempDir
                         generator.getConfig().importTracker().getUsedStaticImports().stream() ) )
             .collect( Collectors.toList() );
 
-      return JavaCompiler.compile( loadOrder, sources, referencedClasses ).compilationUnits();
+      return new GeneratedCodeAndClasses( JavaCompiler.compile( loadOrder, sources, referencedClasses ).compilationUnits(), sources );
    }
 
    private static void writeFile( final String className, final byte[] content, final File targetDirectory ) {