DumbClientSmartServerTest: Open auto-closeable resources in try-with-resource
Change-Id: I599c6e274fe80af7bfd2205f56f469c22d1dd3e0 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
parent
b9a03c69b3
commit
ef9046fa89
|
@ -140,9 +140,8 @@ public void testListRemote() throws IOException {
|
|||
assertEquals("http", remoteURI.getScheme());
|
||||
|
||||
Map<String, Ref> map;
|
||||
Transport t = Transport.open(dst, remoteURI);
|
||||
try (Transport t = Transport.open(dst, remoteURI)) {
|
||||
((TransportHttp) t).setUseSmartHttp(false);
|
||||
try {
|
||||
// I didn't make up these public interface names, I just
|
||||
// approved them for inclusion into the code base. Sorry.
|
||||
// --spearce
|
||||
|
@ -150,14 +149,9 @@ public void testListRemote() throws IOException {
|
|||
assertTrue("isa TransportHttp", t instanceof TransportHttp);
|
||||
assertTrue("isa HttpTransport", t instanceof HttpTransport);
|
||||
|
||||
FetchConnection c = t.openFetch();
|
||||
try {
|
||||
try (FetchConnection c = t.openFetch()) {
|
||||
map = c.getRefsMap();
|
||||
} finally {
|
||||
c.close();
|
||||
}
|
||||
} finally {
|
||||
t.close();
|
||||
}
|
||||
|
||||
assertNotNull("have map of refs", map);
|
||||
|
@ -201,12 +195,9 @@ public void testInitialClone_Small() throws Exception {
|
|||
Repository dst = createBareRepository();
|
||||
assertFalse(dst.hasObject(A_txt));
|
||||
|
||||
Transport t = Transport.open(dst, remoteURI);
|
||||
try (Transport t = Transport.open(dst, remoteURI)) {
|
||||
((TransportHttp) t).setUseSmartHttp(false);
|
||||
try {
|
||||
t.fetch(NullProgressMonitor.INSTANCE, mirror(master));
|
||||
} finally {
|
||||
t.close();
|
||||
}
|
||||
|
||||
assertTrue(dst.hasObject(A_txt));
|
||||
|
@ -229,12 +220,9 @@ public void testInitialClone_Packed() throws Exception {
|
|||
Repository dst = createBareRepository();
|
||||
assertFalse(dst.hasObject(A_txt));
|
||||
|
||||
Transport t = Transport.open(dst, remoteURI);
|
||||
((TransportHttp) t).setUseSmartHttp(false);
|
||||
try {
|
||||
try (Transport t = Transport.open(dst, remoteURI)) {
|
||||
((TransportHttp) t).setUseSmartHttp(false);
|
||||
t.fetch(NullProgressMonitor.INSTANCE, mirror(master));
|
||||
} finally {
|
||||
t.close();
|
||||
}
|
||||
|
||||
assertTrue(dst.hasObject(A_txt));
|
||||
|
@ -265,9 +253,8 @@ public void testPushNotSupported() throws Exception {
|
|||
final RevCommit Q = src.commit().create();
|
||||
final Repository db = src.getRepository();
|
||||
|
||||
Transport t = Transport.open(db, remoteURI);
|
||||
((TransportHttp) t).setUseSmartHttp(false);
|
||||
try {
|
||||
try (Transport t = Transport.open(db, remoteURI)) {
|
||||
((TransportHttp) t).setUseSmartHttp(false);
|
||||
try {
|
||||
t.push(NullProgressMonitor.INSTANCE, push(src, Q));
|
||||
fail("push incorrectly completed against a smart server");
|
||||
|
@ -275,8 +262,6 @@ public void testPushNotSupported() throws Exception {
|
|||
String exp = "smart HTTP push disabled";
|
||||
assertEquals(exp, nse.getMessage());
|
||||
}
|
||||
} finally {
|
||||
t.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue