Browse Source

Update @WebMvcTest to auto-configure Spring HATEOAS

Closes gh-6043
pull/6046/head
Andy Wilkinson 10 years ago
parent
commit
349ec76e62
  1. 5
      spring-boot-test-autoconfigure/pom.xml
  2. 4
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/AutoConfigureWebMvc.java
  3. 47
      spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/HateoasController.java
  4. 54
      spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestHateoasIntegrationTests.java

5
spring-boot-test-autoconfigure/pom.xml

@ -157,5 +157,10 @@ @@ -157,5 +157,10 @@
<artifactId>spring-hateoas</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

4
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/AutoConfigureWebMvc.java

@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration;
import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration;
import org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration;
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
import org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration;
import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
@ -48,7 +49,8 @@ import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; @@ -48,7 +49,8 @@ import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
@ImportAutoConfiguration({ WebMvcAutoConfiguration.class, GsonAutoConfiguration.class,
JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
FreeMarkerAutoConfiguration.class, GroovyTemplateAutoConfiguration.class,
MustacheAutoConfiguration.class, ThymeleafAutoConfiguration.class })
MustacheAutoConfiguration.class, ThymeleafAutoConfiguration.class,
HypermediaAutoConfiguration.class })
public @interface AutoConfigureWebMvc {
}

47
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/HateoasController.java

@ -0,0 +1,47 @@ @@ -0,0 +1,47 @@
/*
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.autoconfigure.web.servlet;
import java.util.HashMap;
import java.util.Map;
import org.springframework.hateoas.Link;
import org.springframework.hateoas.Resource;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* {@link RestController} used by {@link WebMvcTestHateoasIntegrationTests}.
*
* @author Andy Wilkinson
*/
@RestController
@RequestMapping("/hateoas")
class HateoasController {
@RequestMapping("/resource")
public Resource<Map<String, String>> resource() {
return new Resource<Map<String, String>>(new HashMap<>(),
new Link("self", "http://api.example.com"));
}
@RequestMapping("/plain")
public Map<String, String> plain() {
return new HashMap<>();
}
}

54
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestHateoasIntegrationTests.java

@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
/*
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.autoconfigure.web.servlet;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
/**
* Integration tests for {@link WebMvcTest} and Spring HATEOAS.
*
* @author Andy Wilkinson
*/
@RunWith(SpringRunner.class)
@WebMvcTest(secure = false)
public class WebMvcTestHateoasIntegrationTests {
@Autowired
private MockMvc mockMvc;
@Test
public void plainResponse() throws Exception {
this.mockMvc.perform(get("/hateoas/plain")).andExpect(header()
.string(HttpHeaders.CONTENT_TYPE, "application/json;charset=UTF-8"));
}
@Test
public void hateoasResponse() throws Exception {
this.mockMvc.perform(get("/hateoas/resource")).andExpect(header()
.string(HttpHeaders.CONTENT_TYPE, "application/hal+json;charset=UTF-8"));
}
}
Loading…
Cancel
Save