SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Spencer Gibb
2017-06-30 19:33:31 -06:00
parent c44c3f37e4
commit 80b91d0a03
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java
View File

@@ -1,5 +1,7 @@
package org.springframework.cloud.autoconfigure;
import java.util.List;
import org.assertj.core.util.Lists;
import org.junit.Test;
import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
@@ -9,8 +11,6 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.ResponseEntity;
import java.util.List;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertThat;
/**
* @author Spencer Gibb
*/
//TODO: super slow. Port to @SpringBootTest
public class LifecycleMvcAutoConfigurationTests {
// postEnvMvcEndpoint