From 9871ea702c2bb82ee05b465df3603e347daa8c0d Mon Sep 17 00:00:00 2001
From: Jueun Park <s5616012@mailbox.tu-dresden.de>
Date: Thu, 17 Mar 2022 05:48:24 +0900
Subject: [PATCH] edited build.gradle and OpenAPIMain_test
---
build.gradle | 1 +
src/test/java/openapi/OpenAPIMain_test.java | 36 +++++----------------
2 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/build.gradle b/build.gradle
index a86dc6fb..41d0e765 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,6 +72,7 @@ jar {
}
test {
+ testLogging.showStandardStreams = true
useJUnitPlatform()
maxHeapSize = '1G'
diff --git a/src/test/java/openapi/OpenAPIMain_test.java b/src/test/java/openapi/OpenAPIMain_test.java
index f4a61c66..1b618b81 100644
--- a/src/test/java/openapi/OpenAPIMain_test.java
+++ b/src/test/java/openapi/OpenAPIMain_test.java
@@ -12,10 +12,7 @@ import io.swagger.v3.core.util.Yaml;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.parser.OpenAPIV3Parser;
import io.swagger.v3.parser.core.models.SwaggerParseResult;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
@@ -46,41 +43,24 @@ public class OpenAPIMain_test {
ObjectMapper mapper = new ObjectMapper();
List<String> validation;
- // parsed openAPI object with swagger-parser
+ // parse OpenAPI in POJO, parse Json by POJO and validate OpenAPI-Json
SwaggerParseResult result = new OpenAPIParser().readLocation(file.getPath(), null, null);
POJOOpenAPI = result.getOpenAPI();
System.out.println("Loading expression DSL file '" + file + "'.");
-
- // validation of OpenAPI in POJO
JsonNode expectedNode = mapper.readTree(Json.mapper().writeValueAsString(POJOOpenAPI));
validation = new OpenAPIV3Parser().readContents(expectedNode.toString()).getMessages();
- if ( validation.size() != 0 ) {
- System.out.println("validation failed!");
- for ( String s : validation )
- System.out.println(s);
- validation.clear();
- }
- else
- System.out.println("validated!");
- // OpenAPI in POJO to OpenAPI in JastAdd
- jastAddObject = OpenAPIObject.parseOpenAPI(POJOOpenAPI);
+ Assumptions.assumeFalse(validation.size() != 0, "validation of the input yaml not succeeded");
- // OpenAPI in JastAdd to OpenAPI in POJO
+ // parse OpenAPI in JastAdd, transform it to OpenAPI-POJO back and validate this
+ jastAddObject = OpenAPIObject.parseOpenAPI(POJOOpenAPI);
OpenAPI transformedAPI = OpenAPIObject.reverseOpenAPI(jastAddObject);
-
- // validation of transferred OpenAPI
JsonNode actualNode = mapper.readTree(Json.mapper().writeValueAsString(transformedAPI));
validation = new OpenAPIV3Parser().readContents(actualNode.toString()).getMessages();
- if ( validation.size() != 0 ) {
- System.out.println("validation failed!");
- for ( String s : validation )
- System.out.println(s);
- }
- else
- System.out.println("validated");
- // compare if api (source object) is equivalent to api3 (generated object)
+ Assumptions.assumeFalse(validation.size() != 0, "validation of the transformed yaml not succeeded");
+
+ // compare if parsed OpenAPI (source object, Json) is equivalent to back-transformed OpenAPI (generated object, Json)
compareJson(expectedNode, actualNode, Paths.get(file.getPath()));
}
--
GitLab