Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-469 - Removed deprecations.

Browse Source
This commit is contained in:
Oliver Gierke
2014-07-16 11:53:20 +02:00
parent 789f620af1
commit ed0f7c51f8
12 changed files with 34 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/springframework/data/auditing/AuditingHandlerUnitTests.java
View File

@@ -21,6 +21,7 @@ import static org.mockito.Mockito.*;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.domain.AuditorAware;
import org.springframework.data.mapping.context.SampleMappingContext;
/**
* Unit test for {@code AuditingHandler}.
@@ -46,9 +47,8 @@ public class AuditingHandlerUnitTests {
when(auditorAware.getCurrentAuditor()).thenReturn(user);
}
@SuppressWarnings("deprecation")
protected AuditingHandler getHandler() {
return new AuditingHandler();
return new AuditingHandler(new SampleMappingContext());
}
/**

21
src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java
View File

@@ -22,15 +22,12 @@ import static org.mockito.Mockito.*;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.data.annotation.Id;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.mapping.PersistentProperty;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.mapping.context.SampleMappingContext;
import org.springframework.data.support.IsNewStrategy;
import org.springframework.data.support.IsNewStrategyFactory;
/**
* Unit test for {@code AuditingHandler}.
@@ -41,24 +38,21 @@ import org.springframework.data.support.IsNewStrategyFactory;
@RunWith(MockitoJUnitRunner.class)
public class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests {
@Mock IsNewStrategyFactory factory;
@Mock IsNewStrategy strategy;
SampleMappingContext mappingContext;
@Before
public void init() {
when(factory.getIsNewStrategy(Mockito.any(Class.class))).thenReturn(strategy);
this.mappingContext = new SampleMappingContext();
}
@Override
@SuppressWarnings("deprecation")
protected IsNewAwareAuditingHandler getHandler() {
return new IsNewAwareAuditingHandler(factory);
return new IsNewAwareAuditingHandler(mock(SampleMappingContext.class));
}
@Test
public void delegatesToMarkCreatedForNewEntity() {
when(strategy.isNew(Mockito.any(Object.class))).thenReturn(true);
AuditedUser user = new AuditedUser();
getHandler().markAudited(user);
@@ -69,8 +63,8 @@ public class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests
@Test
public void delegatesToMarkModifiedForNonNewEntity() {
when(strategy.isNew(Mockito.any(Object.class))).thenReturn(false);
AuditedUser user = new AuditedUser();
user.id = 1L;
getHandler().markAudited(user);
assertThat(user.createdDate, is(nullValue()));
@@ -93,4 +87,9 @@ public class IsNewAwareAuditingHandlerUnitTests extends AuditingHandlerUnitTests
public void setsUpHandlerWithMappingContext() {
new IsNewAwareAuditingHandler(new SampleMappingContext());
}
static class Domain {
@Id Long id;
}
}