From 651418210c3398ce777239c973a26d0decee01bc Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Thu, 2 Jun 2011 20:05:26 +0000 Subject: [PATCH] isSymbolicLinkSupported() extracted --- .../tests/ErrorParserFileMatchingTest.java | 54 +++++++++---------- 1 file changed, 25 insertions(+), 29 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 99a8b84f4bf..d24ec5a70bb 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 @@ -434,16 +434,15 @@ public class ErrorParserFileMatchingTest extends TestCase { * @throws Exception... */ public void testSymbolicLink() throws Exception { + // do not test on systems where symbolic links are not supported + if (!ResourceHelper.isSymbolicLinkSupported()) + return; + ResourceHelper.createWorkspaceFolder("OutsideFolder"); IPath realFile = ResourceHelper.createWorkspaceFile("OutsideFolder/RealFile.c"); - try { - ResourceHelper.createFolder(fProject,"Folder"); - ResourceHelper.createSymbolicLink(fProject, "Folder/testSymbolicLink.c", realFile); - } catch (UnsupportedOperationException e) { - // Do not run the test on Windows system where links are not supported. - return; - } + ResourceHelper.createFolder(fProject,"Folder"); + ResourceHelper.createSymbolicLink(fProject, "Folder/testSymbolicLink.c", realFile); parseOutput("testSymbolicLink.c:1:error"); assertEquals(1, errorList.size()); @@ -458,19 +457,18 @@ public class ErrorParserFileMatchingTest extends TestCase { * @throws Exception... */ public void testDuplicateSymbolicLink() throws Exception { + // do not test on systems where symbolic links are not supported + if (!ResourceHelper.isSymbolicLinkSupported()) + return; + ResourceHelper.createWorkspaceFolder("OutsideFolder"); IPath realFile = ResourceHelper.createWorkspaceFile("OutsideFolder/RealFile.c"); - try { - ResourceHelper.createFolder(fProject,"FolderA"); - ResourceHelper.createSymbolicLink(fProject, "FolderA/testDuplicateSymbolicLink.c", realFile); + ResourceHelper.createFolder(fProject,"FolderA"); + ResourceHelper.createSymbolicLink(fProject, "FolderA/testDuplicateSymbolicLink.c", realFile); - ResourceHelper.createFolder(fProject,"FolderB"); - ResourceHelper.createSymbolicLink(fProject, "FolderB/testDuplicateSymbolicLink.c", realFile); - } catch (UnsupportedOperationException e) { - // Do not run the test on Windows system where links are not supported. - return; - } + ResourceHelper.createFolder(fProject,"FolderB"); + ResourceHelper.createSymbolicLink(fProject, "FolderB/testDuplicateSymbolicLink.c", realFile); parseOutput("testDuplicateSymbolicLink.c:1:error"); assertEquals(1, errorList.size()); @@ -487,15 +485,14 @@ public class ErrorParserFileMatchingTest extends TestCase { * @throws Exception... */ public void testFolderSymbolicLink() throws Exception { + // do not test on systems where symbolic links are not supported + if (!ResourceHelper.isSymbolicLinkSupported()) + return; + IPath realFolder = ResourceHelper.createWorkspaceFolder("OutsideFolderForSymbolicLink"); ResourceHelper.createWorkspaceFile("OutsideFolderForSymbolicLink/testFolderSymbolicLink.c"); - try { - ResourceHelper.createSymbolicLink(fProject, "FolderSymbolicLink", realFolder); - } catch (UnsupportedOperationException e) { - // Do not run the test on Windows system where links are not supported. - return; - } + ResourceHelper.createSymbolicLink(fProject, "FolderSymbolicLink", realFolder); parseOutput("testFolderSymbolicLink.c:1:error"); assertEquals(1, errorList.size()); @@ -510,16 +507,15 @@ public class ErrorParserFileMatchingTest extends TestCase { * @throws Exception... */ public void testDuplicateFolderSymbolicLink() throws Exception { + // do not test on systems where symbolic links are not supported + if (!ResourceHelper.isSymbolicLinkSupported()) + return; + IPath realFolder = ResourceHelper.createWorkspaceFolder("OutsideFolder"); ResourceHelper.createWorkspaceFile("OutsideFolder/testDuplicateFolderSymbolicLink.c"); - try { - ResourceHelper.createSymbolicLink(fProject, "FolderSymbolicLinkA", realFolder); - ResourceHelper.createSymbolicLink(fProject, "FolderSymbolicLinkB", realFolder); - } catch (UnsupportedOperationException e) { - // Do not run the test on Windows system where links are not supported. - return; - } + ResourceHelper.createSymbolicLink(fProject, "FolderSymbolicLinkA", realFolder); + ResourceHelper.createSymbolicLink(fProject, "FolderSymbolicLinkB", realFolder); parseOutput("testDuplicateFolderSymbolicLink.c:1:error"); assertEquals(1, errorList.size());