From d273d091df4c70938db81fb7e6dc92d41f3e90ef Mon Sep 17 00:00:00 2001
From: Darin Kelkhoff <darin.kelkhoff@gmail.com>
Date: Wed, 14 Jun 2023 15:50:38 -0500
Subject: [PATCH] Test fixes

---
 .../actions/GenerateOpenApiSpecAction.java    |  2 +-
 .../GenerateOpenApiSpecActionTest.java        |  5 +++++
 .../api/javalin/QJavalinApiHandlerTest.java   | 19 ++++++++++++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java b/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java
index d38e5386..90ebf18d 100644
--- a/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java
+++ b/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java
@@ -204,7 +204,6 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
    {
       QInstance  qInstance  = QContext.getQInstance();
       String     version    = input.getVersion();
-      APIVersion apiVersion = new APIVersion(version);
 
       ApiInstanceMetaDataContainer apiInstanceMetaDataContainer = ApiInstanceMetaDataContainer.of(qInstance);
       if(apiInstanceMetaDataContainer == null)
@@ -228,6 +227,7 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
          throw new QException("Missing required input: version");
       }
 
+      APIVersion apiVersion = new APIVersion(version);
       if(!apiInstanceMetaData.getSupportedVersions().contains(apiVersion))
       {
          throw (new QException("[" + version + "] is not a supported API Version."));
diff --git a/qqq-middleware-api/src/test/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecActionTest.java b/qqq-middleware-api/src/test/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecActionTest.java
index c9a3d7e3..902cebf8 100644
--- a/qqq-middleware-api/src/test/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecActionTest.java
+++ b/qqq-middleware-api/src/test/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecActionTest.java
@@ -34,6 +34,7 @@ import com.kingsrook.qqq.api.model.metadata.tables.ApiTableMetaData;
 import com.kingsrook.qqq.api.model.metadata.tables.ApiTableMetaDataContainer;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
+import com.kingsrook.qqq.backend.core.instances.QInstanceEnricher;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
@@ -172,6 +173,8 @@ class GenerateOpenApiSpecActionTest extends BaseTest
          .withSupplementalMetaData(new ApiTableMetaDataContainer().withApiTableMetaData(TestUtils.API_NAME, new ApiTableMetaData()
             .withInitialVersion(TestUtils.V2022_Q4))));
 
+      new QInstanceEnricher(qInstance).enrich();
+
       GenerateOpenApiSpecOutput output   = new GenerateOpenApiSpecAction().execute(new GenerateOpenApiSpecInput().withVersion(TestUtils.CURRENT_API_VERSION).withApiName(TestUtils.API_NAME));
       Set<String>               apiPaths = output.getOpenAPI().getPaths().keySet();
       assertTrue(apiPaths.stream().anyMatch(s -> s.contains("/supportedTable/")));
@@ -201,6 +204,8 @@ class GenerateOpenApiSpecActionTest extends BaseTest
          .withSupplementalMetaData(new ApiTableMetaDataContainer().withApiTableMetaData(TestUtils.API_NAME, new ApiTableMetaData()
             .withApiTableName("externalName")
             .withInitialVersion(TestUtils.V2022_Q4))));
+      
+      new QInstanceEnricher(qInstance).enrich();
 
       GenerateOpenApiSpecOutput output   = new GenerateOpenApiSpecAction().execute(new GenerateOpenApiSpecInput().withVersion(TestUtils.CURRENT_API_VERSION).withApiName(TestUtils.API_NAME));
       Set<String>               apiPaths = output.getOpenAPI().getPaths().keySet();
diff --git a/qqq-middleware-api/src/test/java/com/kingsrook/qqq/api/javalin/QJavalinApiHandlerTest.java b/qqq-middleware-api/src/test/java/com/kingsrook/qqq/api/javalin/QJavalinApiHandlerTest.java
index c3d3e339..99ba063e 100644
--- a/qqq-middleware-api/src/test/java/com/kingsrook/qqq/api/javalin/QJavalinApiHandlerTest.java
+++ b/qqq-middleware-api/src/test/java/com/kingsrook/qqq/api/javalin/QJavalinApiHandlerTest.java
@@ -72,6 +72,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 /*******************************************************************************
@@ -1501,12 +1502,20 @@ class QJavalinApiHandlerTest extends BaseTest
       String     jobId        = acceptedJSON.getString("jobId");
       assertNotNull(jobId);
 
-      SleepUtils.sleep(100, TimeUnit.MILLISECONDS);
+      for(int i = 0; i < 10; i++)
+      {
+         SleepUtils.sleep(100, TimeUnit.MILLISECONDS);
 
-      response = Unirest.get(BASE_URL + "/api/" + VERSION + "/person/transformPeople/status/" + jobId).asString();
-      assertEquals(HttpStatus.MULTI_STATUS_207, response.getStatus());
-      JSONArray jsonArray = new JSONArray(response.getBody());
-      assertEquals(3, jsonArray.length());
+         response = Unirest.get(BASE_URL + "/api/" + VERSION + "/person/transformPeople/status/" + jobId).asString();
+         if(response.getStatus() == HttpStatus.MULTI_STATUS_207)
+         {
+            JSONArray jsonArray = new JSONArray(response.getBody());
+            assertEquals(3, jsonArray.length());
+            return;
+         }
+      }
+
+      fail("Never got back a 207, after many sleeps");
    }