diff options
| author | Robin Stocker | 2013-08-21 19:57:30 +0000 |
|---|---|---|
| committer | Robin Stocker | 2013-08-21 22:30:09 +0000 |
| commit | 84bfabd5655949f87b894d5ca9690bb2c93f16bb (patch) | |
| tree | f3e734bf3d487faa7ecc0af43dd61b770e1637c9 | |
| parent | 0e059bd11e0699af8185fd168e8a00746dd470b3 (diff) | |
| download | egit-84bfabd5655949f87b894d5ca9690bb2c93f16bb.tar.gz egit-84bfabd5655949f87b894d5ca9690bb2c93f16bb.tar.xz egit-84bfabd5655949f87b894d5ca9690bb2c93f16bb.zip | |
Be more strict in LinkedResourcesTest
Throw exception instead of logging and do not allow "missing local" when
creating linked resources. These could hide the real problem.
See https://hudson.eclipse.org/egit/job/egit-stable.gerrit/74/
Change-Id: I50cadd16bee9a65e77bb069c496c305019fd4b99
Signed-off-by: Robin Stocker <robin@nibor.org>
| -rw-r--r-- | org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitResourceDeltaTestHelper.java | 10 | ||||
| -rw-r--r-- | org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/LinkedResourcesTest.java | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitResourceDeltaTestHelper.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitResourceDeltaTestHelper.java index 464897c388..ab1eba1ce0 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitResourceDeltaTestHelper.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/GitResourceDeltaTestHelper.java @@ -28,7 +28,6 @@ import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.internal.indexdiff.GitResourceDeltaVisitor; import org.eclipse.egit.core.project.RepositoryMapping; import org.eclipse.jgit.lib.Repository; @@ -86,8 +85,8 @@ public class GitResourceDeltaTestHelper { try { event.getDelta().accept(visitor); } catch (CoreException e) { - Activator.logError(e.getMessage(), e); - return false; + String msg = "Exception during accept of GitResourceDeltaVisitor for resource delta"; + throw new RuntimeException(msg, e); } IPath gitDirAbsolutePath = mapping .getGitDirAbsolutePath(); @@ -104,8 +103,9 @@ public class GitResourceDeltaTestHelper { } }); } catch (CoreException e) { - Activator.logError(e.getMessage(), e); - return; + throw new RuntimeException( + "Exception during accept of test visitor for resource delta", + e); } } }; diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/LinkedResourcesTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/LinkedResourcesTest.java index d17453e0f4..a96fd989e9 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/LinkedResourcesTest.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/LinkedResourcesTest.java @@ -122,13 +122,12 @@ public class LinkedResourcesTest { throws Exception { // Create linked folder in project1 that points to project2 IFolder folder = project1.getFolder("link2project2"); - folder.createLink(project2.getLocation(), - IResource.ALLOW_MISSING_LOCAL, null); + folder.createLink(project2.getLocation(), 0, null); // Create linked file in project1 that points to a file in project2 IFile file = project1.getFile("link2project2folder1file1.txt"); file.createLink( project2.getFile("project2folder1/project2folder1file1.txt") - .getLocation(), IResource.ALLOW_MISSING_LOCAL, null); + .getLocation(), 0, null); // Add file to project2 testUtils.addFileToProject(project2, "project2folder1/project2folder1file2.txt", "Hello world"); |