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

Remove guava dependency (only in tests)

Browse Source
This commit is contained in:
Dave Syer
2015-01-17 15:10:53 +00:00
parent 83485f77f6
commit c6a9104f5d
2 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@@ -54,20 +54,6 @@
</plugin>
</plugins>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.12.6</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -85,10 +71,6 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>

16
src/test/java/org/springframework/cloud/client/discovery/DiscoveryCompositeHealthIndicatorTests.java
View File

@@ -16,6 +16,13 @@
package org.springframework.cloud.client.discovery;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import java.util.Arrays;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,13 +36,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.google.common.collect.Lists;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
/**
* @author Spencer Gibb
*/
@@ -58,7 +58,7 @@ public class DiscoveryCompositeHealthIndicatorTests {
public DiscoveryClient discoveryClient() {
DiscoveryClient mock = mock(DiscoveryClient.class);
given(mock.description()).willReturn("TestDiscoveryClient");
given(mock.getServices()).willReturn(Lists.newArrayList("TestService1"));
given(mock.getServices()).willReturn(Arrays.asList("TestService1"));
return mock;
}