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 '1.5.x'

This commit is contained in:
Andy Wilkinson 2016-11-16 09:13:32 +00:00
parent d8b7d6dfdc 387a406aad
commit 4edab86ba2
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/LoggersMvcEndpointTests.java
View File

@ -95,7 +95,6 @@ public class LoggersMvcEndpointTests {
.singletonList(new LoggerConfiguration("ROOT", null, LogLevel.DEBUG))); .singletonList(new LoggerConfiguration("ROOT", null, LogLevel.DEBUG)));
String expected = "{\"levels\":[\"OFF\",\"FATAL\",\"ERROR\",\"WARN\",\"INFO\",\"DEBUG\",\"TRACE\"]," String expected = "{\"levels\":[\"OFF\",\"FATAL\",\"ERROR\",\"WARN\",\"INFO\",\"DEBUG\",\"TRACE\"],"
+ "\"loggers\":{\"ROOT\":{\"configuredLevel\":null,\"effectiveLevel\":\"DEBUG\"}}}"; + "\"loggers\":{\"ROOT\":{\"configuredLevel\":null,\"effectiveLevel\":\"DEBUG\"}}}";
System.out.println(expected);
this.mvc.perform(get("/loggers")).andExpect(status().isOk()) this.mvc.perform(get("/loggers")).andExpect(status().isOk())
.andExpect(content().json(expected)); .andExpect(content().json(expected));
} }

5
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java
View File

@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.web;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson; import com.google.gson.Gson;
@ -220,10 +219,6 @@ public class HttpMessageConvertersAutoConfigurationTests {
RepositoryRestMvcConfiguration.class, RepositoryRestMvcConfiguration.class,
HttpMessageConvertersAutoConfiguration.class); HttpMessageConvertersAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
Map<String, MappingJackson2HttpMessageConverter> beansOfType = this.context
.getBeansOfType(MappingJackson2HttpMessageConverter.class);
System.out.println(beansOfType);
BeanDefinition beanDefinition = this.context BeanDefinition beanDefinition = this.context
.getBeanDefinition("mappingJackson2HttpMessageConverter"); .getBeanDefinition("mappingJackson2HttpMessageConverter");
assertThat(beanDefinition.getFactoryBeanName()).isEqualTo( assertThat(beanDefinition.getFactoryBeanName()).isEqualTo(

1
spring-boot-cli/src/test/java/org/springframework/boot/cli/command/archive/ResourceMatcherTests.java
View File

@ -139,7 +139,6 @@ public class ResourceMatcherTests {
.find(Arrays.asList(new File("src/test/resources/resource-matcher/one"), .find(Arrays.asList(new File("src/test/resources/resource-matcher/one"),
new File("src/test/resources/resource-matcher/two"), new File("src/test/resources/resource-matcher/two"),
new File("src/test/resources/resource-matcher/three"))); new File("src/test/resources/resource-matcher/three")));
System.out.println(matchedResources);
List<String> paths = new ArrayList<String>(); List<String> paths = new ArrayList<String>();
for (MatchedResource resource : matchedResources) { for (MatchedResource resource : matchedResources) {
paths.add(resource.getName()); paths.add(resource.getName());