Skip to content

Commit 2991636

Browse files
author
Sun
committed
more fixes
1 parent 52b04ce commit 2991636

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

‎src/test/java/com/fasterxml/jackson/module/jsonSchema/TestGenerateJsonSchema.java

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -295,22 +295,24 @@ public void testSinglePropertyDependency() throws Exception {
295295
"\"property4\":{\"type\":\"array\",\"items\":{\"type\":\"number\"}}," +
296296
"\"property5\":{\"type\":\"string\",\"required\":true}}}", schemaString);
297297
}
298-
298+
299299
public void testMultiplePropertyDependencies() throws Exception {
300-
JsonSchemaGenerator generator = new JsonSchemaGenerator(MAPPER);
300+
ObjectMapper mapper = new ObjectMapper();
301+
mapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
302+
JsonSchemaGenerator generator = new JsonSchemaGenerator(mapper);
301303
JsonSchema jsonSchema = generator.generateSchema(SimpleBean.class);
302304
((ObjectSchema) jsonSchema).addSimpleDependency("property1", "property2");
303305
((ObjectSchema) jsonSchema).addSimpleDependency("property1", "property3");
304306
((ObjectSchema) jsonSchema).addSimpleDependency("property1", "property2");
305307
((ObjectSchema) jsonSchema).addSimpleDependency("property2", "property3");
306308

307-
Map<String, Object> result = writeAndMap(MAPPER, jsonSchema);
309+
Map<String, Object> result = writeAndMap(mapper, jsonSchema);
308310
assertNotNull(result);
309311

310-
String schemaString = MAPPER.writeValueAsString(jsonSchema);
312+
String schemaString = mapper.writeValueAsString(jsonSchema);
311313
assertEquals("{\"type\":\"object\"," +
312-
"\"id\":\"urn:jsonschema:com:fasterxml:jackson:module:jsonSchema:TestGenerateJsonSchema:SimpleBean\"," +
313314
"\"dependencies\":{\"property1\":[\"property2\",\"property3\"],\"property2\":[\"property3\"]}," +
315+
"\"id\":\"urn:jsonschema:com:fasterxml:jackson:module:jsonSchema:TestGenerateJsonSchema:SimpleBean\"," +
314316
"\"properties\":{\"property1\":{\"type\":\"integer\"}" +
315317
",\"property2\":{\"type\":\"string\"}," +
316318
"\"property3\":{\"type\":\"array\",\"items\":{\"type\":\"string\"}}," +
@@ -319,7 +321,9 @@ public void testMultiplePropertyDependencies() throws Exception {
319321
}
320322

321323
public void testSchemaPropertyDependency() throws Exception {
322-
JsonSchemaGenerator generator = new JsonSchemaGenerator(MAPPER);
324+
ObjectMapper mapper = new ObjectMapper();
325+
mapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
326+
JsonSchemaGenerator generator = new JsonSchemaGenerator(mapper);
323327

324328
// Given this dependency schema
325329
JsonSchema schemaPropertyDependency = generator.generateSchema(DependencySchema.class);
@@ -328,14 +332,14 @@ public void testSchemaPropertyDependency() throws Exception {
328332
JsonSchema simpleBeanSchema = generator.generateSchema(SimpleBean.class);
329333
((ObjectSchema) simpleBeanSchema).addSchemaDependency("property1", schemaPropertyDependency);
330334

331-
Map<String, Object> result = writeAndMap(MAPPER, simpleBeanSchema);
335+
Map<String, Object> result = writeAndMap(mapper, simpleBeanSchema);
332336
assertNotNull(result);
333337

334338
// Test the generated value.
335-
String schemaString = MAPPER.writeValueAsString(simpleBeanSchema);
339+
String schemaString = mapper.writeValueAsString(simpleBeanSchema);
336340
assertEquals("{\"type\":\"object\"," +
337-
"\"id\":\"urn:jsonschema:com:fasterxml:jackson:module:jsonSchema:TestGenerateJsonSchema:SimpleBean\"," +
338341
"\"dependencies\":{\"property1\":{\"id\":\"urn:jsonschema:com:fasterxml:jackson:module:jsonSchema:TestGenerateJsonSchema:DependencySchema\",\"properties\":{\"property2\":{\"type\":\"string\",\"required\":true}}}}," +
342+
"\"id\":\"urn:jsonschema:com:fasterxml:jackson:module:jsonSchema:TestGenerateJsonSchema:SimpleBean\"," +
339343
"\"properties\":{\"property1\":{\"type\":\"integer\"}" +
340344
",\"property2\":{\"type\":\"string\"}," +
341345
"\"property3\":{\"type\":\"array\",\"items\":{\"type\":\"string\"}}," +
@@ -344,7 +348,9 @@ public void testSchemaPropertyDependency() throws Exception {
344348
}
345349

346350
public void testSchemaPropertyDependencies() throws Exception {
347-
JsonSchemaGenerator generator = new JsonSchemaGenerator(MAPPER);
351+
ObjectMapper mapper = new ObjectMapper();
352+
mapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
353+
JsonSchemaGenerator generator = new JsonSchemaGenerator(mapper);
348354

349355
// Given this dependency schema
350356
JsonSchema schemaPropertyDependency = generator.generateSchema(DependencySchema.class);
@@ -354,18 +360,18 @@ public void testSchemaPropertyDependencies() throws Exception {
354360
((ObjectSchema) simpleBeanSchema).addSchemaDependency("property1", schemaPropertyDependency);
355361
((ObjectSchema) simpleBeanSchema).addSchemaDependency("property3", schemaPropertyDependency);
356362

357-
Map<String, Object> result = writeAndMap(MAPPER, simpleBeanSchema);
363+
Map<String, Object> result = writeAndMap(mapper, simpleBeanSchema);
358364
assertNotNull(result);
359365

360366
// Test the generated value.
361-
String schemaString = MAPPER.writeValueAsString(simpleBeanSchema);
367+
String schemaString = mapper.writeValueAsString(simpleBeanSchema);
362368
assertEquals(
363369
"{" +
364370
"\"type\":\"object\"," +
365-
"\"id\":\"urn:jsonschema:com:fasterxml:jackson:module:jsonSchema:TestGenerateJsonSchema:SimpleBean\"," +
366371
"\"dependencies\":{" +
367372
"\"property1\":{\"id\":\"urn:jsonschema:com:fasterxml:jackson:module:jsonSchema:TestGenerateJsonSchema:DependencySchema\",\"properties\":{\"property2\":{\"type\":\"string\",\"required\":true}}}," +
368373
"\"property3\":{\"id\":\"urn:jsonschema:com:fasterxml:jackson:module:jsonSchema:TestGenerateJsonSchema:DependencySchema\",\"properties\":{\"property2\":{\"type\":\"string\",\"required\":true}}}}," +
374+
"\"id\":\"urn:jsonschema:com:fasterxml:jackson:module:jsonSchema:TestGenerateJsonSchema:SimpleBean\"," +
369375
"\"properties\":{" +
370376
"\"property1\":{\"type\":\"integer\"}" +
371377
",\"property2\":{\"type\":\"string\"}," +

0 commit comments

Comments
 (0)