Skip to content

Mark integration tests #1690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pivovarit merged 2 commits into from
Apr 19, 2017
Merged

Mark integration tests #1690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aeb7ae
Mark integration tests
pivovarit Apr 19, 2017
67a2982
Merge branch 'master' into spring_boot_module_opt
pivovarit Apr 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions .../boottest/EmployeeRestControllerTest.java → ...st/EmployeeControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
package org.baeldung.boot.boottest;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.hasSize;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import java.util.Arrays;
import java.util.List;

import org.baeldung.boot.boottest.Employee;
import org.baeldung.boot.boottest.EmployeeRestController;
import org.baeldung.boot.boottest.EmployeeService;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -28,9 +12,22 @@
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;

import java.util.Arrays;
import java.util.List;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.hasSize;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

@RunWith(SpringRunner.class)
@WebMvcTest(EmployeeRestController.class)
public class EmployeeRestControllerTest {
public class EmployeeControllerIntegrationTest {

@Autowired
private MockMvc mvc;
Expand Down
2 changes: 1 addition & 1 deletion ...boot/boottest/EmployeeRepositoryTest.java → ...st/EmployeeRepositoryIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

@RunWith(SpringRunner.class)
@DataJpaTest
public class EmployeeRepositoryTest {
public class EmployeeRepositoryIntegrationTest {

@Autowired
private TestEntityManager entityManager;
Expand Down
2 changes: 1 addition & 1 deletion ...ottest/EmployeeRestControllerIntTest.java → ...mployeeRestControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = DemoApplication.class)
@AutoConfigureMockMvc
@TestPropertySource(locations = "classpath:application-integrationtest.properties")
public class EmployeeRestControllerIntTest {
public class EmployeeRestControllerIntegrationTest {

@Autowired
private MockMvc mvc;
Expand Down
2 changes: 1 addition & 1 deletion ...oot/boottest/EmployeeServiceImplTest.java → ...t/EmployeeServiceImplIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.springframework.test.context.junit4.SpringRunner;

@RunWith(SpringRunner.class)
public class EmployeeServiceImplTest {
public class EmployeeServiceImplIntegrationTest {

@TestConfiguration
static class EmployeeServiceImplTestContextConfiguration {
Expand Down