diff options
| -rw-r--r-- | org.eclipse.jgit.test/src/org/eclipse/jgit/lib/MoreAsserts.java | 79 | ||||
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java | 263 |
2 files changed, 188 insertions, 154 deletions
diff --git a/org.eclipse.jgit.test/src/org/eclipse/jgit/lib/MoreAsserts.java b/org.eclipse.jgit.test/src/org/eclipse/jgit/lib/MoreAsserts.java new file mode 100644 index 0000000000..5945e7e43d --- /dev/null +++ b/org.eclipse.jgit.test/src/org/eclipse/jgit/lib/MoreAsserts.java @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2019, Google LLC + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available + * under the terms of the Eclipse Distribution License v1.0 which + * accompanies this distribution, is reproduced below, and is + * available at http://www.eclipse.org/org/documents/edl-v10.php + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Eclipse Foundation, Inc. nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.eclipse.jgit.lib; + +/** Assertion methods. */ +public class MoreAsserts { + /** + * Simple version of assertThrows that will be introduced in JUnit 4.13. + * + * @param expected + * Expected throwable class + * @param r + * Runnable that is expected to throw an exception. + * @return The thrown exception. + */ + public static <T extends Throwable> T assertThrows(Class<T> expected, + ThrowingRunnable r) { + try { + r.run(); + } catch (Throwable actual) { + if (expected.isAssignableFrom(actual.getClass())) { + @SuppressWarnings("unchecked") + T toReturn = (T) actual; + return toReturn; + } + throw new AssertionError("Expected " + expected.getSimpleName() + + ", but got " + actual.getClass().getSimpleName(), actual); + } + throw new AssertionError( + "Expected " + expected.getSimpleName() + " to be thrown"); + } + + public interface ThrowingRunnable { + void run() throws Throwable; + } + + private MoreAsserts() { + } +} 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 fb7afbc378..4892dabb62 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 @@ -1,5 +1,6 @@ package org.eclipse.jgit.transport; +import static org.eclipse.jgit.lib.MoreAsserts.assertThrows; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.is; @@ -50,20 +51,14 @@ import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.storage.pack.PackStatistics; import org.eclipse.jgit.transport.UploadPack.RequestPolicy; import org.eclipse.jgit.util.io.NullOutputStream; -import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; /** * Tests for server upload-pack utilities. */ public class UploadPackTest { - @Rule - public ExpectedException thrown = ExpectedException.none(); - private URIish uri; private TestProtocol<Object> testProtocol; @@ -147,11 +142,11 @@ public class UploadPackTest { assertFalse(client.getObjectDatabase().has(blob.toObjectId())); try (Transport tn = testProtocol.open(uri, client, "server")) { - thrown.expect(TransportException.class); - thrown.expectMessage(Matchers.containsString( - "want " + blob.name() + " not valid")); - tn.fetch(NullProgressMonitor.INSTANCE, - Collections.singletonList(new RefSpec(blob.name()))); + TransportException e = assertThrows(TransportException.class, + () -> tn.fetch(NullProgressMonitor.INSTANCE, Collections + .singletonList(new RefSpec(blob.name())))); + assertThat(e.getMessage(), + containsString("want " + blob.name() + " not valid")); } } @@ -186,11 +181,12 @@ public class UploadPackTest { assertFalse(client.getObjectDatabase().has(blob.toObjectId())); try (Transport tn = testProtocol.open(uri, client, "server")) { - thrown.expect(TransportException.class); - thrown.expectMessage(Matchers.containsString( + TransportException e = assertThrows(TransportException.class, + () -> tn.fetch(NullProgressMonitor.INSTANCE, Collections + .singletonList(new RefSpec(blob.name())))); + assertThat(e.getMessage(), + containsString( "want " + blob.name() + " not valid")); - tn.fetch(NullProgressMonitor.INSTANCE, - Collections.singletonList(new RefSpec(blob.name()))); } } @@ -416,12 +412,11 @@ public class UploadPackTest { try (Transport tn = testProtocol.open(uri, client, "server2")) { tn.setFilterSpec(FilterSpec.withBlobLimit(0)); - thrown.expect(TransportException.class); - thrown.expectMessage( - "filter requires server to advertise that capability"); - - tn.fetch(NullProgressMonitor.INSTANCE, - Collections.singletonList(new RefSpec(commit.name()))); + TransportException e = assertThrows(TransportException.class, + () -> tn.fetch(NullProgressMonitor.INSTANCE, Collections + .singletonList(new RefSpec(commit.name())))); + assertThat(e.getMessage(), containsString( + "filter requires server to advertise that capability")); } } } @@ -739,13 +734,12 @@ public class UploadPackTest { @Test public void testV2LsRefsUnrecognizedArgument() throws Exception { - thrown.expect(PackProtocolException.class); - thrown.expectMessage("unexpected invalid-argument"); - uploadPackV2( - "command=ls-refs\n", - PacketLineIn.delimiter(), - "invalid-argument\n", - PacketLineIn.end()); + PackProtocolException e = assertThrows(PackProtocolException.class, + () -> uploadPackV2("command=ls-refs\n", + PacketLineIn.delimiter(), "invalid-argument\n", + PacketLineIn.end())); + assertThat(e.getMessage(), + containsString("unexpected invalid-argument")); } @Test @@ -792,119 +786,88 @@ public class UploadPackTest { remote.update("branch1", advertized); // This works - uploadPackV2( - RequestPolicy.ADVERTISED, - null, - null, - "command=fetch\n", - PacketLineIn.delimiter(), - "want " + advertized.name() + "\n", + uploadPackV2(RequestPolicy.ADVERTISED, null, null, "command=fetch\n", + PacketLineIn.delimiter(), "want " + advertized.name() + "\n", PacketLineIn.end()); // This doesn't - thrown.expect(TransportException.class); - thrown.expectMessage(Matchers.containsString( - "want " + unadvertized.name() + " not valid")); - uploadPackV2( - RequestPolicy.ADVERTISED, - null, - null, - "command=fetch\n", - PacketLineIn.delimiter(), - "want " + unadvertized.name() + "\n", - PacketLineIn.end()); + TransportException e = assertThrows(TransportException.class, + () -> uploadPackV2(RequestPolicy.ADVERTISED, null, null, + "command=fetch\n", PacketLineIn.delimiter(), + "want " + unadvertized.name() + "\n", + PacketLineIn.end())); + assertThat(e.getMessage(), + containsString("want " + unadvertized.name() + " not valid")); } @Test public void testV2FetchRequestPolicyReachableCommit() throws Exception { RevCommit reachable = remote.commit().message("x").create(); - RevCommit advertized = remote.commit().message("x").parent(reachable).create(); + RevCommit advertized = remote.commit().message("x").parent(reachable) + .create(); RevCommit unreachable = remote.commit().message("y").create(); remote.update("branch1", advertized); // This works - uploadPackV2( - RequestPolicy.REACHABLE_COMMIT, - null, - null, - "command=fetch\n", - PacketLineIn.delimiter(), - "want " + reachable.name() + "\n", - PacketLineIn.end()); + uploadPackV2(RequestPolicy.REACHABLE_COMMIT, null, null, + "command=fetch\n", PacketLineIn.delimiter(), + "want " + reachable.name() + "\n", PacketLineIn.end()); // This doesn't - thrown.expect(TransportException.class); - thrown.expectMessage(Matchers.containsString( - "want " + unreachable.name() + " not valid")); - uploadPackV2( - RequestPolicy.REACHABLE_COMMIT, - null, - null, - "command=fetch\n", - PacketLineIn.delimiter(), - "want " + unreachable.name() + "\n", - PacketLineIn.end()); + TransportException e = assertThrows(TransportException.class, + () -> uploadPackV2(RequestPolicy.REACHABLE_COMMIT, null, null, + "command=fetch\n", PacketLineIn.delimiter(), + "want " + unreachable.name() + "\n", + PacketLineIn.end())); + assertThat(e.getMessage(), + containsString("want " + unreachable.name() + " not valid")); } @Test public void testV2FetchRequestPolicyTip() throws Exception { RevCommit parentOfTip = remote.commit().message("x").create(); - RevCommit tip = remote.commit().message("y").parent(parentOfTip).create(); + RevCommit tip = remote.commit().message("y").parent(parentOfTip) + .create(); remote.update("secret", tip); // This works - uploadPackV2( - RequestPolicy.TIP, - new RejectAllRefFilter(), - null, - "command=fetch\n", - PacketLineIn.delimiter(), - "want " + tip.name() + "\n", - PacketLineIn.end()); + uploadPackV2(RequestPolicy.TIP, new RejectAllRefFilter(), null, + "command=fetch\n", PacketLineIn.delimiter(), + "want " + tip.name() + "\n", PacketLineIn.end()); // This doesn't - thrown.expect(TransportException.class); - thrown.expectMessage(Matchers.containsString( - "want " + parentOfTip.name() + " not valid")); - uploadPackV2( - RequestPolicy.TIP, - new RejectAllRefFilter(), - null, - "command=fetch\n", - PacketLineIn.delimiter(), - "want " + parentOfTip.name() + "\n", - PacketLineIn.end()); + TransportException e = assertThrows(TransportException.class, + () -> uploadPackV2(RequestPolicy.TIP, new RejectAllRefFilter(), + null, "command=fetch\n", PacketLineIn.delimiter(), + "want " + parentOfTip.name() + "\n", + PacketLineIn.end())); + assertThat(e.getMessage(), + containsString("want " + parentOfTip.name() + " not valid")); } @Test public void testV2FetchRequestPolicyReachableCommitTip() throws Exception { RevCommit parentOfTip = remote.commit().message("x").create(); - RevCommit tip = remote.commit().message("y").parent(parentOfTip).create(); + RevCommit tip = remote.commit().message("y").parent(parentOfTip) + .create(); RevCommit unreachable = remote.commit().message("y").create(); remote.update("secret", tip); // This works - uploadPackV2( - RequestPolicy.REACHABLE_COMMIT_TIP, - new RejectAllRefFilter(), - null, - "command=fetch\n", - PacketLineIn.delimiter(), - "want " + parentOfTip.name() + "\n", + uploadPackV2(RequestPolicy.REACHABLE_COMMIT_TIP, + new RejectAllRefFilter(), null, "command=fetch\n", + PacketLineIn.delimiter(), "want " + parentOfTip.name() + "\n", PacketLineIn.end()); // This doesn't - thrown.expect(TransportException.class); - thrown.expectMessage(Matchers.containsString( - "want " + unreachable.name() + " not valid")); - uploadPackV2( - RequestPolicy.REACHABLE_COMMIT_TIP, - new RejectAllRefFilter(), - null, - "command=fetch\n", - PacketLineIn.delimiter(), - "want " + unreachable.name() + "\n", - PacketLineIn.end()); + TransportException e = assertThrows(TransportException.class, + () -> uploadPackV2(RequestPolicy.REACHABLE_COMMIT_TIP, + new RejectAllRefFilter(), null, "command=fetch\n", + PacketLineIn.delimiter(), + "want " + unreachable.name() + "\n", + PacketLineIn.end())); + assertThat(e.getMessage(), + containsString("want " + unreachable.name() + " not valid")); } @Test @@ -1012,29 +975,29 @@ public class UploadPackTest { String commonInBlob = "abcdefghijklmnopqrstuvwxyz"; RevBlob parentBlob = remote.blob(commonInBlob + "a"); - RevCommit parent = remote.commit(remote.tree(remote.file("foo", parentBlob))); + RevCommit parent = remote + .commit(remote.tree(remote.file("foo", parentBlob))); RevBlob childBlob = remote.blob(commonInBlob + "b"); - RevCommit child = remote.commit(remote.tree(remote.file("foo", childBlob)), parent); + RevCommit child = remote + .commit(remote.tree(remote.file("foo", childBlob)), parent); remote.update("branch1", child); // Pretend that we have parent to get a thin pack based on it. - ByteArrayInputStream recvStream = uploadPackV2( - "command=fetch\n", - PacketLineIn.delimiter(), - "want " + child.toObjectId().getName() + "\n", - "have " + parent.toObjectId().getName() + "\n", - "thin-pack\n", - "done\n", - PacketLineIn.end()); + ByteArrayInputStream recvStream = uploadPackV2("command=fetch\n", + PacketLineIn.delimiter(), + "want " + child.toObjectId().getName() + "\n", + "have " + parent.toObjectId().getName() + "\n", "thin-pack\n", + "done\n", PacketLineIn.end()); PacketLineIn pckIn = new PacketLineIn(recvStream); assertThat(pckIn.readString(), is("packfile")); // Verify that we received a thin pack by trying to apply it // against the client repo, which does not have parent. - thrown.expect(IOException.class); - thrown.expectMessage("pack has unresolved deltas"); - parsePack(recvStream); + IOException e = assertThrows(IOException.class, + () -> parsePack(recvStream)); + assertThat(e.getMessage(), + containsString("pack has unresolved deltas")); } @Test @@ -1335,19 +1298,17 @@ public class UploadPackTest { PersonIdent person = new PersonIdent(remote.getRepository()); RevCommit tooOld = remote.commit() - .committer(new PersonIdent(person, 1500000000, 0)).create(); + .committer(new PersonIdent(person, 1500000000, 0)).create(); remote.update("branch1", tooOld); - thrown.expect(PackProtocolException.class); - thrown.expectMessage("No commits selected for shallow request"); - uploadPackV2( - "command=fetch\n", - PacketLineIn.delimiter(), - "deepen-since 1510000\n", - "want " + tooOld.toObjectId().getName() + "\n", - "done\n", - PacketLineIn.end()); + PackProtocolException e = assertThrows(PackProtocolException.class, + () -> uploadPackV2("command=fetch\n", PacketLineIn.delimiter(), + "deepen-since 1510000\n", + "want " + tooOld.toObjectId().getName() + "\n", + "done\n", PacketLineIn.end())); + assertThat(e.getMessage(), + containsString("No commits selected for shallow request")); } @Test @@ -1406,7 +1367,8 @@ public class UploadPackTest { } @Test - public void testV2FetchDeepenNot_excludeDescendantOfWant() throws Exception { + public void testV2FetchDeepenNot_excludeDescendantOfWant() + throws Exception { RevCommit one = remote.commit().message("one").create(); RevCommit two = remote.commit().message("two").parent(one).create(); RevCommit three = remote.commit().message("three").parent(two).create(); @@ -1415,15 +1377,13 @@ public class UploadPackTest { remote.update("two", two); remote.update("four", four); - thrown.expect(PackProtocolException.class); - thrown.expectMessage("No commits selected for shallow request"); - uploadPackV2( - "command=fetch\n", - PacketLineIn.delimiter(), - "deepen-not four\n", - "want " + two.toObjectId().getName() + "\n", - "done\n", - PacketLineIn.end()); + PackProtocolException e = assertThrows(PackProtocolException.class, + () -> uploadPackV2("command=fetch\n", PacketLineIn.delimiter(), + "deepen-not four\n", + "want " + two.toObjectId().getName() + "\n", "done\n", + PacketLineIn.end())); + assertThat(e.getMessage(), + containsString("No commits selected for shallow request")); } @Test @@ -1501,13 +1461,11 @@ public class UploadPackTest { @Test public void testV2FetchUnrecognizedArgument() throws Exception { - thrown.expect(PackProtocolException.class); - thrown.expectMessage("unexpected invalid-argument"); - uploadPackV2( - "command=fetch\n", - PacketLineIn.delimiter(), - "invalid-argument\n", - PacketLineIn.end()); + PackProtocolException e = assertThrows(PackProtocolException.class, + () -> uploadPackV2("command=fetch\n", PacketLineIn.delimiter(), + "invalid-argument\n", PacketLineIn.end())); + assertThat(e.getMessage(), + containsString("unexpected invalid-argument")); } @Test @@ -1876,15 +1834,12 @@ public class UploadPackTest { server.getConfig().setBoolean("uploadpack", null, "allowfilter", false); - thrown.expect(PackProtocolException.class); - thrown.expectMessage("unexpected filter blob:limit=5"); - uploadPackV2( - "command=fetch\n", - PacketLineIn.delimiter(), - "want " + commit.toObjectId().getName() + "\n", - "filter blob:limit=5\n", - "done\n", - PacketLineIn.end()); + PackProtocolException e = assertThrows(PackProtocolException.class, + () -> uploadPackV2("command=fetch\n", PacketLineIn.delimiter(), + "want " + commit.toObjectId().getName() + "\n", + "filter blob:limit=5\n", "done\n", PacketLineIn.end())); + assertThat(e.getMessage(), + containsString("unexpected filter blob:limit=5")); } @Test |