From 05653b2740b7ad3614f75ada2fbfc4d55a7bc700 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Tue, 5 Jan 2010 20:32:37 +0000 Subject: [PATCH] cleanup: generics and casts --- .../core/tests/ManagedBuildCoreTests20.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java index 963f3066dd5..19565732f2e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java @@ -80,6 +80,7 @@ public class ManagedBuildCoreTests20 extends TestCase { public static Test suite() { TestSuite suite = new TestSuite(ManagedBuildCoreTests20.class.getName()); + // Note that some of the tests are dependent on others so run the suite as a whole suite.addTest(new ManagedBuildCoreTests20("testExtensions")); suite.addTest(new ManagedBuildCoreTests20("testProjectCreation")); suite.addTest(new ManagedBuildCoreTests20("testConfigurations")); @@ -201,8 +202,6 @@ public class ManagedBuildCoreTests20 extends TestCase { * The purpose of this test is to exercise the build path info interface. * To get to that point, a new project/config has to be created in the test * project and the default configuration changed. - * - * @throws CoreException */ public void testScannerInfoInterface(){ // Open the test project @@ -288,14 +287,14 @@ public class ManagedBuildCoreTests20 extends TestCase { public void changeNotification(IResource project, IScannerInfo info) { // Test the symbols: expect "BUILTIN" from the manifest, and "DEBUG" and "GNOME=ME" // from the overidden settings - Map definedSymbols = info.getDefinedSymbols(); + Map definedSymbols = info.getDefinedSymbols(); assertTrue(definedSymbols.containsKey("BUILTIN")); assertTrue(definedSymbols.containsKey("DEBUG")); assertTrue(definedSymbols.containsKey("GNOME")); assertTrue(definedSymbols.containsValue("ME")); - assertEquals((String)definedSymbols.get("BUILTIN"), ""); - assertEquals((String)definedSymbols.get("DEBUG"), ""); - assertEquals((String)definedSymbols.get("GNOME"), "ME"); + assertEquals(definedSymbols.get("BUILTIN"), ""); + assertEquals(definedSymbols.get("DEBUG"), ""); + assertEquals(definedSymbols.get("GNOME"), "ME"); // Test the includes path String[] actualPaths = info.getIncludePaths(); BuildSystemTestHelper.checkDiff(expectedPaths, actualPaths); @@ -305,10 +304,10 @@ public class ManagedBuildCoreTests20 extends TestCase { // Check the build information before we change it IScannerInfo currentSettings = provider.getScannerInformation(project); - Map currentSymbols = currentSettings.getDefinedSymbols(); + Map currentSymbols = currentSettings.getDefinedSymbols(); // It should simply contain the built-in assertTrue(currentSymbols.containsKey("BUILTIN")); - assertEquals((String)currentSymbols.get("BUILTIN"), ""); + assertEquals(currentSymbols.get("BUILTIN"), ""); String[] currentPaths = currentSettings.getIncludePaths(); BuildSystemTestHelper.checkDiff(expectedPaths, currentPaths); @@ -492,7 +491,6 @@ public class ManagedBuildCoreTests20 extends TestCase { } /** - * @throws CoreException * @throws BuildException */ public void testProjectCreation() throws BuildException { @@ -1743,7 +1741,6 @@ public class ManagedBuildCoreTests20 extends TestCase { } } /** - * @throws CoreException * @throws BuildException */ public void testErrorParsers() throws BuildException {