From cb6f2c29474d68dfdb9d06e78bea90dfcbfe3551 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 24 Aug 2012 11:55:52 -0400 Subject: [PATCH] bug 387730: Better failure message in the unit test --- .../errorparsers/tests/ErrorParserFileMatchingTest.java | 5 ++++- .../org/eclipse/cdt/core/testplugin/ResourceHelper.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java index a209c2cad9b..75c7b5f5995 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java @@ -937,10 +937,13 @@ public class ErrorParserFileMatchingTest extends TestCase { // Skip the test if Cygwin is not available. return; } - + assertTrue("usrIncludeWindowsPath=["+usrIncludeWindowsPath+"]", usrIncludeWindowsPath.charAt(1)==IPath.DEVICE_SEPARATOR); + java.io.File file = new java.io.File(usrIncludeWindowsPath + "\\" + fileName); + assertTrue("File " + file + " does not exist, check your cygwin installation", file.exists()); + ResourceHelper.createLinkedFolder(fProject, "include", usrIncludeWindowsPath); parseOutput(cygwinFolder+fileName+":1:error"); diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java index 696dae3fbf2..5db7cc5ca2c 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java @@ -457,7 +457,7 @@ public class ResourceHelper { */ public static IFolder createLinkedFolder(IProject project, String folderLink, IPath realFolder) throws CoreException { IFolder folder = project.getFolder(folderLink); - folder.createLink(realFolder, IResource.REPLACE, null); + folder.createLink(realFolder, IResource.REPLACE | IResource.ALLOW_MISSING_LOCAL, null); Assert.assertTrue(folder.exists()); resourcesCreated.add(folder); return folder;