From 45863dc881c0f098023ab027df69b97d6b52a6b0 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Fri, 11 Dec 2020 11:43:05 +0100 Subject: [PATCH] DATAJPA-1827 - Polishing. Fixing tests. Original pull request: #438. --- .../jpa/repository/query/JpaQueryExecutionUnitTests.java | 2 +- .../data/jpa/repository/query/JpaQueryMethodUnitTests.java | 6 ++++++ .../data/jpa/repository/query/NamedQueryUnitTests.java | 5 +++++ .../data/jpa/repository/query/SimpleJpaQueryUnitTests.java | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java index 0078ca87c..4c9c16bd8 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryExecutionUnitTests.java @@ -90,7 +90,7 @@ public class JpaQueryExecutionUnitTests { } @Test // DATAJPA-1827 - void supportsModifyingResultsUsingWrappers() throws Exception { + public void supportsModifyingResultsUsingWrappers() throws Exception { Method method = VavrRepository.class.getMethod("updateUsingVavrMethod"); DefaultRepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(VavrRepository.class); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java index 14885c127..7e8d457d9 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryMethodUnitTests.java @@ -32,6 +32,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.core.annotation.AliasFor; import org.springframework.data.domain.Page; @@ -54,6 +55,8 @@ import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.core.support.DefaultRepositoryMetadata; import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.QueryMethod; +import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; /** * Unit test for {@link QueryMethod}. @@ -94,6 +97,9 @@ public class JpaQueryMethodUnitTests { queryMethodWithCustomEntityFetchGraph = ValidRepository.class.getMethod("queryMethodWithCustomEntityFetchGraph", Integer.class); + + when(metadata.getReturnType(Mockito.any(Method.class))).thenReturn((TypeInformation) ClassTypeInformation.from(Void.class)); + } @Test diff --git a/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java index 3cd21ab5b..490b3d290 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/NamedQueryUnitTests.java @@ -29,6 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -37,6 +38,8 @@ import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.projection.SpelAwareProxyProjectionFactory; import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.query.QueryCreationException; +import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; /** * Unit tests for {@link NamedQuery}. @@ -44,6 +47,7 @@ import org.springframework.data.repository.query.QueryCreationException; * @author Oliver Gierke * @author Thomas Darimont * @author Mark Paluch + * @author Jens Schauder */ @RunWith(MockitoJUnitRunner.class) public class NamedQueryUnitTests { @@ -65,6 +69,7 @@ public class NamedQueryUnitTests { method = SampleRepository.class.getMethod("foo", Pageable.class); when(metadata.getDomainType()).thenReturn((Class) String.class); when(metadata.getReturnedDomainClass(method)).thenReturn((Class) String.class); + when(metadata.getReturnType(Mockito.any(Method.class))).thenReturn((TypeInformation) ClassTypeInformation.from(String.class)); when(em.getMetamodel()).thenReturn(metamodel); when(em.getEntityManagerFactory()).thenReturn(emf); diff --git a/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java index 253c0b5b8..39410c212 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java @@ -52,6 +52,8 @@ import org.springframework.data.projection.SpelAwareProxyProjectionFactory; import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider; import org.springframework.data.repository.query.RepositoryQuery; +import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; import org.springframework.expression.spel.standard.SpelExpressionParser; /** @@ -96,6 +98,7 @@ public class SimpleJpaQueryUnitTests { when(emf.createEntityManager()).thenReturn(em); when(metadata.getDomainType()).thenReturn((Class) User.class); when(metadata.getReturnedDomainClass(Mockito.any(Method.class))).thenReturn((Class) User.class); + when(metadata.getReturnType(Mockito.any(Method.class))).thenReturn((TypeInformation)ClassTypeInformation.from(User.class)); Method setUp = UserRepository.class.getMethod("findByLastname", String.class); method = new JpaQueryMethod(setUp, metadata, factory, extractor);