From 50f400cf5aeff0155ef398c9ce12fda7e9e9adf2 Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Thu, 7 Mar 2019 15:59:13 +0100 Subject: [PATCH] Fix MongoItemReader tests Spring Data MongoDB v2.2 upgraded the mongodb java driver to v3.10 (See DATAMONGO-2198) which has changed the JSON serialization format. This commit fixes expected values to the right format. Note that these changes are related to MongoDB APIs only and batch users should not be impacted. --- .../batch/item/data/MongoItemReaderTests.java | 24 +++++++++---------- .../builder/MongoItemReaderBuilderTests.java | 12 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java index a6c0eff2a..d6a2e7117 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java @@ -136,8 +136,8 @@ public class MongoItemReaderTests { Query query = queryContainer.getValue(); assertEquals(50, query.getLimit()); assertEquals(0, query.getSkip()); - assertEquals("{ }", query.getQueryObject().toJson()); - assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson()); + assertEquals("{}", query.getQueryObject().toJson()); + assertEquals("{\"name\": -1}", query.getSortObject().toJson()); } @Test @@ -153,8 +153,8 @@ public class MongoItemReaderTests { assertEquals(50, query.getLimit()); assertEquals(100, query.getSkip()); - assertEquals("{ }", query.getQueryObject().toJson()); - assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson()); + assertEquals("{}", query.getQueryObject().toJson()); + assertEquals("{\"name\": -1}", query.getSortObject().toJson()); assertTrue(query.getFieldsObject().isEmpty()); } @@ -170,8 +170,8 @@ public class MongoItemReaderTests { Query query = queryContainer.getValue(); assertEquals(50, query.getLimit()); assertEquals(0, query.getSkip()); - assertEquals("{ }", query.getQueryObject().toJson()); - assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson()); + assertEquals("{}", query.getQueryObject().toJson()); + assertEquals("{\"name\": -1}", query.getSortObject().toJson()); assertEquals(1, query.getFieldsObject().get("name")); assertEquals(1, query.getFieldsObject().get("age")); assertEquals(0, query.getFieldsObject().get("_id")); @@ -189,8 +189,8 @@ public class MongoItemReaderTests { Query query = queryContainer.getValue(); assertEquals(50, query.getLimit()); assertEquals(0, query.getSkip()); - assertEquals("{ }", query.getQueryObject().toJson()); - assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson()); + assertEquals("{}", query.getQueryObject().toJson()); + assertEquals("{\"name\": -1}", query.getSortObject().toJson()); assertEquals("{ $natural : 1}", query.getHint()); } @@ -211,8 +211,8 @@ public class MongoItemReaderTests { Query query = queryContainer.getValue(); assertEquals(50, query.getLimit()); assertEquals(0, query.getSkip()); - assertEquals("{ \"name\" : \"foo\" }", query.getQueryObject().toJson()); - assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson()); + assertEquals("{\"name\": \"foo\"}", query.getQueryObject().toJson()); + assertEquals("{\"name\": -1}", query.getSortObject().toJson()); } @SuppressWarnings("serial") @@ -234,8 +234,8 @@ public class MongoItemReaderTests { Query query = queryContainer.getValue(); assertEquals(50, query.getLimit()); assertEquals(0, query.getSkip()); - assertEquals("{ \"name\" : \"foo\" }", query.getQueryObject().toJson()); - assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson()); + assertEquals("{\"name\": \"foo\"}", query.getQueryObject().toJson()); + assertEquals("{\"name\": -1}", query.getSortObject().toJson()); assertEquals("collection", collectionContainer.getValue()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilderTests.java index c9f3c08cc..f4699b599 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilderTests.java @@ -69,8 +69,8 @@ public class MongoItemReaderBuilderTests { Query query = this.queryContainer.getValue(); assertEquals(50, query.getLimit()); assertEquals(0, query.getSkip()); - assertEquals("{ }", query.getQueryObject().toJson()); - assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson()); + assertEquals("{}", query.getQueryObject().toJson()); + assertEquals("{\"name\": -1}", query.getSortObject().toJson()); } @Test @@ -119,8 +119,8 @@ public class MongoItemReaderBuilderTests { assertNull("reader should not return result", reader.read()); Query query = this.queryContainer.getValue(); - assertEquals("{ \"name\" : \"foo\" }", query.getQueryObject().toJson()); - assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson()); + assertEquals("{\"name\": \"foo\"}", query.getQueryObject().toJson()); + assertEquals("{\"name\": -1}", query.getSortObject().toJson()); assertEquals("collection", collectionContainer.getValue()); } @@ -140,8 +140,8 @@ public class MongoItemReaderBuilderTests { assertNull("reader should not return result", reader.read()); Query query = this.queryContainer.getValue(); - assertEquals("{ \"name\" : \"foo\" }", query.getQueryObject().toJson()); - assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson()); + assertEquals("{\"name\": \"foo\"}", query.getQueryObject().toJson()); + assertEquals("{\"name\": -1}", query.getSortObject().toJson()); assertEquals("collection", collectionContainer.getValue()); }