Revert Guava 20 features until we get the build working properly

*** Original change description ***

Remove deprecated methods with Guava 20 release

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=137945126
This commit is contained in:
mcilwain 2016-11-02 07:56:02 -07:00 committed by Ben McIlwain
parent 7206f88c6c
commit 1627bd4975
14 changed files with 29 additions and 34 deletions

View file

@ -28,25 +28,25 @@ public class HostAndPortParameterTest {
@Test
public void testConvert_hostOnly() throws Exception {
assertThat(instance.convert("foo.bar").getHost()).isEqualTo("foo.bar");
assertThat(instance.convert("foo.bar").getHostText()).isEqualTo("foo.bar");
assertThat(instance.convert("foo.bar").getPortOrDefault(31337)).isEqualTo(31337);
}
@Test
public void testConvert_hostAndPort() throws Exception {
assertThat(instance.convert("foo.bar:1234").getHost()).isEqualTo("foo.bar");
assertThat(instance.convert("foo.bar:1234").getHostText()).isEqualTo("foo.bar");
assertThat(instance.convert("foo.bar:1234").getPortOrDefault(31337)).isEqualTo(1234);
}
@Test
public void testConvert_ipv6_hostOnly() throws Exception {
assertThat(instance.convert("[feed:a:bee]").getHost()).isEqualTo("feed:a:bee");
assertThat(instance.convert("[feed:a:bee]").getHostText()).isEqualTo("feed:a:bee");
assertThat(instance.convert("[feed:a:bee]").getPortOrDefault(31337)).isEqualTo(31337);
}
@Test
public void testConvert_ipv6_hostAndPort() throws Exception {
assertThat(instance.convert("[feed:a:bee]:1234").getHost()).isEqualTo("feed:a:bee");
assertThat(instance.convert("[feed:a:bee]:1234").getHostText()).isEqualTo("feed:a:bee");
assertThat(instance.convert("[feed:a:bee]:1234").getPortOrDefault(31337)).isEqualTo(1234);
}
}