From 56ee8117802a672e80011ee07ea6b253a5b7d0a9 Mon Sep 17 00:00:00 2001 From: Robin Stocker Date: Mon, 8 Jul 2013 10:51:52 +0200 Subject: Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilter * It didn't check the first character in the pattern due to a off-by-one error. Spotted by James Roper. * It returned true even when pattern was longer than current path, e.g. it returned that ".txt" is suffix of "txt". Bug: 411999 Change-Id: I9fbcd68a11fb57cc49956b70c387a47271a0424f Signed-off-by: Robin Stocker --- .../org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'org.eclipse.jgit.test') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java index 3ec159198a..d871c5ec10 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathSuffixFilterTest.java @@ -82,6 +82,16 @@ public class PathSuffixFilterTest extends RepositoryTestCase { assertEquals(expected, paths); } + @Test + public void testEdgeCases() throws IOException { + ObjectId treeId = createTree("abc", "abcd", "bcd", "c"); + assertEquals(new ArrayList(), getMatchingPaths("xbcd", treeId)); + assertEquals(new ArrayList(), getMatchingPaths("abcx", treeId)); + assertEquals(Arrays.asList("abcd"), getMatchingPaths("abcd", treeId)); + assertEquals(Arrays.asList("abcd", "bcd"), getMatchingPaths("bcd", treeId)); + assertEquals(Arrays.asList("abc", "c"), getMatchingPaths("c", treeId)); + } + private ObjectId createTree(String... paths) throws IOException { final ObjectInserter odi = db.newObjectInserter(); final DirCache dc = db.readDirCache(); -- cgit v1.2.3