@@ -993,13 +993,13 @@ public void testGenerateMultiLinePropertiesIssue19628() throws IOException {
993993 generator .setGeneratorPropertyDefault (CodegenConstants .MODEL_TESTS , "false" );
994994 generator .setGeneratorPropertyDefault (CodegenConstants .API_TESTS , "false" );
995995
996- List <String > filesToGenerate = Arrays .asList (
996+ List <String > supportingFilesToGenerate = Arrays .asList (
997997 "pom.xml" ,
998998 ".travis.yml" ,
999999 ".gitignore" ,
10001000 "git_push.sh"
10011001 );
1002- GlobalSettings .setProperty (CodegenConstants .SUPPORTING_FILES , String .join (multiLineSeparator , filesToGenerate ));
1002+ GlobalSettings .setProperty (CodegenConstants .SUPPORTING_FILES , String .join (multiLineSeparator , supportingFilesToGenerate ));
10031003
10041004 List <String > apisToGenerate = Arrays .asList (
10051005 "Pet" ,
@@ -1017,21 +1017,24 @@ public void testGenerateMultiLinePropertiesIssue19628() throws IOException {
10171017
10181018 List <File > files = generator .opts (clientOptInput ).generate ();
10191019
1020- Assert .assertEquals (files .size (), 5 + modelsToGenerate .size () + apisToGenerate .size ());
1020+ Assert .assertEquals (
1021+ files .size (),
1022+ // version file + files specified by properties
1023+ 1 + supportingFilesToGenerate .size () + modelsToGenerate .size () + apisToGenerate .size ()
1024+ );
10211025
1022- TestUtils .ensureContainsFile (files , output , "pom.xml" );
1023- TestUtils .ensureContainsFile (files , output , ".travis.yml" );
1024- TestUtils .ensureContainsFile (files , output , ".gitignore" );
1025- TestUtils .ensureContainsFile (files , output , "git_push.sh" );
10261026 TestUtils .ensureContainsFile (files , output , ".openapi-generator/VERSION" );
1027+ for (String supportingFile : supportingFilesToGenerate ) {
1028+ TestUtils .ensureContainsFile (files , output , supportingFile );
1029+ }
10271030
10281031 for (String apiFile : apisToGenerate ) {
10291032 String filename = "src/main/java/org/openapitools/client/api/" + apiFile + "Api.java" ;
10301033 TestUtils .ensureContainsFile (files , output , filename );
10311034 }
10321035
1033- for (String apiFile : modelsToGenerate ) {
1034- String filename = "src/main/java/org/openapitools/client/model/" + apiFile + ".java" ;
1036+ for (String modelFile : modelsToGenerate ) {
1037+ String filename = "src/main/java/org/openapitools/client/model/" + modelFile + ".java" ;
10351038 TestUtils .ensureContainsFile (files , output , filename );
10361039 }
10371040 } finally {
0 commit comments