From e5c43ec9e577b146d037206613cc5d8112a1038d Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 25 Sep 2021 14:09:29 +0800 Subject: [PATCH 01/13] update surefire to newer version --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8bf0f19b74c9..2709447e131f 100644 --- a/pom.xml +++ b/pom.xml @@ -226,6 +226,7 @@ ${surefire-version} true + 120 false none:none org.testng:testng @@ -1616,7 +1617,7 @@ 1.14 4.1.2 7.1.0 - 3.0.0-M3 + 3.0.0-M5 0.9.10 3.6.28 0.8.5 From a3282f2e63bfb20b7a853c2911f2a4adb9f5e94e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 28 Sep 2021 10:30:38 +0800 Subject: [PATCH 02/13] more fixes --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 2709447e131f..1f73af69c71e 100644 --- a/pom.xml +++ b/pom.xml @@ -231,6 +231,9 @@ none:none org.testng:testng @{argLine} -XX:+StartAttachListener + 3 + true + -Xmx1024m -XX:MaxPermSize=256m 1000 5000 From 0766ebb7b0443dc46ad7220096d7c33902e8fdef Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 10:30:12 +0800 Subject: [PATCH 03/13] update pet.proto --- .../src/test/resources/3_0/protobuf-schema/pet.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/resources/3_0/protobuf-schema/pet.proto b/modules/openapi-generator/src/test/resources/3_0/protobuf-schema/pet.proto index 86da6922f5e3..7ba4adc282a1 100644 --- a/modules/openapi-generator/src/test/resources/3_0/protobuf-schema/pet.proto +++ b/modules/openapi-generator/src/test/resources/3_0/protobuf-schema/pet.proto @@ -4,7 +4,7 @@ No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) The version of the OpenAPI document: 1.0.0 - + Generated by OpenAPI Generator: https://openapi-generator.tech */ From 5019f040a126fb7837f193c64b87d479895cb6ae Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 10:45:11 +0800 Subject: [PATCH 04/13] update model protobuf template --- .../resources/protobuf-schema/partial_header.mustache | 10 ++++++++-- .../petstore/protobuf-schema/models/api_response.proto | 2 +- .../petstore/protobuf-schema/models/category.proto | 2 +- .../config/petstore/protobuf-schema/models/order.proto | 2 +- .../config/petstore/protobuf-schema/models/pet.proto | 2 +- .../config/petstore/protobuf-schema/models/tag.proto | 2 +- .../config/petstore/protobuf-schema/models/user.proto | 2 +- .../protobuf-schema/services/pet_service.proto | 2 +- .../protobuf-schema/services/store_service.proto | 2 +- .../protobuf-schema/services/user_service.proto | 2 +- 10 files changed, 17 insertions(+), 11 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/protobuf-schema/partial_header.mustache b/modules/openapi-generator/src/main/resources/protobuf-schema/partial_header.mustache index 79ae090e31a6..038e725751a7 100644 --- a/modules/openapi-generator/src/main/resources/protobuf-schema/partial_header.mustache +++ b/modules/openapi-generator/src/main/resources/protobuf-schema/partial_header.mustache @@ -7,7 +7,13 @@ {{{.}}} {{/appDescription}} - {{#version}}The version of the OpenAPI document: {{{.}}}{{/version}} - {{#infoEmail}}Contact: {{{.}}}{{/infoEmail}} + {{#version}} + The version of the OpenAPI document: {{{.}}} + + {{/version}} + {{#infoEmail}} + Contact: {{{.}}} + + {{/infoEmail}} Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/samples/config/petstore/protobuf-schema/models/api_response.proto b/samples/config/petstore/protobuf-schema/models/api_response.proto index 9ab4d12e1703..96f876529132 100644 --- a/samples/config/petstore/protobuf-schema/models/api_response.proto +++ b/samples/config/petstore/protobuf-schema/models/api_response.proto @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. The version of the OpenAPI document: 1.0.0 - + Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/samples/config/petstore/protobuf-schema/models/category.proto b/samples/config/petstore/protobuf-schema/models/category.proto index 824ce32ac595..7c05a10a8f63 100644 --- a/samples/config/petstore/protobuf-schema/models/category.proto +++ b/samples/config/petstore/protobuf-schema/models/category.proto @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. The version of the OpenAPI document: 1.0.0 - + Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/samples/config/petstore/protobuf-schema/models/order.proto b/samples/config/petstore/protobuf-schema/models/order.proto index 5d46dfd9beea..27cded1f00e1 100644 --- a/samples/config/petstore/protobuf-schema/models/order.proto +++ b/samples/config/petstore/protobuf-schema/models/order.proto @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. The version of the OpenAPI document: 1.0.0 - + Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/samples/config/petstore/protobuf-schema/models/pet.proto b/samples/config/petstore/protobuf-schema/models/pet.proto index 725dfa0818a6..41ed4b7a9fc5 100644 --- a/samples/config/petstore/protobuf-schema/models/pet.proto +++ b/samples/config/petstore/protobuf-schema/models/pet.proto @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. The version of the OpenAPI document: 1.0.0 - + Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/samples/config/petstore/protobuf-schema/models/tag.proto b/samples/config/petstore/protobuf-schema/models/tag.proto index 9f2a6343955e..bd7a99341664 100644 --- a/samples/config/petstore/protobuf-schema/models/tag.proto +++ b/samples/config/petstore/protobuf-schema/models/tag.proto @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. The version of the OpenAPI document: 1.0.0 - + Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/samples/config/petstore/protobuf-schema/models/user.proto b/samples/config/petstore/protobuf-schema/models/user.proto index 5dcba10582f5..eb6f727b876e 100644 --- a/samples/config/petstore/protobuf-schema/models/user.proto +++ b/samples/config/petstore/protobuf-schema/models/user.proto @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. The version of the OpenAPI document: 1.0.0 - + Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/samples/config/petstore/protobuf-schema/services/pet_service.proto b/samples/config/petstore/protobuf-schema/services/pet_service.proto index 9c694f6e8388..6ac05f1deeb6 100644 --- a/samples/config/petstore/protobuf-schema/services/pet_service.proto +++ b/samples/config/petstore/protobuf-schema/services/pet_service.proto @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. The version of the OpenAPI document: 1.0.0 - + Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/samples/config/petstore/protobuf-schema/services/store_service.proto b/samples/config/petstore/protobuf-schema/services/store_service.proto index f1b1e90d9092..e30382ad502a 100644 --- a/samples/config/petstore/protobuf-schema/services/store_service.proto +++ b/samples/config/petstore/protobuf-schema/services/store_service.proto @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. The version of the OpenAPI document: 1.0.0 - + Generated by OpenAPI Generator: https://openapi-generator.tech */ diff --git a/samples/config/petstore/protobuf-schema/services/user_service.proto b/samples/config/petstore/protobuf-schema/services/user_service.proto index 639867b4fe26..8130b04aadd2 100644 --- a/samples/config/petstore/protobuf-schema/services/user_service.proto +++ b/samples/config/petstore/protobuf-schema/services/user_service.proto @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. The version of the OpenAPI document: 1.0.0 - + Generated by OpenAPI Generator: https://openapi-generator.tech */ From defb2aa74b8d9b74a04f449ca3663853ee61a440 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 10:55:04 +0800 Subject: [PATCH 05/13] add charset --- .../codegen/markdown/MarkdownSampleGeneratorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java index 43b19edb55a0..a894e838b038 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java @@ -44,7 +44,7 @@ public void testSampleMarkdownGeneration() throws IOException { Assert.assertTrue(expected.exists(), "Could not find " + expected.toString()); - Assert.assertEquals(FileUtils.readFileToString(generated), + Assert.assertEquals(FileUtils.readFileToString(generated, StandardCharsets.UTF_8), FileUtils.readFileToString(expected, StandardCharsets.UTF_8)); } } From 1d8c59d77f899b2550ea2e35311235920451bef6 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 11:00:26 +0800 Subject: [PATCH 06/13] set line separator --- .../markdown/MarkdownSampleGeneratorTest.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java index a894e838b038..28411da81abf 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java @@ -1,12 +1,4 @@ -package org.openapitools.codegen.markdown; - -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; - +package org.openapitools.codegen.markdown; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; import org.apache.commons.io.FileUtils; import org.openapitools.codegen.DefaultGenerator; @@ -21,6 +13,8 @@ public class MarkdownSampleGeneratorTest { @BeforeClass public void beforeClassGenerateTestMarkup() throws Exception { + // set line break to \n across all platforms + System.setProperty("line.separator", "\n"); this.outputTempDirectory = Files.createTempDirectory("test-markdown-sample-generator.").toFile(); From fb826fd1caaa526db34f76b7c4afb841430286b7 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 11:12:12 +0800 Subject: [PATCH 07/13] set proper line break in proto test --- .../codegen/markdown/MarkdownSampleGeneratorTest.java | 10 ++++++++-- .../codegen/protobuf/ProtobufSchemaCodegenTest.java | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java index 28411da81abf..7fd6606b57b2 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java @@ -1,5 +1,11 @@ -package org.openapitools.codegen.markdown; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import org.apache.commons.io.FileUtils; +package org.openapitools.codegen.markdown; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.config.CodegenConfigurator; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java index db3f06e3c80f..4e82a8e712ab 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java @@ -49,6 +49,9 @@ public void testFeatureSet() { @Test public void testCodeGenWithAllOf() throws IOException { + // set line break to \n across all platforms + System.setProperty("line.separator", "\n"); + File output = Files.createTempDirectory("test").toFile(); final CodegenConfigurator configurator = new CodegenConfigurator() @@ -74,4 +77,4 @@ private void assertFileEquals(Path generatedFilePath, Path expectedFilePath) thr assertEquals(generatedFile, expectedFile); } -} \ No newline at end of file +} From 647137a1808e109bf5178a55cec86b1a36057654 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 11:29:21 +0800 Subject: [PATCH 08/13] minor fix --- .../codegen/markdown/MarkdownSampleGeneratorTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java index 7fd6606b57b2..2a162383cc8e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java @@ -7,6 +7,7 @@ import java.nio.file.Path; import java.util.List; +import org.apache.commons.io.FileUtils; import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.config.CodegenConfigurator; import org.testng.Assert; From 63705cb94ead6c9a31bd4447c4740585dd4baadf Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 11:54:45 +0800 Subject: [PATCH 09/13] use UTF-8 --- .../codegen/markdown/MarkdownSampleGeneratorTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java index 2a162383cc8e..25aea6dc1ba3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java @@ -45,8 +45,8 @@ public void testSampleMarkdownGeneration() throws IOException { Assert.assertTrue(expected.exists(), "Could not find " + expected.toString()); - Assert.assertEquals(FileUtils.readFileToString(generated, StandardCharsets.UTF_8), - FileUtils.readFileToString(expected, StandardCharsets.UTF_8)); + Assert.assertEquals(FileUtils.readFileToString(generated, "UTF-8"), + FileUtils.readFileToString(expected, "UTF-8")); } } From a97158246d5ee4c6a77f85c768ef969ecdb3153e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 12:32:34 +0800 Subject: [PATCH 10/13] use FileUtils.contentEquals --- .../codegen/markdown/MarkdownSampleGeneratorTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java index 25aea6dc1ba3..fc032ea1746e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java @@ -45,8 +45,10 @@ public void testSampleMarkdownGeneration() throws IOException { Assert.assertTrue(expected.exists(), "Could not find " + expected.toString()); - Assert.assertEquals(FileUtils.readFileToString(generated, "UTF-8"), - FileUtils.readFileToString(expected, "UTF-8")); + Assert.assertTrue(FileUtils.contentEquals(generated, expected)); + + //Assert.assertEquals(FileUtils.readFileToString(generated, "UTF-8"), + // FileUtils.readFileToString(expected, "UTF-8")); } } From 057be448c34be321dbfd8b852ac383673d3081c4 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 12:46:45 +0800 Subject: [PATCH 11/13] remove line break --- .../codegen/markdown/MarkdownSampleGeneratorTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java index fc032ea1746e..45c19fcd7195 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java @@ -45,10 +45,10 @@ public void testSampleMarkdownGeneration() throws IOException { Assert.assertTrue(expected.exists(), "Could not find " + expected.toString()); - Assert.assertTrue(FileUtils.contentEquals(generated, expected)); + //Assert.assertTrue(FileUtils.contentEquals(generated, expected)); - //Assert.assertEquals(FileUtils.readFileToString(generated, "UTF-8"), - // FileUtils.readFileToString(expected, "UTF-8")); + Assert.assertEquals(FileUtils.readFileToString(generated, "UTF-8").replace("\n", "").replace("\r", ""), + FileUtils.readFileToString(expected, "UTF-8").replace("\n", "").replace("\r", "")); } } From b62f7931aa0fc3da49e83716f06dc0dcdf35898b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 13:08:36 +0800 Subject: [PATCH 12/13] remove line breaks --- .../codegen/markdown/MarkdownSampleGeneratorTest.java | 2 -- .../codegen/protobuf/ProtobufSchemaCodegenTest.java | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java index 45c19fcd7195..6c6b7e45e4ce 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java @@ -45,8 +45,6 @@ public void testSampleMarkdownGeneration() throws IOException { Assert.assertTrue(expected.exists(), "Could not find " + expected.toString()); - //Assert.assertTrue(FileUtils.contentEquals(generated, expected)); - Assert.assertEquals(FileUtils.readFileToString(generated, "UTF-8").replace("\n", "").replace("\r", ""), FileUtils.readFileToString(expected, "UTF-8").replace("\n", "").replace("\r", "")); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java index 4e82a8e712ab..3b30f96b2e35 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java @@ -72,8 +72,10 @@ public void testCodeGenWithAllOf() throws IOException { } private void assertFileEquals(Path generatedFilePath, Path expectedFilePath) throws IOException { - String generatedFile = new String(Files.readAllBytes(generatedFilePath), StandardCharsets.UTF_8); - String expectedFile = new String(Files.readAllBytes(expectedFilePath), StandardCharsets.UTF_8); + String generatedFile = new String(Files.readAllBytes(generatedFilePath), StandardCharsets.UTF_8) + .replace("\n", "").replace("\r", ""); + String expectedFile = new String(Files.readAllBytes(expectedFilePath), StandardCharsets.UTF_8) + .replace("\n", "").replace("\r", ""); assertEquals(generatedFile, expectedFile); } From 453f6c1a8851c9a0c4388ad3998d4e22d777db9e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 5 Oct 2021 13:31:25 +0800 Subject: [PATCH 13/13] revert utf-8 change --- .../codegen/markdown/MarkdownSampleGeneratorTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java index 6c6b7e45e4ce..db8a5b29cd0e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/markdown/MarkdownSampleGeneratorTest.java @@ -45,8 +45,8 @@ public void testSampleMarkdownGeneration() throws IOException { Assert.assertTrue(expected.exists(), "Could not find " + expected.toString()); - Assert.assertEquals(FileUtils.readFileToString(generated, "UTF-8").replace("\n", "").replace("\r", ""), - FileUtils.readFileToString(expected, "UTF-8").replace("\n", "").replace("\r", "")); + Assert.assertEquals(FileUtils.readFileToString(generated, StandardCharsets.UTF_8).replace("\n", "").replace("\r", ""), + FileUtils.readFileToString(expected, StandardCharsets.UTF_8).replace("\n", "").replace("\r", "")); } }