From 3e2fede4d584226d44f2c11edeea98801d3fe571 Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Mon, 16 Mar 2009 13:36:11 +0000 Subject: [PATCH] [263201] - test for markers --- .../tests/ErrorParserFileMatchingTest.java | 30 ++++++++++++------- .../tests/ErrorParserManagerTest.java | 6 ++-- 2 files changed, 24 insertions(+), 12 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 13853724d6a..afa74c96191 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 @@ -206,7 +206,8 @@ public class ErrorParserFileMatchingTest extends TestCase { // No match found assertEquals("P/FindMatchingFilesTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); - assertEquals("testMissing.c error",problemMarkerInfo.description); + assertEquals("error",problemMarkerInfo.description); + assertEquals(new Path("testMissing.c"),problemMarkerInfo.externalPath); } /** @@ -226,7 +227,8 @@ public class ErrorParserFileMatchingTest extends TestCase { ProblemMarkerInfo problemMarkerInfo = errorList.get(0); // Ambiguous match assertEquals("P/FindMatchingFilesTest",problemMarkerInfo.file.toString()); - assertEquals("testDuplicate.c error",problemMarkerInfo.description); + assertEquals("error",problemMarkerInfo.description); + assertEquals(new Path("testDuplicate.c"),problemMarkerInfo.externalPath); } /** @@ -304,7 +306,8 @@ public class ErrorParserFileMatchingTest extends TestCase { ProblemMarkerInfo problemMarkerInfo = errorList.get(0); // Ambiguous match assertEquals("P/FindMatchingFilesTest",problemMarkerInfo.file.toString()); - assertEquals("testDuplicateLinkedFile.c error",problemMarkerInfo.description); + assertEquals("error",problemMarkerInfo.description); + assertEquals(new Path("testDuplicateLinkedFile.c"),problemMarkerInfo.externalPath); } /** @@ -343,7 +346,8 @@ public class ErrorParserFileMatchingTest extends TestCase { ProblemMarkerInfo problemMarkerInfo = errorList.get(0); // No match found assertEquals("P/FindMatchingFilesTest",problemMarkerInfo.file.toString()); - assertEquals("testDuplicateInLinkedFolder.c error",problemMarkerInfo.description); + assertEquals("error",problemMarkerInfo.description); + assertEquals(new Path("testDuplicateInLinkedFolder.c"),problemMarkerInfo.externalPath); } /** @@ -561,7 +565,8 @@ public class ErrorParserFileMatchingTest extends TestCase { // No match assertEquals("P/FindMatchingFilesTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); - assertEquals("NotMatchingFolder/testRelativePathNotMatchingFolder.c error",problemMarkerInfo.description); + assertEquals("error",problemMarkerInfo.description); + assertEquals(new Path("NotMatchingFolder/testRelativePathNotMatchingFolder.c"),problemMarkerInfo.externalPath); } /** @@ -583,7 +588,8 @@ public class ErrorParserFileMatchingTest extends TestCase { // No match found assertEquals("P/FindMatchingFilesTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); - assertEquals("Folder/testRelativePathDuplicate.c error",problemMarkerInfo.description); + assertEquals("error",problemMarkerInfo.description); + assertEquals(new Path("Folder/testRelativePathDuplicate.c"),problemMarkerInfo.externalPath); } /** @@ -636,7 +642,8 @@ public class ErrorParserFileMatchingTest extends TestCase { // No match found assertEquals("P/FindMatchingFilesTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); - assertEquals("../SubFolder/testRelativePathUpDuplicate.c error",problemMarkerInfo.description); + assertEquals("error",problemMarkerInfo.description); + assertEquals(new Path("../SubFolder/testRelativePathUpDuplicate.c"),problemMarkerInfo.externalPath); } /** @@ -689,7 +696,8 @@ public class ErrorParserFileMatchingTest extends TestCase { // No match assertEquals("P/FindMatchingFilesTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); - assertEquals("./NotMatchingFolder/testRelativePathDotNotMatchingFolder.c error",problemMarkerInfo.description); + assertEquals("error",problemMarkerInfo.description); + assertEquals(new Path("./NotMatchingFolder/testRelativePathDotNotMatchingFolder.c"),problemMarkerInfo.externalPath); } /** @@ -712,7 +720,8 @@ public class ErrorParserFileMatchingTest extends TestCase { // No match found assertEquals("P/FindMatchingFilesTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); - assertEquals("./Folder/testRelativePathDotDuplicate.c error",problemMarkerInfo.description); + assertEquals("error",problemMarkerInfo.description); + assertEquals(new Path("./Folder/testRelativePathDotDuplicate.c"),problemMarkerInfo.externalPath); } @@ -775,7 +784,8 @@ public class ErrorParserFileMatchingTest extends TestCase { // No match found assertEquals("P/FindMatchingFilesTest",problemMarkerInfo.file.toString()); assertEquals(1,problemMarkerInfo.lineNumber); - assertEquals("UpCase4.c error",problemMarkerInfo.description); + assertEquals("error",problemMarkerInfo.description); + assertEquals(new Path("UpCase4.c"),problemMarkerInfo.externalPath); } /** diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserManagerTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserManagerTest.java index 155e485e3bc..156329aff1a 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserManagerTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserManagerTest.java @@ -161,7 +161,8 @@ public class ErrorParserManagerTest extends TestCase { assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); - assertEquals("catchpoints.cpp no return statement in function returning non-void",problemMarkerInfo.description); + assertEquals("no return statement in function returning non-void",problemMarkerInfo.description); + assertEquals(new Path("catchpoints.cpp"),problemMarkerInfo.externalPath); } public void testParsersSanityTrimmed() throws CoreException, IOException { output(" catchpoints.cpp:12: warning: no return statement in function returning non-void \n"); @@ -169,7 +170,8 @@ public class ErrorParserManagerTest extends TestCase { assertEquals(1, errorList.size()); ProblemMarkerInfo problemMarkerInfo = errorList.get(0); - assertEquals("catchpoints.cpp no return statement in function returning non-void",problemMarkerInfo.description); + assertEquals("no return statement in function returning non-void",problemMarkerInfo.description); + assertEquals(new Path("catchpoints.cpp"),problemMarkerInfo.externalPath); } public void testOutput() throws IOException {