git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [JGIT PATCH 1/5] JUnit test for EmptyTreeIterator
@ 2008-08-28 15:27 Shawn O. Pearce
  2008-08-28 15:27 ` [JGIT PATCH 2/5] JUnit tests for some TreeFilter implementations Shawn O. Pearce
  0 siblings, 1 reply; 5+ messages in thread
From: Shawn O. Pearce @ 2008-08-28 15:27 UTC (permalink / raw)
  To: Robin Rosenberg; +Cc: git

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 .../jgit/treewalk/EmptyTreeIteratorTest.java       |  106 ++++++++++++++++++++
 1 files changed, 106 insertions(+), 0 deletions(-)
 create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/EmptyTreeIteratorTest.java

diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/EmptyTreeIteratorTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/EmptyTreeIteratorTest.java
new file mode 100644
index 0000000..2cf5eca
--- /dev/null
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/EmptyTreeIteratorTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2008, Google Inc.
+ *
+ * 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 org.spearce.jgit.lib.ObjectId;
+import org.spearce.jgit.lib.RepositoryTestCase;
+
+public class EmptyTreeIteratorTest extends RepositoryTestCase {
+	public void testAtEOF() throws Exception {
+		final EmptyTreeIterator etp = new EmptyTreeIterator();
+		assertTrue(etp.first());
+		assertTrue(etp.eof());
+	}
+
+	public void testCreateSubtreeIterator() throws Exception {
+		final EmptyTreeIterator etp = new EmptyTreeIterator();
+		final AbstractTreeIterator sub = etp.createSubtreeIterator(db);
+		assertNotNull(sub);
+		assertTrue(sub.first());
+		assertTrue(sub.eof());
+		assertTrue(sub instanceof EmptyTreeIterator);
+	}
+
+	public void testEntryObjectId() throws Exception {
+		final EmptyTreeIterator etp = new EmptyTreeIterator();
+		assertSame(ObjectId.zeroId(), etp.getEntryObjectId());
+		assertNotNull(etp.idBuffer());
+		assertEquals(0, etp.idOffset());
+		assertEquals(ObjectId.zeroId(), ObjectId.fromRaw(etp.idBuffer()));
+	}
+
+	public void testNextDoesNothing() throws Exception {
+		final EmptyTreeIterator etp = new EmptyTreeIterator();
+		etp.next(1);
+		assertTrue(etp.first());
+		assertTrue(etp.eof());
+		assertEquals(ObjectId.zeroId(), ObjectId.fromRaw(etp.idBuffer()));
+
+		etp.next(1);
+		assertTrue(etp.first());
+		assertTrue(etp.eof());
+		assertEquals(ObjectId.zeroId(), ObjectId.fromRaw(etp.idBuffer()));
+	}
+
+	public void testBackDoesNothing() throws Exception {
+		final EmptyTreeIterator etp = new EmptyTreeIterator();
+		etp.back(1);
+		assertTrue(etp.first());
+		assertTrue(etp.eof());
+		assertEquals(ObjectId.zeroId(), ObjectId.fromRaw(etp.idBuffer()));
+
+		etp.back(1);
+		assertTrue(etp.first());
+		assertTrue(etp.eof());
+		assertEquals(ObjectId.zeroId(), ObjectId.fromRaw(etp.idBuffer()));
+	}
+
+	public void testStopWalkCallsParent() throws Exception {
+		final boolean called[] = new boolean[1];
+		assertFalse(called[0]);
+
+		final EmptyTreeIterator parent = new EmptyTreeIterator() {
+			@Override
+			public void stopWalk() {
+				called[0] = true;
+			}
+		};
+		parent.createSubtreeIterator(db).stopWalk();
+		assertTrue(called[0]);
+	}
+}
-- 
1.6.0.174.gd789c

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [JGIT PATCH 2/5] JUnit tests for some TreeFilter implementations
  2008-08-28 15:27 [JGIT PATCH 1/5] JUnit test for EmptyTreeIterator Shawn O. Pearce
@ 2008-08-28 15:27 ` Shawn O. Pearce
  2008-08-28 15:27   ` [JGIT PATCH 3/5] JUnit test for FileTreeIterator, WorkingTreeIterator Shawn O. Pearce
  0 siblings, 1 reply; 5+ messages in thread
From: Shawn O. Pearce @ 2008-08-28 15:27 UTC (permalink / raw)
  To: Robin Rosenberg; +Cc: git

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 .../treewalk/filter/AlwaysCloneTreeFilter.java     |   57 +++++++++++++
 .../jgit/treewalk/filter/NotTreeFilterTest.java    |   85 ++++++++++++++++++++
 .../jgit/treewalk/filter/TreeFilterTest.java       |   74 +++++++++++++++++
 .../jgit/treewalk/filter/NotTreeFilter.java        |    3 +-
 4 files changed, 218 insertions(+), 1 deletions(-)
 create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/AlwaysCloneTreeFilter.java
 create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/NotTreeFilterTest.java
 create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/TreeFilterTest.java

diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/AlwaysCloneTreeFilter.java b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/AlwaysCloneTreeFilter.java
new file mode 100644
index 0000000..054f081
--- /dev/null
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/AlwaysCloneTreeFilter.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2008, Google Inc.
+ *
+ * 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.filter;
+
+import org.spearce.jgit.treewalk.TreeWalk;
+
+class AlwaysCloneTreeFilter extends TreeFilter {
+	@Override
+	public TreeFilter clone() {
+		return new AlwaysCloneTreeFilter();
+	}
+
+	@Override
+	public boolean include(final TreeWalk walker) {
+		return false;
+	}
+
+	@Override
+	public boolean shouldBeRecursive() {
+		return false;
+	}
+}
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/NotTreeFilterTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/NotTreeFilterTest.java
new file mode 100644
index 0000000..7749a51
--- /dev/null
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/NotTreeFilterTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2008, Google Inc.
+ *
+ * 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.filter;
+
+import org.spearce.jgit.lib.RepositoryTestCase;
+import org.spearce.jgit.treewalk.TreeWalk;
+
+public class NotTreeFilterTest extends RepositoryTestCase {
+	public void testWrap() throws Exception {
+		final TreeWalk tw = new TreeWalk(db);
+		final TreeFilter a = TreeFilter.ALL;
+		final TreeFilter n = NotTreeFilter.create(a);
+		assertNotNull(n);
+		assertTrue(a.include(tw));
+		assertFalse(n.include(tw));
+	}
+
+	public void testNegateIsUnwrap() throws Exception {
+		final TreeFilter a = PathFilter.create("a/b");
+		final TreeFilter n = NotTreeFilter.create(a);
+		assertSame(a, n.negate());
+	}
+
+	public void testShouldBeRecursive_ALL() throws Exception {
+		final TreeFilter a = TreeFilter.ALL;
+		final TreeFilter n = NotTreeFilter.create(a);
+		assertEquals(a.shouldBeRecursive(), n.shouldBeRecursive());
+	}
+
+	public void testShouldBeRecursive_PathFilter() throws Exception {
+		final TreeFilter a = PathFilter.create("a/b");
+		assertTrue(a.shouldBeRecursive());
+		final TreeFilter n = NotTreeFilter.create(a);
+		assertTrue(n.shouldBeRecursive());
+	}
+
+	public void testCloneIsDeepClone() throws Exception {
+		final TreeFilter a = new AlwaysCloneTreeFilter();
+		assertNotSame(a, a.clone());
+		final TreeFilter n = NotTreeFilter.create(a);
+		assertNotSame(n, n.clone());
+	}
+
+	public void testCloneIsSparseWhenPossible() throws Exception {
+		final TreeFilter a = TreeFilter.ALL;
+		assertSame(a, a.clone());
+		final TreeFilter n = NotTreeFilter.create(a);
+		assertSame(n, n.clone());
+	}
+}
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/TreeFilterTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/TreeFilterTest.java
new file mode 100644
index 0000000..a8643bd
--- /dev/null
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/filter/TreeFilterTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2008, Google Inc.
+ *
+ * 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.filter;
+
+import org.spearce.jgit.lib.RepositoryTestCase;
+import org.spearce.jgit.treewalk.TreeWalk;
+
+public class TreeFilterTest extends RepositoryTestCase {
+	public void testALL_IncludesAnything() throws Exception {
+		final TreeWalk tw = new TreeWalk(db);
+		assertTrue(TreeFilter.ALL.include(tw));
+	}
+
+	public void testALL_ShouldNotBeRecursive() throws Exception {
+		assertFalse(TreeFilter.ALL.shouldBeRecursive());
+	}
+
+	public void testALL_IdentityClone() throws Exception {
+		assertSame(TreeFilter.ALL, TreeFilter.ALL.clone());
+	}
+
+	public void testNotALL_IncludesNothing() throws Exception {
+		final TreeWalk tw = new TreeWalk(db);
+		assertFalse(TreeFilter.ALL.negate().include(tw));
+	}
+
+	public void testANY_DIFF_IncludesSingleTreeCase() throws Exception {
+		final TreeWalk tw = new TreeWalk(db);
+		assertTrue(TreeFilter.ANY_DIFF.include(tw));
+	}
+
+	public void testANY_DIFF_ShouldNotBeRecursive() throws Exception {
+		assertFalse(TreeFilter.ANY_DIFF.shouldBeRecursive());
+	}
+
+	public void testANY_DIFF_IdentityClone() throws Exception {
+		assertSame(TreeFilter.ANY_DIFF, TreeFilter.ANY_DIFF.clone());
+	}
+}
diff --git a/org.spearce.jgit/src/org/spearce/jgit/treewalk/filter/NotTreeFilter.java b/org.spearce.jgit/src/org/spearce/jgit/treewalk/filter/NotTreeFilter.java
index 86ae82d..37d655e 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/treewalk/filter/NotTreeFilter.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/treewalk/filter/NotTreeFilter.java
@@ -81,7 +81,8 @@ public boolean shouldBeRecursive() {
 
 	@Override
 	public TreeFilter clone() {
-		return new NotTreeFilter(a.clone());
+		final TreeFilter n = a.clone();
+		return n == a ? this : new NotTreeFilter(n);
 	}
 
 	@Override
-- 
1.6.0.174.gd789c

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [JGIT PATCH 3/5] JUnit test for FileTreeIterator, WorkingTreeIterator
  2008-08-28 15:27 ` [JGIT PATCH 2/5] JUnit tests for some TreeFilter implementations Shawn O. Pearce
@ 2008-08-28 15:27   ` Shawn O. Pearce
  2008-08-28 15:27     ` [JGIT PATCH 4/5] Increase JUnit coverage on CanonicalTreeParser Shawn O. Pearce
  0 siblings, 1 reply; 5+ messages in thread
From: Shawn O. Pearce @ 2008-08-28 15:27 UTC (permalink / raw)
  To: Robin Rosenberg; +Cc: git

This test is an indirect test of WorkingTreeIterator as the class
is abstract.  An easy way to test it is through the FileTreeIterator
as that relies only on standard Java IO.

We don't have full coverage yet, but most of the cases are dealt
with by this test.  A better test of WorkingTreeIterator would be
to setup a mock implementation that works strictly in memory and
throws it all of the corner cases.  Building that is a lot more
work, and the test will be focusing more on the mock code than on
the live library, so I'm punting on it for now.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 .../jgit/treewalk/FileTreeIteratorTest.java        |  167 ++++++++++++++++++++
 1 files changed, 167 insertions(+), 0 deletions(-)
 create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/FileTreeIteratorTest.java

diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/FileTreeIteratorTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/FileTreeIteratorTest.java
new file mode 100644
index 0000000..ca31991
--- /dev/null
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/FileTreeIteratorTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2008, Google Inc.
+ *
+ * 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.File;
+import java.security.MessageDigest;
+
+import org.spearce.jgit.lib.Constants;
+import org.spearce.jgit.lib.FileMode;
+import org.spearce.jgit.lib.ObjectId;
+import org.spearce.jgit.lib.RepositoryTestCase;
+import org.spearce.jgit.util.RawParseUtils;
+
+public class FileTreeIteratorTest extends RepositoryTestCase {
+	private final String[] paths = { "a.", "a.b", "a/b", "a0b" };
+
+	private long[] mtime;
+
+	public void setUp() throws Exception {
+		super.setUp();
+
+		// We build the entries backwards so that on POSIX systems we
+		// are likely to get the entries in the trash directory in the
+		// opposite order of what they should be in for the iteration.
+		// This should stress the sorting code better than doing it in
+		// the correct order.
+		//
+		mtime = new long[paths.length];
+		for (int i = paths.length - 1; i >= 0; i--) {
+			final String s = paths[i];
+			writeTrashFile(s, s);
+			mtime[i] = new File(trash, s).lastModified();
+		}
+	}
+
+	public void testEmptyIfRootIsFile() throws Exception {
+		final File r = new File(trash, paths[0]);
+		assertTrue(r.isFile());
+		final FileTreeIterator fti = new FileTreeIterator(r);
+		assertTrue(fti.first());
+		assertTrue(fti.eof());
+	}
+
+	public void testEmptyIfRootDoesNotExist() throws Exception {
+		final File r = new File(trash, "not-existing-file");
+		assertFalse(r.exists());
+		final FileTreeIterator fti = new FileTreeIterator(r);
+		assertTrue(fti.first());
+		assertTrue(fti.eof());
+	}
+
+	public void testEmptyIfRootIsEmpty() throws Exception {
+		final File r = new File(trash, "not-existing-file");
+		assertFalse(r.exists());
+		r.mkdir();
+		assertTrue(r.isDirectory());
+
+		final FileTreeIterator fti = new FileTreeIterator(r);
+		assertTrue(fti.first());
+		assertTrue(fti.eof());
+	}
+
+	public void testSimpleIterate() throws Exception {
+		final FileTreeIterator top = new FileTreeIterator(trash);
+
+		assertTrue(top.first());
+		assertFalse(top.eof());
+		assertEquals(FileMode.REGULAR_FILE.getBits(), top.mode);
+		assertEquals(paths[0], nameOf(top));
+		assertEquals(paths[0].length(), top.getEntryLength());
+		assertEquals(mtime[0], top.getEntryLastModified());
+
+		top.next(1);
+		assertFalse(top.first());
+		assertFalse(top.eof());
+		assertEquals(FileMode.REGULAR_FILE.getBits(), top.mode);
+		assertEquals(paths[1], nameOf(top));
+		assertEquals(paths[1].length(), top.getEntryLength());
+		assertEquals(mtime[1], top.getEntryLastModified());
+
+		top.next(1);
+		assertFalse(top.first());
+		assertFalse(top.eof());
+		assertEquals(FileMode.TREE.getBits(), top.mode);
+
+		final AbstractTreeIterator sub = top.createSubtreeIterator(db);
+		assertTrue(sub instanceof FileTreeIterator);
+		final FileTreeIterator subfti = (FileTreeIterator) sub;
+		assertTrue(sub.first());
+		assertFalse(sub.eof());
+		assertEquals(paths[2], nameOf(sub));
+		assertEquals(paths[2].length(), subfti.getEntryLength());
+		assertEquals(mtime[2], subfti.getEntryLastModified());
+
+		sub.next(1);
+		assertTrue(sub.eof());
+
+		top.next(1);
+		assertFalse(top.first());
+		assertFalse(top.eof());
+		assertEquals(FileMode.REGULAR_FILE.getBits(), top.mode);
+		assertEquals(paths[3], nameOf(top));
+		assertEquals(paths[3].length(), top.getEntryLength());
+		assertEquals(mtime[3], top.getEntryLastModified());
+
+		top.next(1);
+		assertTrue(top.eof());
+	}
+
+	public void testComputeFileObjectId() throws Exception {
+		final FileTreeIterator top = new FileTreeIterator(trash);
+
+		final MessageDigest md = Constants.newMessageDigest();
+		md.update(Constants.encodeASCII(Constants.TYPE_BLOB));
+		md.update((byte) ' ');
+		md.update(Constants.encodeASCII(paths[0].length()));
+		md.update((byte) 0);
+		md.update(Constants.encode(paths[0]));
+		final ObjectId expect = ObjectId.fromRaw(md.digest());
+
+		assertEquals(expect, top.getEntryObjectId());
+
+		// Verify it was cached by removing the file and getting it again.
+		//
+		new File(trash, paths[0]).delete();
+		assertEquals(expect, top.getEntryObjectId());
+	}
+
+	private static String nameOf(final AbstractTreeIterator i) {
+		return RawParseUtils.decode(Constants.CHARSET, i.path, 0, i.pathLen);
+	}
+}
-- 
1.6.0.174.gd789c

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [JGIT PATCH 4/5] Increase JUnit coverage on CanonicalTreeParser
  2008-08-28 15:27   ` [JGIT PATCH 3/5] JUnit test for FileTreeIterator, WorkingTreeIterator Shawn O. Pearce
@ 2008-08-28 15:27     ` Shawn O. Pearce
  2008-08-28 15:27       ` [JGIT PATCH 5/5] Restore IContainer.INCLUDE_HIDDEN within ContainerTreeIterator Shawn O. Pearce
  0 siblings, 1 reply; 5+ messages in thread
From: Shawn O. Pearce @ 2008-08-28 15:27 UTC (permalink / raw)
  To: Robin Rosenberg; +Cc: git

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 .../jgit/treewalk/CanonicalTreeParserTest.java     |   18 ++++++++++++++++++
 .../jgit/treewalk/AbstractTreeIterator.java        |    2 +-
 2 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/CanonicalTreeParserTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/CanonicalTreeParserTest.java
index fd92844..ed3478c 100644
--- a/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/CanonicalTreeParserTest.java
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/treewalk/CanonicalTreeParserTest.java
@@ -108,18 +108,21 @@ public void testEmptyTree_AtEOF() throws Exception {
 	public void testOneEntry_Forward() throws Exception {
 		ctp.reset(tree1);
 
+		assertTrue(ctp.first());
 		assertFalse(ctp.eof());
 		assertEquals(m644.getBits(), ctp.mode);
 		assertEquals("a", path());
 		assertEquals(hash_a, ctp.getEntryObjectId());
 
 		ctp.next(1);
+		assertFalse(ctp.first());
 		assertTrue(ctp.eof());
 	}
 
 	public void testTwoEntries_ForwardOneAtATime() throws Exception {
 		ctp.reset(tree2);
 
+		assertTrue(ctp.first());
 		assertFalse(ctp.eof());
 		assertEquals(m644.getBits(), ctp.mode);
 		assertEquals("a", path());
@@ -132,6 +135,7 @@ public void testTwoEntries_ForwardOneAtATime() throws Exception {
 		assertEquals(hash_foo, ctp.getEntryObjectId());
 
 		ctp.next(1);
+		assertFalse(ctp.first());
 		assertTrue(ctp.eof());
 	}
 
@@ -170,9 +174,11 @@ public void testThreeEntries_Seek2() throws Exception {
 	public void testOneEntry_Backwards() throws Exception {
 		ctp.reset(tree1);
 		ctp.next(1);
+		assertFalse(ctp.first());
 		assertTrue(ctp.eof());
 
 		ctp.back(1);
+		assertTrue(ctp.first());
 		assertFalse(ctp.eof());
 		assertEquals(m644.getBits(), ctp.mode);
 		assertEquals("a", path());
@@ -258,4 +264,16 @@ public void testBackwards_ConfusingPathName() throws Exception {
 		assertEquals("a", path());
 		assertEquals(hash_a, ctp.getEntryObjectId());
 	}
+
+	public void testFreakingHugePathName() throws Exception {
+		final int n = AbstractTreeIterator.DEFAULT_PATH_SIZE * 4;
+		final StringBuilder b = new StringBuilder(n);
+		for (int i = 0; i < n; i++)
+			b.append('q');
+		final String name = b.toString();
+		ctp.reset(entry(m644, name, hash_a));
+		assertFalse(ctp.eof());
+		assertEquals(name, RawParseUtils.decode(Constants.CHARSET, ctp.path,
+				ctp.pathOffset, ctp.pathLen));
+	}
 }
diff --git a/org.spearce.jgit/src/org/spearce/jgit/treewalk/AbstractTreeIterator.java b/org.spearce.jgit/src/org/spearce/jgit/treewalk/AbstractTreeIterator.java
index 3227fab..5226ab6 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/treewalk/AbstractTreeIterator.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/treewalk/AbstractTreeIterator.java
@@ -71,7 +71,7 @@
  * @see CanonicalTreeParser
  */
 public abstract class AbstractTreeIterator {
-	private static final int DEFAULT_PATH_SIZE = 128;
+	static final int DEFAULT_PATH_SIZE = 128;
 
 	/** A dummy object id buffer that matches the zero ObjectId. */
 	protected static final byte[] zeroid = new byte[Constants.OBJECT_ID_LENGTH];
-- 
1.6.0.174.gd789c

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [JGIT PATCH 5/5] Restore IContainer.INCLUDE_HIDDEN within ContainerTreeIterator
  2008-08-28 15:27     ` [JGIT PATCH 4/5] Increase JUnit coverage on CanonicalTreeParser Shawn O. Pearce
@ 2008-08-28 15:27       ` Shawn O. Pearce
  0 siblings, 0 replies; 5+ messages in thread
From: Shawn O. Pearce @ 2008-08-28 15:27 UTC (permalink / raw)
  To: Robin Rosenberg; +Cc: git

Now that we support only Eclipse 3.4 we might as well use this
flag to pick up hidden resources which may be part of the Git
repository, but hidden from view from Eclipse.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 .../spearce/egit/core/ContainerTreeIterator.java   |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/ContainerTreeIterator.java b/org.spearce.egit.core/src/org/spearce/egit/core/ContainerTreeIterator.java
index 2b7ff3b..61717f5 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/ContainerTreeIterator.java
+++ b/org.spearce.egit.core/src/org/spearce/egit/core/ContainerTreeIterator.java
@@ -91,8 +91,7 @@ public AbstractTreeIterator createSubtreeIterator(final Repository db)
 	private Entry[] entries() {
 		final IResource[] all;
 		try {
-//			all = node.members(IContainer.INCLUDE_HIDDEN); 3.4 flag
-			all = node.members(0);
+			all = node.members(IContainer.INCLUDE_HIDDEN);
 		} catch (CoreException err) {
 			return EOF;
 		}
-- 
1.6.0.174.gd789c

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-08-28 15:29 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-08-28 15:27 [JGIT PATCH 1/5] JUnit test for EmptyTreeIterator Shawn O. Pearce
2008-08-28 15:27 ` [JGIT PATCH 2/5] JUnit tests for some TreeFilter implementations Shawn O. Pearce
2008-08-28 15:27   ` [JGIT PATCH 3/5] JUnit test for FileTreeIterator, WorkingTreeIterator Shawn O. Pearce
2008-08-28 15:27     ` [JGIT PATCH 4/5] Increase JUnit coverage on CanonicalTreeParser Shawn O. Pearce
2008-08-28 15:27       ` [JGIT PATCH 5/5] Restore IContainer.INCLUDE_HIDDEN within ContainerTreeIterator Shawn O. Pearce

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).