From 60c5939b236723cb43344115eed03caf8de2b22a Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 28 Jul 2010 14:45:12 -0700 Subject: Rename getOldName,getNewName to getOldPath,getNewPath TreeWalk calls this value "path", while "name" is the stuff after the last slash. FileHeader should do the same thing to be consistent. Rename getOldName to getOldPath and getNewName to getNewPath. Bug: 318526 Change-Id: Ib2e372ad4426402d37939b48d8f233154cc637da Signed-off-by: Shawn O. Pearce --- .../tst/org/eclipse/jgit/diff/RenameDetectorTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/diff') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java index 37c9d2fb77..26116d2504 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java @@ -498,10 +498,10 @@ public class RenameDetectorTest extends RepositoryTestCase { assertEquals(1, entries.size()); DiffEntry modify = entries.get(0); - assertEquals(m.oldName, modify.oldName); + assertEquals(m.oldPath, modify.oldPath); assertEquals(m.oldId, modify.oldId); assertEquals(m.oldMode, modify.oldMode); - assertEquals(m.newName, modify.newName); + assertEquals(m.newPath, modify.newPath); assertEquals(m.newId, modify.newId); assertEquals(m.newMode, modify.newMode); assertEquals(m.changeType, modify.changeType); @@ -560,8 +560,8 @@ public class RenameDetectorTest extends RepositoryTestCase { DiffEntry rename) { assertEquals(ChangeType.RENAME, rename.getChangeType()); - assertEquals(o.getOldName(), rename.getOldName()); - assertEquals(n.getNewName(), rename.getNewName()); + assertEquals(o.getOldPath(), rename.getOldPath()); + assertEquals(n.getNewPath(), rename.getNewPath()); assertEquals(o.getOldMode(), rename.getOldMode()); assertEquals(n.getNewMode(), rename.getNewMode()); @@ -576,8 +576,8 @@ public class RenameDetectorTest extends RepositoryTestCase { DiffEntry copy) { assertEquals(ChangeType.COPY, copy.getChangeType()); - assertEquals(o.getOldName(), copy.getOldName()); - assertEquals(n.getNewName(), copy.getNewName()); + assertEquals(o.getOldPath(), copy.getOldPath()); + assertEquals(n.getNewPath(), copy.getNewPath()); assertEquals(o.getOldMode(), copy.getOldMode()); assertEquals(n.getNewMode(), copy.getNewMode()); @@ -590,11 +590,11 @@ public class RenameDetectorTest extends RepositoryTestCase { private static void assertAdd(String newName, ObjectId newId, FileMode newMode, DiffEntry add) { - assertEquals(DiffEntry.DEV_NULL, add.oldName); + assertEquals(DiffEntry.DEV_NULL, add.oldPath); assertEquals(DiffEntry.A_ZERO, add.oldId); assertEquals(FileMode.MISSING, add.oldMode); assertEquals(ChangeType.ADD, add.changeType); - assertEquals(newName, add.newName); + assertEquals(newName, add.newPath); assertEquals(AbbreviatedObjectId.fromObjectId(newId), add.newId); assertEquals(newMode, add.newMode); } -- cgit v1.2.3