diff options
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core.tests')
2 files changed, 20 insertions, 13 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/standardbuilder/core/tests/AllStandardBuildTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/standardbuilder/core/tests/AllStandardBuildTests.java index 8626d6b9df8..01a9b57efc0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/standardbuilder/core/tests/AllStandardBuildTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/standardbuilder/core/tests/AllStandardBuildTests.java @@ -34,7 +34,7 @@ public class AllStandardBuildTests extends TestSuite { public static Test suite() { TestSuite suite = new AllStandardBuildTests("Test for org.eclipse.cdt.standardbuild.core.tests"); //$JUnit-BEGIN$ - suite.addTest(ScannerConfigConsoleParserTests.suite()); + suite.addTestSuite(ScannerConfigConsoleParserTests.class); //$JUnit-END$ return suite; } diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/standardbuilder/core/tests/ScannerConfigConsoleParserTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/standardbuilder/core/tests/ScannerConfigConsoleParserTests.java index a07087c8a85..3f7cab7f37f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/standardbuilder/core/tests/ScannerConfigConsoleParserTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/standardbuilder/core/tests/ScannerConfigConsoleParserTests.java @@ -19,9 +19,7 @@ import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser; import org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCScannerInfoConsoleParser; import org.eclipse.core.resources.IResource; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Scanner configuration console parser tests @@ -55,15 +53,6 @@ public class ScannerConfigConsoleParserTests extends TestCase { clParser = null; } - public static Test suite() { - TestSuite suite = new TestSuite(ScannerConfigConsoleParserTests.class.getName()); - - suite.addTest(new ScannerConfigConsoleParserTests("testParsingIncludePaths")); - suite.addTest(new ScannerConfigConsoleParserTests("testParsingSymbolDefinitions")); - - return suite; - } - /* * Tests GCCScannerInfoConsoleParser. Utility object not provided. * Only tests parsing of the imput (make build output) @@ -115,6 +104,7 @@ public class ScannerConfigConsoleParserTests extends TestCase { assertTrue(sumIncludes.contains("//server5/include")); assertTrue(sumIncludes.contains("//server6/include")); assertTrue(sumIncludes.contains("/multiline/dir")); + assertTrue(sumIncludes.size() == 24); } public void testParsingSymbolDefinitions() { @@ -152,5 +142,22 @@ public class ScannerConfigConsoleParserTests extends TestCase { assertTrue(sumSymbols.contains("MACRO13=\"value 13\"")); assertTrue(sumSymbols.contains("MULTILINE=TRUE")); assertTrue(sumSymbols.contains("SUM(x, y) = (x) + (y)")); + assertTrue(sumSymbols.size() == 15); + + } + + public void testParsingSymbolDefinitions_bug80271() { + final ArrayList sumSymbols = new ArrayList(); + // initialize it with the utility + clParser.startup(null, null, new IScannerInfoCollector() { + public void contributeToScannerConfig(IResource resource, List includes, List symbols, Map extraInfo) { + sumSymbols.addAll(symbols); + } + }); + + clParser.processLine("gcc -DMACRO1 -I ..\\inc -c ..\\source\\source.c"); // PR 80271 + + assertTrue(sumSymbols.contains("MACRO1")); + assertTrue(sumSymbols.size() == 1); } -}
\ No newline at end of file +} |