From 99e04dbcaee83b6360c9186d95d78f6d811ccb78 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 23 Nov 2011 12:27:26 +0100 Subject: [PATCH] DATACMNS-98 - Adapt refactorings. --- .../data/jpa/repository/query/JpaQueryMethodUnitTests.java | 7 +++++-- .../data/jpa/repository/query/NamedQueryUnitTests.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) 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 cfbe0516f..968f42355 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 @@ -17,6 +17,7 @@ package org.springframework.data.jpa.repository.query; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import java.lang.reflect.Method; import java.util.List; @@ -75,7 +76,8 @@ public class JpaQueryMethodUnitTests { @Test public void testname() { - JpaQueryMethod method = new JpaQueryMethod(repositoryMethod, metadata, extractor); + JpaQueryMethod method = new JpaQueryMethod(repositoryMethod, new DefaultRepositoryMetadata(UserRepository.class), + extractor); assertEquals("User.findByLastname", method.getNamedQueryName()); assertThat(method.isCollectionQuery(), is(true)); @@ -173,10 +175,11 @@ public class JpaQueryMethodUnitTests { @Test public void calculatesNamedQueryNamesCorrectly() throws SecurityException, NoSuchMethodException { + RepositoryMetadata metadata = new DefaultRepositoryMetadata(UserRepository.class); + JpaQueryMethod queryMethod = new JpaQueryMethod(repositoryMethod, metadata, extractor); assertThat(queryMethod.getNamedQueryName(), is("User.findByLastname")); - RepositoryMetadata metadata = new DefaultRepositoryMetadata(UserRepository.class); Method method = UserRepository.class.getMethod("renameAllUsersTo", String.class); queryMethod = new JpaQueryMethod(method, metadata, extractor); assertThat(queryMethod.getNamedQueryName(), is("User.renameAllUsersTo")); 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 a292b1bbf..e0aef304c 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 @@ -54,6 +54,7 @@ public class NamedQueryUnitTests { method = SampleRepository.class.getMethod("foo", Pageable.class); when(metadata.getDomainClass()).thenReturn((Class) String.class); + when(metadata.getReturnedDomainClass(method)).thenReturn((Class) String.class); } @Test(expected = QueryCreationException.class)