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

DATAJPA-885 - Polishing.

Browse Source 
Some cleanups in some test cases.
This commit is contained in:
Oliver Gierke
2016-04-09 15:41:20 +02:00
parent 38a875e584
commit 237a438e07
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/java/org/springframework/data/jpa/repository/query/PartTreeJpaQueryIntegrationTests.java
View File

@@ -34,10 +34,12 @@ import javax.persistence.TemporalType;
import org.hibernate.Version;
import org.hibernate.ejb.HibernateQuery;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.springframework.data.annotation.PersistenceConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
@@ -66,6 +68,13 @@ public class PartTreeJpaQueryIntegrationTests {
@PersistenceContext EntityManager entityManager;
PersistenceProvider provider;
@Before
public void setUp() {
this.provider = PersistenceProvider.fromEntityManager(entityManager);
}
/**
* @see DATADOC-90
* @throws Exception
@@ -74,8 +83,7 @@ public class PartTreeJpaQueryIntegrationTests {
public void test() throws Exception {
JpaQueryMethod queryMethod = getQueryMethod("findByFirstname", String.class, Pageable.class);
PartTreeJpaQuery jpaQuery = new PartTreeJpaQuery(queryMethod, entityManager,
PersistenceProvider.fromEntityManager(entityManager));
PartTreeJpaQuery jpaQuery = new PartTreeJpaQuery(queryMethod, entityManager, provider);
jpaQuery.createQuery(new Object[] { "Matthews", new PageRequest(0, 1) });
jpaQuery.createQuery(new Object[] { "Matthews", new PageRequest(0, 1) });
@@ -102,8 +110,7 @@ public class PartTreeJpaQueryIntegrationTests {
public void recreatesQueryIfNullValueIsGiven() throws Exception {
JpaQueryMethod queryMethod = getQueryMethod("findByFirstname", String.class, Pageable.class);
PartTreeJpaQuery jpaQuery = new PartTreeJpaQuery(queryMethod, entityManager,
PersistenceProvider.fromEntityManager(entityManager));
PartTreeJpaQuery jpaQuery = new PartTreeJpaQuery(queryMethod, entityManager, provider);
Query query = jpaQuery.createQuery(new Object[] { "Matthews", new PageRequest(0, 1) });

12
src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java
View File

@@ -348,6 +348,18 @@ public class StringQueryUnitTests {
assertThat(new StringQuery("select a from A a").hasConstructorExpression(), is(false));
}
/**
* @see DATAJPA-886
* @see JPA 2.1 specification, section 4.8
*/
@Test
public void detectsConstructorExpressionForDefaultConstructor() {
// Parentheses required
assertThat(new StringQuery("select new Dto() from A a").hasConstructorExpression(), is(true));
assertThat(new StringQuery("select new Dto from A a").hasConstructorExpression(), is(false));
}
private void assertPositionalBinding(Class<? extends ParameterBinding> bindingType, Integer position,
ParameterBinding expectedBinding) {