From c9d4609ecbe3e8ed74f8fc169d541a1d7c8c5f15 Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Wed, 2 May 2018 16:35:48 -0700 Subject: [PATCH] Refactor test of capabilities output A subsequent patch will dynamically generate the capability advertisement, so the capability advertisements produced are not always the same. Separate the checking of the advertisements into its own test method. Change-Id: I768d14b9d1a244d5d886c42ffd62ef3957b518fb Signed-off-by: Jonathan Tan --- .../jgit/transport/UploadPackTest.java | 44 ++++++++++++++----- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java index 6550f1a52..d1a31720b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java @@ -336,12 +336,12 @@ public UploadPack create(Object req, Repository db) } /* - * Invokes UploadPack with protocol v2 and sends it the given lines. - * Returns UploadPack's output stream, not including the capability - * advertisement by the server. + * Invokes UploadPack with protocol v2 and sends it the given lines, + * and returns UploadPack's output stream. */ - private ByteArrayInputStream uploadPackV2(RequestPolicy requestPolicy, + private ByteArrayInputStream uploadPackV2Setup(RequestPolicy requestPolicy, RefFilter refFilter, String... inputLines) throws Exception { + ByteArrayOutputStream send = new ByteArrayOutputStream(); PacketLineOut pckOut = new PacketLineOut(send); for (String line : inputLines) { @@ -365,10 +365,37 @@ private ByteArrayInputStream uploadPackV2(RequestPolicy requestPolicy, ByteArrayOutputStream recv = new ByteArrayOutputStream(); up.upload(new ByteArrayInputStream(send.toByteArray()), recv, null); - ByteArrayInputStream recvStream = new ByteArrayInputStream(recv.toByteArray()); + return new ByteArrayInputStream(recv.toByteArray()); + } + + /* + * Invokes UploadPack with protocol v2 and sends it the given lines. + * Returns UploadPack's output stream, not including the capability + * advertisement by the server. + */ + private ByteArrayInputStream uploadPackV2(RequestPolicy requestPolicy, + RefFilter refFilter, String... inputLines) throws Exception { + ByteArrayInputStream recvStream = + uploadPackV2Setup(requestPolicy, refFilter, inputLines); + PacketLineIn pckIn = new PacketLineIn(recvStream); + + // drain capabilities + while (pckIn.readString() != PacketLineIn.END) { + // do nothing + } + return recvStream; + } + + private ByteArrayInputStream uploadPackV2(String... inputLines) throws Exception { + return uploadPackV2(null, null, inputLines); + } + + @Test + public void testV2Capabilities() throws Exception { + ByteArrayInputStream recvStream = + uploadPackV2Setup(null, null, PacketLineIn.END); PacketLineIn pckIn = new PacketLineIn(recvStream); - // capability advertisement (always sent) assertThat(pckIn.readString(), is("version 2")); assertThat( Arrays.asList(pckIn.readString(), pckIn.readString()), @@ -380,11 +407,6 @@ private ByteArrayInputStream uploadPackV2(RequestPolicy requestPolicy, // commands without requiring test changes. hasItems("ls-refs", "fetch=shallow")); assertTrue(pckIn.readString() == PacketLineIn.END); - return recvStream; - } - - private ByteArrayInputStream uploadPackV2(String... inputLines) throws Exception { - return uploadPackV2(null, null, inputLines); } @Test