Skip to content

Commit 0475b90

Browse files
committed
Add custom model resolver script for Linux/Unix.
1 parent f88ddf0 commit 0475b90

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.junit.jupiter.api.BeforeAll;
3737
import org.junit.jupiter.api.BeforeEach;
3838
import org.junit.jupiter.api.Test;
39-
import org.junit.jupiter.api.condition.EnabledOnOs;
4039
import org.junit.jupiter.api.condition.OS;
4140
import org.junit.jupiter.api.io.TempDir;
4241
import org.junit.jupiter.params.ParameterizedTest;
@@ -160,7 +159,6 @@ public void testSvgGenToStdout( final KnownVersion metaModelVersion ) {
160159
assertThat( stdoutBuffer.toString( StandardCharsets.UTF_8 ) ).startsWith( "<svg" );
161160
}
162161

163-
@EnabledOnOs( OS.WINDOWS )
164162
@ParameterizedTest
165163
@MethodSource( value = "allVersions" )
166164
public void testSvgGenToFileWithDefLanguageAndExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -194,7 +192,6 @@ public void testPngGenToFileFailForNonexistentLanguage( final KnownVersion metaM
194192
.hasMessageContaining( "The model does not contain the desired language" );
195193
}
196194

197-
@EnabledOnOs( OS.WINDOWS )
198195
@ParameterizedTest
199196
@MethodSource( value = "allVersions" )
200197
public void testPngGenToFileWithDefLanguageAndExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -235,7 +232,6 @@ public void testDotGenToStdout( final KnownVersion metaModelVersion ) {
235232
assertThat( stdoutBuffer.toString( StandardCharsets.UTF_8 ) ).startsWith( "digraph AspectModel" );
236233
}
237234

238-
@EnabledOnOs( OS.WINDOWS )
239235
@ParameterizedTest
240236
@MethodSource( value = "allVersions" )
241237
public void testDotGenToFileWithDefLanguageAndExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -260,7 +256,6 @@ public void testJsonToStdout( final KnownVersion metaModelVersion ) {
260256
assertThat( stdoutBuffer.toString( StandardCharsets.UTF_8 ) ).startsWith( "{" );
261257
}
262258

263-
@EnabledOnOs( OS.WINDOWS )
264259
@ParameterizedTest
265260
@MethodSource( value = "allVersions" )
266261
public void testJsonToFileWithExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -285,7 +280,6 @@ public void testJsonSchemaToStdout( final KnownVersion metaModelVersion ) {
285280
assertThat( stdoutBuffer.toString( StandardCharsets.UTF_8 ) ).startsWith( "{" );
286281
}
287282

288-
@EnabledOnOs( OS.WINDOWS )
289283
@ParameterizedTest
290284
@MethodSource( value = "allVersions" )
291285
public void testJsonSchemaToFileWithExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -309,7 +303,6 @@ public void testGenerateAspectModelJavaClassWithDefaultPackageName( final KnownV
309303
validateFile( directory, "TestEntity.java" );
310304
}
311305

312-
@EnabledOnOs( OS.WINDOWS )
313306
@ParameterizedTest
314307
@MethodSource( value = "allVersions" )
315308
public void testGenerateAspectModelJavaClassWithDefaultPackageNameAndExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -346,7 +339,6 @@ public void testValidation( final KnownVersion metaModelVersion ) {
346339
createValidArgsExecution( metaModelVersion, "validate" );
347340
}
348341

349-
@EnabledOnOs( OS.WINDOWS )
350342
@ParameterizedTest
351343
@MethodSource( value = "allVersions" )
352344
public void testValidationWithCustomResolver( final KnownVersion metaModelVersion ) throws IOException, URISyntaxException {
@@ -446,8 +438,7 @@ public void testGenerateOpenApiSpecWithoutResourcePath( final KnownVersion metaM
446438
public void testGenerateOpenApiSpecWithResourcePath( final KnownVersion metaModelVersion ) {
447439
createValidArgsExecution( metaModelVersion, "to", "openapi", "-j", "-b", "https://test.example.com", "-r", "my-aspect" );
448440
}
449-
450-
@EnabledOnOs( OS.WINDOWS )
441+
451442
@ParameterizedTest
452443
@MethodSource( value = "allVersions" )
453444
public void testGenerateOpenApiSpecWithResourcePathAndExternalModelResolver( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -582,6 +573,7 @@ private String getResolverCommand( final KnownVersion metaModelVersion ) throws
582573
final Path targetDirectory = Paths.get( getClass().getResource( "/" ).toURI() ).getParent();
583574
final Path testClasses = Paths.get( targetDirectory.toString(), "test-classes" );
584575
final Path modelsRoot = Paths.get( targetDirectory.toString(), "classes", "valid" );
585-
return testClasses + "\\model_resolver.bat " + modelsRoot + " " + metaModelVersion.toString().toLowerCase();
576+
final String scriptName = OS.WINDOWS.isCurrentOs() ? "\\model_resolver.bat " : "/model_resolver.sh ";
577+
return testClasses + scriptName + modelsRoot + " " + metaModelVersion.toString().toLowerCase();
586578
}
587579
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
root="$1"
4+
bamm_ver="$2"
5+
model_urn="$3"
6+
7+
no_bamm_urn="${model_urn/urn:bamm:/}"
8+
path="${no_bamm_urn/://}"
9+
path="${path/\#//}"
10+
path="${root}/${bamm_ver}/${path}.ttl"
11+
12+
cat "$path"

0 commit comments

Comments
 (0)