Skip to content

Commit 1da008f

Browse files
committed
DATAJDBC-485 - Fixes the Travis build.
Uses the .travis.yml from the master branch. But without the check for the microsoft license acceptance which isn't present here. Changes one test to not be dependent on nanosecond precision of time values.
1 parent 06805b1 commit 1da008f

File tree

2 files changed

+32
-18
lines changed

2 files changed

+32
-18
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
language: java
22

3-
jdk:
4-
- oraclejdk8
5-
63
cache:
74
directories:
85
- $HOME/.m2
@@ -14,4 +11,6 @@ services:
1411

1512
install: true
1613

17-
script: "mvn clean dependency:list test -Pall-dbs -Dsort -U"
14+
script:
15+
- "./mvnw -version"
16+
- "./mvnw -Pjava11 clean dependency:list test -Pall-dbs${NO_JACOCO:+',no-jacoco'} -Dsort -U"

src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.ComponentScan;
3636
import org.springframework.context.annotation.Primary;
37-
import org.springframework.context.annotation.Profile;
3837
import org.springframework.data.annotation.CreatedBy;
3938
import org.springframework.data.annotation.CreatedDate;
4039
import org.springframework.data.annotation.Id;
@@ -59,7 +58,7 @@ public class EnableJdbcAuditingHsqlIntegrationTests {
5958

6059
SoftAssertions softly = new SoftAssertions();
6160

62-
@Test
61+
@Test // DATAJDBC-204
6362
public void auditForAnnotatedEntity() {
6463

6564
configureRepositoryWith( //
@@ -73,13 +72,20 @@ public void auditForAnnotatedEntity() {
7372

7473
AuditingAnnotatedDummyEntity entity = repository.save(new AuditingAnnotatedDummyEntity());
7574

76-
softly.assertThat(entity.id).isNotNull();
77-
softly.assertThat(entity.getCreatedBy()).isEqualTo("user01");
78-
softly.assertThat(entity.getCreatedDate()).isAfter(now);
79-
softly.assertThat(entity.getLastModifiedBy()).isEqualTo("user01");
80-
softly.assertThat(entity.getLastModifiedDate()).isAfterOrEqualTo(entity.getCreatedDate());
81-
softly.assertThat(entity.getLastModifiedDate()).isAfter(now);
82-
softly.assertThat(repository.findById(entity.id).get()).isEqualTo(entity);
75+
softly.assertThat(entity.id).as("id not null").isNotNull();
76+
softly.assertThat(entity.getCreatedBy()).as("created by set").isEqualTo("user01");
77+
softly.assertThat(entity.getCreatedDate()).as("created date set").isAfter(now);
78+
softly.assertThat(entity.getLastModifiedBy()).as("modified by set").isEqualTo("user01");
79+
softly.assertThat(entity.getLastModifiedDate()).as("modified date set")
80+
.isAfterOrEqualTo(entity.getCreatedDate());
81+
softly.assertThat(entity.getLastModifiedDate()).as("modified date after instance creation").isAfter(now);
82+
83+
AuditingAnnotatedDummyEntity reloaded = repository.findById(entity.id).get();
84+
85+
softly.assertThat(reloaded.getCreatedBy()).as("reload created by").isNotNull();
86+
softly.assertThat(reloaded.getCreatedDate()).as("reload created date").isNotNull();
87+
softly.assertThat(reloaded.getLastModifiedBy()).as("reload modified by").isNotNull();
88+
softly.assertThat(reloaded.getLastModifiedDate()).as("reload modified date").isNotNull();
8389

8490
LocalDateTime beforeCreatedDate = entity.getCreatedDate();
8591
LocalDateTime beforeLastModifiedDate = entity.getLastModifiedDate();
@@ -92,11 +98,20 @@ public void auditForAnnotatedEntity() {
9298

9399
entity = repository.save(entity);
94100

95-
softly.assertThat(entity.getCreatedBy()).isEqualTo("user01");
96-
softly.assertThat(entity.getCreatedDate()).isEqualTo(beforeCreatedDate);
97-
softly.assertThat(entity.getLastModifiedBy()).isEqualTo("user02");
98-
softly.assertThat(entity.getLastModifiedDate()).isAfter(beforeLastModifiedDate);
99-
softly.assertThat(repository.findById(entity.id).get()).isEqualTo(entity);
101+
softly.assertThat(entity.getCreatedBy()).as("created by unchanged").isEqualTo("user01");
102+
softly.assertThat(entity.getCreatedDate()).as("created date unchanged").isEqualTo(beforeCreatedDate);
103+
softly.assertThat(entity.getLastModifiedBy()).as("modified by updated").isEqualTo("user02");
104+
softly.assertThat(entity.getLastModifiedDate()).as("modified date updated")
105+
.isAfter(beforeLastModifiedDate);
106+
107+
reloaded = repository.findById(entity.id).get();
108+
109+
softly.assertThat(reloaded.getCreatedBy()).as("2. reload created by").isNotNull();
110+
softly.assertThat(reloaded.getCreatedDate()).as("2. reload created date").isNotNull();
111+
softly.assertThat(reloaded.getLastModifiedBy()).as("2. reload modified by").isNotNull();
112+
softly.assertThat(reloaded.getLastModifiedDate()).as("2. reload modified date").isNotNull();
113+
114+
softly.assertAll();
100115
});
101116
}
102117

0 commit comments

Comments
 (0)