36
36
import org .junit .jupiter .api .BeforeAll ;
37
37
import org .junit .jupiter .api .BeforeEach ;
38
38
import org .junit .jupiter .api .Test ;
39
- import org .junit .jupiter .api .condition .EnabledOnOs ;
40
39
import org .junit .jupiter .api .condition .OS ;
41
40
import org .junit .jupiter .api .io .TempDir ;
42
41
import org .junit .jupiter .params .ParameterizedTest ;
@@ -160,7 +159,6 @@ public void testSvgGenToStdout( final KnownVersion metaModelVersion ) {
160
159
assertThat ( stdoutBuffer .toString ( StandardCharsets .UTF_8 ) ).startsWith ( "<svg" );
161
160
}
162
161
163
- @ EnabledOnOs ( OS .WINDOWS )
164
162
@ ParameterizedTest
165
163
@ MethodSource ( value = "allVersions" )
166
164
public void testSvgGenToFileWithDefLanguageAndExternalModelResolver ( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -194,7 +192,6 @@ public void testPngGenToFileFailForNonexistentLanguage( final KnownVersion metaM
194
192
.hasMessageContaining ( "The model does not contain the desired language" );
195
193
}
196
194
197
- @ EnabledOnOs ( OS .WINDOWS )
198
195
@ ParameterizedTest
199
196
@ MethodSource ( value = "allVersions" )
200
197
public void testPngGenToFileWithDefLanguageAndExternalModelResolver ( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -235,7 +232,6 @@ public void testDotGenToStdout( final KnownVersion metaModelVersion ) {
235
232
assertThat ( stdoutBuffer .toString ( StandardCharsets .UTF_8 ) ).startsWith ( "digraph AspectModel" );
236
233
}
237
234
238
- @ EnabledOnOs ( OS .WINDOWS )
239
235
@ ParameterizedTest
240
236
@ MethodSource ( value = "allVersions" )
241
237
public void testDotGenToFileWithDefLanguageAndExternalModelResolver ( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -260,7 +256,6 @@ public void testJsonToStdout( final KnownVersion metaModelVersion ) {
260
256
assertThat ( stdoutBuffer .toString ( StandardCharsets .UTF_8 ) ).startsWith ( "{" );
261
257
}
262
258
263
- @ EnabledOnOs ( OS .WINDOWS )
264
259
@ ParameterizedTest
265
260
@ MethodSource ( value = "allVersions" )
266
261
public void testJsonToFileWithExternalModelResolver ( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -285,7 +280,6 @@ public void testJsonSchemaToStdout( final KnownVersion metaModelVersion ) {
285
280
assertThat ( stdoutBuffer .toString ( StandardCharsets .UTF_8 ) ).startsWith ( "{" );
286
281
}
287
282
288
- @ EnabledOnOs ( OS .WINDOWS )
289
283
@ ParameterizedTest
290
284
@ MethodSource ( value = "allVersions" )
291
285
public void testJsonSchemaToFileWithExternalModelResolver ( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -309,7 +303,6 @@ public void testGenerateAspectModelJavaClassWithDefaultPackageName( final KnownV
309
303
validateFile ( directory , "TestEntity.java" );
310
304
}
311
305
312
- @ EnabledOnOs ( OS .WINDOWS )
313
306
@ ParameterizedTest
314
307
@ MethodSource ( value = "allVersions" )
315
308
public void testGenerateAspectModelJavaClassWithDefaultPackageNameAndExternalModelResolver ( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -346,7 +339,6 @@ public void testValidation( final KnownVersion metaModelVersion ) {
346
339
createValidArgsExecution ( metaModelVersion , "validate" );
347
340
}
348
341
349
- @ EnabledOnOs ( OS .WINDOWS )
350
342
@ ParameterizedTest
351
343
@ MethodSource ( value = "allVersions" )
352
344
public void testValidationWithCustomResolver ( final KnownVersion metaModelVersion ) throws IOException , URISyntaxException {
@@ -446,8 +438,7 @@ public void testGenerateOpenApiSpecWithoutResourcePath( final KnownVersion metaM
446
438
public void testGenerateOpenApiSpecWithResourcePath ( final KnownVersion metaModelVersion ) {
447
439
createValidArgsExecution ( metaModelVersion , "to" , "openapi" , "-j" , "-b" , "https://test.example.com" , "-r" , "my-aspect" );
448
440
}
449
-
450
- @ EnabledOnOs ( OS .WINDOWS )
441
+
451
442
@ ParameterizedTest
452
443
@ MethodSource ( value = "allVersions" )
453
444
public void testGenerateOpenApiSpecWithResourcePathAndExternalModelResolver ( final KnownVersion metaModelVersion ) throws URISyntaxException {
@@ -582,6 +573,7 @@ private String getResolverCommand( final KnownVersion metaModelVersion ) throws
582
573
final Path targetDirectory = Paths .get ( getClass ().getResource ( "/" ).toURI () ).getParent ();
583
574
final Path testClasses = Paths .get ( targetDirectory .toString (), "test-classes" );
584
575
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 ();
586
578
}
587
579
}
0 commit comments