From f8d2b7e4baeefd44064ef1b07cb7c356b1f2d3e0 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 26 Nov 2014 12:55:46 +0100 Subject: [PATCH] DATAJPA-632 - Fix SimpleJpaQueryUnit test after cleanups in Spring Data Commons. We now use a JpaQueryMethod instance rather than a mock as isPageQuery() cannot be mocked anymore as it has been made final. Related issue: DATACMNS-601. --- .../jpa/repository/query/SimpleJpaQueryUnitTests.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 5157b3781..b47df59fd 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 @@ -89,14 +89,10 @@ public class SimpleJpaQueryUnitTests { } @Test - @SuppressWarnings({ "rawtypes", "unchecked" }) public void prefersDeclaredCountQueryOverCreatingOne() throws Exception { - method = mock(JpaQueryMethod.class); - when(method.getCountQuery()).thenReturn("foo"); - when(method.getParameters()).thenReturn( - new JpaParameters(SimpleJpaQueryUnitTests.class.getMethod("prefersDeclaredCountQueryOverCreatingOne"))); - when(method.getEntityInformation()).thenReturn((JpaEntityMetadata) new DefaultJpaEntityMetadata(User.class)); + method = new JpaQueryMethod(SimpleJpaQueryUnitTests.class.getMethod("prefersDeclaredCountQueryOverCreatingOne"), + metadata, extractor); // mock(JpaQueryMethod.class); when(em.createQuery("foo", Long.class)).thenReturn(query); SimpleJpaQuery jpaQuery = new SimpleJpaQuery(method, em, "select u from User u", EVALUATION_CONTEXT_PROVIDER,