openapi test: fix random output while producing yaml for server variables

jknack · jknack · commit 2b1ce9d488db · 2020-03-26T09:50:31.000-03:00
diff --git a/modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenAPIExtension.java b/modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenAPIExtension.java
@@ -16,9 +16,8 @@
 import java.util.Optional;
 import java.util.Set;
 
-import static java.util.Objects.requireNonNull;
-
 public class OpenAPIExtension implements ParameterResolver, AfterEachCallback {
+
   @Override public boolean supportsParameter(ParameterContext parameterContext,
       ExtensionContext extensionContext) throws ParameterResolutionException {
     Parameter parameter = parameterContext.getParameter();
diff --git a/modules/jooby-openapi/src/test/java/issues/Issue1601.java b/modules/jooby-openapi/src/test/java/issues/Issue1601.java
@@ -5,13 +5,13 @@
 import issues.i1601.App1601;
 import issues.i1601.App1601b;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Issue1601 {
 
   @OpenAPITest(value = App1601.class)
   public void shouldParseOpenAPIDefinition(OpenAPIResult result) {
-    assertEquals("openapi: 3.0.1\n"
+    String yaml1 = "openapi: 3.0.1\n"
         + "info:\n"
         + "  title: Title\n"
         + "  description: description\n"
@@ -49,12 +49,53 @@ public void shouldParseOpenAPIDefinition(OpenAPIResult result) {
         + "          content:\n"
         + "            application/json:\n"
         + "              schema:\n"
-        + "                type: string\n", result.toYaml());
+        + "                type: string\n";
+    String yaml2 = "openapi: 3.0.1\n"
+        + "info:\n"
+        + "  title: Title\n"
+        + "  description: description\n"
+        + "  termsOfService: Terms\n"
+        + "  contact:\n"
+        + "    name: Jooby\n"
+        + "    url: https://jooby.io\n"
+        + "    email: support@jooby.io\n"
+        + "  license:\n"
+        + "    name: Apache\n"
+        + "    url: https://jooby.io/LICENSE\n"
+        + "  version: \"10\"\n"
+        + "servers:\n"
+        + "- url: serverurl\n"
+        + "  description: '...'\n"
+        + "  variables:\n"
+        + "    env:\n"
+        + "      description: environment\n"
+        + "      enum:\n"
+        + "      - stage\n"
+        + "      - prod\n"
+        + "      default: dev\n"
+        + "security:\n"
+        + "- oauth:\n"
+        + "  - read:write\n"
+        + "tags:\n"
+        + "- name: mytag\n"
+        + "paths:\n"
+        + "  /1601:\n"
+        + "    get:\n"
+        + "      operationId: get1601\n"
+        + "      responses:\n"
+        + "        \"200\":\n"
+        + "          description: Success\n"
+        + "          content:\n"
+        + "            application/json:\n"
+        + "              schema:\n"
+        + "                type: string\n";
+    String output = result.toYaml();
+    assertTrue(output.equals(yaml1) || output.equals(yaml2));
   }
 
   @OpenAPITest(value = App1601b.class)
   public void shouldParseOpenAPIDefinitionController(OpenAPIResult result) {
-    assertEquals("openapi: 3.0.1\n"
+    String yaml1 = "openapi: 3.0.1\n"
         + "info:\n"
         + "  title: Title\n"
         + "  description: description\n"
@@ -92,6 +133,47 @@ public void shouldParseOpenAPIDefinitionController(OpenAPIResult result) {
         + "          content:\n"
         + "            application/json:\n"
         + "              schema:\n"
-        + "                type: string\n", result.toYaml());
+        + "                type: string\n";
+    String yaml2 = "openapi: 3.0.1\n"
+        + "info:\n"
+        + "  title: Title\n"
+        + "  description: description\n"
+        + "  termsOfService: Terms\n"
+        + "  contact:\n"
+        + "    name: Jooby\n"
+        + "    url: https://jooby.io\n"
+        + "    email: support@jooby.io\n"
+        + "  license:\n"
+        + "    name: Apache\n"
+        + "    url: https://jooby.io/LICENSE\n"
+        + "  version: \"10\"\n"
+        + "servers:\n"
+        + "- url: serverurl\n"
+        + "  description: '...'\n"
+        + "  variables:\n"
+        + "    env:\n"
+        + "      description: environment\n"
+        + "      enum:\n"
+        + "      - stage\n"
+        + "      - prod\n"
+        + "      default: dev\n"
+        + "security:\n"
+        + "- oauth:\n"
+        + "  - read:write\n"
+        + "tags:\n"
+        + "- name: mytag\n"
+        + "paths:\n"
+        + "  /1601:\n"
+        + "    get:\n"
+        + "      operationId: doSomething\n"
+        + "      responses:\n"
+        + "        \"200\":\n"
+        + "          description: Success\n"
+        + "          content:\n"
+        + "            application/json:\n"
+        + "              schema:\n"
+        + "                type: string\n";
+    String output = result.toYaml();
+    assertTrue(output.equals(yaml1) || output.equals(yaml2));
   }
 }
