git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Robin Rosenberg <robin.rosenberg@dewire.com>
Cc: git@vger.kernel.org,
	Constantine Plotnikov <constantine.plotnikov@gmail.com>
Subject: [JGIT PATCH] Add more tests for AbstractTreeIterator
Date: Mon,  6 Jul 2009 09:52:08 -0700	[thread overview]
Message-ID: <1246899128-8201-1-git-send-email-spearce@spearce.org> (raw)

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
CC: Constantine Plotnikov <constantine.plotnikov@gmail.com>
---
 .../jgit/treewalk/AbstractTreeIteratorTest.java    |   91 +++++++++++++++++++-
 1 files changed, 88 insertions(+), 3 deletions(-)

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
index 562053e..ed4936b 100644
--- a/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/AbstractTreeIteratorTest.java
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/AbstractTreeIteratorTest.java
@@ -42,16 +42,27 @@
 import junit.framework.TestCase;
 
 import org.spearce.jgit.errors.IncorrectObjectTypeException;
+import org.spearce.jgit.lib.Constants;
 import org.spearce.jgit.lib.FileMode;
 import org.spearce.jgit.lib.Repository;
 
 
 public class AbstractTreeIteratorTest extends TestCase {
+	private static String prefix(String path) {
+		final int s = path.lastIndexOf('/');
+		return s > 0 ? path.substring(0, s) : "";
+	}
+
 	public class FakeTreeIterator extends WorkingTreeIterator {
-		public FakeTreeIterator(String path, FileMode fileMode) {
-			super(path);
+		public FakeTreeIterator(String pathName, FileMode fileMode) {
+			super(prefix(pathName));
 			mode = fileMode.getBits();
-			pathLen -= 1; // Get rid of extra '/'
+
+			final int s = pathName.lastIndexOf('/');
+			final byte[] name = Constants.encode(pathName.substring(s + 1));
+			ensurePathCapacity(pathOffset + name.length, pathOffset);
+			System.arraycopy(name, 0, path, pathOffset, name.length);
+			pathLen = pathOffset + name.length;
 		}
 
 		@Override
@@ -74,4 +85,78 @@ public void testPathCompare() throws Exception {
 		assertTrue(new FakeTreeIterator("a", FileMode.TREE).pathCompare(
 				new FakeTreeIterator("a", FileMode.TREE)) == 0);
 	}
+
+	public void testGrowPath() throws Exception {
+		final FakeTreeIterator i = new FakeTreeIterator("ab", FileMode.TREE);
+		final byte[] origpath = i.path;
+		assertEquals(i.path[0], 'a');
+		assertEquals(i.path[1], 'b');
+
+		i.growPath(2);
+
+		assertNotSame(origpath, i.path);
+		assertEquals(origpath.length * 2, i.path.length);
+		assertEquals(i.path[0], 'a');
+		assertEquals(i.path[1], 'b');
+	}
+
+	public void testEnsurePathCapacityFastCase() throws Exception {
+		final FakeTreeIterator i = new FakeTreeIterator("ab", FileMode.TREE);
+		final int want = 50;
+		final byte[] origpath = i.path;
+		assertEquals(i.path[0], 'a');
+		assertEquals(i.path[1], 'b');
+		assertTrue(want < i.path.length);
+
+		i.ensurePathCapacity(want, 2);
+
+		assertSame(origpath, i.path);
+		assertEquals(i.path[0], 'a');
+		assertEquals(i.path[1], 'b');
+	}
+
+	public void testEnsurePathCapacityGrows() throws Exception {
+		final FakeTreeIterator i = new FakeTreeIterator("ab", FileMode.TREE);
+		final int want = 384;
+		final byte[] origpath = i.path;
+		assertEquals(i.path[0], 'a');
+		assertEquals(i.path[1], 'b');
+		assertTrue(i.path.length < want);
+
+		i.ensurePathCapacity(want, 2);
+
+		assertNotSame(origpath, i.path);
+		assertEquals(512, i.path.length);
+		assertEquals(i.path[0], 'a');
+		assertEquals(i.path[1], 'b');
+	}
+
+	public void testEntryFileMode() {
+		for (FileMode m : new FileMode[] { FileMode.TREE,
+				FileMode.REGULAR_FILE, FileMode.EXECUTABLE_FILE,
+				FileMode.GITLINK, FileMode.SYMLINK }) {
+			final FakeTreeIterator i = new FakeTreeIterator("a", m);
+			assertEquals(m.getBits(), i.getEntryRawMode());
+			assertSame(m, i.getEntryFileMode());
+		}
+	}
+
+	public void testEntryPath() {
+		FakeTreeIterator i = new FakeTreeIterator("a/b/cd", FileMode.TREE);
+		assertEquals("a/b/cd", i.getEntryPathString());
+		assertEquals(2, i.getNameLength());
+		byte[] b = new byte[3];
+		b[0] = 0x0a;
+		i.getName(b, 1);
+		assertEquals(0x0a, b[0]);
+		assertEquals('c', b[1]);
+		assertEquals('d', b[2]);
+	}
+
+	public void testCreateEmptyTreeIterator() {
+		FakeTreeIterator i = new FakeTreeIterator("a/b/cd", FileMode.TREE);
+		EmptyTreeIterator e = i.createEmptyTreeIterator();
+		assertNotNull(e);
+		assertEquals(i.getEntryPathString() + "/", e.getEntryPathString());
+	}
 }
-- 
1.6.3.3.507.gc6b5a

                 reply	other threads:[~2009-07-06 16:52 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1246899128-8201-1-git-send-email-spearce@spearce.org \
    --to=spearce@spearce.org \
    --cc=constantine.plotnikov@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=robin.rosenberg@dewire.com \
    /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).