root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-07-25 15:39:01 +02:00
parent 56542ef809 99f33d5070
commit bdf028a2e6
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java
View File

@ -17,10 +17,7 @@
package org.springframework.boot.autoconfigure.data.rest; package org.springframework.boot.autoconfigure.data.rest;
import java.net.URI; import java.net.URI;
import java.util.Date;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
@ -145,13 +142,6 @@ public class RepositoryRestMvcAutoConfigurationTests {
assertThat(bean.getBaseUri()).isEqualTo(URI.create("")); assertThat(bean.getBaseUri()).isEqualTo(URI.create(""));
} }
public void assertThatDateIsFormattedCorrectly(String beanName)
throws JsonProcessingException {
ObjectMapper objectMapper = this.context.getBean(beanName, ObjectMapper.class);
assertThat(objectMapper.writeValueAsString(new Date(1413387983267L)))
.isEqualTo("\"2014-10\"");
}
private void load(Class<?> config, String... environment) { private void load(Class<?> config, String... environment) {
AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext(); AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
applicationContext.setServletContext(new MockServletContext()); applicationContext.setServletContext(new MockServletContext());