fix KotlinServerCodegenTest and PostmanCollectionCodegenTest (OpenAPI…

…Tools#18019) * fix KotlinServerCodegenTest and PostmanCollectionCodegenTest * fix PostmanCollectionCodegen line endings
Eurofunk · Mar 4, 2024 · 8f74d03 · 8f74d03
1 parent 9231423
commit 8f74d03
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...-generator/src/main/java/org/openapitools/codegen/languages/PostmanCollectionCodegen.java b/...-generator/src/main/java/org/openapitools/codegen/languages/PostmanCollectionCodegen.java
@@ -715,6 +715,8 @@ public String formatJson(String json) {
             JsonNode actualObj = objectMapper.readTree(json);
             json = Json.pretty(actualObj);
             json = json.replace("\"", JSON_ESCAPE_DOUBLE_QUOTE);
+            json = json.replace("\r\n", JSON_ESCAPE_NEW_LINE);
+            json = json.replace("\r", JSON_ESCAPE_NEW_LINE);
             json = json.replace("\n", JSON_ESCAPE_NEW_LINE);
 
         } catch (JsonProcessingException e) {

diff --git a/...napi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinServerCodegenTest.java b/...napi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinServerCodegenTest.java
@@ -1,11 +1,11 @@
 package org.openapitools.codegen.kotlin;
 
-import org.junit.Test;
 import org.openapitools.codegen.ClientOptInput;
 import org.openapitools.codegen.DefaultGenerator;
 import org.openapitools.codegen.TestUtils;
 import org.openapitools.codegen.languages.KotlinServerCodegen;
 import org.openapitools.codegen.languages.KotlinSpringServerCodegen;
+import org.testng.annotations.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -180,7 +180,7 @@ public void attributesInRef() throws IOException {
                         .config(codegen))
                 .generate();
 
-        String outputPath = output.getAbsolutePath() + "src/main/kotlin/org/openapitools";
+        String outputPath = output.getAbsolutePath() + "/src/main/kotlin/org/openapitools";
         Path order = Paths.get(outputPath + "/model/Order.kt");
         assertFileContains(
                 order,

diff --git a/...enerator/src/test/java/org/openapitools/codegen/postman/PostmanCollectionCodegenTest.java b/...enerator/src/test/java/org/openapitools/codegen/postman/PostmanCollectionCodegenTest.java
@@ -6,10 +6,10 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.swagger.v3.oas.models.tags.Tag;
 import org.junit.Assert;
-import org.junit.Test;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.config.CodegenConfigurator;
 import org.openapitools.codegen.languages.PostmanCollectionCodegen;
+import org.testng.annotations.Test;
 
 import java.io.File;