From 49e276d0ac63628a96e1c425917fe9016d50c2fb Mon Sep 17 00:00:00 2001 From: Andrew Niefer Date: Tue, 16 Mar 2004 22:29:55 +0000 Subject: [PATCH] managed build tests from Sean Evoy --- core/org.eclipse.cdt.core.tests/ChangeLog | 9 ++ .../managed/tests/ManagedBuildTests.java | 17 ++-- core/org.eclipse.cdt.core.tests/plugin.xml | 93 ++++++++++--------- 3 files changed, 67 insertions(+), 52 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog index 3068ddb05b8..19f5e6c5af4 100644 --- a/core/org.eclipse.cdt.core.tests/ChangeLog +++ b/core/org.eclipse.cdt.core.tests/ChangeLog @@ -1,3 +1,12 @@ +2004-03-12 Sean Evoy + Corrected a target definition in the plugin manifest that was flagged + as release when it should have been flagged as test. Also updated the + tests to save the build information after changes that make the build + information dirty. + + * plugin.xml + * build/org/eclipse/cdt/core/build/managed/tests/ManagedBuildTests.java + 2004-03-16 Alain Magloire Test from Thomas Fletcher for the Error Parser diff --git a/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/ManagedBuildTests.java b/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/ManagedBuildTests.java index 0437600a395..aa6402c9124 100644 --- a/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/ManagedBuildTests.java +++ b/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/ManagedBuildTests.java @@ -41,7 +41,6 @@ import org.eclipse.cdt.managedbuilder.core.IOption; import org.eclipse.cdt.managedbuilder.core.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.ITarget; import org.eclipse.cdt.managedbuilder.core.ITool; -import org.eclipse.cdt.managedbuilder.core.IToolReference; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature; import org.eclipse.cdt.managedbuilder.internal.core.OptionReference; @@ -176,6 +175,8 @@ public class ManagedBuildTests extends TestCase { targets[0].resetMakeCommand(); assertFalse(targets[0].hasOverridenMakeCommand()); assertEquals(oldMakeCmd, targets[0].getMakeCommand()); + + ManagedBuildManager.saveBuildInfo(project, false); } @@ -219,13 +220,15 @@ public class ManagedBuildTests extends TestCase { for (int i = 0; i < baseConfigs.length; ++i) { newTarget.createConfiguration(baseConfigs[i], baseConfigs[i].getId() + "." + i); } - // Change the default configuration to the sub config IConfiguration[] configs = newTarget.getConfigurations(); assertEquals(4, configs.length); IManagedBuildInfo buildInfo = ManagedBuildManager.getBuildInfo(project); buildInfo.setDefaultConfiguration(newTarget.getConfiguration(configs[0].getId())); + // Save the build info + ManagedBuildManager.saveBuildInfo(project, false); + // Use the plugin mechanism to discover the supplier of the path information IExtensionPoint extensionPoint = CCorePlugin.getDefault().getDescriptor().getExtensionPoint("ScannerInfoProvider"); if (extensionPoint == null) { @@ -315,7 +318,7 @@ public class ManagedBuildTests extends TestCase { // Open the test project IProject project = createProject(projectName); - // Make sure there is one and only one target with 2 configs + // Make sure there is one and only one target with 3 configs ITarget[] definedTargets = ManagedBuildManager.getTargets(project); assertEquals(1, definedTargets.length); ITarget rootTarget = definedTargets[0]; @@ -359,7 +362,7 @@ public class ManagedBuildTests extends TestCase { ManagedBuildManager.setOption(newConfig, options[1], enumVal); // Save, close, reopen and test again - ManagedBuildManager.saveBuildInfo(project); + ManagedBuildManager.saveBuildInfo(project, false); project.close(null); ManagedBuildManager.removeBuildInfo(project); project.open(null); @@ -378,6 +381,7 @@ public class ManagedBuildTests extends TestCase { assertEquals(3, definedConfigs.length); assertEquals(definedConfigs[0].getName(), rootName); assertEquals(definedConfigs[1].getName(), overrideName); + ManagedBuildManager.saveBuildInfo(project, false); } public void testConfigurationReset() { @@ -406,6 +410,7 @@ public class ManagedBuildTests extends TestCase { // Reset the config and retest ManagedBuildManager.resetConfiguration(project, defaultConfig); + ManagedBuildManager.saveBuildInfo(project, false); try { checkRootTarget(defaultTarget); } catch (BuildException e2) { @@ -474,7 +479,7 @@ public class ManagedBuildTests extends TestCase { assertEquals("z", options[0].getStringValue()); // Save, close, reopen and test again - ManagedBuildManager.saveBuildInfo(project); + ManagedBuildManager.saveBuildInfo(project, true); try { project.close(null); } catch (CoreException e) { @@ -1202,7 +1207,7 @@ public class ManagedBuildTests extends TestCase { rootTarget.setArtifactName(name); // Save, close, reopen and test again - ManagedBuildManager.saveBuildInfo(project); + ManagedBuildManager.saveBuildInfo(project, false); project.close(null); ManagedBuildManager.removeBuildInfo(project); project.open(null); diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml index de1ac6b6019..c30a72873a1 100644 --- a/core/org.eclipse.cdt.core.tests/plugin.xml +++ b/core/org.eclipse.cdt.core.tests/plugin.xml @@ -33,12 +33,12 @@ point="org.eclipse.cdt.managedbuilder.core.ManagedBuildInfo"> + id="org.eclipse.cdt.core.tests.option1" + valueType="string"> + id="org.eclipse.cdt.core.tests.option2" + valueType="boolean"> + id="list.option" + valueType="stringList"> + builtIn="false" + value="b"> + builtIn="true" + value="c">