From d168e285f980c05e4395bf084d924ca4512cf788 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 19 Oct 2017 14:46:17 +0200 Subject: [PATCH] DATAJPA-1205 - Polishing. Moved to AssertJ for assertions in QuerydslRepositorySupportIntegrationTests. Declare BeanFactoryPostProcessor as static bean. Original pull request: #227. --- ...erydslRepositorySupportIntegrationTests.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java index e3b154d73..0998089b9 100644 --- a/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupportIntegrationTests.java @@ -15,8 +15,7 @@ */ package org.springframework.data.jpa.repository.support; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.*; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; @@ -62,7 +61,7 @@ public class QuerydslRepositorySupportIntegrationTests { } @Bean - EntityManagerBeanDefinitionRegistrarPostProcessor entityManagerBeanDefinitionRegistrarPostProcessor() { + static EntityManagerBeanDefinitionRegistrarPostProcessor entityManagerBeanDefinitionRegistrarPostProcessor() { return new EntityManagerBeanDefinitionRegistrarPostProcessor(); } @@ -99,21 +98,23 @@ public class QuerydslRepositorySupportIntegrationTests { @Test public void createsRepoCorrectly() { - assertThat(repository, is(notNullValue())); + assertThat(repository).isNotNull(); } @Test // DATAJPA-135 public void createsReconfiguredRepoAccordingly() { - assertThat(reconfiguredRepo, is(notNullValue())); - assertThat(reconfiguredRepo.getEntityManager().getEntityManagerFactory(), is(em.getEntityManagerFactory())); + assertThat(reconfiguredRepo).isNotNull(); + assertThat(reconfiguredRepo.getEntityManager().getEntityManagerFactory()) // + .isEqualTo(em.getEntityManagerFactory()); } @Test // DATAJPA-1205 public void createsRepositoryWithCustomImplementationUsingQueryDsl() { - assertThat(querydslCustom, is(notNullValue())); - assertThat(querydslCustom.getEntityManager().getEntityManagerFactory(), is(em.getEntityManagerFactory())); + assertThat(querydslCustom).isNotNull(); + assertThat(querydslCustom.getEntityManager().getEntityManagerFactory()) // + .isEqualTo(em.getEntityManagerFactory()); } static class ReconfiguringUserRepositoryImpl extends QuerydslRepositorySupport {