Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2019-01-01 13:38:57 -0500
committerMatthias Sohn2019-01-02 19:46:52 -0500
commit532d2c9a31f855078952f9f1dca1fce08240b55f (patch)
tree4fcab15a93c90874a423438a0404fcdd728f11d9 /org.eclipse.egit.core.test/src
parent2f9d027cc5a35c42a58f92139eedde36958421e9 (diff)
downloadegit-532d2c9a31f855078952f9f1dca1fce08240b55f.tar.gz
egit-532d2c9a31f855078952f9f1dca1fce08240b55f.tar.xz
egit-532d2c9a31f855078952f9f1dca1fce08240b55f.zip
Enabled ignored tests
Disabled tests should always be re-enabled as soon as possible (or deleted). ResourceUtilTest has been adapted to test for the most nested project, caused by the implementation of bug #476585. I'm not sure if we can eventually remove the "innermost" parameter of getFileForLocation by now. Change-Id: I9f343dbb371e124e8e1576dbe2f3693f3b2f1d71 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Diffstat (limited to 'org.eclipse.egit.core.test/src')
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ResourceUtilTest.java10
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java5
2 files changed, 4 insertions, 11 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ResourceUtilTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ResourceUtilTest.java
index 375db2bc7..73c16846a 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ResourceUtilTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/util/ResourceUtilTest.java
@@ -31,7 +31,6 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -76,7 +75,6 @@ public class ResourceUtilTest extends GitTestCase {
assertThat(resource, nullValue());
}
- @Ignore
@Test
public void getFileForLocationShouldReturnExistingFileInCaseOfNestedProject()
throws Exception {
@@ -88,7 +86,7 @@ public class ResourceUtilTest extends GitTestCase {
IFile result = ResourceUtil.getFileForLocation(location, false);
assertThat(result, notNullValue());
assertTrue("Returned IFile should exist", result.exists());
- assertThat(result.getProject(), is(project.getProject()));
+ assertThat(result.getProject(), is(nested.getProject()));
result = ResourceUtil.getFileForLocation(location, true);
assertThat(result, notNullValue());
@@ -96,7 +94,6 @@ public class ResourceUtilTest extends GitTestCase {
assertThat(result.getProject(), is(nested.getProject()));
}
- @Ignore
@Test
public void getFileForLocationShouldReturnExistingFileInCaseOfNestedNotClosedProject()
throws Exception {
@@ -111,7 +108,7 @@ public class ResourceUtilTest extends GitTestCase {
IFile result = ResourceUtil.getFileForLocation(location, false);
assertThat(result, notNullValue());
assertTrue("Returned IFile should exist", result.exists());
- assertThat(result.getProject(), is(project.getProject()));
+ assertThat(result.getProject(), is(nested.getProject()));
result = ResourceUtil.getFileForLocation(location, true);
assertThat(result, notNullValue());
@@ -119,7 +116,6 @@ public class ResourceUtilTest extends GitTestCase {
assertThat(result.getProject(), is(nested.getProject()));
}
- @Ignore
@Test
public void getFileForLocationShouldNotUseFilesWithoutRepositoryMapping()
throws Exception {
@@ -142,7 +138,7 @@ public class ResourceUtilTest extends GitTestCase {
result = ResourceUtil.getFileForLocation(location, false);
assertThat(result, notNullValue());
assertTrue("Returned IFile should exist", result.exists());
- assertThat(result.getProject(), is(project.getProject()));
+ assertThat(result.getProject(), is(nested.getProject()));
result = ResourceUtil.getFileForLocation(location, true);
assertThat(result, notNullValue());
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java
index 973bc3800..0e525b309 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java
@@ -23,8 +23,8 @@ import org.eclipse.egit.core.op.RebaseOperation;
import org.eclipse.egit.core.test.GitTestCase;
import org.eclipse.egit.core.test.TestRepository;
import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.RebaseResult;
import org.eclipse.jgit.api.RebaseCommand.Operation;
+import org.eclipse.jgit.api.RebaseResult;
import org.eclipse.jgit.api.RebaseResult.Status;
import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
import org.eclipse.jgit.lib.Constants;
@@ -32,7 +32,6 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
public class RebaseOperationTest extends GitTestCase {
@@ -60,8 +59,6 @@ public class RebaseOperationTest extends GitTestCase {
}
@Test
- @Ignore
- // currently not working as expected; see also TODO in RebaseCommand
public void testUpToDate() throws Exception {
IFile file = project.createFile("theFile.txt", "Hello, world"
.getBytes("UTF-8"));

Back to the top