Add integration tests with an external resolver.

Author: RaMisess

tools/bamm-cli/src/test/java/io/openmanufacturing/sds/ApplicationIntegrationTest.java

@@ -19,6 +19,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -35,6 +36,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -157,6 +160,16 @@ public void testSvgGenToStdout( final KnownVersion metaModelVersion ) {
       assertThat( stdoutBuffer.toString( StandardCharsets.UTF_8 ) ).startsWith( "<svg" );
    }
 
+   @EnabledOnOs( OS.WINDOWS )
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testSvgGenToFileWithDefLanguageAndExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
+      final File outputDir = outputDirectory.toFile();
+      createValidArgsExecution( metaModelVersion, "to", "svg", "-o", getPathForArtifact( "AspectWithEntity.svg" ),
+            "--custom-resolver", getResolverCommand( metaModelVersion ) );
+      validateFile( outputDir, "AspectWithEntity.svg" );
+   }
+
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testPngGenToFileWithDefLanguage( final KnownVersion metaModelVersion ) {
@@ -181,6 +194,16 @@ public void testPngGenToFileFailForNonexistentLanguage( final KnownVersion metaM
             .hasMessageContaining( "The model does not contain the desired language" );
    }
 
+   @EnabledOnOs( OS.WINDOWS )
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testPngGenToFileWithDefLanguageAndExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
+      final File outputDir = outputDirectory.toFile();
+      createValidArgsExecution( metaModelVersion, "to", "png", "-o", getPathForArtifact( "AspectWithEntity.png" ),
+            "--custom-resolver", getResolverCommand( metaModelVersion ) );
+      validateFile( outputDir, "AspectWithEntity.png" );
+   }
+
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testDotGenToFileWithDefLanguage( final KnownVersion metaModelVersion ) {
@@ -212,6 +235,16 @@ public void testDotGenToStdout( final KnownVersion metaModelVersion ) {
       assertThat( stdoutBuffer.toString( StandardCharsets.UTF_8 ) ).startsWith( "digraph AspectModel" );
    }
 
+   @EnabledOnOs( OS.WINDOWS )
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testDotGenToFileWithDefLanguageAndExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
+      final File outputDir = outputDirectory.toFile();
+      createValidArgsExecution( metaModelVersion, "to", "dot", "-o", getPathForArtifact( "AspectWithEntity.dot" ),
+            "--custom-resolver", getResolverCommand( metaModelVersion ) );
+      validateFile( outputDir, "AspectWithEntity.dot" );
+   }
+
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testJsonToFile( final KnownVersion metaModelVersion ) {
@@ -227,6 +260,16 @@ public void testJsonToStdout( final KnownVersion metaModelVersion ) {
       assertThat( stdoutBuffer.toString( StandardCharsets.UTF_8 ) ).startsWith( "{" );
    }
 
+   @EnabledOnOs( OS.WINDOWS )
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testJsonToFileWithExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
+      final File outputDir = outputDirectory.toFile();
+      createValidArgsExecution( metaModelVersion, "to", "json", "-o", getPathForArtifact( "AspectWithEntity.json" ),
+            "--custom-resolver", getResolverCommand( metaModelVersion ) );
+      validateFile( outputDir, "AspectWithEntity.json" );
+   }
+
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testJsonSchemaToFile( final KnownVersion metaModelVersion ) {
@@ -242,6 +285,16 @@ public void testJsonSchemaToStdout( final KnownVersion metaModelVersion ) {
       assertThat( stdoutBuffer.toString( StandardCharsets.UTF_8 ) ).startsWith( "{" );
    }
 
+   @EnabledOnOs( OS.WINDOWS )
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testJsonSchemaToFileWithExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
+      final File outputDir = outputDirectory.toFile();
+      createValidArgsExecution( metaModelVersion, "to", "schema", "-o", getPathForArtifact( "AspectWithEntity.schema.json" ),
+            "--custom-resolver", getResolverCommand( metaModelVersion ) );
+      validateFile( outputDir, "AspectWithEntity.schema.json" );
+   }
+
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testGenerateAspectModelJavaClassWithDefaultPackageName( final KnownVersion metaModelVersion ) {
@@ -256,6 +309,22 @@ public void testGenerateAspectModelJavaClassWithDefaultPackageName( final KnownV
       validateFile( directory, "TestEntity.java" );
    }
 
+   @EnabledOnOs( OS.WINDOWS )
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testGenerateAspectModelJavaClassWithDefaultPackageNameAndExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
+      final File outputDir = outputDirectory.toFile();
+
+      createValidArgsExecution( metaModelVersion, "to", "java", "-d", outputDirectory.toString(),
+            "--custom-resolver", getResolverCommand( metaModelVersion ) );
+      final File directory = Paths.get( outputDir.getAbsolutePath(), "io", "openmanufacturing", "test" ).toFile();
+      assertThat( directory ).exists();
+      assertThat( directory ).isDirectory();
+
+      validateFile( directory, "AspectWithEntity.java" );
+      validateFile( directory, "TestEntity.java" );
+   }
+
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testGenerateStaticMetaModelJavaClassWithDefaultPackageName( final KnownVersion metaModelVersion )
@@ -276,7 +345,14 @@ public void testGenerateStaticMetaModelJavaClassWithDefaultPackageName( final Kn
    public void testValidation( final KnownVersion metaModelVersion ) {
       createValidArgsExecution( metaModelVersion, "validate" );
    }
-   
+
+   @EnabledOnOs( OS.WINDOWS )
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testValidationWithCustomResolver( final KnownVersion metaModelVersion ) throws IOException, URISyntaxException {
+      createValidArgsExecution( metaModelVersion, "validate", "--custom-resolver", getResolverCommand( metaModelVersion ) );
+   }
+
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
    public void testPrettyPrintingToFile( final KnownVersion metaModelVersion ) {
@@ -371,6 +447,14 @@ public void testGenerateOpenApiSpecWithResourcePath( final KnownVersion metaMode
       createValidArgsExecution( metaModelVersion, "to", "openapi", "-j", "-b", "https://test.example.com", "-r", "my-aspect" );
    }
 
+   @EnabledOnOs( OS.WINDOWS )
+   @ParameterizedTest
+   @MethodSource( value = "allVersions" )
+   public void testGenerateOpenApiSpecWithResourcePathAndExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
+      createValidArgsExecution( metaModelVersion, "to", "openapi", "-j", "-b", "https://test.example.com", "-r", "my-aspect",
+            "--custom-resolver", getResolverCommand( metaModelVersion ) );
+   }
+
    private void createValidArgsExecution( final KnownVersion testedVersion, final String... args ) {
       assertThat( executeCommand( testedVersion, args ) ).isEqualTo( 0 );
    }
@@ -493,4 +577,11 @@ private Path findTestsJar( final Path searchDirectory ) throws IOException {
                .get();
       }
    }
+
+   private String getResolverCommand( final KnownVersion metaModelVersion ) throws URISyntaxException {
+      final Path targetDirectory = Paths.get( getClass().getResource( "/" ).toURI() ).getParent();
+      final Path testClasses = Paths.get( targetDirectory.toString(), "test-classes" );
+      final Path modelsRoot = Paths.get( targetDirectory.toString(), "classes", "valid" );
+      return testClasses + "\\model_resolver.bat " + modelsRoot + " " + metaModelVersion.toString().toLowerCase();
+   }
 }

tools/bamm-cli/src/test/java/io/openmanufacturing/sds/DelegatingCommandResolver.java

@@ -28,7 +28,6 @@
 public class DelegatingCommandResolver {
 
    public static void main( final String[] args ) throws URISyntaxException {
-      System.out.println( args[0] + ", " + args[1] );
       final Path target = Paths.get( DelegatingCommandResolver.class.getResource( "/" ).toURI() ).getParent();
       final Path modelsRoot = Paths.get( target.toString(), "classes", "valid", args[0] );
       final AspectModelUrn urn = AspectModelUrn.fromUrn( args[1] );

tools/bamm-cli/src/test/resources/model_resolver.bat

@@ -0,0 +1,11 @@
+@echo off
+set "root=%~1"
+set "bamm_ver=%~2"
+set "model_urn=%~3"
+
+set no_bamm_urn=%model_urn:urn:bamm:=%
+set path=%no_bamm_urn::=\%
+set path=%path:#=\%
+set path=%root%\%bamm_ver%\%path%.ttl
+
+type %path%