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

DATAJDBC-485 - Fixes the Travis build.

Browse Source 
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.
This commit is contained in:
Jens Schauder
2020-02-07 15:53:28 +01:00
parent 06805b1bc4
commit 1da008f331
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@@ -1,8 +1,5 @@
language: java
jdk:
- oraclejdk8
cache:
directories:
- $HOME/.m2
@@ -14,4 +11,6 @@ services:
install: true
script: "mvn clean dependency:list test -Pall-dbs -Dsort -U"
script:
- "./mvnw -version"
- "./mvnw -Pjava11 clean dependency:list test -Pall-dbs${NO_JACOCO:+',no-jacoco'} -Dsort -U"

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

@@ -34,7 +34,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Primary;
import org.springframework.context.annotation.Profile;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.Id;
@@ -59,7 +58,7 @@ public class EnableJdbcAuditingHsqlIntegrationTests {
SoftAssertions softly = new SoftAssertions();
@Test
@Test // DATAJDBC-204
public void auditForAnnotatedEntity() {
configureRepositoryWith( //
@@ -73,13 +72,20 @@ public class EnableJdbcAuditingHsqlIntegrationTests {
AuditingAnnotatedDummyEntity entity = repository.save(new AuditingAnnotatedDummyEntity());
softly.assertThat(entity.id).isNotNull();
softly.assertThat(entity.getCreatedBy()).isEqualTo("user01");
softly.assertThat(entity.getCreatedDate()).isAfter(now);
softly.assertThat(entity.getLastModifiedBy()).isEqualTo("user01");
softly.assertThat(entity.getLastModifiedDate()).isAfterOrEqualTo(entity.getCreatedDate());
softly.assertThat(entity.getLastModifiedDate()).isAfter(now);
softly.assertThat(repository.findById(entity.id).get()).isEqualTo(entity);
softly.assertThat(entity.id).as("id not null").isNotNull();
softly.assertThat(entity.getCreatedBy()).as("created by set").isEqualTo("user01");
softly.assertThat(entity.getCreatedDate()).as("created date set").isAfter(now);
softly.assertThat(entity.getLastModifiedBy()).as("modified by set").isEqualTo("user01");
softly.assertThat(entity.getLastModifiedDate()).as("modified date set")
.isAfterOrEqualTo(entity.getCreatedDate());
softly.assertThat(entity.getLastModifiedDate()).as("modified date after instance creation").isAfter(now);
AuditingAnnotatedDummyEntity reloaded = repository.findById(entity.id).get();
softly.assertThat(reloaded.getCreatedBy()).as("reload created by").isNotNull();
softly.assertThat(reloaded.getCreatedDate()).as("reload created date").isNotNull();
softly.assertThat(reloaded.getLastModifiedBy()).as("reload modified by").isNotNull();
softly.assertThat(reloaded.getLastModifiedDate()).as("reload modified date").isNotNull();
LocalDateTime beforeCreatedDate = entity.getCreatedDate();
LocalDateTime beforeLastModifiedDate = entity.getLastModifiedDate();
@@ -92,11 +98,20 @@ public class EnableJdbcAuditingHsqlIntegrationTests {
entity = repository.save(entity);
softly.assertThat(entity.getCreatedBy()).isEqualTo("user01");
softly.assertThat(entity.getCreatedDate()).isEqualTo(beforeCreatedDate);
softly.assertThat(entity.getLastModifiedBy()).isEqualTo("user02");
softly.assertThat(entity.getLastModifiedDate()).isAfter(beforeLastModifiedDate);
softly.assertThat(repository.findById(entity.id).get()).isEqualTo(entity);
softly.assertThat(entity.getCreatedBy()).as("created by unchanged").isEqualTo("user01");
softly.assertThat(entity.getCreatedDate()).as("created date unchanged").isEqualTo(beforeCreatedDate);
softly.assertThat(entity.getLastModifiedBy()).as("modified by updated").isEqualTo("user02");
softly.assertThat(entity.getLastModifiedDate()).as("modified date updated")
.isAfter(beforeLastModifiedDate);
reloaded = repository.findById(entity.id).get();
softly.assertThat(reloaded.getCreatedBy()).as("2. reload created by").isNotNull();
softly.assertThat(reloaded.getCreatedDate()).as("2. reload created date").isNotNull();
softly.assertThat(reloaded.getLastModifiedBy()).as("2. reload modified by").isNotNull();
softly.assertThat(reloaded.getLastModifiedDate()).as("2. reload modified date").isNotNull();
softly.assertAll();
});
}