kangaroo-and-rabbit/archidata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] correct test

Browse Source
This commit is contained in:
Edouard DUPIN 2024-05-21 23:45:35 +02:00
parent c33a73a567
commit 300ce8eab6
6 changed files with 85 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/kar/archidata/externalRestApi/model/ApiTool.java
View File

@ -9,7 +9,6 @@ import java.util.List;
import org.glassfish.jersey.media.multipart.FormDataParam;
import org.kar.archidata.annotation.AsyncType;
import org.kar.archidata.annotation.TypeScriptProgress;
import org.kar.archidata.dataAccess.DataFactoryZod.ClassElement;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.ws.rs.Consumes;
@ -206,28 +205,4 @@ public class ApiTool {
return element.getDeclaredAnnotationsByType(Context.class).length != 0;
}
public static String convertInTypeScriptType(final List<ClassElement> tmp, final boolean isList) {
String out = "";
for (final ClassElement elem : tmp) {
if (out.length() != 0) {
out += " | ";
}
out += elem.tsTypeName;
if (isList) {
out += "[]";
}
}
return out;
}
public static String convertInTypeScriptCheckType(final List<ClassElement> tmp) {
String out = "";
for (final ClassElement elem : tmp) {
if (out.length() != 0) {
out += " | ";
}
out += elem.tsCheckType;
}
return out;
}
}

10
test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiName.java
View File

@ -31,15 +31,15 @@ public class TestAnalyzeApiName {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ApiName.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals("ApiName", api.apiModels.get(0).name);
Assertions.assertEquals(2, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals("ApiName", api.getAllApi().get(0).name);
Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("firstName");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("firstName");
Assertions.assertNotNull(model);
}
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("SecondName");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("SecondName");
Assertions.assertNotNull(model);
}
}

26
test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiParameterType.java
View File

@ -49,10 +49,10 @@ public class TestAnalyzeApiParameterType {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(BasicParameter.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(5, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(5, api.getAllApi().get(0).interfaces.size());
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("setInteger1");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setInteger1");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.unnamedElement.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -60,7 +60,7 @@ public class TestAnalyzeApiParameterType {
Assertions.assertEquals(int.class, classModel.getOriginClasses());
}
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("setInteger2");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setInteger2");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.unnamedElement.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -68,7 +68,7 @@ public class TestAnalyzeApiParameterType {
Assertions.assertEquals(Integer.class, classModel.getOriginClasses());
}
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("setString");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setString");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.unnamedElement.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -76,7 +76,7 @@ public class TestAnalyzeApiParameterType {
Assertions.assertEquals(String.class, classModel.getOriginClasses());
}
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("setObject");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setObject");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.unnamedElement.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -84,7 +84,7 @@ public class TestAnalyzeApiParameterType {
Assertions.assertEquals(TestObject.class, classModel.getOriginClasses());
}
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("setEnum");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setEnum");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.unnamedElement.size());
final ClassEnumModel classModel = Assertions.assertInstanceOf(ClassEnumModel.class,
@ -104,9 +104,9 @@ public class TestAnalyzeApiParameterType {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ListParameter.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(1, api.apiModels.get(0).interfaces.size());
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("setList");
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(1, api.getAllApi().get(0).interfaces.size());
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setList");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.unnamedElement.size());
final ClassListModel classModel = Assertions.assertInstanceOf(ClassListModel.class,
@ -127,9 +127,9 @@ public class TestAnalyzeApiParameterType {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(MapParameter.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(1, api.apiModels.get(0).interfaces.size());
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("setMap");
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(1, api.getAllApi().get(0).interfaces.size());
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setMap");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.unnamedElement.size());
final ClassMapModel classModel = Assertions.assertInstanceOf(ClassMapModel.class, model.unnamedElement.get(0));

24
test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiPath.java
View File

@ -39,21 +39,21 @@ public class TestAnalyzeApiPath {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(NoPath.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals("", api.apiModels.get(0).restEndPoint);
Assertions.assertEquals(3, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals("", api.getAllApi().get(0).restEndPoint);
Assertions.assertEquals(3, api.getAllApi().get(0).interfaces.size());
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("noPath");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("noPath");
Assertions.assertNotNull(model);
Assertions.assertEquals("/", model.restEndPoint);
}
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("withPath");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("withPath");
Assertions.assertNotNull(model);
Assertions.assertEquals("/plop", model.restEndPoint);
}
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("withPath2");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("withPath2");
Assertions.assertNotNull(model);
Assertions.assertEquals("//plop", model.restEndPoint);
}
@ -84,21 +84,21 @@ public class TestAnalyzeApiPath {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(WithPath.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals("/kaboom", api.apiModels.get(0).restEndPoint);
Assertions.assertEquals(3, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals("/kaboom", api.getAllApi().get(0).restEndPoint);
Assertions.assertEquals(3, api.getAllApi().get(0).interfaces.size());
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("noPath");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("noPath");
Assertions.assertNotNull(model);
Assertions.assertEquals("/kaboom/", model.restEndPoint);
}
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("withPath");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("withPath");
Assertions.assertNotNull(model);
Assertions.assertEquals("/kaboom/plop", model.restEndPoint);
}
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("withPath2");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("withPath2");
Assertions.assertNotNull(model);
Assertions.assertEquals("/kaboom//plop", model.restEndPoint);
}

98
test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiReturn.java
View File

@ -43,10 +43,10 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueVoid.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(2, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getVoid1");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getVoid1");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -54,7 +54,7 @@ public class TestAnalyzeApiReturn {
Assertions.assertEquals(void.class, classModel.getOriginClasses());
}
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getVoid2");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getVoid2");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -82,11 +82,11 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueInteger.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(2, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
// Check int
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getInteger1");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getInteger1");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -95,7 +95,7 @@ public class TestAnalyzeApiReturn {
}
// Check Integer
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getInteger2");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getInteger2");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -123,11 +123,11 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueShort.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(2, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
// Check short
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getShort1");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getShort1");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -136,7 +136,7 @@ public class TestAnalyzeApiReturn {
}
// Check Short
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getShort2");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getShort2");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -164,11 +164,11 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueLong.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(2, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
// Check long
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getLong1");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getLong1");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -177,7 +177,7 @@ public class TestAnalyzeApiReturn {
}
// Check Long
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getLong2");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getLong2");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
Assertions.assertInstanceOf(ClassObjectModel.class, model.returnTypes.get(0));
@ -206,11 +206,11 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueFloat.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(2, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
// Check float
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getFloat1");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getFloat1");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -219,7 +219,7 @@ public class TestAnalyzeApiReturn {
}
// Check Float
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getFloat2");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getFloat2");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -247,11 +247,11 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueDouble.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(2, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
// Check double
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getDouble1");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getDouble1");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -260,7 +260,7 @@ public class TestAnalyzeApiReturn {
}
// Check Double
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getDouble2");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getDouble2");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -283,11 +283,11 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueString.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(1, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(1, api.getAllApi().get(0).interfaces.size());
// Check String
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getString");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getString");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -314,11 +314,11 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueAny.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(2, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
// Check Response ==> represent a Any value then it wrapped as Object
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getResponse");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getResponse");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -327,7 +327,7 @@ public class TestAnalyzeApiReturn {
}
// Check Object
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getObject");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getObject");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
@ -350,11 +350,11 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueEnum.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(1, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(1, api.getAllApi().get(0).interfaces.size());
// Check Enum
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getEnum");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getEnum");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
final ClassEnumModel classModel = Assertions.assertInstanceOf(ClassEnumModel.class,
@ -396,11 +396,11 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueList.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(5, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(5, api.getAllApi().get(0).interfaces.size());
// Check List<Integer>
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getListInteger");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getListInteger");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
// Level 0
@ -413,7 +413,7 @@ public class TestAnalyzeApiReturn {
}
// Check List<TestEnum>
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getListEnum");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getListEnum");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
// Level 0
@ -426,7 +426,7 @@ public class TestAnalyzeApiReturn {
}
// Check List<TestObject>
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getListObject");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getListObject");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
// Level 0
@ -435,11 +435,11 @@ public class TestAnalyzeApiReturn {
// Level 1
final ClassObjectModel classModelOfValue = Assertions.assertInstanceOf(ClassObjectModel.class,
classListModel.valueModel);
Assertions.assertEquals(Integer.class, classModelOfValue.getOriginClasses());
Assertions.assertEquals(TestObject.class, classModelOfValue.getOriginClasses());
}
// Check List<List<Integer>>
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getListListInteger");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getListListInteger");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
// Level 0
@ -455,7 +455,7 @@ public class TestAnalyzeApiReturn {
}
// Check List<Map<String, Integer>>
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getListMapInteger");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getListMapInteger");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
// Level 0
@ -509,11 +509,11 @@ public class TestAnalyzeApiReturn {
final AnalyzeApi api = new AnalyzeApi();
api.addAllApi(List.of(ReturnValueMap.class));
Assertions.assertEquals(1, api.apiModels.size());
Assertions.assertEquals(5, api.apiModels.get(0).interfaces.size());
Assertions.assertEquals(1, api.getAllApi().size());
Assertions.assertEquals(5, api.getAllApi().get(0).interfaces.size());
// Check Map<String, Integer>
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getMapInteger");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getMapInteger");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
// Level 0
@ -529,7 +529,7 @@ public class TestAnalyzeApiReturn {
}
// Check Map<String, TestEnum>
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getMapEnum");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getMapEnum");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
// Level 0
@ -545,7 +545,7 @@ public class TestAnalyzeApiReturn {
}
// Check Map<String, TestObject>
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getMapObject");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getMapObject");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
// Level 0
@ -561,7 +561,7 @@ public class TestAnalyzeApiReturn {
}
// Check Map<String, Map<String, Integer>>
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getMapMap");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getMapMap");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
// Level 0
@ -583,7 +583,7 @@ public class TestAnalyzeApiReturn {
}
// Check Map<String, List<Integer>>
{
final ApiModel model = api.apiModels.get(0).getInterfaceNamed("getMapList");
final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getMapList");
Assertions.assertNotNull(model);
Assertions.assertEquals(1, model.returnTypes.size());
// Level 0

15
test/src/test/kar/archidata/externalRestApi/TestAnalyzeModel.java
View File

@ -1,12 +1,8 @@
package test.kar.archidata.externalRestApi;
import java.util.ArrayList;
import java.util.List;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.kar.archidata.externalRestApi.AnalyzeModel;
import org.kar.archidata.externalRestApi.model.ClassModel;
import org.kar.archidata.externalRestApi.AnalyzeApi;
import org.kar.archidata.externalRestApi.model.ClassObjectModel;
import org.kar.archidata.externalRestApi.model.ClassObjectModel.FieldProperty;
import org.slf4j.Logger;
@ -21,10 +17,11 @@ public class TestAnalyzeModel {
@Test
public void testNames() throws Exception {
final ClassObjectModel model = new ClassObjectModel(TestObject.class);
final List<ClassModel> models = new ArrayList<>();
models.add(model);
AnalyzeModel.fillModel(models);
final AnalyzeApi apiInterface = new AnalyzeApi();
apiInterface.addModel(TestObject.class);
Assertions.assertEquals(2, apiInterface.getAllModel().size());
final ClassObjectModel model = Assertions.assertInstanceOf(ClassObjectModel.class,
apiInterface.getAllModel().get(0));
Assertions.assertEquals("TestObject", model.getName());
Assertions.assertEquals(false, model.isPrimitive());