Skip to content

Commit 6c0c54d

Browse files
committed
Merge branch 'bug/multipleAllOf' of https://github.com/richard-walsh-sb/swagger-inflector into bug/multipleAllOf
2 parents 4549cfc + f2b9fbb commit 6c0c54d

1 file changed

Lines changed: 20 additions & 18 deletions

File tree

src/test/java/io/swagger/oas/test/examples/ExampleBuilderTest.java

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,24 +1065,26 @@ public void testNullExampleSupportOAS3NoFlag() throws Exception{
10651065
@Test
10661066
public void testAllOfMergeSchemas() throws Exception {
10671067
String expected = "{\n" +
1068-
" \"data\" : [ {\n" +
1069-
" \"topApiId\" : \"8ab9b11d-bf43-469e-a276-f601801d043c\",\n" +
1070-
" \"name\" : \"docman\",\n" +
1071-
" \"pathwaysVersion\" : \"0.1\",\n" +
1072-
" \"active\" : false,\n" +
1073-
" \"created\" : \"2018-07-21T17:32:28Z\"\n" +
1074-
" }, {\n" +
1075-
" \"topApiId\" : \"baa0dc91-9711-4b61-9c90-ce8ac0b109a9\",\n" +
1076-
" \"name\" : \"careweb\",\n" +
1077-
" \"pathwaysVersion\" : \"0.1\",\n" +
1078-
" \"active\" : true,\n" +
1079-
" \"created\" : \"2019-07-21T17:32:28Z\"\n" +
1080-
" } ]\n" +
1081-
"}, {\n" +
1082-
" \"pagination\" : {\n" +
1083-
" \"offset\" : 0,\n" +
1084-
" \"limit\" : 10,\n" +
1085-
" \"totalResultCount\" : 100\n" +
1068+
" \"data\": [\n" +
1069+
" {\n" +
1070+
" \"topApiId\": \"8ab9b11d-bf43-469e-a276-f601801d043c\",\n" +
1071+
" \"name\": \"docman\",\n" +
1072+
" \"pathwaysVersion\": \"0.1\",\n" +
1073+
" \"active\": false,\n" +
1074+
" \"created\": \"2018-07-21T17:32:28Z\"\n" +
1075+
" },\n" +
1076+
" {\n" +
1077+
" \"topApiId\": \"baa0dc91-9711-4b61-9c90-ce8ac0b109a9\",\n" +
1078+
" \"name\": \"careweb\",\n" +
1079+
" \"pathwaysVersion\": \"0.1\",\n" +
1080+
" \"active\": true,\n" +
1081+
" \"created\": \"2019-07-21T17:32:28Z\"\n" +
1082+
" }\n" +
1083+
" ],\n" +
1084+
" \"pagination\": {\n" +
1085+
" \"offset\": 0,\n" +
1086+
" \"limit\": 10,\n" +
1087+
" \"totalResultCount\": 100\n" +
10861088
" }\n" +
10871089
"}";
10881090
ParseOptions options = new ParseOptions();

0 commit comments

Comments
 (0)