Skip to content

Commit 87a6083

Browse files
andreas-grafenbergerandreas-grafenberger
committed
Replacing hamcrest imports with assertj.
1 parent e547100 commit 87a6083

15 files changed

Lines changed: 694 additions & 802 deletions

‎services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/extensions/VersionedRecordExtensionTest.java‎

Lines changed: 35 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515

1616
package software.amazon.awssdk.enhanced.dynamodb.extensions;
1717

18+
import static org.assertj.core.api.Assertions.assertThat;
1819
import static java.util.Collections.singletonMap;
19-
import static org.hamcrest.MatcherAssert.assertThat;
20-
import static org.hamcrest.Matchers.is;
2120
import static org.junit.jupiter.api.Assertions.assertThrows;
2221
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
2322
import static software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension.AttributeTags.versionAttribute;
@@ -68,7 +67,7 @@ public void beforeRead_doesNotTransformObject() {
6867
.tableMetadata(FakeItem.getTableMetadata())
6968
.operationContext(PRIMARY_CONTEXT).build());
7069

71-
assertThat(result, is(ReadModification.builder().build()));
70+
assertThat(result).isEqualTo(ReadModification.builder().build());
7271
}
7372

7473
@Test
@@ -83,11 +82,10 @@ public void beforeWrite_initialVersion_expressionIsCorrect() {
8382
.tableMetadata(FakeItem.getTableMetadata())
8483
.operationContext(PRIMARY_CONTEXT).build());
8584

86-
assertThat(result.additionalConditionalExpression(),
87-
is(Expression.builder()
85+
assertThat(result.additionalConditionalExpression()).isEqualTo(Expression.builder()
8886
.expression("attribute_not_exists(#AMZN_MAPPED_version)")
8987
.expressionNames(singletonMap("#AMZN_MAPPED_version", "version"))
90-
.build()));
88+
.build());
9189
}
9290

9391
@Test
@@ -105,7 +103,7 @@ public void beforeWrite_initialVersion_transformedItemIsCorrect() {
105103
.operationContext(PRIMARY_CONTEXT).build());
106104

107105

108-
assertThat(result.transformedItem(), is(fakeItemWithInitialVersion));
106+
assertThat(result.transformedItem()).isEqualTo(fakeItemWithInitialVersion);
109107
}
110108

111109
@Test
@@ -125,7 +123,7 @@ public void beforeWrite_initialVersionDueToExplicitNull_transformedItemIsCorrect
125123
.tableMetadata(FakeItem.getTableMetadata())
126124
.operationContext(PRIMARY_CONTEXT).build());
127125

128-
assertThat(result.transformedItem(), is(fakeItemWithInitialVersion));
126+
assertThat(result.transformedItem()).isEqualTo(fakeItemWithInitialVersion);
129127
}
130128

131129
@Test
@@ -140,13 +138,12 @@ public void beforeWrite_existingVersion_expressionIsCorrect() {
140138
.tableMetadata(FakeItem.getTableMetadata())
141139
.operationContext(PRIMARY_CONTEXT).build());
142140

143-
assertThat(result.additionalConditionalExpression(),
144-
is(Expression.builder()
141+
assertThat(result.additionalConditionalExpression()).isEqualTo(Expression.builder()
145142
.expression("#AMZN_MAPPED_version = :old_version_value")
146143
.expressionNames(singletonMap("#AMZN_MAPPED_version", "version"))
147144
.expressionValues(singletonMap(":old_version_value",
148145
AttributeValue.builder().n("13").build()))
149-
.build()));
146+
.build());
150147
}
151148

152149
@Test
@@ -164,7 +161,7 @@ public void beforeWrite_existingVersion_transformedItemIsCorrect() {
164161
.tableMetadata(FakeItem.getTableMetadata())
165162
.operationContext(PRIMARY_CONTEXT).build());
166163

167-
assertThat(result.transformedItem(), is(fakeItemWithInitialVersion));
164+
assertThat(result.transformedItem()).isEqualTo(fakeItemWithInitialVersion);
168165
}
169166

170167
@Test
@@ -178,7 +175,7 @@ public void beforeWrite_returnsNoOpModification_ifVersionAttributeNotDefined() {
178175
.operationContext(PRIMARY_CONTEXT)
179176
.tableMetadata(FakeItemWithSort.getTableMetadata())
180177
.build());
181-
assertThat(writeModification, is(WriteModification.builder().build()));
178+
assertThat(writeModification).isEqualTo(WriteModification.builder().build());
182179
}
183180

184181
@Test(expected = IllegalArgumentException.class)
@@ -215,8 +212,7 @@ public void beforeWrite_versionEqualsStartAt_treatedAsInitialVersion() {
215212
.tableMetadata(FakeItem.getTableMetadata())
216213
.operationContext(PRIMARY_CONTEXT).build());
217214

218-
assertThat(result.additionalConditionalExpression().expression(),
219-
is("attribute_not_exists(#AMZN_MAPPED_version) OR #AMZN_MAPPED_version = :old_version_value"));
215+
assertThat(result.additionalConditionalExpression().expression()).isEqualTo("attribute_not_exists(#AMZN_MAPPED_version) OR #AMZN_MAPPED_version = :old_version_value");
220216
}
221217

222218
@ParameterizedTest
@@ -249,12 +245,11 @@ public void customStartingValueAndIncrement_worksAsExpected(Long startAt, Long i
249245
.tableMetadata(FakeItem.getTableMetadata())
250246
.operationContext(PRIMARY_CONTEXT).build());
251247

252-
assertThat(result.transformedItem(), is(expectedInitialVersion));
253-
assertThat(result.additionalConditionalExpression(),
254-
is(Expression.builder()
248+
assertThat(result.transformedItem()).isEqualTo(expectedInitialVersion);
249+
assertThat(result.additionalConditionalExpression()).isEqualTo(Expression.builder()
255250
.expression("attribute_not_exists(#AMZN_MAPPED_version)")
256251
.expressionNames(singletonMap("#AMZN_MAPPED_version", "version"))
257-
.build()));
252+
.build());
258253
}
259254

260255
public static Stream<Arguments> customStartAtAndIncrementValues() {
@@ -315,8 +310,7 @@ public void beforeWrite_versionNotEqualsAnnotationStartAt_notTreatedAsInitialVer
315310
.tableMetadata(schema.tableMetadata())
316311
.operationContext(PRIMARY_CONTEXT).build());
317312

318-
assertThat(result.additionalConditionalExpression().expression(),
319-
is("#AMZN_MAPPED_version = :old_version_value"));
313+
assertThat(result.additionalConditionalExpression().expression()).isEqualTo("#AMZN_MAPPED_version = :old_version_value");
320314
}
321315

322316
@Test
@@ -339,8 +333,7 @@ public void beforeWrite_versionEqualsAnnotationStartAt_isTreatedAsInitialVersion
339333
.tableMetadata(schema.tableMetadata())
340334
.operationContext(PRIMARY_CONTEXT).build());
341335

342-
assertThat(result.additionalConditionalExpression().expression(),
343-
is("attribute_not_exists(#AMZN_MAPPED_version) OR #AMZN_MAPPED_version = :old_version_value"));
336+
assertThat(result.additionalConditionalExpression().expression()).isEqualTo("attribute_not_exists(#AMZN_MAPPED_version) OR #AMZN_MAPPED_version = :old_version_value");
344337
}
345338

346339

@@ -383,12 +376,11 @@ public void customStartingValueAndIncrementWithAnnotation_worksAsExpected() {
383376
.tableMetadata(schema.tableMetadata())
384377
.operationContext(PRIMARY_CONTEXT).build());
385378

386-
assertThat(result.transformedItem(), is(expectedInitialVersion));
387-
assertThat(result.additionalConditionalExpression(),
388-
is(Expression.builder()
379+
assertThat(result.transformedItem()).isEqualTo(expectedInitialVersion);
380+
assertThat(result.additionalConditionalExpression()).isEqualTo(Expression.builder()
389381
.expression("attribute_not_exists(#AMZN_MAPPED_version)")
390382
.expressionNames(singletonMap("#AMZN_MAPPED_version", "version"))
391-
.build()));
383+
.build());
392384
}
393385

394386
@Test
@@ -415,12 +407,11 @@ public void customAnnotationValuesAndBuilderValues_annotationShouldTakePrecedenc
415407
.tableMetadata(schema.tableMetadata())
416408
.operationContext(PRIMARY_CONTEXT).build());
417409

418-
assertThat(result.transformedItem(), is(expectedInitialVersion));
419-
assertThat(result.additionalConditionalExpression(),
420-
is(Expression.builder()
410+
assertThat(result.transformedItem()).isEqualTo(expectedInitialVersion);
411+
assertThat(result.additionalConditionalExpression()).isEqualTo(Expression.builder()
421412
.expression("attribute_not_exists(#AMZN_MAPPED_version)")
422413
.expressionNames(singletonMap("#AMZN_MAPPED_version", "version"))
423-
.build()));
414+
.build());
424415
}
425416

426417
@DynamoDbBean
@@ -464,12 +455,11 @@ public void customAnnotationDefaultValuesAndBuilderValues_annotationShouldTakePr
464455
.tableMetadata(schema.tableMetadata())
465456
.operationContext(PRIMARY_CONTEXT).build());
466457

467-
assertThat(result.transformedItem(), is(expectedInitialVersion));
468-
assertThat(result.additionalConditionalExpression(),
469-
is(Expression.builder()
458+
assertThat(result.transformedItem()).isEqualTo(expectedInitialVersion);
459+
assertThat(result.additionalConditionalExpression()).isEqualTo(Expression.builder()
470460
.expression("attribute_not_exists(#AMZN_MAPPED_version)")
471461
.expressionNames(singletonMap("#AMZN_MAPPED_version", "version"))
472-
.build()));
462+
.build());
473463
}
474464

475465
@DynamoDbBean
@@ -527,9 +517,8 @@ public void customIncrementForExistingVersion_worksAsExpected(Long startAt, Long
527517
.tableMetadata(FakeItem.getTableMetadata())
528518
.operationContext(PRIMARY_CONTEXT).build());
529519

530-
assertThat(result.transformedItem(), is(expectedVersionedItem));
531-
assertThat(result.additionalConditionalExpression().expression(),
532-
is("#AMZN_MAPPED_version = :old_version_value"));
520+
assertThat(result.transformedItem()).isEqualTo(expectedVersionedItem);
521+
assertThat(result.additionalConditionalExpression().expression()).isEqualTo("#AMZN_MAPPED_version = :old_version_value");
533522
}
534523

535524
@ParameterizedTest
@@ -565,9 +554,8 @@ public void customIncrementForExistingVersion_withImmutableSchema_worksAsExpecte
565554
.tableMetadata(FakeVersionedStaticImmutableItem.getTableMetadata())
566555
.operationContext(PRIMARY_CONTEXT).build());
567556

568-
assertThat(result.transformedItem(), is(expectedVersionedItem));
569-
assertThat(result.additionalConditionalExpression().expression(),
570-
is("#AMZN_MAPPED_version = :old_version_value"));
557+
assertThat(result.transformedItem()).isEqualTo(expectedVersionedItem);
558+
assertThat(result.additionalConditionalExpression().expression()).isEqualTo("#AMZN_MAPPED_version = :old_version_value");
571559
}
572560

573561
@Test
@@ -593,12 +581,11 @@ public void customStartingValueAndIncrementWithImmutableClass_worksAsExpected()
593581
.tableMetadata(schema.tableMetadata())
594582
.operationContext(PRIMARY_CONTEXT).build());
595583

596-
assertThat(result.transformedItem(), is(expectedInitialVersion));
597-
assertThat(result.additionalConditionalExpression(),
598-
is(Expression.builder()
584+
assertThat(result.transformedItem()).isEqualTo(expectedInitialVersion);
585+
assertThat(result.additionalConditionalExpression()).isEqualTo(Expression.builder()
599586
.expression("attribute_not_exists(#AMZN_MAPPED_version)")
600587
.expressionNames(singletonMap("#AMZN_MAPPED_version", "version"))
601-
.build()));
588+
.build());
602589
}
603590

604591
@Test(expected = IllegalStateException.class)
@@ -649,8 +636,7 @@ public void isInitialVersion_shouldPrioritizeAnnotationValueOverBuilderValue() {
649636
.tableMetadata(schema.tableMetadata())
650637
.operationContext(PRIMARY_CONTEXT).build());
651638

652-
assertThat(result.additionalConditionalExpression().expression(),
653-
is("#AMZN_MAPPED_version = :old_version_value"));
639+
assertThat(result.additionalConditionalExpression().expression()).isEqualTo("#AMZN_MAPPED_version = :old_version_value");
654640
}
655641

656642
@Test
@@ -668,8 +654,7 @@ public void updateItem_existingRecordWithVersionEqualToStartAt_shouldSucceed() {
668654
.tableMetadata(FakeItem.getTableMetadata())
669655
.operationContext(PRIMARY_CONTEXT).build());
670656

671-
assertThat(result.additionalConditionalExpression().expression(),
672-
is("attribute_not_exists(#AMZN_MAPPED_version) OR #AMZN_MAPPED_version = :old_version_value"));
657+
assertThat(result.additionalConditionalExpression().expression()).isEqualTo("attribute_not_exists(#AMZN_MAPPED_version) OR #AMZN_MAPPED_version = :old_version_value");
673658
}
674659

675660
@Test
@@ -690,7 +675,7 @@ public void beforeWrite_startAtNegativeOne_firstVersionIsZero() {
690675
.tableMetadata(FakeItem.getTableMetadata())
691676
.operationContext(PRIMARY_CONTEXT).build());
692677

693-
assertThat(result.transformedItem(), is(expectedItem));
678+
assertThat(result.transformedItem()).isEqualTo(expectedItem);
694679
}
695680

696681
public static Stream<Arguments> customIncrementForExistingVersionValues() {

0 commit comments

Comments
 (0)