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

Migrates JPA examples to JUnit 5.

Browse Source 
Original pull request #602
Related tickest #583
This commit is contained in:
divya_jnu08
2021-01-25 20:54:57 +05:30
committed by Jens Schauder
parent 06eed6ec50
commit 6a894d9334
28 changed files with 362 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jpa/example/src/test/java/example/springdata/jpa/auditing/AuditableUserSample.java
View File

@@ -15,15 +15,16 @@
*/
package example.springdata.jpa.auditing;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.transaction.annotation.Transactional;
@@ -31,7 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
* @author Oliver Gierke
* @author Thomas Darimont
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@Transactional
@SpringBootTest
public class AuditableUserSample {
@@ -43,7 +44,7 @@ public class AuditableUserSample {
@Test
public void auditEntityCreation() throws Exception {
assertThat(ReflectionTestUtils.getField(listener, "handler"), is(notNullValue()));
assertThat(ReflectionTestUtils.getField(listener, "handler"),is(notNullValue()));
AuditableUser user = new AuditableUser();
user.setUsername("username");

10
jpa/example/src/test/java/example/springdata/jpa/basics/BasicFactorySetup.java
View File

@@ -24,9 +24,9 @@ import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
/**
@@ -48,7 +48,7 @@ public class BasicFactorySetup {
*
* @throws Exception
*/
@Before
@BeforeEach
public void setUp() {
em = factory.createEntityManager();
@@ -69,7 +69,7 @@ public class BasicFactorySetup {
/**
* Rollback transaction.
*/
@After
@AfterEach
public void tearDown() {
em.getTransaction().rollback();

10
jpa/example/src/test/java/example/springdata/jpa/basics/BasicSample.java
View File

@@ -27,9 +27,9 @@ import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
import org.springframework.data.repository.CrudRepository;
@@ -47,7 +47,7 @@ public class BasicSample {
/**
* Sets up a {@link SimpleJpaRepository} instance.
*/
@Before
@BeforeEach
public void setUp() {
EntityManagerFactory factory = Persistence.createEntityManagerFactory("jpa.sample.plain");
@@ -58,7 +58,7 @@ public class BasicSample {
em.getTransaction().begin();
}
@After
@AfterEach
public void tearDown() {
em.getTransaction().rollback();
}

10
jpa/example/src/test/java/example/springdata/jpa/caching/CachingRepositoryTests.java
View File

@@ -15,16 +15,16 @@
*/
package example.springdata.jpa.caching;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
* @author Thomas Darimont
* @author Andrea Rizzini
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@Transactional
@SpringBootTest
public class CachingRepositoryTests {

10
jpa/example/src/test/java/example/springdata/jpa/compositions/ComposedRepositoryTests.java
View File

@@ -15,15 +15,15 @@
*/
package example.springdata.jpa.compositions;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -31,7 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@Transactional
@SpringBootTest
public class ComposedRepositoryTests {

10
jpa/example/src/test/java/example/springdata/jpa/custom/UserRepositoryCustomizationTests.java
View File

@@ -15,15 +15,15 @@
*/
package example.springdata.jpa.custom;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -32,7 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
* @author Oliver Gierke
* @author Thomas Darimont
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@Transactional
@SpringBootTest
// @ActiveProfiles("jdbc") // Uncomment @ActiveProfiles to enable the JDBC Implementation of the custom repository

10
jpa/example/src/test/java/example/springdata/jpa/customall/UserRepositoryCustomizationTests.java
View File

@@ -15,13 +15,13 @@
*/
package example.springdata.jpa.customall;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -30,7 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
* @author Oliver Gierke
* @soundtrack Elen - It's you (Elen)
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@Transactional
@SpringBootTest
public class UserRepositoryCustomizationTests {

14
jpa/example/src/test/java/example/springdata/jpa/projections/CustomerRepositoryIntegrationTest.java
View File

@@ -15,14 +15,14 @@
*/
package example.springdata.jpa.projections;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Collection;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
@@ -32,7 +32,7 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.projection.TargetAware;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -40,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
*
* @author Oliver Gierke
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
@SpringBootTest
@Transactional
public class CustomerRepositoryIntegrationTest {
@@ -53,7 +53,7 @@ public class CustomerRepositoryIntegrationTest {
Customer dave, carter;
@Before
@BeforeEach
public void setUp() {
this.dave = customers.save(new Customer("Dave", "Matthews"));

21
jpa/example/src/test/java/example/springdata/jpa/simple/SimpleUserRepositoryTests.java
View File

@@ -16,24 +16,27 @@
package example.springdata.jpa.simple;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.assertThat;
import static org.springframework.data.domain.Sort.Direction.*;
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.iterableWithSize;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.springframework.data.domain.Sort.Direction.ASC;
import static org.springframework.data.domain.Sort.Direction.DESC;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.Sort;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -43,7 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
* @author Thomas Darimont
* @author Christoph Strobl
*/
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@Transactional
@SpringBootTest
public class SimpleUserRepositoryTests {
@@ -51,7 +54,7 @@ public class SimpleUserRepositoryTests {
@Autowired SimpleUserRepository repository;
User user;
@Before
@BeforeEach
public void setUp() {
user = new User();