From 6128cfdc2c51eb442827cb458c2c964ce87a1a70 Mon Sep 17 00:00:00 2001 From: "Greg L. Turnquist" Date: Thu, 5 May 2022 10:31:49 -0500 Subject: [PATCH] Polishing. See #1943. --- .../data/jpa/domain/SpecificationUnitTests.java | 12 ++++++------ .../data/jpa/repository/UserRepositoryTests.java | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java index 695ee67b6..8f08e7d6f 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java @@ -21,13 +21,13 @@ import static org.springframework.data.jpa.domain.Specification.*; import static org.springframework.data.jpa.domain.Specification.not; import static org.springframework.util.SerializationUtils.*; -import java.io.Serializable; - import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; +import java.io.Serializable; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -119,7 +119,7 @@ class SpecificationUnitTests implements Serializable { assertThat(specification.toPredicate(root, query, builder)).isEqualTo(predicate); } - @Test // DATAJPA-1651 + @Test // GH-1943 public void allOfConcatenatesNull() { Specification specification = Specification.allOf(null, spec, null); @@ -128,7 +128,7 @@ class SpecificationUnitTests implements Serializable { assertThat(specification.toPredicate(root, query, builder)).isEqualTo(predicate); } - @Test // DATAJPA-1651 + @Test // GH-1943 public void anyOfConcatenatesNull() { Specification specification = Specification.anyOf(null, spec, null); @@ -137,7 +137,7 @@ class SpecificationUnitTests implements Serializable { assertThat(specification.toPredicate(root, query, builder)).isEqualTo(predicate); } - @Test // DATAJPA-1651 + @Test // GH-1943 public void emptyAllOfReturnsEmptySpecification() { Specification specification = Specification.allOf(); @@ -146,7 +146,7 @@ class SpecificationUnitTests implements Serializable { assertThat(specification.toPredicate(root, query, builder)).isNull(); } - @Test // DATAJPA-1651 + @Test // GH-1943 public void emptyAnyOfReturnsEmptySpecification() { Specification specification = Specification.anyOf(); diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java index d120dee13..59b45711c 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java @@ -490,7 +490,7 @@ public class UserRepositoryTests { .isThrownBy(() -> repository.findOne(userHasFirstnameLike("e"))); } - @Test // DATAJPA-1651 + @Test // GH-1943 void executesCombinedSpecificationsCorrectly() { flushTestUsers(); @@ -516,7 +516,7 @@ public class UserRepositoryTests { assertThat(repository.findAll(spec)).containsOnly(secondUser); } - @Test // DATAJPA-1651 + @Test // GH-1943 void executesCombinedSpecificationsWithPageableCorrectly() { flushTestUsers(); @@ -623,14 +623,14 @@ public class UserRepositoryTests { assertThat(repository.count()).isEqualTo(3L); } - @Test // DATAJPA-1651 + @Test void executesPagedSpecificationsCorrectly() { Page result = executeSpecWithSort(Sort.unsorted()); assertThat(result.getContent()).isSubsetOf(firstUser, thirdUser); } - @Test // DATAJPA-1651 + @Test void executesPagedSpecificationsWithSortCorrectly() { Page result = executeSpecWithSort(Sort.by(Direction.ASC, "lastname")); @@ -638,7 +638,7 @@ public class UserRepositoryTests { assertThat(result.getContent()).contains(firstUser).doesNotContain(secondUser, thirdUser); } - @Test // DATAJPA-1651 + @Test void executesPagedSpecificationWithSortCorrectly2() { Page result = executeSpecWithSort(Sort.by(Direction.DESC, "lastname"));