Skip to content

Commit 8596f2f

Browse files
kolorobotkolorobot
committed
Configuration improvements
1 parent a5306dd commit 8596f2f

File tree

5 files changed

+17
-43
lines changed

5 files changed

+17
-43
lines changed

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>1.4.0.RELEASE</version>
15+
<version>1.4.1.RELEASE</version>
1616
</parent>
1717

1818
<properties>
@@ -22,7 +22,7 @@
2222
<maven.compiler.target>${java.version}</maven.compiler.target>
2323
<failOnMissingWebXml>false</failOnMissingWebXml>
2424
<!-- Overriding version of selected dependencies -->
25-
<thymeleaf.version>3.0.0.RELEASE</thymeleaf.version>
25+
<thymeleaf.version>3.0.1.RELEASE</thymeleaf.version>
2626
<thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version>
2727
<thymeleaf-layout-dialect.version>2.0.1</thymeleaf-layout-dialect.version>
2828
<assertj.version>3.5.2</assertj.version>

‎src/main/java/pl/codeleak/demos/sbt/Application.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5-
import org.springframework.context.annotation.Bean;
6-
import org.thymeleaf.extras.java8time.dialect.Java8TimeDialect;
75

86
@SpringBootApplication
97
public class Application {
108

11-
@Bean
12-
public Java8TimeDialect java8TimeDialect() {
13-
return new Java8TimeDialect();
14-
}
15-
169
public static void main(String[] args) {
1710
SpringApplication.run(Application.class);
1811
}

‎src/main/java/pl/codeleak/demos/sbt/home/HomeController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
import org.springframework.stereotype.Controller;
44
import org.springframework.ui.Model;
5-
import org.springframework.web.bind.annotation.RequestMapping;
5+
import org.springframework.web.bind.annotation.GetMapping;
66
import org.springframework.web.bind.annotation.ResponseBody;
77

88
import java.time.LocalDateTime;
99

1010
@Controller
1111
class HomeController {
1212

13-
@RequestMapping("/")
13+
@GetMapping("/")
1414
String index(Model model) {
1515
model.addAttribute("now", LocalDateTime.now());
1616
return "index";
1717
}
1818

19-
@RequestMapping("properties")
19+
@GetMapping("properties")
2020
@ResponseBody
2121
java.util.Properties properties() {
2222
return System.getProperties();

‎src/test/java/pl/codeleak/demos/sbt/home/HomeControllerClassicTest.java

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,27 @@
11
package pl.codeleak.demos.sbt.home;
22

3-
import org.junit.Before;
43
import org.junit.Test;
54
import org.junit.runner.RunWith;
6-
import org.openqa.selenium.WebDriver;
7-
import org.openqa.selenium.chrome.ChromeDriver;
8-
import org.openqa.selenium.support.PageFactory;
95
import org.springframework.beans.factory.annotation.Autowired;
10-
import org.springframework.boot.test.SpringApplicationConfiguration;
11-
import org.springframework.boot.test.WebIntegrationTest;
12-
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
13-
import org.springframework.test.context.web.WebAppConfiguration;
6+
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
7+
import org.springframework.test.context.junit4.SpringRunner;
148
import org.springframework.test.web.servlet.MockMvc;
15-
import org.springframework.test.web.servlet.RequestBuilder;
169
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
1710
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
18-
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
19-
import org.springframework.web.context.WebApplicationContext;
20-
import pl.codeleak.demos.sbt.Application;
21-
import pl.codeleak.selenium.support.SeleniumTest;
2211

23-
@RunWith(SpringJUnit4ClassRunner.class)
24-
@SpringApplicationConfiguration(classes = Application.class)
25-
@WebAppConfiguration
12+
@RunWith(SpringRunner.class)
13+
@WebMvcTest(controllers = HomeController.class)
2614
public class HomeControllerClassicTest {
2715

2816
@Autowired
29-
private WebApplicationContext wac;
30-
3117
private MockMvc mockMvc;
3218

33-
@Before
34-
public void setUp() throws Exception {
35-
mockMvc = MockMvcBuilders.webAppContextSetup(wac).build();
36-
}
37-
3819
@Test
3920
public void verifiesHomePageLoads() throws Exception {
4021
mockMvc.perform(MockMvcRequestBuilders.get("/"))
41-
.andExpect(MockMvcResultMatchers.status().isOk());
22+
.andExpect(MockMvcResultMatchers.model().hasNoErrors())
23+
.andExpect(MockMvcResultMatchers.model().attributeExists("now"))
24+
.andExpect(MockMvcResultMatchers.view().name("index"))
25+
.andExpect(MockMvcResultMatchers.status().isOk());
4226
}
4327
}

‎src/test/java/pl/codeleak/demos/sbt/home/HomeControllerTest.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@
88
import org.openqa.selenium.firefox.FirefoxDriver;
99
import org.openqa.selenium.support.PageFactory;
1010
import org.springframework.beans.factory.annotation.Autowired;
11-
import org.springframework.boot.test.SpringApplicationConfiguration;
12-
import org.springframework.boot.test.WebIntegrationTest;
13-
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
14-
import pl.codeleak.demos.sbt.Application;
11+
import org.springframework.boot.test.context.SpringBootTest;
12+
import org.springframework.test.context.junit4.SpringRunner;
1513
import pl.codeleak.selenium.support.SeleniumTest;
1614

17-
@RunWith(SpringJUnit4ClassRunner.class)
18-
@SpringApplicationConfiguration(classes = Application.class)
19-
@WebIntegrationTest(value = "server.port=9000")
15+
@RunWith(SpringRunner.class)
16+
@SpringBootTest(properties = "server.port=9000", webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
2017
@SeleniumTest(driver = FirefoxDriver.class, baseUrl = "http://localhost:9000")
2118
public class HomeControllerTest {
2219

0 commit comments

Comments
 (0)