From 04870fb8b3256b4401a9e20b87784b02e6320fbf Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 16 Jul 2014 12:04:10 +0200 Subject: [PATCH] DATAMONGO-991 - Adapted to deprecation removals in Spring Data Commons. Related ticket: DATACMNS-469. --- .../event/AuditingEventListenerUnitTests.java | 6 +----- ...stractPersonRepositoryIntegrationTests.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListenerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListenerUnitTests.java index f5c44bc6f..1d5697c58 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListenerUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListenerUnitTests.java @@ -27,9 +27,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.ObjectFactory; import org.springframework.data.annotation.Id; import org.springframework.data.auditing.IsNewAwareAuditingHandler; -import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory; import org.springframework.data.mongodb.core.mapping.MongoMappingContext; -import org.springframework.data.support.IsNewStrategyFactory; /** * Unit tests for {@link AuditingEventListener}. @@ -42,16 +40,14 @@ public class AuditingEventListenerUnitTests { IsNewAwareAuditingHandler handler; - IsNewStrategyFactory factory; AuditingEventListener listener; @Before public void setUp() { MongoMappingContext mappingContext = new MongoMappingContext(); - factory = new MappingContextIsNewStrategyFactory(mappingContext); - handler = spy(new IsNewAwareAuditingHandler(factory)); + handler = spy(new IsNewAwareAuditingHandler(mappingContext)); doNothing().when(handler).markCreated(Mockito.any(Object.class)); doNothing().when(handler).markModified(Mockito.any(Object.class)); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java index 942e8aa2b..b07103f67 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java @@ -618,8 +618,8 @@ public abstract class AbstractPersonRepositoryIntegrationTests { assertThat(results.getContent().isEmpty(), is(false)); assertThat(results.getNumberOfElements(), is(2)); - assertThat(results.isFirstPage(), is(false)); - assertThat(results.isLastPage(), is(false)); + assertThat(results.isFirst(), is(false)); + assertThat(results.isLast(), is(false)); assertThat(results.getAverageDistance().getMetric(), is((Metric) Metrics.KILOMETERS)); assertThat(results.getAverageDistance().getNormalizedValue(), is(0.0)); } @@ -642,8 +642,8 @@ public abstract class AbstractPersonRepositoryIntegrationTests { Metrics.KILOMETERS), new PageRequest(1, 2)); assertThat(results.getContent().isEmpty(), is(false)); assertThat(results.getNumberOfElements(), is(1)); - assertThat(results.isFirstPage(), is(false)); - assertThat(results.isLastPage(), is(true)); + assertThat(results.isFirst(), is(false)); + assertThat(results.isLast(), is(true)); assertThat(results.getAverageDistance().getMetric(), is((Metric) Metrics.KILOMETERS)); } @@ -662,8 +662,8 @@ public abstract class AbstractPersonRepositoryIntegrationTests { assertThat(results.getContent().isEmpty(), is(false)); assertThat(results.getNumberOfElements(), is(1)); - assertThat(results.isFirstPage(), is(true)); - assertThat(results.isLastPage(), is(true)); + assertThat(results.isFirst(), is(true)); + assertThat(results.isLast(), is(true)); assertThat(results.getAverageDistance().getMetric(), is((Metric) Metrics.KILOMETERS)); } @@ -681,8 +681,8 @@ public abstract class AbstractPersonRepositoryIntegrationTests { assertThat(results.getContent().isEmpty(), is(true)); assertThat(results.getNumberOfElements(), is(0)); - assertThat(results.isFirstPage(), is(false)); - assertThat(results.isLastPage(), is(true)); + assertThat(results.isFirst(), is(false)); + assertThat(results.isLast(), is(true)); assertThat(results.getAverageDistance().getMetric(), is((Metric) Metrics.KILOMETERS)); } @@ -990,7 +990,7 @@ public abstract class AbstractPersonRepositoryIntegrationTests { assertThat(repository.findOne(QPerson.person.creator.eq(user)), is(dave)); } - + /** * @see DATAMONGO-969 */