diff options
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.java | 10 | ||||
| -rw-r--r-- | org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/RebaseOperationTest.java | 5 |
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 375db2bc7b..73c16846aa 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 973bc38007..0e525b309b 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")); |