Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDariusz Luksza2011-03-13 20:27:05 -0400
committerDariusz Luksza2011-03-13 20:27:05 -0400
commit6c5e2ea0ec6ac72c38b6a2a0529ece510d571dde (patch)
treec78f6a776a4bdaffd77aaa161aaffdf191354df5 /org.eclipse.egit.core.test
parent82f705cb86a9249cd377ba8354b6b61f2f5c11c0 (diff)
downloadegit-6c5e2ea0ec6ac72c38b6a2a0529ece510d571dde.tar.gz
egit-6c5e2ea0ec6ac72c38b6a2a0529ece510d571dde.tar.xz
egit-6c5e2ea0ec6ac72c38b6a2a0529ece510d571dde.zip
[sync] Don't show ignored files in Workspace model
It appears that after performance improvements in synchronize view ignored files was shown in Workspace model. This change adds also an test case for checking that ignored files doesn't show in Git Change Set and Workspace models. Bug: 322454 Change-Id: Iecd37a15ddf5eb04303f4daa6d6016112b9eea43 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java
index 92b4f0e12..16641e935 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java
@@ -153,7 +153,7 @@ public class GitResourceVariantComparatorTest extends GitTestCase {
IPath localPath = mock(IPath.class);
IContainer local = mock(IContainer.class);
when(local.exists()).thenReturn(true);
- when(local.getFullPath()).thenReturn(localPath);
+ when(local.getLocation()).thenReturn(localPath);
File file = testRepo.createFile(iProject, "test" + File.separator
+ "keep");
@@ -188,11 +188,11 @@ public class GitResourceVariantComparatorTest extends GitTestCase {
RevCommit commit = testRepo.addAndCommit(iProject, file,
"initial commit");
String path = Repository.stripWorkDir(repo.getWorkTree(), file);
- IPath iPath = new Path(File.separator + path);
+ IPath iPath = new Path(path);
IContainer local = mock(IContainer.class);
when(local.exists()).thenReturn(true);
- when(local.getFullPath()).thenReturn(iPath);
+ when(local.getLocation()).thenReturn(iPath);
GitFolderResourceVariant remote = new GitFolderResourceVariant(repo, null,
commit.getTree(), path);

Back to the top