HookMessageTest: Open Transport in try-with-resource
Change-Id: Ie58b01a8a78e4f42a3b913708a545687c5c9f96b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
parent
6722f6927a
commit
b5115f6897
|
@ -149,11 +149,9 @@ public void testPush_CreateBranch() throws Exception {
|
||||||
final RevCommit Q = src.commit().add("Q", Q_txt).create();
|
final RevCommit Q = src.commit().add("Q", Q_txt).create();
|
||||||
final Repository db = src.getRepository();
|
final Repository db = src.getRepository();
|
||||||
final String dstName = Constants.R_HEADS + "new.branch";
|
final String dstName = Constants.R_HEADS + "new.branch";
|
||||||
Transport t;
|
|
||||||
PushResult result;
|
PushResult result;
|
||||||
|
|
||||||
t = Transport.open(db, remoteURI);
|
try (Transport t = Transport.open(db, remoteURI)) {
|
||||||
try {
|
|
||||||
final String srcExpr = Q.name();
|
final String srcExpr = Q.name();
|
||||||
final boolean forceUpdate = false;
|
final boolean forceUpdate = false;
|
||||||
final String localName = null;
|
final String localName = null;
|
||||||
|
@ -163,8 +161,6 @@ public void testPush_CreateBranch() throws Exception {
|
||||||
srcExpr, dstName, forceUpdate, localName, oldId);
|
srcExpr, dstName, forceUpdate, localName, oldId);
|
||||||
result = t.push(NullProgressMonitor.INSTANCE, Collections
|
result = t.push(NullProgressMonitor.INSTANCE, Collections
|
||||||
.singleton(update));
|
.singleton(update));
|
||||||
} finally {
|
|
||||||
t.close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
assertTrue(remoteRepository.hasObject(Q_txt));
|
assertTrue(remoteRepository.hasObject(Q_txt));
|
||||||
|
@ -193,12 +189,10 @@ public void testPush_HookMessagesToOutputStream() throws Exception {
|
||||||
final RevCommit Q = src.commit().add("Q", Q_txt).create();
|
final RevCommit Q = src.commit().add("Q", Q_txt).create();
|
||||||
final Repository db = src.getRepository();
|
final Repository db = src.getRepository();
|
||||||
final String dstName = Constants.R_HEADS + "new.branch";
|
final String dstName = Constants.R_HEADS + "new.branch";
|
||||||
Transport t;
|
|
||||||
PushResult result;
|
PushResult result;
|
||||||
|
|
||||||
t = Transport.open(db, remoteURI);
|
|
||||||
OutputStream out = new ByteArrayOutputStream();
|
OutputStream out = new ByteArrayOutputStream();
|
||||||
try {
|
try (Transport t = Transport.open(db, remoteURI)) {
|
||||||
final String srcExpr = Q.name();
|
final String srcExpr = Q.name();
|
||||||
final boolean forceUpdate = false;
|
final boolean forceUpdate = false;
|
||||||
final String localName = null;
|
final String localName = null;
|
||||||
|
@ -208,8 +202,6 @@ public void testPush_HookMessagesToOutputStream() throws Exception {
|
||||||
srcExpr, dstName, forceUpdate, localName, oldId);
|
srcExpr, dstName, forceUpdate, localName, oldId);
|
||||||
result = t.push(NullProgressMonitor.INSTANCE,
|
result = t.push(NullProgressMonitor.INSTANCE,
|
||||||
Collections.singleton(update), out);
|
Collections.singleton(update), out);
|
||||||
} finally {
|
|
||||||
t.close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
String expectedMessage = "message line 1\n" //
|
String expectedMessage = "message line 1\n" //
|
||||||
|
|
Loading…
Reference in New Issue