UploadPackTest: ensure UploadPack is closed to fix resource leak
Change-Id: I4c8cf6041b4011934d338138d4531d190fdd6abb
This commit is contained in:
parent
4ddc64a2dd
commit
bde09c185f
|
@ -2416,35 +2416,39 @@ public void testGetPeerAgentProtocolV0() throws Exception {
|
||||||
RevCommit one = remote.commit().message("1").create();
|
RevCommit one = remote.commit().message("1").create();
|
||||||
remote.update("one", one);
|
remote.update("one", one);
|
||||||
|
|
||||||
UploadPack up = new UploadPack(server);
|
try (UploadPack up = new UploadPack(server)) {
|
||||||
ByteArrayInputStream send = linesAsInputStream(
|
ByteArrayInputStream send = linesAsInputStream(
|
||||||
"want " + one.getName() + " agent=JGit-test/1.2.3\n",
|
"want " + one.getName() + " agent=JGit-test/1.2.3\n",
|
||||||
PacketLineIn.end(),
|
PacketLineIn.end(),
|
||||||
"have 11cedf1b796d44207da702f7d420684022fc0f09\n", "done\n");
|
"have 11cedf1b796d44207da702f7d420684022fc0f09\n",
|
||||||
|
"done\n");
|
||||||
|
|
||||||
ByteArrayOutputStream recv = new ByteArrayOutputStream();
|
ByteArrayOutputStream recv = new ByteArrayOutputStream();
|
||||||
up.upload(send, recv, null);
|
up.upload(send, recv, null);
|
||||||
|
|
||||||
assertEquals(up.getPeerUserAgent(), "JGit-test/1.2.3");
|
assertEquals(up.getPeerUserAgent(), "JGit-test/1.2.3");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetSessionIDValueProtocolV0() throws Exception {
|
public void testGetSessionIDValueProtocolV0() throws Exception {
|
||||||
RevCommit one = remote.commit().message("1").create();
|
RevCommit one = remote.commit().message("1").create();
|
||||||
remote.update("one", one);
|
remote.update("one", one);
|
||||||
|
|
||||||
UploadPack up = new UploadPack(server);
|
try (UploadPack up = new UploadPack(server)) {
|
||||||
ByteArrayInputStream send = linesAsInputStream(
|
ByteArrayInputStream send = linesAsInputStream(
|
||||||
"want " + one.getName() + " agent=JGit-test/1.2.3"
|
"want " + one.getName() + " agent=JGit-test/1.2.3"
|
||||||
+ " session-id=client-session-id\n",
|
+ " session-id=client-session-id\n",
|
||||||
PacketLineIn.end(),
|
PacketLineIn.end(),
|
||||||
"have 11cedf1b796d44207da702f7d420684022fc0f09\n", "done\n");
|
"have 11cedf1b796d44207da702f7d420684022fc0f09\n",
|
||||||
|
"done\n");
|
||||||
|
|
||||||
ByteArrayOutputStream recv = new ByteArrayOutputStream();
|
ByteArrayOutputStream recv = new ByteArrayOutputStream();
|
||||||
up.upload(send, recv, null);
|
up.upload(send, recv, null);
|
||||||
|
|
||||||
assertEquals(up.getClientSID(), "client-session-id");
|
assertEquals(up.getClientSID(), "client-session-id");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetPeerAgentProtocolV2() throws Exception {
|
public void testGetPeerAgentProtocolV2() throws Exception {
|
||||||
|
@ -2455,12 +2459,12 @@ public void testGetPeerAgentProtocolV2() throws Exception {
|
||||||
RevCommit one = remote.commit().message("1").create();
|
RevCommit one = remote.commit().message("1").create();
|
||||||
remote.update("one", one);
|
remote.update("one", one);
|
||||||
|
|
||||||
UploadPack up = new UploadPack(server);
|
try (UploadPack up = new UploadPack(server)) {
|
||||||
up.setExtraParameters(Sets.of("version=2"));
|
up.setExtraParameters(Sets.of("version=2"));
|
||||||
|
|
||||||
ByteArrayInputStream send = linesAsInputStream(
|
ByteArrayInputStream send = linesAsInputStream("command=fetch\n",
|
||||||
"command=fetch\n", "agent=JGit-test/1.2.4\n",
|
"agent=JGit-test/1.2.4\n", PacketLineIn.delimiter(),
|
||||||
PacketLineIn.delimiter(), "want " + one.getName() + "\n",
|
"want " + one.getName() + "\n",
|
||||||
"have 11cedf1b796d44207da702f7d420684022fc0f09\n", "done\n",
|
"have 11cedf1b796d44207da702f7d420684022fc0f09\n", "done\n",
|
||||||
PacketLineIn.end());
|
PacketLineIn.end());
|
||||||
|
|
||||||
|
@ -2469,6 +2473,7 @@ public void testGetPeerAgentProtocolV2() throws Exception {
|
||||||
|
|
||||||
assertEquals(up.getPeerUserAgent(), "JGit-test/1.2.4");
|
assertEquals(up.getPeerUserAgent(), "JGit-test/1.2.4");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetSessionIDValueProtocolV2() throws Exception {
|
public void testGetSessionIDValueProtocolV2() throws Exception {
|
||||||
|
@ -2479,7 +2484,7 @@ public void testGetSessionIDValueProtocolV2() throws Exception {
|
||||||
RevCommit one = remote.commit().message("1").create();
|
RevCommit one = remote.commit().message("1").create();
|
||||||
remote.update("one", one);
|
remote.update("one", one);
|
||||||
|
|
||||||
UploadPack up = new UploadPack(server);
|
try (UploadPack up = new UploadPack(server)) {
|
||||||
up.setExtraParameters(Sets.of("version=2"));
|
up.setExtraParameters(Sets.of("version=2"));
|
||||||
|
|
||||||
ByteArrayInputStream send = linesAsInputStream("command=fetch\n",
|
ByteArrayInputStream send = linesAsInputStream("command=fetch\n",
|
||||||
|
@ -2493,6 +2498,7 @@ public void testGetSessionIDValueProtocolV2() throws Exception {
|
||||||
|
|
||||||
assertEquals(up.getClientSID(), "client-session-id");
|
assertEquals(up.getClientSID(), "client-session-id");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static class RejectAllRefFilter implements RefFilter {
|
private static class RejectAllRefFilter implements RefFilter {
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue