Skip to content

Commit a6fcf0f

Browse files
committedMar 5, 2022
fix tests
1 parent a27af7c commit a6fcf0f

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed
 

‎springdoc-openapi-hateoas/src/test/java/test/org/springdoc/api/app5/SpringDocApp5Test.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import io.swagger.v3.oas.models.Components;
2222
import io.swagger.v3.oas.models.OpenAPI;
23-
import io.swagger.v3.oas.models.media.Schema;
23+
import io.swagger.v3.oas.models.media.ObjectSchema;
2424
import io.swagger.v3.oas.models.media.StringSchema;
2525
import test.org.springdoc.api.AbstractSpringDocTest;
2626

@@ -34,7 +34,7 @@ static class SpringDocTestApp {
3434
@Bean
3535
public OpenAPI customOpenAPI() {
3636
return new OpenAPI().components(new Components()
37-
.addSchemas("CompanyDtoNew",new Schema().addProperties("id", new StringSchema().format("uuid"
37+
.addSchemas("CompanyDtoNew",new ObjectSchema().addProperties("id", new StringSchema().format("uuid"
3838
)).addProperties("name", new StringSchema())));
3939
}
4040
}

‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app138/SpringDocApp138Test.java

+21
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,18 @@
2222
*/
2323
package test.org.springdoc.api.app138;
2424

25+
import java.lang.reflect.Field;
2526
import java.util.HashMap;
2627
import java.util.LinkedHashMap;
2728
import java.util.Map;
2829

30+
import com.fasterxml.jackson.databind.ObjectMapper;
31+
import io.swagger.v3.core.util.Json;
32+
import io.swagger.v3.core.util.ObjectMapperFactory;
2933
import io.swagger.v3.oas.models.OpenAPI;
34+
import org.apache.commons.lang3.reflect.FieldUtils;
3035
import org.junit.jupiter.api.Assertions;
36+
import org.junit.jupiter.api.BeforeEach;
3137
import org.junit.jupiter.api.Test;
3238
import org.springdoc.core.Constants;
3339
import test.org.springdoc.api.AbstractSpringDocTest;
@@ -49,6 +55,19 @@
4955
@TestPropertySource(properties = "springdoc.writer-with-order-by-keys=true")
5056
public class SpringDocApp138Test extends AbstractSpringDocTest {
5157

58+
@BeforeEach
59+
void init() throws IllegalAccessException {
60+
Field conField = FieldUtils.getDeclaredField(Json.class, "mapper", true);
61+
ObjectMapper mapper = SpringDocObjectMapperFactory.createJson();
62+
conField.set(mapper, mapper);
63+
}
64+
65+
private static class SpringDocObjectMapperFactory extends ObjectMapperFactory {
66+
protected static ObjectMapper createJson() {
67+
return ObjectMapperFactory.createJson();
68+
}
69+
}
70+
5271
@SpringBootApplication
5372
static class SpringDocTestApp {
5473
@Bean
@@ -68,6 +87,7 @@ private static Map<String, Object> apiExtensions() {
6887
extensions.put("x-my-vendor-extensions", linkedMap);
6988
return extensions;
7089
}
90+
7191
@Test
7292
public void testApp() throws Exception {
7393
MvcResult mockMvcResult = mockMvc.perform(MockMvcRequestBuilders.get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk())
@@ -76,4 +96,5 @@ public void testApp() throws Exception {
7696
String expected = getContent("results/app138.json");
7797
Assertions.assertEquals(expected, result);
7898
}
99+
79100
}

0 commit comments

Comments
 (0)
Please sign in to comment.