QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test fixes

Browse Source
This commit is contained in:
darin.kelkhoff
2023-06-14 15:50:38 -05:00
parent d0194d9580
commit d273d091df
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java
View File

@ -204,7 +204,6 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
{ {
QInstance qInstance = QContext.getQInstance(); QInstance qInstance = QContext.getQInstance();
String version = input.getVersion(); String version = input.getVersion();
APIVersion apiVersion = new APIVersion(version);
ApiInstanceMetaDataContainer apiInstanceMetaDataContainer = ApiInstanceMetaDataContainer.of(qInstance); ApiInstanceMetaDataContainer apiInstanceMetaDataContainer = ApiInstanceMetaDataContainer.of(qInstance);
if(apiInstanceMetaDataContainer == null) if(apiInstanceMetaDataContainer == null)
@ -228,6 +227,7 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
throw new QException("Missing required input: version"); throw new QException("Missing required input: version");
} }
APIVersion apiVersion = new APIVersion(version);
if(!apiInstanceMetaData.getSupportedVersions().contains(apiVersion)) if(!apiInstanceMetaData.getSupportedVersions().contains(apiVersion))
{ {
throw (new QException("[" + version + "] is not a supported API Version.")); throw (new QException("[" + version + "] is not a supported API Version."));

5
qqq-middleware-api/src/test/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecActionTest.java
View File

@ -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.api.model.metadata.tables.ApiTableMetaDataContainer;
import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.context.QContext;
import com.kingsrook.qqq.backend.core.exceptions.QException; 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.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; 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() .withSupplementalMetaData(new ApiTableMetaDataContainer().withApiTableMetaData(TestUtils.API_NAME, new ApiTableMetaData()
.withInitialVersion(TestUtils.V2022_Q4)))); .withInitialVersion(TestUtils.V2022_Q4))));
new QInstanceEnricher(qInstance).enrich();
GenerateOpenApiSpecOutput output = new GenerateOpenApiSpecAction().execute(new GenerateOpenApiSpecInput().withVersion(TestUtils.CURRENT_API_VERSION).withApiName(TestUtils.API_NAME)); GenerateOpenApiSpecOutput output = new GenerateOpenApiSpecAction().execute(new GenerateOpenApiSpecInput().withVersion(TestUtils.CURRENT_API_VERSION).withApiName(TestUtils.API_NAME));
Set<String> apiPaths = output.getOpenAPI().getPaths().keySet(); Set<String> apiPaths = output.getOpenAPI().getPaths().keySet();
assertTrue(apiPaths.stream().anyMatch(s -> s.contains("/supportedTable/"))); assertTrue(apiPaths.stream().anyMatch(s -> s.contains("/supportedTable/")));
@ -202,6 +205,8 @@ class GenerateOpenApiSpecActionTest extends BaseTest
.withApiTableName("externalName") .withApiTableName("externalName")
.withInitialVersion(TestUtils.V2022_Q4)))); .withInitialVersion(TestUtils.V2022_Q4))));
new QInstanceEnricher(qInstance).enrich();
GenerateOpenApiSpecOutput output = new GenerateOpenApiSpecAction().execute(new GenerateOpenApiSpecInput().withVersion(TestUtils.CURRENT_API_VERSION).withApiName(TestUtils.API_NAME)); GenerateOpenApiSpecOutput output = new GenerateOpenApiSpecAction().execute(new GenerateOpenApiSpecInput().withVersion(TestUtils.CURRENT_API_VERSION).withApiName(TestUtils.API_NAME));
Set<String> apiPaths = output.getOpenAPI().getPaths().keySet(); Set<String> apiPaths = output.getOpenAPI().getPaths().keySet();
assertTrue(apiPaths.stream().anyMatch(s -> s.contains("/externalName/"))); assertTrue(apiPaths.stream().anyMatch(s -> s.contains("/externalName/")));

19
qqq-middleware-api/src/test/java/com/kingsrook/qqq/api/javalin/QJavalinApiHandlerTest.java
View File

@ -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.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue; 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"); String jobId = acceptedJSON.getString("jobId");
assertNotNull(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(); response = Unirest.get(BASE_URL + "/api/" + VERSION + "/person/transformPeople/status/" + jobId).asString();
assertEquals(HttpStatus.MULTI_STATUS_207, response.getStatus()); if(response.getStatus() == HttpStatus.MULTI_STATUS_207)
JSONArray jsonArray = new JSONArray(response.getBody()); {
assertEquals(3, jsonArray.length()); JSONArray jsonArray = new JSONArray(response.getBody());
assertEquals(3, jsonArray.length());
return;
}
}
fail("Never got back a 207, after many sleeps");
} }