Windows does not like naming files "a.". The trailing "." may be dropped by the filesystem, which is confusing. Even though these tests currently do not write to disk, future tests like them might. Replace "." with "-", which has the same sorting properties that were desirable about ".", but does not have the same limitations. Change-Id: Ie5b7594bf5e79828d1341883c73ddb70123d5055tags/v3.4.2.201412180340-r
@@ -190,7 +190,7 @@ public class DirCacheBasicTest extends RepositoryTestCase { | |||
public void testBuildThenClear() throws Exception { | |||
final DirCache dc = db.readDirCache(); | |||
final String[] paths = { "a.", "a.b", "a/b", "a0b" }; | |||
final String[] paths = { "a-", "a.b", "a/b", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); |
@@ -63,7 +63,7 @@ public class DirCacheBuilderIteratorTest extends RepositoryTestCase { | |||
final DirCache dc = db.readDirCache(); | |||
final FileMode mode = FileMode.REGULAR_FILE; | |||
final String[] paths = { "a.", "a/b", "a/c", "a/d", "a0b" }; | |||
final String[] paths = { "a-", "a/b", "a/c", "a/d", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); |
@@ -290,7 +290,7 @@ public class DirCacheBuilderTest extends RepositoryTestCase { | |||
public void testAdd_InGitSortOrder() throws Exception { | |||
final DirCache dc = db.readDirCache(); | |||
final String[] paths = { "a.", "a.b", "a/b", "a0b" }; | |||
final String[] paths = { "a-", "a.b", "a/b", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); | |||
@@ -315,7 +315,7 @@ public class DirCacheBuilderTest extends RepositoryTestCase { | |||
public void testAdd_ReverseGitSortOrder() throws Exception { | |||
final DirCache dc = db.readDirCache(); | |||
final String[] paths = { "a.", "a.b", "a/b", "a0b" }; | |||
final String[] paths = { "a-", "a.b", "a/b", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); | |||
@@ -340,7 +340,7 @@ public class DirCacheBuilderTest extends RepositoryTestCase { | |||
public void testBuilderClear() throws Exception { | |||
final DirCache dc = db.readDirCache(); | |||
final String[] paths = { "a.", "a.b", "a/b", "a0b" }; | |||
final String[] paths = { "a-", "a.b", "a/b", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); |
@@ -56,7 +56,7 @@ public class DirCacheFindTest extends RepositoryTestCase { | |||
public void testEntriesWithin() throws Exception { | |||
final DirCache dc = db.readDirCache(); | |||
final String[] paths = { "a.", "a/b", "a/c", "a/d", "a0b" }; | |||
final String[] paths = { "a-", "a/b", "a/c", "a/d", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); | |||
@@ -96,13 +96,13 @@ public class DirCacheFindTest extends RepositoryTestCase { | |||
assertSame(ents[i], aContents[i]); | |||
} | |||
assertNotNull(dc.getEntriesWithin("a.")); | |||
assertEquals(0, dc.getEntriesWithin("a.").length); | |||
assertNotNull(dc.getEntriesWithin("a-")); | |||
assertEquals(0, dc.getEntriesWithin("a-").length); | |||
assertNotNull(dc.getEntriesWithin("a0b")); | |||
assertEquals(0, dc.getEntriesWithin("a0b.").length); | |||
assertEquals(0, dc.getEntriesWithin("a0b-").length); | |||
assertNotNull(dc.getEntriesWithin("zoo")); | |||
assertEquals(0, dc.getEntriesWithin("zoo.").length); | |||
assertEquals(0, dc.getEntriesWithin("zoo-").length); | |||
} | |||
} |
@@ -85,7 +85,7 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
public void testNoSubtree_NoTreeWalk() throws Exception { | |||
final DirCache dc = DirCache.newInCore(); | |||
final String[] paths = { "a.", "a0b" }; | |||
final String[] paths = { "a-", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); | |||
@@ -111,7 +111,7 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
public void testNoSubtree_WithTreeWalk() throws Exception { | |||
final DirCache dc = DirCache.newInCore(); | |||
final String[] paths = { "a.", "a0b" }; | |||
final String[] paths = { "a-", "a0b" }; | |||
final FileMode[] modes = { FileMode.EXECUTABLE_FILE, FileMode.GITLINK }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
@@ -144,7 +144,7 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
public void testSingleSubtree_NoRecursion() throws Exception { | |||
final DirCache dc = DirCache.newInCore(); | |||
final String[] paths = { "a.", "a/b", "a/c", "a/d", "a0b" }; | |||
final String[] paths = { "a-", "a/b", "a/c", "a/d", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); | |||
@@ -156,7 +156,7 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
b.add(ents[i]); | |||
b.finish(); | |||
final String[] expPaths = { "a.", "a", "a0b" }; | |||
final String[] expPaths = { "a-", "a", "a0b" }; | |||
final FileMode[] expModes = { FileMode.REGULAR_FILE, FileMode.TREE, | |||
FileMode.REGULAR_FILE }; | |||
final int expPos[] = { 0, -1, 4 }; | |||
@@ -189,7 +189,7 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
final DirCache dc = DirCache.newInCore(); | |||
final FileMode mode = FileMode.REGULAR_FILE; | |||
final String[] paths = { "a.", "a/b", "a/c", "a/d", "a0b" }; | |||
final String[] paths = { "a-", "a/b", "a/c", "a/d", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); | |||
@@ -224,7 +224,7 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
final DirCache dc = DirCache.newInCore(); | |||
final FileMode mode = FileMode.REGULAR_FILE; | |||
final String[] paths = { "a.", "a/b", "a/c/e", "a/c/f", "a/d", "a0b" }; | |||
final String[] paths = { "a-", "a/b", "a/c/e", "a/c/f", "a/d", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); | |||
@@ -258,7 +258,7 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
final DirCache dc = DirCache.newInCore(); | |||
final FileMode mode = FileMode.REGULAR_FILE; | |||
final String[] paths = { "a.", "a/b", "a/c/e", "a/c/f", "a/d", "a0b" }; | |||
final String[] paths = { "a-", "a/b", "a/c/e", "a/c/f", "a/d", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); | |||
@@ -272,7 +272,7 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
DirCacheIterator dci = new DirCacheIterator(dc); | |||
assertFalse(dci.eof()); | |||
assertEquals("a.", dci.getEntryPathString()); | |||
assertEquals("a-", dci.getEntryPathString()); | |||
dci.next(1); | |||
assertFalse(dci.eof()); | |||
assertEquals("a", dci.getEntryPathString()); | |||
@@ -285,7 +285,7 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
// same entries the second time | |||
dci.reset(); | |||
assertFalse(dci.eof()); | |||
assertEquals("a.", dci.getEntryPathString()); | |||
assertEquals("a-", dci.getEntryPathString()); | |||
dci.next(1); | |||
assertFalse(dci.eof()); | |||
assertEquals("a", dci.getEntryPathString()); | |||
@@ -304,12 +304,12 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
assertEquals("a", dci.getEntryPathString()); | |||
dci.back(1); | |||
assertFalse(dci.eof()); | |||
assertEquals("a.", dci.getEntryPathString()); | |||
assertEquals("a-", dci.getEntryPathString()); | |||
assertTrue(dci.first()); | |||
// forward | |||
assertFalse(dci.eof()); | |||
assertEquals("a.", dci.getEntryPathString()); | |||
assertEquals("a-", dci.getEntryPathString()); | |||
dci.next(1); | |||
assertFalse(dci.eof()); | |||
assertEquals("a", dci.getEntryPathString()); | |||
@@ -385,7 +385,7 @@ public class DirCacheIteratorTest extends RepositoryTestCase { | |||
final DirCache dc = DirCache.newInCore(); | |||
final FileMode mode = FileMode.REGULAR_FILE; | |||
final String[] paths = { "a.", "a/b", "a/c/e", "a/c/f", "a/d", "a0b" }; | |||
final String[] paths = { "a-", "a/b", "a/c/e", "a/c/f", "a/d", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); |
@@ -113,21 +113,23 @@ public class DirCachePathEditTest { | |||
DirCache dc = DirCache.newInCore(); | |||
DirCacheEditor editor = dc.editor(); | |||
editor.add(new AddEdit("a/b")); | |||
editor.add(new AddEdit("a.")); | |||
editor.add(new AddEdit("a-")); | |||
editor.add(new AddEdit("ab")); | |||
editor.finish(); | |||
assertEquals(3, dc.getEntryCount()); | |||
// Validate sort order | |||
assertEquals("a.", dc.getEntry(0).getPathString()); | |||
assertEquals("a-", dc.getEntry(0).getPathString()); | |||
assertEquals("a/b", dc.getEntry(1).getPathString()); | |||
assertEquals("ab", dc.getEntry(2).getPathString()); | |||
editor = dc.editor(); | |||
// Sort order should not confuse DeleteTree | |||
editor.add(new DirCacheEditor.DeleteTree("a")); | |||
editor.finish(); | |||
assertEquals(2, dc.getEntryCount()); | |||
assertEquals("a.", dc.getEntry(0).getPathString()); | |||
assertEquals("a-", dc.getEntry(0).getPathString()); | |||
assertEquals("ab", dc.getEntry(1).getPathString()); | |||
} | |||
@@ -92,7 +92,7 @@ public class DirCacheTreeTest extends RepositoryTestCase { | |||
public void testSingleSubtree() throws Exception { | |||
final DirCache dc = db.readDirCache(); | |||
final String[] paths = { "a.", "a/b", "a/c", "a/d", "a0b" }; | |||
final String[] paths = { "a-", "a/b", "a/c", "a/d", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); | |||
@@ -130,7 +130,7 @@ public class DirCacheTreeTest extends RepositoryTestCase { | |||
public void testTwoLevelSubtree() throws Exception { | |||
final DirCache dc = db.readDirCache(); | |||
final String[] paths = { "a.", "a/b", "a/c/e", "a/c/f", "a/d", "a0b" }; | |||
final String[] paths = { "a-", "a/b", "a/c/e", "a/c/f", "a/d", "a0b" }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); | |||
@@ -190,7 +190,7 @@ public class DirCacheTreeTest extends RepositoryTestCase { | |||
final String A = String.format("a%2000s", "a"); | |||
final String B = String.format("b%2000s", "b"); | |||
final String[] paths = { A + ".", A + "." + B, A + "/" + B, A + "0" + B }; | |||
final String[] paths = { A + "-", A + "-" + B, A + "/" + B, A + "0" + B }; | |||
final DirCacheEntry[] ents = new DirCacheEntry[paths.length]; | |||
for (int i = 0; i < paths.length; i++) { | |||
ents[i] = new DirCacheEntry(paths[i]); |
@@ -169,7 +169,7 @@ public class PathFilterGroupTest { | |||
} | |||
// less obvious due to git sorting order | |||
filter.include(fakeWalk("d.")); | |||
filter.include(fakeWalk("d-")); | |||
// less obvious due to git sorting order | |||
try { |