From: "Tor Arne Vestbø" <torarnv@gmail.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: git@vger.kernel.org, Robin Rosenberg <robin.rosenberg@dewire.com>
Subject: [JGIT PATCH v2] Add a few test cases for AbstractTreeIterator's pathCompare
Date: Tue, 3 Feb 2009 18:20:23 +0100 [thread overview]
Message-ID: <1233681623-22011-1-git-send-email-torarnv@gmail.com> (raw)
In-Reply-To: <49887A86.2040602@gmail.com>
Tests that files sort before trees if the path is the same, and
that if both path and mode is the same, they are considered equal.
Signed-off-by: Tor Arne Vestbø <torarnv@gmail.com>
---
.../jgit/treewalk/AbstractTreeIteratorTest.java | 80 ++++++++++++++++++++
1 files changed, 80 insertions(+), 0 deletions(-)
create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/AbstractTreeIteratorTest.java
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/AbstractTreeIteratorTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/AbstractTreeIteratorTest.java
new file mode 100644
index 0000000..d45e22c
--- /dev/null
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/AbstractTreeIteratorTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2009, Tor Arne Vestbø <torarnv@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.treewalk;
+
+import java.io.IOException;
+
+import org.spearce.jgit.errors.IncorrectObjectTypeException;
+import org.spearce.jgit.lib.FileMode;
+import org.spearce.jgit.lib.Repository;
+import org.spearce.jgit.lib.RepositoryTestCase;
+
+
+public class AbstractTreeIteratorTest extends RepositoryTestCase {
+
+
+ public class FakeTreeIterator extends WorkingTreeIterator {
+ public FakeTreeIterator(String path, FileMode fileMode) {
+ super(path);
+ mode = fileMode.getBits();
+ pathLen -= 1; // Get rid of extra '/'
+ }
+
+ @Override
+ public AbstractTreeIterator createSubtreeIterator(Repository repo)
+ throws IncorrectObjectTypeException, IOException {
+ return null;
+ }
+
+ }
+
+ public void testPathCompare() throws Exception {
+ assertTrue(new FakeTreeIterator("a", FileMode.REGULAR_FILE).pathCompare(
+ new FakeTreeIterator("a", FileMode.TREE)) < 0);
+
+ assertTrue(new FakeTreeIterator("a", FileMode.TREE).pathCompare(
+ new FakeTreeIterator("a", FileMode.REGULAR_FILE)) > 0);
+
+ assertTrue(new FakeTreeIterator("a", FileMode.REGULAR_FILE).pathCompare(
+ new FakeTreeIterator("a", FileMode.REGULAR_FILE)) == 0);
+
+ assertTrue(new FakeTreeIterator("a", FileMode.TREE).pathCompare(
+ new FakeTreeIterator("a", FileMode.TREE)) == 0);
+ }
+
+}
--
1.6.1.2.309.g2ea3
next prev parent reply other threads:[~2009-02-03 17:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-02 20:13 [JGIT PATCH] Fix AbstractTreeIterator path comparion betwen 'a' and 'a/b' Tor Arne Vestbø
2009-02-03 16:15 ` Shawn O. Pearce
2009-02-03 16:36 ` Tor Arne Vestbø
2009-02-03 17:03 ` Shawn O. Pearce
2009-02-03 17:10 ` Tor Arne Vestbø
2009-02-03 17:20 ` Tor Arne Vestbø [this message]
2009-02-03 16:57 ` Shawn O. Pearce
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=1233681623-22011-1-git-send-email-torarnv@gmail.com \
--to=torarnv@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).