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

Migrate REST examples to JUnit 5.

Browse Source 
Original pull request: #620.
See #583.
This commit is contained in:
divya_jnu08
2021-04-29 12:44:04 +05:30
committed by Mark Paluch
parent e4f3438122
commit ce39a53448
11 changed files with 32 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rest/headers/src/test/java/example/springdata/rest/headers/ApplicationIntegrationTests.java
View File

@@ -16,13 +16,12 @@
package example.springdata.rest.headers;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.hamcrest.MatcherAssert.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
/**
* Integration tests to bootstrap the application.
@@ -30,7 +29,6 @@ import org.springframework.test.context.junit4.SpringRunner;
* @author Oliver Gierke
* @soundtrack The Intersphere - Out of phase (Live at Alte Feuerwache Mannheim)
*/
@RunWith(SpringRunner.class)
@SpringBootTest
public class ApplicationIntegrationTests {

9
rest/headers/src/test/java/example/springdata/rest/headers/CrossOriginIntegrationTests.java
View File

@@ -22,12 +22,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import java.net.URI;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
@@ -37,7 +35,6 @@ import org.springframework.web.context.WebApplicationContext;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest
public class CrossOriginIntegrationTests {
@@ -46,7 +43,7 @@ public class CrossOriginIntegrationTests {
MockMvc mvc;
@Before
@BeforeEach
public void setUp() {
this.mvc = MockMvcBuilders.webAppContextSetup(context).build();
}

9
rest/headers/src/test/java/example/springdata/rest/headers/WebIntegrationTests.java
View File

@@ -23,14 +23,12 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import java.net.URI;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.restdocs.config.RestDocumentationConfigurer;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
@@ -40,7 +38,6 @@ import org.springframework.web.util.UriTemplate;
* @author Oliver Gierke
* @soundtrack The Intersphere - Out of phase (Live at Alte Feuerwache Mannheim)
*/
@RunWith(SpringRunner.class)
@SpringBootTest
public class WebIntegrationTests {
@@ -49,7 +46,7 @@ public class WebIntegrationTests {
MockMvc mvc;
@Before
@BeforeEach
public void setUp() {
this.mvc = MockMvcBuilders.webAppContextSetup(context).//

5
rest/multi-store/src/test/java/example/springdata/multistore/ApplicationIntegrationTests.java
View File

@@ -21,11 +21,9 @@ import example.springdata.multistore.treasure.Treasure;
import example.springdata.multistore.treasure.TreasureRepository;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
/**
* Integration test to show the usage of repositories backed by different stores.
@@ -33,7 +31,6 @@ import org.springframework.test.context.junit4.SpringRunner;
* @author Oliver Gierke
*/
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
public class ApplicationIntegrationTests {

7
rest/projections/src/test/java/example/springdata/rest/projections/ApplicationIntegrationTests.java
View File

@@ -16,20 +16,17 @@
package example.springdata.rest.projections;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.hamcrest.MatcherAssert.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
/**
* Integration tests to bootstrap the application.
*
* @author Oliver Gierke
*/
@RunWith(SpringRunner.class)
@SpringBootTest
public class ApplicationIntegrationTests {

4
rest/projections/src/test/java/example/springdata/rest/projections/SimpleProjectionTests.java
View File

@@ -16,12 +16,12 @@
package example.springdata.rest.projections;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.hamcrest.MatcherAssert.assertThat;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.projection.ProjectionFactory;
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;

11
rest/security/src/test/java/example/springdata/rest/security/MethodLevelSecurityTests.java
View File

@@ -15,17 +15,15 @@
*/
package example.springdata.rest.security;
import static org.junit.Assert.*;
import static org.junit.jupiter.api.Assertions.fail;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.test.context.junit4.SpringRunner;
/**
* Collection of test cases used to verify method-level security.
@@ -33,13 +31,12 @@ import org.springframework.test.context.junit4.SpringRunner;
* @author Greg Turnquist
* @author Oliver Gierke
*/
@RunWith(SpringRunner.class)
@SpringBootTest
public class MethodLevelSecurityTests {
@Autowired ItemRepository itemRepository;
@Before
@BeforeEach
public void setUp() {
SecurityContextHolder.clearContext();
}

11
rest/security/src/test/java/example/springdata/rest/security/UrlLevelSecurityTests.java
View File

@@ -16,16 +16,15 @@
package example.springdata.rest.security;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*;
import java.util.Base64;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.hateoas.MediaTypes;
@@ -33,7 +32,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.FilterChainProxy;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.web.context.WebApplicationContext;
@@ -45,7 +43,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* @author Greg Turnquist
* @author Oliver Gierke
*/
@RunWith(SpringRunner.class)
@SpringBootTest
public class UrlLevelSecurityTests {
@@ -56,7 +53,7 @@ public class UrlLevelSecurityTests {
MockMvc mvc;
@Before
@BeforeEach
public void setUp() {
this.mvc = webAppContextSetup(context).addFilters(filterChain).build();

5
rest/starbucks/src/test/java/example/springdata/rest/stores/StarbucksClient.java
View File

@@ -24,8 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.stream.StreamSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
@@ -45,7 +44,6 @@ import org.springframework.hateoas.server.core.TypeReferences.CollectionModelTyp
import org.springframework.hateoas.server.core.TypeReferences.EntityModelType;
import org.springframework.hateoas.server.core.TypeReferences.PagedModelType;
import org.springframework.http.RequestEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.client.RestOperations;
import org.springframework.web.client.RestTemplate;
@@ -54,7 +52,6 @@ import org.springframework.web.client.RestTemplate;
*
* @author Oliver Gierke
*/
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@Slf4j
public class StarbucksClient {

15
rest/starbucks/src/test/java/example/springdata/rest/stores/StoreRepositoryIntegrationTests.java
View File

@@ -15,17 +15,16 @@
*/
package example.springdata.rest.stores;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import example.springdata.rest.stores.Store.Address;
import java.util.UUID;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.domain.Page;
@@ -33,7 +32,6 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.geo.Distance;
import org.springframework.data.geo.Metrics;
import org.springframework.data.geo.Point;
import org.springframework.test.context.junit4.SpringRunner;
/**
* Integration tests for {@link StoreRepository}.
@@ -41,14 +39,13 @@ import org.springframework.test.context.junit4.SpringRunner;
* @author Oliver Gierke
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class)
public class StoreRepositoryIntegrationTests {
@Autowired StoreRepository repository;
@Before
@After
@BeforeEach
@AfterEach
public void clearDb() {
repository.deleteAll();
}

9
rest/uri-customization/src/test/java/example/springdata/rest/uris/WebIntegrationTests.java
View File

@@ -19,12 +19,10 @@ import static org.hamcrest.CoreMatchers.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
@@ -35,7 +33,6 @@ import org.springframework.web.context.WebApplicationContext;
* @author Oliver Gierke
* @soundtrack Clueso - Gewinner (Stadtrandlichter Live)
*/
@RunWith(SpringRunner.class)
@SpringBootTest
public class WebIntegrationTests {
@@ -43,7 +40,7 @@ public class WebIntegrationTests {
MockMvc mvc;
@Before
@BeforeEach
public void setUp() {
this.mvc = MockMvcBuilders.webAppContextSetup(context).build();
}