From 9bb94fe95dff5652c5d58ceccb5686b036203c70 Mon Sep 17 00:00:00 2001 From: Adrian Price Date: Mon, 18 Mar 2019 03:02:59 +0000 Subject: [PATCH] Fix #2340 (#2387) Test case was using an invalid mixture of File.getAbsoluteFile|Path() and File.getCanonicalFile|Path() to identify generated output files. --- .../jaxrs/JavaJAXRSCXFExtServerCodegenTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java index 76398208f598..b16acc6c793a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java @@ -558,7 +558,7 @@ public class JavaJAXRSCXFExtServerCodegenTest { @Test public void testAddOperationToGroup() throws Exception { - File output = Files.createTempDirectory("test").toFile(); + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); output.deleteOnExit(); OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/tags.yaml", null, new ParseOptions()) @@ -634,11 +634,11 @@ public class JavaJAXRSCXFExtServerCodegenTest { assertEquals(group5List.get(1).subresourceOperation, true); } - @Test(enabled = false) + @Test() public void testGenerateOperationBodyWithCodedTestData() throws Exception { - File output = Files.createTempDirectory("test").toFile(); + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); output.deleteOnExit(); - String outputPath = output.getCanonicalPath().replace('\\', '/'); + String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() .readLocation("src/test/resources/3_0/petstore.yaml", null, new ParseOptions()).getOpenAPI(); @@ -680,11 +680,11 @@ public class JavaJAXRSCXFExtServerCodegenTest { checkFile(generator, outputPath + "/test-data-control.json", false); } - @Test(enabled = false) + @Test() public void testGenerateOperationBodyWithJsonTestData() throws Exception { - File output = Files.createTempDirectory("test").toFile(); + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); output.deleteOnExit(); - String outputPath = output.getCanonicalPath().replace('\\', '/'); + String outputPath = output.getAbsolutePath().replace('\\', '/'); OpenAPI openAPI = new OpenAPIParser() .readLocation("src/test/resources/3_0/petstore.yaml", null, new ParseOptions()).getOpenAPI();