GitHub-Spring
/
spring-data-relational
mirror of https://github.com/spring-projects/spring-data-relational.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polishing. 

Formatting and removing public modifier from test methods.

See #1502
Original pull request #1855
3.3.x
Jens Schauder 1 year ago
parent
fb42959ccc
commit
bec76278ff
No known key found for this signature in database
GPG Key ID: 74F6C554AE971567
1 changed files with 39 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 99
      spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java

99
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java
Unescape View File

@ -59,17 +59,13 @@ public class JdbcAggregateTemplateUnitTests {
JdbcAggregateTemplate template; JdbcAggregateTemplate template;
@Mock @Mock DataAccessStrategy dataAccessStrategy;
DataAccessStrategy dataAccessStrategy; @Mock ApplicationEventPublisher eventPublisher;
@Mock @Mock RelationResolver relationResolver;
ApplicationEventPublisher eventPublisher; @Mock EntityCallbacks callbacks;
@Mock
RelationResolver relationResolver;
@Mock
EntityCallbacks callbacks;
@BeforeEach @BeforeEach
public void setUp() { void setUp() {
RelationalMappingContext mappingContext = new RelationalMappingContext(); RelationalMappingContext mappingContext = new RelationalMappingContext();
JdbcConverter converter = new MappingJdbcConverter(mappingContext, relationResolver); JdbcConverter converter = new MappingJdbcConverter(mappingContext, relationResolver);
@ -80,24 +76,24 @@ public class JdbcAggregateTemplateUnitTests {
} }
@Test // DATAJDBC-378 @Test // DATAJDBC-378
public void findAllByIdMustNotAcceptNullArgumentForType() { void findAllByIdMustNotAcceptNullArgumentForType() {
assertThatThrownBy(() -> template.findAllById(singleton(23L), null)).isInstanceOf(IllegalArgumentException.class); assertThatThrownBy(() -> template.findAllById(singleton(23L), null)).isInstanceOf(IllegalArgumentException.class);
} }
@Test // DATAJDBC-378 @Test // DATAJDBC-378
public void findAllByIdMustNotAcceptNullArgumentForIds() { void findAllByIdMustNotAcceptNullArgumentForIds() {
assertThatThrownBy(() -> template.findAllById(null, SampleEntity.class)) assertThatThrownBy(() -> template.findAllById(null, SampleEntity.class))
.isInstanceOf(IllegalArgumentException.class); .isInstanceOf(IllegalArgumentException.class);
} }
@Test // DATAJDBC-378 @Test // DATAJDBC-378
public void findAllByIdWithEmptyListMustReturnEmptyResult() { void findAllByIdWithEmptyListMustReturnEmptyResult() {
assertThat(template.findAllById(emptyList(), SampleEntity.class)).isEmpty(); assertThat(template.findAllById(emptyList(), SampleEntity.class)).isEmpty();
} }
@Test // DATAJDBC-393, GH-1291 @Test // DATAJDBC-393, GH-1291
public void callbackOnSave() { void callbackOnSave() {
SampleEntity first = new SampleEntity(null, "Alfred"); SampleEntity first = new SampleEntity(null, "Alfred");
SampleEntity second = new SampleEntity(23L, "Alfred E."); SampleEntity second = new SampleEntity(23L, "Alfred E.");
@ -115,7 +111,7 @@ public class JdbcAggregateTemplateUnitTests {
} }
@Test // GH-1291 @Test // GH-1291
public void doesNotEmitEvents() { void doesNotEmitEvents() {
SampleEntity first = new SampleEntity(null, "Alfred"); SampleEntity first = new SampleEntity(null, "Alfred");
SampleEntity second = new SampleEntity(23L, "Alfred E."); SampleEntity second = new SampleEntity(23L, "Alfred E.");
@ -129,8 +125,7 @@ public class JdbcAggregateTemplateUnitTests {
verifyNoInteractions(eventPublisher); verifyNoInteractions(eventPublisher);
} }
@Test @Test // GH-1137
// GH-1137
void savePreparesInstanceWithInitialVersion_onInsert() { void savePreparesInstanceWithInitialVersion_onInsert() {
EntityWithVersion entity = new EntityWithVersion(1L); EntityWithVersion entity = new EntityWithVersion(1L);
@ -145,8 +140,7 @@ public class JdbcAggregateTemplateUnitTests {
assertThat(afterConvert.getVersion()).isEqualTo(0L); assertThat(afterConvert.getVersion()).isEqualTo(0L);
} }
@Test @Test // GH-1137
// GH-1137
void savePreparesInstanceWithInitialVersion_onInsert_whenVersionPropertyIsImmutable() { void savePreparesInstanceWithInitialVersion_onInsert_whenVersionPropertyIsImmutable() {
EntityWithImmutableVersion entity = new EntityWithImmutableVersion(1L, null); EntityWithImmutableVersion entity = new EntityWithImmutableVersion(1L, null);
@ -161,8 +155,7 @@ public class JdbcAggregateTemplateUnitTests {
assertThat(afterConvert.getVersion()).isEqualTo(0L); assertThat(afterConvert.getVersion()).isEqualTo(0L);
} }
@Test @Test // GH-1137
// GH-1137
void savePreparesInstanceWithInitialVersion_onInsert_whenVersionPropertyIsPrimitiveType() { void savePreparesInstanceWithInitialVersion_onInsert_whenVersionPropertyIsPrimitiveType() {
EntityWithPrimitiveVersion entity = new EntityWithPrimitiveVersion(1L); EntityWithPrimitiveVersion entity = new EntityWithPrimitiveVersion(1L);
@ -177,8 +170,7 @@ public class JdbcAggregateTemplateUnitTests {
assertThat(afterConvert.getVersion()).isEqualTo(1L); assertThat(afterConvert.getVersion()).isEqualTo(1L);
} }
@Test @Test // GH-1137
// GH-1137
void savePreparesInstanceWithInitialVersion_onInsert__whenVersionPropertyIsImmutableAndPrimitiveType() { void savePreparesInstanceWithInitialVersion_onInsert__whenVersionPropertyIsImmutableAndPrimitiveType() {
EntityWithImmutablePrimitiveVersion entity = new EntityWithImmutablePrimitiveVersion(1L, 0L); EntityWithImmutablePrimitiveVersion entity = new EntityWithImmutablePrimitiveVersion(1L, 0L);
@ -194,8 +186,7 @@ public class JdbcAggregateTemplateUnitTests {
assertThat(afterConvert.getVersion()).isEqualTo(1L); assertThat(afterConvert.getVersion()).isEqualTo(1L);
} }
@Test @Test // GH-1137
// GH-1137
void savePreparesChangeWithPreviousVersion_onUpdate() { void savePreparesChangeWithPreviousVersion_onUpdate() {
when(dataAccessStrategy.updateWithVersion(any(), any(), any())).thenReturn(true); when(dataAccessStrategy.updateWithVersion(any(), any(), any())).thenReturn(true);
@ -212,8 +203,7 @@ public class JdbcAggregateTemplateUnitTests {
assertThat(aggregateChange.getPreviousVersion()).isEqualTo(1L); assertThat(aggregateChange.getPreviousVersion()).isEqualTo(1L);
} }
@Test @Test // GH-1137
// GH-1137
void savePreparesInstanceWithNextVersion_onUpdate() { void savePreparesInstanceWithNextVersion_onUpdate() {
when(dataAccessStrategy.updateWithVersion(any(), any(), any())).thenReturn(true); when(dataAccessStrategy.updateWithVersion(any(), any(), any())).thenReturn(true);
@ -230,8 +220,7 @@ public class JdbcAggregateTemplateUnitTests {
assertThat(afterConvert.getVersion()).isEqualTo(2L); assertThat(afterConvert.getVersion()).isEqualTo(2L);
} }
@Test @Test // GH-1137
// GH-1137
void savePreparesInstanceWithNextVersion_onUpdate_whenVersionPropertyIsImmutable() { void savePreparesInstanceWithNextVersion_onUpdate_whenVersionPropertyIsImmutable() {
when(dataAccessStrategy.updateWithVersion(any(), any(), any())).thenReturn(true); when(dataAccessStrategy.updateWithVersion(any(), any(), any())).thenReturn(true);
@ -246,8 +235,7 @@ public class JdbcAggregateTemplateUnitTests {
assertThat(afterConvert.getVersion()).isEqualTo(2L); assertThat(afterConvert.getVersion()).isEqualTo(2L);
} }
@Test @Test // GH-1137
// GH-1137
void deletePreparesChangeWithPreviousVersion_onDeleteByInstance() { void deletePreparesChangeWithPreviousVersion_onDeleteByInstance() {
EntityWithImmutableVersion entity = new EntityWithImmutableVersion(1L, 1L); EntityWithImmutableVersion entity = new EntityWithImmutableVersion(1L, 1L);
@ -263,7 +251,7 @@ public class JdbcAggregateTemplateUnitTests {
} }
@Test // DATAJDBC-393 @Test // DATAJDBC-393
public void callbackOnDelete() { void callbackOnDelete() {
SampleEntity first = new SampleEntity(23L, "Alfred"); SampleEntity first = new SampleEntity(23L, "Alfred");
SampleEntity second = new SampleEntity(23L, "Alfred E."); SampleEntity second = new SampleEntity(23L, "Alfred E.");
@ -277,7 +265,7 @@ public class JdbcAggregateTemplateUnitTests {
} }
@Test // DATAJDBC-101 @Test // DATAJDBC-101
public void callbackOnLoadSorted() { void callbackOnLoadSorted() {
SampleEntity alfred1 = new SampleEntity(23L, "Alfred"); SampleEntity alfred1 = new SampleEntity(23L, "Alfred");
SampleEntity alfred2 = new SampleEntity(23L, "Alfred E."); SampleEntity alfred2 = new SampleEntity(23L, "Alfred E.");
@ -299,7 +287,7 @@ public class JdbcAggregateTemplateUnitTests {
} }
@Test // DATAJDBC-101 @Test // DATAJDBC-101
public void callbackOnLoadPaged() { void callbackOnLoadPaged() {
SampleEntity alfred1 = new SampleEntity(23L, "Alfred"); SampleEntity alfred1 = new SampleEntity(23L, "Alfred");
SampleEntity alfred2 = new SampleEntity(23L, "Alfred E."); SampleEntity alfred2 = new SampleEntity(23L, "Alfred E.");
@ -321,35 +309,34 @@ public class JdbcAggregateTemplateUnitTests {
} }
@Test // GH-1401 @Test // GH-1401
public void saveAllWithEmptyListDoesNothing() { void saveAllWithEmptyListDoesNothing() {
assertThat(template.saveAll(emptyList())).isEmpty(); assertThat(template.saveAll(emptyList())).isEmpty();
} }
@Test // GH-1401 @Test // GH-1401
public void insertAllWithEmptyListDoesNothing() { void insertAllWithEmptyListDoesNothing() {
assertThat(template.insertAll(emptyList())).isEmpty(); assertThat(template.insertAll(emptyList())).isEmpty();
} }
@Test // GH-1401 @Test // GH-1401
public void updateAllWithEmptyListDoesNothing() { void updateAllWithEmptyListDoesNothing() {
assertThat(template.updateAll(emptyList())).isEmpty(); assertThat(template.updateAll(emptyList())).isEmpty();
} }
@Test // GH-1401 @Test // GH-1401
public void deleteAllWithEmptyListDoesNothing() { void deleteAllWithEmptyListDoesNothing() {
template.deleteAll(emptyList()); template.deleteAll(emptyList());
} }
@Test // GH-1401 @Test // GH-1401
public void deleteAllByIdWithEmptyListDoesNothing() { void deleteAllByIdWithEmptyListDoesNothing() {
template.deleteAllById(emptyList(), SampleEntity.class); template.deleteAllById(emptyList(), SampleEntity.class);
} }
private static class SampleEntity { private static class SampleEntity {
@Column("id1") @Column("id1")
@Id @Id private Long id;
private Long id;
private String name; private String name;
@ -366,11 +353,11 @@ public class JdbcAggregateTemplateUnitTests {
return this.name; return this.name;
} }
public void setId(Long id) { void setId(Long id) {
this.id = id; this.id = id;
} }
public void setName(String name) { void setName(String name) {
this.name = name; this.name = name;
} }
} }
@ -378,11 +365,9 @@ public class JdbcAggregateTemplateUnitTests {
private static class EntityWithVersion { private static class EntityWithVersion {
@Column("id1") @Column("id1")
@Id @Id private final Long id;
private final Long id;
@Version @Version private Long version;
private Long version;
public EntityWithVersion(Long id) { public EntityWithVersion(Long id) {
this.id = id; this.id = id;
@ -396,7 +381,7 @@ public class JdbcAggregateTemplateUnitTests {
return this.version; return this.version;
} }
public void setVersion(Long version) { void setVersion(Long version) {
this.version = version; this.version = version;
} }
} }
@ -404,11 +389,9 @@ public class JdbcAggregateTemplateUnitTests {
private static class EntityWithImmutableVersion { private static class EntityWithImmutableVersion {
@Column("id1") @Column("id1")
@Id @Id private final Long id;
private final Long id;
@Version @Version private final Long version;
private final Long version;
public EntityWithImmutableVersion(Long id, Long version) { public EntityWithImmutableVersion(Long id, Long version) {
this.id = id; this.id = id;
@ -427,11 +410,9 @@ public class JdbcAggregateTemplateUnitTests {
private static class EntityWithPrimitiveVersion { private static class EntityWithPrimitiveVersion {
@Column("id1") @Column("id1")
@Id @Id private final Long id;
private final Long id;
@Version @Version private long version;
private long version;
public EntityWithPrimitiveVersion(Long id) { public EntityWithPrimitiveVersion(Long id) {
this.id = id; this.id = id;
@ -445,7 +426,7 @@ public class JdbcAggregateTemplateUnitTests {
return this.version; return this.version;
} }
public void setVersion(long version) { void setVersion(long version) {
this.version = version; this.version = version;
} }
} }
@ -453,11 +434,9 @@ public class JdbcAggregateTemplateUnitTests {
private static class EntityWithImmutablePrimitiveVersion { private static class EntityWithImmutablePrimitiveVersion {
@Column("id1") @Column("id1")
@Id @Id private final Long id;
private final Long id;
@Version @Version private final long version;
private final long version;
public EntityWithImmutablePrimitiveVersion(Long id, long version) { public EntityWithImmutablePrimitiveVersion(Long id, long version) {
this.id = id; this.id = id;

Write Preview
Loading…
Cancel
Save