From 3981a8ac92d7b6265df13af769253e858820ef4a Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 15 Aug 2018 15:53:23 +0200 Subject: [PATCH] DATAMONGO-2055 - Polishing. Move test to UpdateMapperUnitTests. Original pull request: #600. --- .../core/convert/UpdateMapperUnitTests.java | 14 ++++++++++++++ .../data/mongodb/core/query/UpdateTests.java | 7 ------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java index 2e807387a..8d7215ab4 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java @@ -289,6 +289,20 @@ public class UpdateMapperUnitTests { assertThat(getAsDBObject(push, "key").containsField("$each"), is(true)); } + @Test // DATAMONGO-943, DATAMONGO-2055 + public void updatePushEachAtNegativePositionWorksCorrectly() { + + Update update = new Update().push("key").atPosition(-2).each(Arrays.asList("Arya", "Arry", "Weasel")); + + DBObject mappedObject = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(Object.class)); + + DBObject push = getAsDBObject(mappedObject, "$push"); + DBObject key = getAsDBObject(push, "key"); + + assertThat(key.containsField("$position"), is(true)); + assertThat((Integer) key.get("$position"), is(-2)); + } + @Test // DATAMONGO-943 public void updatePushEachAtPositionWorksCorrectlyWhenGivenPositionFirst() { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java index b0d5e879b..b1d1c4887 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java @@ -399,13 +399,6 @@ public class UpdateTests { equalTo(new BasicDBObjectBuilder().add("$bit", new BasicDBObject("key", new BasicDBObject("xor", 10L))).get())); } - @Test // DATAMONGO-943, // DATAMONGO-2055 - public void pushShouldAllowNegativePosition() { - - assertThat(new Update().push("foo").atPosition(-1).each("booh").toString()).isEqualTo( - "{ \"$push\" : { \"foo\" : { \"$java\" : { \"$position\" : { \"$java\" : { \"$position\" : -1} }, \"$each\" : { \"$java\" : { \"$each\" : [ \"booh\"]} } } } } }"); - } - @Test // DATAMONGO-1346 public void registersMultiplePullAllClauses() {