Skip to content

Commit e3fcb31

Browse files
derjustderjust
committed
Update Mockito and resolve dependency clashes
1 parent 79de7b9 commit e3fcb31

13 files changed

+102
-119
lines changed

‎src/changes/changes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<action dev="derjust" type="add" date="2017-12-01" >
1414
Added maven-changes-plugin to build process
1515
</action>
16+
<action dev="derjust" type="add" date="2017-12-17" >
17+
Update Mockito and resolve dependency clashes
18+
</action>
1619
</release>
1720
<release version="5.0.0" date="2017-11-27" description="Spring 5 release" >
1821
<action dev="derjust" type="add">

‎src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateUnitTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.junit.runner.RunWith;
1111
import org.mockito.Mock;
1212
import org.mockito.Mockito;
13-
import org.mockito.runners.MockitoJUnitRunner;
13+
import org.mockito.junit.MockitoJUnitRunner;
1414
import org.socialsignin.spring.data.dynamodb.domain.sample.Playlist;
1515
import org.socialsignin.spring.data.dynamodb.domain.sample.User;
1616

@@ -38,7 +38,7 @@ public void setUp() {
3838
@Test
3939
public void testBatchDelete_CallsCorrectDynamoDBMapperMethod()
4040
{
41-
List<User> users = new ArrayList<User>();
41+
List<User> users = new ArrayList<>();
4242
dynamoDBTemplate.batchDelete(users);
4343
Mockito.verify(dynamoDBMapper).batchDelete(Mockito.any(List.class));
4444
}
@@ -47,7 +47,7 @@ public void testBatchDelete_CallsCorrectDynamoDBMapperMethod()
4747
@Test
4848
public void testBatchSave_CallsCorrectDynamoDBMapperMethod()
4949
{
50-
List<User> users = new ArrayList<User>();
50+
List<User> users = new ArrayList<>();
5151
dynamoDBTemplate.batchSave(users);
5252
Mockito.verify(dynamoDBMapper).batchSave(Mockito.any(List.class));
5353
}

‎src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.junit.Before;
1919
import org.junit.Test;
2020
import org.junit.runner.RunWith;
21-
import org.mockito.runners.MockitoJUnitRunner;
21+
import org.mockito.junit.MockitoJUnitRunner;
2222
import org.socialsignin.spring.data.dynamodb.domain.sample.User;
2323

2424
import static org.hamcrest.CoreMatchers.is;

‎src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.junit.Before;
2121
import org.junit.Test;
2222
import org.junit.runner.RunWith;
23-
import org.mockito.runners.MockitoJUnitRunner;
23+
import org.mockito.junit.MockitoJUnitRunner;
2424

2525
import static org.hamcrest.CoreMatchers.is;
2626
import static org.hamcrest.CoreMatchers.notNullValue;

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.junit.runner.RunWith;
77
import org.mockito.Mock;
88
import org.mockito.Mockito;
9-
import org.mockito.runners.MockitoJUnitRunner;
9+
import org.mockito.junit.MockitoJUnitRunner;
1010
import org.socialsignin.spring.data.dynamodb.domain.sample.Playlist;
1111
import org.socialsignin.spring.data.dynamodb.repository.support.DynamoDBIdIsHashAndRangeKeyEntityInformation;
1212

@@ -22,7 +22,7 @@ public void setUp()
2222
{
2323
Mockito.when(entityInformation.getHashKeyPropertyName()).thenReturn("userName");
2424
Mockito.when(entityInformation.getRangeKeyPropertyName()).thenReturn("playlistName");
25-
criteria = new DynamoDBEntityWithHashAndRangeKeyCriteria<Playlist,String>(entityInformation, null);
25+
criteria = new DynamoDBEntityWithHashAndRangeKeyCriteria<>(entityInformation, null);
2626
}
2727

2828
@Test
@@ -119,7 +119,6 @@ public void testHasIndexRangeKeyCondition_WhenConditionCriteriaIsEqualityOnAProp
119119
@Test
120120
public void testHasIndexRangeKeyCondition_WhenConditionCriteriaIsEqualityOnAPropertyWhichIsNotAnIndexRangeKeyButIsARangeKey()
121121
{
122-
Mockito.when(entityInformation.isGlobalIndexRangeKeyProperty("playlistName")).thenReturn(false);
123122
criteria.withPropertyEquals("playlist name", "some playlist name", String.class);
124123
boolean hasIndexRangeKeyCondition = criteria.hasIndexRangeKeyCondition();
125124
Assert.assertFalse(hasIndexRangeKeyCondition);

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.junit.runner.RunWith;
77
import org.mockito.Mock;
88
import org.mockito.Mockito;
9-
import org.mockito.runners.MockitoJUnitRunner;
9+
import org.mockito.junit.MockitoJUnitRunner;
1010
import org.socialsignin.spring.data.dynamodb.domain.sample.User;
1111
import org.socialsignin.spring.data.dynamodb.repository.support.DynamoDBEntityInformation;
1212

@@ -23,7 +23,7 @@ public class DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest extends AbstractDynam
2323
public void setUp()
2424
{
2525
Mockito.when(entityInformation.getHashKeyPropertyName()).thenReturn("id");
26-
criteria = new DynamoDBEntityWithHashKeyOnlyCriteria<User,String>(entityInformation, null);
26+
criteria = new DynamoDBEntityWithHashKeyOnlyCriteria<>(entityInformation, null);
2727
}
2828

2929
@Test

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java

Lines changed: 75 additions & 75 deletions
Large diffs are not rendered by default.

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.junit.Assert;
55
import org.junit.Test;
66
import org.junit.runner.RunWith;
7-
import org.mockito.runners.MockitoJUnitRunner;
7+
import org.mockito.junit.MockitoJUnitRunner;
88
import org.socialsignin.spring.data.dynamodb.domain.sample.User;
99

1010
@RunWith(MockitoJUnitRunner.class)

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.junit.Assert;
66
import org.junit.Test;
77
import org.junit.runner.RunWith;
8-
import org.mockito.runners.MockitoJUnitRunner;
8+
import org.mockito.junit.MockitoJUnitRunner;
99
import org.socialsignin.spring.data.dynamodb.domain.sample.PlaylistId;
1010

1111
import java.lang.reflect.Method;

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.junit.runner.RunWith;
88
import org.mockito.Mock;
99
import org.mockito.Mockito;
10-
import org.mockito.runners.MockitoJUnitRunner;
10+
import org.mockito.junit.MockitoJUnitRunner;
1111
import org.socialsignin.spring.data.dynamodb.domain.sample.Playlist;
1212
import org.socialsignin.spring.data.dynamodb.domain.sample.PlaylistId;
1313
import org.socialsignin.spring.data.dynamodb.domain.sample.User;
@@ -55,25 +55,16 @@ public void setup()
5555
Mockito.when(mockHashAndRangeKeyExtractor.getHashKey(mockPlaylistId)).thenReturn(mockHashKey);
5656
Mockito.when(mockHashAndRangeKeyExtractor.getRangeKey(mockPlaylistId)).thenReturn(mockRangeKey);
5757

58-
Mockito.when(mockUserEntityMetadata.getHashKeyPropertyName()).thenReturn("userHashKeyPropertyName");
5958
Mockito.when(mockPlaylistEntityMetadata.getHashKeyPropertyName()).thenReturn("playlistHashKeyPropertyName");
60-
Mockito.when(mockUserEntityMetadata.getHashKeyPropotypeEntityForHashKey("someUserHashKey")).thenReturn(mockUserPrototype);
6159
Mockito.when(mockPlaylistEntityMetadata.getHashKeyPropotypeEntityForHashKey("somePlaylistHashKey")).thenReturn(mockPlaylistPrototype);
62-
Mockito.when(mockUserEntityMetadata.getMarshallerForProperty("marshalledProperty")).thenReturn(mockPropertyMarshaller);
6360
Mockito.when(mockPlaylistEntityMetadata.getMarshallerForProperty("marshalledProperty")).thenReturn(mockPropertyMarshaller);
64-
Mockito.when(mockUserEntityMetadata.getOverriddenAttributeName("overriddenProperty")).thenReturn("modifiedPropertyName");
6561
Mockito.when(mockPlaylistEntityMetadata.getOverriddenAttributeName("overriddenProperty")).thenReturn("modifiedPropertyName");
6662

67-
Mockito.when(mockUserEntityMetadata.isHashKeyProperty("hashKeyProperty")).thenReturn(true);
68-
Mockito.when(mockPlaylistEntityMetadata.isHashKeyProperty("hashKeyProperty")).thenReturn(true);
69-
Mockito.when(mockUserEntityMetadata.isHashKeyProperty("nonHashKeyProperty")).thenReturn(false);
7063
Mockito.when(mockPlaylistEntityMetadata.isHashKeyProperty("nonHashKeyProperty")).thenReturn(false);
71-
Mockito.when(mockUserEntityMetadata.isCompositeHashAndRangeKeyProperty("compositeIdProperty")).thenReturn(true);
7264
Mockito.when(mockPlaylistEntityMetadata.isCompositeHashAndRangeKeyProperty("compositeIdProperty")).thenReturn(true);
73-
Mockito.when(mockUserEntityMetadata.isCompositeHashAndRangeKeyProperty("nonCompositeIdProperty")).thenReturn(false);
7465
Mockito.when(mockPlaylistEntityMetadata.isCompositeHashAndRangeKeyProperty("nonCompositeIdProperty")).thenReturn(false);
7566

76-
dynamoDBPlaylistEntityInformation = new DynamoDBIdIsHashAndRangeKeyEntityInformationImpl<Playlist,PlaylistId>(Playlist.class,mockPlaylistEntityMetadata);
67+
dynamoDBPlaylistEntityInformation = new DynamoDBIdIsHashAndRangeKeyEntityInformationImpl<>(Playlist.class,mockPlaylistEntityMetadata);
7768

7869
}
7970

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.junit.runner.RunWith;
88
import org.mockito.Mock;
99
import org.mockito.Mockito;
10-
import org.mockito.runners.MockitoJUnitRunner;
10+
import org.mockito.junit.MockitoJUnitRunner;
1111
import org.socialsignin.spring.data.dynamodb.domain.sample.Playlist;
1212
import org.socialsignin.spring.data.dynamodb.domain.sample.PlaylistId;
1313
import org.socialsignin.spring.data.dynamodb.domain.sample.User;
@@ -46,21 +46,16 @@ public void setup()
4646

4747
Mockito.when(mockUserEntityMetadata.getHashKeyPropertyName()).thenReturn("userHashKeyPropertyName");
4848
Mockito.when(mockPlaylistEntityMetadata.getHashKeyPropertyName()).thenReturn("playlistHashKeyPropertyName");
49-
Mockito.when(mockPlaylistEntityMetadata.getHashKeyPropotypeEntityForHashKey("somePlaylistHashKey")).thenReturn(mockPlaylistPrototype);
5049
Mockito.when(mockUserEntityMetadata.getMarshallerForProperty("marshalledProperty")).thenReturn(mockPropertyMarshaller);
5150
Mockito.when(mockPlaylistEntityMetadata.getMarshallerForProperty("marshalledProperty")).thenReturn(mockPropertyMarshaller);
5251
Mockito.when(mockUserEntityMetadata.getOverriddenAttributeName("overriddenProperty")).thenReturn("modifiedPropertyName");
5352
Mockito.when(mockPlaylistEntityMetadata.getOverriddenAttributeName("overriddenProperty")).thenReturn("modifiedPropertyName");
5453

5554
Mockito.when(mockUserEntityMetadata.isHashKeyProperty("hashKeyProperty")).thenReturn(true);
56-
Mockito.when(mockPlaylistEntityMetadata.isHashKeyProperty("hashKeyProperty")).thenReturn(true);
57-
Mockito.when(mockUserEntityMetadata.isHashKeyProperty("nonHashKeyProperty")).thenReturn(false);
5855
Mockito.when(mockPlaylistEntityMetadata.isHashKeyProperty("nonHashKeyProperty")).thenReturn(false);
59-
Mockito.when(mockPlaylistEntityMetadata.isCompositeHashAndRangeKeyProperty("compositeIdProperty")).thenReturn(true);
60-
Mockito.when(mockPlaylistEntityMetadata.isCompositeHashAndRangeKeyProperty("nonCompositeIdProperty")).thenReturn(false);
61-
62-
dynamoDBPlaylistEntityInformation = new DynamoDBIdIsHashKeyEntityInformationImpl<Playlist,PlaylistId>(Playlist.class,mockPlaylistEntityMetadata);
63-
dynamoDBUserEntityInformation = new DynamoDBIdIsHashKeyEntityInformationImpl<User,String>(User.class,mockUserEntityMetadata);
56+
57+
dynamoDBPlaylistEntityInformation = new DynamoDBIdIsHashKeyEntityInformationImpl<>(Playlist.class,mockPlaylistEntityMetadata);
58+
dynamoDBUserEntityInformation = new DynamoDBIdIsHashKeyEntityInformationImpl<>(User.class,mockUserEntityMetadata);
6459

6560
}
6661

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryUnitTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.junit.runner.RunWith;
2121
import org.mockito.Mock;
2222
import org.mockito.Mockito;
23-
import org.mockito.runners.MockitoJUnitRunner;
23+
import org.mockito.junit.MockitoJUnitRunner;
2424
import org.socialsignin.spring.data.dynamodb.core.DynamoDBOperations;
2525
import org.socialsignin.spring.data.dynamodb.domain.sample.Playlist;
2626
import org.socialsignin.spring.data.dynamodb.domain.sample.PlaylistId;
@@ -77,9 +77,9 @@ public void setUp() {
7777
when(entityWithSimpleIdInformation.getJavaType()).thenReturn(User.class);
7878
when(entityWithSimpleIdInformation.getHashKey(1l)).thenReturn(1l);
7979

80-
when(mockEnableScanPermissions.isFindAllUnpaginatedScanEnabled()).thenReturn(true);
81-
when(mockEnableScanPermissions.isDeleteAllUnpaginatedScanEnabled()).thenReturn(true);
82-
when(mockEnableScanPermissions.isCountUnpaginatedScanEnabled()).thenReturn(true);
80+
// when(mockEnableScanPermissions.isFindAllUnpaginatedScanEnabled()).thenReturn(true);
81+
// when(mockEnableScanPermissions.isDeleteAllUnpaginatedScanEnabled()).thenReturn(true);
82+
// when(mockEnableScanPermissions.isCountUnpaginatedScanEnabled()).thenReturn(true);
8383

8484

8585
when(entityWithCompositeIdInformation.getJavaType()).thenReturn(Playlist.class);

‎src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.junit.runner.RunWith;
2121
import org.mockito.Mock;
2222
import org.mockito.Mockito;
23-
import org.mockito.runners.MockitoJUnitRunner;
23+
import org.mockito.junit.MockitoJUnitRunner;
2424
import org.socialsignin.spring.data.dynamodb.core.DynamoDBOperations;
2525
import org.socialsignin.spring.data.dynamodb.domain.sample.Playlist;
2626
import org.socialsignin.spring.data.dynamodb.domain.sample.PlaylistId;
@@ -77,19 +77,14 @@ public void setUp() {
7777
when(entityWithOnlyHashKeyInformation.getHashKey(1l)).thenReturn(1l);
7878

7979

80-
when(mockEnableScanPermissions.isFindAllUnpaginatedScanEnabled()).thenReturn(true);
81-
when(mockEnableScanPermissions.isDeleteAllUnpaginatedScanEnabled()).thenReturn(true);
82-
when(mockEnableScanPermissions.isCountUnpaginatedScanEnabled()).thenReturn(true);
83-
84-
8580
when(entityWithHashAndRangeKeyInformation.getJavaType()).thenReturn(Playlist.class);
8681
when(entityWithHashAndRangeKeyInformation.getHashKey(testPlaylistId)).thenReturn("michael");
8782
when(entityWithHashAndRangeKeyInformation.getRangeKey(testPlaylistId)).thenReturn("playlist1");
8883
when(entityWithHashAndRangeKeyInformation.isRangeKeyAware()).thenReturn(true);
8984

90-
repoForEntityWithOnlyHashKey = new SimpleDynamoDBPagingAndSortingRepository<User, Long>(entityWithOnlyHashKeyInformation,
85+
repoForEntityWithOnlyHashKey = new SimpleDynamoDBPagingAndSortingRepository<>(entityWithOnlyHashKeyInformation,
9186
dynamoDBOperations,mockEnableScanPermissions);
92-
repoForEntityWithHashAndRangeKey = new SimpleDynamoDBPagingAndSortingRepository<Playlist, PlaylistId>(
87+
repoForEntityWithHashAndRangeKey = new SimpleDynamoDBPagingAndSortingRepository<>(
9388
entityWithHashAndRangeKeyInformation, dynamoDBOperations,mockEnableScanPermissions);
9489

9590
when(dynamoDBOperations.load(User.class, 1l)).thenReturn(testUser);

0 commit comments

Comments
 (0)