JCLOUDS-534 Folded overly explicit use of HostAndPort, which is also incompatible with guava 16.

This commit is contained in:
Adrian Cole 2014-10-27 08:48:27 -07:00 committed by Adrian Cole
parent 6b6af2824f
commit 1832b53242
1 changed files with 1 additions and 1 deletions

View File

@ -76,7 +76,7 @@ public class BaseContainerLiveTest extends BaseBlobStoreIntegrationTest {
SocketOpen socketOpen = context.utils().injector().getInstance(SocketOpen.class); SocketOpen socketOpen = context.utils().injector().getInstance(SocketOpen.class);
Predicate<HostAndPort> socketTester = retry(socketOpen, 1200, 10, SECONDS); Predicate<HostAndPort> socketTester = retry(socketOpen, 1200, 10, SECONDS);
assertTrue(socketTester.apply(HostAndPort.fromHost(metadata.getPublicUri().getHost()).withDefaultPort(80)), metadata.getPublicUri().toString()); assertTrue(socketTester.apply(HostAndPort.fromParts(metadata.getPublicUri().getHost(), 80)), metadata.getPublicUri().toString());
assertEquals(Strings2.toStringAndClose(view.utils().http().get(metadata.getPublicUri())), TEST_STRING); assertEquals(Strings2.toStringAndClose(view.utils().http().get(metadata.getPublicUri())), TEST_STRING);