Also fix anybodyHasFlag() to return false, as the queue is empty, and thus nobody has that flag. This matches the behavior of the other queue types. Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx> --- .../jgit/revwalk/AlwaysEmptyRevQueueTest.java | 63 ++++++++++++++++++++ .../org/spearce/jgit/revwalk/AbstractRevQueue.java | 2 +- 2 files changed, 64 insertions(+), 1 deletions(-) create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/revwalk/AlwaysEmptyRevQueueTest.java diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/revwalk/AlwaysEmptyRevQueueTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/revwalk/AlwaysEmptyRevQueueTest.java new file mode 100644 index 0000000..94edd0a --- /dev/null +++ b/org.spearce.jgit.test/tst/org/spearce/jgit/revwalk/AlwaysEmptyRevQueueTest.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2009, 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.revwalk; + +public class AlwaysEmptyRevQueueTest extends RevWalkTestCase { + private final AbstractRevQueue q = AbstractRevQueue.EMPTY_QUEUE; + + public void testEmpty() throws Exception { + assertNull(q.next()); + assertTrue(q.everbodyHasFlag(RevWalk.UNINTERESTING)); + assertFalse(q.anybodyHasFlag(RevWalk.UNINTERESTING)); + assertEquals(0, q.outputType()); + } + + public void testClear() throws Exception { + q.clear(); + testEmpty(); + } + + public void testAddFails() throws Exception { + try { + q.add(commit()); + fail("Did not throw UnsupportedOperationException"); + } catch (UnsupportedOperationException e) { + // expected result + } + } +} diff --git a/org.spearce.jgit/src/org/spearce/jgit/revwalk/AbstractRevQueue.java b/org.spearce.jgit/src/org/spearce/jgit/revwalk/AbstractRevQueue.java index 5bb969d..9a6bf81 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/revwalk/AbstractRevQueue.java +++ b/org.spearce.jgit/src/org/spearce/jgit/revwalk/AbstractRevQueue.java @@ -133,7 +133,7 @@ public RevCommit next() { @Override boolean anybodyHasFlag(int f) { - return true; + return false; } @Override -- 1.6.2.1.286.g8173 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html