From: Marek Zawirski <marek.zawirski@gmail.com>
To: robin.rosenberg@dewire.com, spearce@spearce.org
Cc: git@vger.kernel.org, Marek Zawirski <marek.zawirski@gmail.com>
Subject: [EGIT PATCH 17/23] Test cases for PushProcess
Date: Sat, 28 Jun 2008 00:06:41 +0200 [thread overview]
Message-ID: <1214604407-30572-18-git-send-email-marek.zawirski@gmail.com> (raw)
In-Reply-To: <1214604407-30572-17-git-send-email-marek.zawirski@gmail.com>
Tests for push process with highly differentiated remote update cases,
that are possible in practice.
Signed-off-by: Marek Zawirski <marek.zawirski@gmail.com>
---
.../spearce/jgit/transport/PushProcessTest.java | 407 ++++++++++++++++++++
1 files changed, 407 insertions(+), 0 deletions(-)
create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/transport/PushProcessTest.java
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/transport/PushProcessTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/transport/PushProcessTest.java
new file mode 100644
index 0000000..f0cfe98
--- /dev/null
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/transport/PushProcessTest.java
@@ -0,0 +1,407 @@
+/*
+ * Copyright (C) 2008, Marek Zawirski <marek.zawirski@gmail.com>
+ *
+ * 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 Git Development Community 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.spearce.jgit.transport;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import org.spearce.jgit.errors.NotSupportedException;
+import org.spearce.jgit.errors.TransportException;
+import org.spearce.jgit.lib.ObjectId;
+import org.spearce.jgit.lib.ProgressMonitor;
+import org.spearce.jgit.lib.Ref;
+import org.spearce.jgit.lib.Repository;
+import org.spearce.jgit.lib.RepositoryTestCase;
+import org.spearce.jgit.lib.TextProgressMonitor;
+import org.spearce.jgit.lib.RefUpdate.Result;
+import org.spearce.jgit.transport.RemoteRefUpdate.Status;
+
+public class PushProcessTest extends RepositoryTestCase {
+ private PushProcess process;
+
+ private MockTransport transport;
+
+ private HashSet<RemoteRefUpdate> refUpdates;
+
+ private HashSet<Ref> advertisedRefs;
+
+ private Status connectionUpdateStatus;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ transport = new MockTransport(db, new URIish());
+ refUpdates = new HashSet<RemoteRefUpdate>();
+ advertisedRefs = new HashSet<Ref>();
+ connectionUpdateStatus = Status.OK;
+ }
+
+ /**
+ * Test for fast-forward remote update.
+ *
+ * @throws IOException
+ */
+ public void testUpdateFastForward() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "2c349335b7f797072cf729c4f3bb0914ecb6dec9",
+ "refs/heads/master", false, null, null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
+ testOneUpdateStatus(rru, ref, Status.OK, true);
+ }
+
+ /**
+ * Test for non fast-forward remote update, when remote object is not known
+ * to local repository.
+ *
+ * @throws IOException
+ */
+ public void testUpdateNonFastForwardUnknownObject() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "2c349335b7f797072cf729c4f3bb0914ecb6dec9",
+ "refs/heads/master", false, null, null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("0000000000000000000000000000000000000001"));
+ testOneUpdateStatus(rru, ref, Status.REJECTED_NONFASTFORWARD, null);
+ }
+
+ /**
+ * Test for non fast-forward remote update, when remote object is known to
+ * local repository, but it is not an ancestor of new object.
+ *
+ * @throws IOException
+ */
+ public void testUpdateNonFastForward() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "ac7e7e44c1885efb472ad54a78327d66bfc4ecef",
+ "refs/heads/master", false, null, null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("2c349335b7f797072cf729c4f3bb0914ecb6dec9"));
+ testOneUpdateStatus(rru, ref, Status.REJECTED_NONFASTFORWARD, null);
+ }
+
+ /**
+ * Test for non fast-forward remote update, when force update flag is set.
+ *
+ * @throws IOException
+ */
+ public void testUpdateNonFastForwardForced() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "ac7e7e44c1885efb472ad54a78327d66bfc4ecef",
+ "refs/heads/master", true, null, null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("2c349335b7f797072cf729c4f3bb0914ecb6dec9"));
+ testOneUpdateStatus(rru, ref, Status.OK, false);
+ }
+
+ /**
+ * Test for remote ref creation.
+ *
+ * @throws IOException
+ */
+ public void testUpdateCreateRef() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "ac7e7e44c1885efb472ad54a78327d66bfc4ecef",
+ "refs/heads/master", false, null, null);
+ testOneUpdateStatus(rru, null, Status.OK, true);
+ }
+
+ /**
+ * Test for remote ref deletion.
+ *
+ * @throws IOException
+ */
+ public void testUpdateDelete() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db, null,
+ "refs/heads/master", false, null, null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("2c349335b7f797072cf729c4f3bb0914ecb6dec9"));
+ testOneUpdateStatus(rru, ref, Status.OK, true);
+ }
+
+ /**
+ * Test for remote ref deletion (try), when that ref doesn't exist on remote
+ * repo.
+ *
+ * @throws IOException
+ */
+ public void testUpdateDeleteNonExisting() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db, null,
+ "refs/heads/master", false, null, null);
+ testOneUpdateStatus(rru, null, Status.NON_EXISTING, null);
+ }
+
+ /**
+ * Test for remote ref update, when it is already up to date.
+ *
+ * @throws IOException
+ */
+ public void testUpdateUpToDate() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "2c349335b7f797072cf729c4f3bb0914ecb6dec9",
+ "refs/heads/master", false, null, null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("2c349335b7f797072cf729c4f3bb0914ecb6dec9"));
+ testOneUpdateStatus(rru, ref, Status.UP_TO_DATE, null);
+ }
+
+ /**
+ * Test for remote ref update with expected remote object.
+ *
+ * @throws IOException
+ */
+ public void testUpdateExpectedRemote() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "2c349335b7f797072cf729c4f3bb0914ecb6dec9",
+ "refs/heads/master", false, null, ObjectId
+ .fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
+ testOneUpdateStatus(rru, ref, Status.OK, true);
+ }
+
+ /**
+ * Test for remote ref update with expected old object set, when old object
+ * is not that expected one.
+ *
+ * @throws IOException
+ */
+ public void testUpdateUnexpectedRemote() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "2c349335b7f797072cf729c4f3bb0914ecb6dec9",
+ "refs/heads/master", false, null, ObjectId
+ .fromString("0000000000000000000000000000000000000001"));
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
+ testOneUpdateStatus(rru, ref, Status.REJECTED_REMOTE_CHANGED, null);
+ }
+
+ /**
+ * Test for remote ref update with expected old object set, when old object
+ * is not that expected one and force update flag is set (which should have
+ * lower priority) - shouldn't change behavior.
+ *
+ * @throws IOException
+ */
+ public void testUpdateUnexpectedRemoteVsForce() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "2c349335b7f797072cf729c4f3bb0914ecb6dec9",
+ "refs/heads/master", true, null, ObjectId
+ .fromString("0000000000000000000000000000000000000001"));
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
+ testOneUpdateStatus(rru, ref, Status.REJECTED_REMOTE_CHANGED, null);
+ }
+
+ /**
+ * Test for remote ref udpate, when connection rejects update.
+ *
+ * @throws IOException
+ */
+ public void testUpdateRejectedByConnection() throws IOException {
+ connectionUpdateStatus = Status.REJECTED_OTHER_REASON;
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "2c349335b7f797072cf729c4f3bb0914ecb6dec9",
+ "refs/heads/master", false, null, null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
+ testOneUpdateStatus(rru, ref, Status.REJECTED_OTHER_REASON, null);
+ }
+
+ /**
+ * Test for remote refs updates with mixed cases that shouldn't depend on
+ * each other.
+ *
+ * @throws IOException
+ */
+ public void testUpdateMixedCases() throws IOException {
+ final RemoteRefUpdate rruOk = new RemoteRefUpdate(db, null,
+ "refs/heads/master", false, null, null);
+ final Ref refToChange = new Ref("refs/heads/master", ObjectId
+ .fromString("2c349335b7f797072cf729c4f3bb0914ecb6dec9"));
+ final RemoteRefUpdate rruReject = new RemoteRefUpdate(db, null,
+ "refs/heads/nonexisting", false, null, null);
+ refUpdates.add(rruOk);
+ refUpdates.add(rruReject);
+ advertisedRefs.add(refToChange);
+ executePush();
+ assertEquals(Status.OK, rruOk.getStatus());
+ assertEquals(true, rruOk.isFastForward());
+ assertEquals(Status.NON_EXISTING, rruReject.getStatus());
+ }
+
+ /**
+ * Test for local tracking ref update.
+ *
+ * @throws IOException
+ */
+ public void testTrackingRefUpdateEnabled() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "2c349335b7f797072cf729c4f3bb0914ecb6dec9",
+ "refs/heads/master", false, "refs/remotes/test/master", null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
+ refUpdates.add(rru);
+ advertisedRefs.add(ref);
+ final PushResult result = executePush();
+ final TrackingRefUpdate tru = result
+ .getTrackingRefUpdate("refs/remotes/test/master");
+ assertNotNull(tru);
+ assertEquals("refs/remotes/test/master", tru.getLocalName());
+ assertEquals(Result.NEW, tru.getResult());
+ }
+
+ /**
+ * Test for local tracking ref update disabled.
+ *
+ * @throws IOException
+ */
+ public void testTrackingRefUpdateDisabled() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "2c349335b7f797072cf729c4f3bb0914ecb6dec9",
+ "refs/heads/master", false, null, null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
+ refUpdates.add(rru);
+ advertisedRefs.add(ref);
+ final PushResult result = executePush();
+ assertTrue(result.getTrackingRefUpdates().isEmpty());
+ }
+
+ /**
+ * Test for local tracking ref update when remote update has failed.
+ *
+ * @throws IOException
+ */
+ public void testTrackingRefUpdateOnReject() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "ac7e7e44c1885efb472ad54a78327d66bfc4ecef",
+ "refs/heads/master", false, null, null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("2c349335b7f797072cf729c4f3bb0914ecb6dec9"));
+ final PushResult result = testOneUpdateStatus(rru, ref,
+ Status.REJECTED_NONFASTFORWARD, null);
+ assertTrue(result.getTrackingRefUpdates().isEmpty());
+ }
+
+ /**
+ * Test for push operation result - that contains expected elements.
+ *
+ * @throws IOException
+ */
+ public void testPushResult() throws IOException {
+ final RemoteRefUpdate rru = new RemoteRefUpdate(db,
+ "2c349335b7f797072cf729c4f3bb0914ecb6dec9",
+ "refs/heads/master", false, "refs/remotes/test/master", null);
+ final Ref ref = new Ref("refs/heads/master", ObjectId
+ .fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
+ refUpdates.add(rru);
+ advertisedRefs.add(ref);
+ final PushResult result = executePush();
+ assertEquals(1, result.getTrackingRefUpdates().size());
+ assertEquals(1, result.getAdvertisedRefs().size());
+ assertEquals(1, result.getRemoteUpdates().size());
+ assertNotNull(result.getTrackingRefUpdate("refs/remotes/test/master"));
+ assertNotNull(result.getAdvertisedRef("refs/heads/master"));
+ assertNotNull(result.getRemoteUpdate("refs/heads/master"));
+ }
+
+ private PushResult testOneUpdateStatus(final RemoteRefUpdate rru,
+ final Ref advertisedRef, final Status expectedStatus,
+ Boolean fastForward) throws NotSupportedException,
+ TransportException {
+ refUpdates.add(rru);
+ if (advertisedRef != null)
+ advertisedRefs.add(advertisedRef);
+ final PushResult result = executePush();
+ assertEquals(expectedStatus, rru.getStatus());
+ if (fastForward != null)
+ assertEquals(fastForward.booleanValue(), rru.isFastForward());
+ return result;
+ }
+
+ private PushResult executePush() throws NotSupportedException,
+ TransportException {
+ process = new PushProcess(transport, refUpdates);
+ return process.execute(new TextProgressMonitor());
+ }
+
+ private class MockTransport extends Transport {
+ MockTransport(Repository local, URIish uri) {
+ super(local, uri);
+ }
+
+ @Override
+ public FetchConnection openFetch() throws NotSupportedException,
+ TransportException {
+ throw new NotSupportedException("mock");
+ }
+
+ @Override
+ public PushConnection openPush() throws NotSupportedException,
+ TransportException {
+ return new MockPushConnection();
+ }
+ }
+
+ private class MockPushConnection extends BaseConnection implements
+ PushConnection {
+ MockPushConnection() {
+ final Map<String, Ref> refsMap = new HashMap<String, Ref>();
+ for (final Ref r : advertisedRefs)
+ refsMap.put(r.getName(), r);
+ available(refsMap);
+ }
+
+ @Override
+ public void close() {
+ // nothing here
+ }
+
+ public void push(ProgressMonitor monitor,
+ Map<String, RemoteRefUpdate> refUpdates)
+ throws TransportException {
+ for (final RemoteRefUpdate rru : refUpdates.values()) {
+ assertEquals(Status.NOT_ATTEMPTED, rru.getStatus());
+ rru.setStatus(connectionUpdateStatus);
+ }
+ }
+ }
+}
--
1.5.5.3
next prev parent reply other threads:[~2008-06-27 22:10 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-27 22:06 [EGIT PATCH 00/23] Push implementation Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 01/23] Fix: let FetchProcess use fetch() instead of doFetch() Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 02/23] RefUpdate: new possible result Result.IO_FAILURE Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 03/23] Refactor TrackingRefUpdate to not hold RefSpec Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 04/23] New constructor without RefSpec for TrackingRefUpdate Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 05/23] Add RemoteRefUpdate class Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 06/23] Refactor: extract superclass OperationResult from FetchResult Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 07/23] Add PushResult class Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 08/23] Support for fetchThin and pushThin options in Transport Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 09/23] Big refactor: *Connection hierarchy Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 10/23] Add ignoreMissingUninteresting option to PackWriter Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 11/23] Add BasePackPushConnection implementing git-send-pack protocol Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 12/23] Fix: let RevWalk reset correctly before isMergedInto() Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 13/23] Add PushProcess class implementing git-send-pack logic Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 14/23] Clarify Repository#resolve() documentation Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 15/23] Add String versions of methods in RefSpec Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 16/23] Transport* - general support for push() and implementations Marek Zawirski
2008-06-27 22:06 ` Marek Zawirski [this message]
2008-06-27 22:06 ` [EGIT PATCH 18/23] Test cases for RefSpec to RemoteRefUpdate conversions Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 19/23] Repository search for command line tools Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 20/23] Push command line utility Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 21/23] Don't accept RefSpec with null source for fetch Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 22/23] Add new handy constructors to TransportException, PackProtocolException Marek Zawirski
2008-06-27 22:06 ` [EGIT PATCH 23/23] Use new TransportException constructors Marek Zawirski
2008-06-28 12:36 ` [EGIT PATCH 20/23] Push command line utility Robin Rosenberg
2008-06-27 23:25 ` [EGIT PATCH 00/23] Push implementation Robin Rosenberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1214604407-30572-18-git-send-email-marek.zawirski@gmail.com \
--to=marek.zawirski@gmail.com \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).