Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Baumgart2011-01-10 07:13:29 -0500
committerMatthias Sohn2011-01-10 08:28:26 -0500
commitb07033deb2140b321b8d4882161f6e0431bcdb20 (patch)
tree1b6f6dd5b8e69bb31d9bb9cf53e185e5e118a40a /org.eclipse.egit.core.test
parent74ee7edcdb577067b025e663b82dc1acead890dd (diff)
downloadegit-b07033deb2140b321b8d4882161f6e0431bcdb20.tar.gz
egit-b07033deb2140b321b8d4882161f6e0431bcdb20.tar.xz
egit-b07033deb2140b321b8d4882161f6e0431bcdb20.zip
Remove usages of deprecated methods
Change-Id: I09da29344eb7d337ec441c76881fd5651c924c83 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/AddOperationTest.java4
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/AddOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/AddOperationTest.java
index 96315cd27..8c70cc07e 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/AddOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/AddOperationTest.java
@@ -164,6 +164,8 @@ public class AddOperationTest extends GitTestCase {
"sub/a.txt", "some text");
IFile file2 = testUtils.addFileToProject(project.getProject(),
"sub/b.txt", "some text");
+ // TODO use setDerived(boolean isDerived, IProgressMonitor monitor)
+ // when minimal supported Eclipse version is 3.6
file2.setDerived(true);
resources.add(project.getProject().getFolder("sub"));
@@ -181,6 +183,8 @@ public class AddOperationTest extends GitTestCase {
"sub/a.txt", "some text");
IFile file2 = testUtils.addFileToProject(project.getProject(),
"sub/b.txt", "some text");
+ // TODO use setDerived(boolean isDerived, IProgressMonitor monitor)
+ // when minimal supported Eclipse version is 3.6
file2.setDerived(true);
resources.add(project.getProject());
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java
index fac06bfc8..96d9804eb 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java
@@ -119,7 +119,7 @@ public class IgnoreOperationTest extends GitTestCase {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
File rootFile = root.getRawLocation().toFile();
File ignoreFile = new File(rootFile, Constants.GITIGNORE_FILENAME);
- String content = testUtils.slurpAndClose(ignoreFile.toURL()
+ String content = testUtils.slurpAndClose(ignoreFile.toURI().toURL()
.openStream());
assertEquals("/" + project.getProject().getName() + "\n", content);
assertTrue(operation.isGitignoreOutsideWSChanged());

Back to the top