diff options
8 files changed, 0 insertions, 434 deletions
diff --git a/build/org.eclipse.cdt.make.core.tests/.classpath b/build/org.eclipse.cdt.make.core.tests/.classpath deleted file mode 100644 index 065ac06e197..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/build/org.eclipse.cdt.make.core.tests/.cvsignore b/build/org.eclipse.cdt.make.core.tests/.cvsignore deleted file mode 100644 index ba077a4031a..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -bin diff --git a/build/org.eclipse.cdt.make.core.tests/.project b/build/org.eclipse.cdt.make.core.tests/.project deleted file mode 100644 index d1802faee0f..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.cdt.make.core.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/build/org.eclipse.cdt.make.core.tests/build.properties b/build/org.eclipse.cdt.make.core.tests/build.properties deleted file mode 100644 index b542f515850..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.makecoretests.jar = src/ -output.makecoretests.jar = bin/ -bin.includes = plugin.xml,\ - makecoretests.jar diff --git a/build/org.eclipse.cdt.make.core.tests/plugin.xml b/build/org.eclipse.cdt.make.core.tests/plugin.xml deleted file mode 100644 index f7e2ecbcf2f..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/plugin.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin - id="org.eclipse.cdt.make.core.tests" - name="Make Core Tests Plug-in" - version="3.0.0" - provider-name="" - class="org.eclipse.cdt.make.core.tests.MakeTestsPlugin"> - - <runtime> - <library name="makecoretests.jar"> - <export name="*"/> - </library> - </runtime> - - <requires> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.junit"/> - <import plugin="org.eclipse.cdt.make.core"/> - <import plugin="org.eclipse.cdt.core"/> - <import plugin="org.eclipse.core.resources"/> - </requires> - -</plugin> diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/StandardBuildTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/StandardBuildTests.java deleted file mode 100644 index bb5a4914200..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/StandardBuildTests.java +++ /dev/null @@ -1,257 +0,0 @@ -package org.eclipse.cdt.make.builder.tests; -/********************************************************************** - * Copyright (c) 2002,2004 Rational Software Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v0.5 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v05.html - * - * Contributors: - * IBM Rational Software - Initial API and implementation -***********************************************************************/ - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.CProjectNature; -import org.eclipse.cdt.make.core.IMakeBuilderInfo; -import org.eclipse.cdt.make.core.MakeBuilder; -import org.eclipse.cdt.make.core.MakeCorePlugin; -import org.eclipse.cdt.make.core.MakeProjectNature; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; - -public class StandardBuildTests extends TestCase { - private static final boolean OFF = false; - private static final boolean ON = true; - private static final String OVR_BUILD_ARGS = "-f"; - private static final String OVR_BUILD_COMMAND = "/home/tester/bin/nmake"; - private static final String OVR_BUILD_LOCATION = "src"; - private static final String PROJECT_NAME = "StandardBuildTest"; - - /** - * @param name - */ - public StandardBuildTests(String name) { - super(name); - } - - public static Test suite() { - TestSuite suite = new TestSuite(StandardBuildTests.class.getName()); - - // Add the relevant tests to the suite - suite.addTest(new StandardBuildTests("testProjectCreation")); - suite.addTest(new StandardBuildTests("testProjectSettings")); - suite.addTest(new StandardBuildTests("testProjectConversion")); - suite.addTest(new StandardBuildTests("testProjectCleanup")); - return suite; - } - - private void checkDefaultProjectSettings(IProject project) throws Exception { - assertNotNull(project); - - IMakeBuilderInfo defaultInfo = MakeCorePlugin.createBuildInfo(MakeCorePlugin.getDefault().getPluginPreferences(), MakeBuilder.BUILDER_ID, true); - - IMakeBuilderInfo builderInfo = MakeCorePlugin.createBuildInfo(project, MakeBuilder.BUILDER_ID); - // Check the rest of the project information - assertEquals(defaultInfo.isDefaultBuildCmd(), builderInfo.isDefaultBuildCmd()); - assertEquals(defaultInfo.isStopOnError(), builderInfo.isStopOnError()); - assertEquals(defaultInfo.getBuildCommand(), builderInfo.getBuildCommand()); - assertEquals(defaultInfo.getBuildArguments(), builderInfo.getBuildArguments()); - assertEquals(defaultInfo.getBuildLocation(), builderInfo.getBuildLocation()); - - assertEquals(defaultInfo.isAutoBuildEnable(), builderInfo.isAutoBuildEnable()); - assertEquals(defaultInfo.getAutoBuildTarget(), builderInfo.getAutoBuildTarget()); - assertEquals(defaultInfo.isIncrementalBuildEnabled(), builderInfo.isIncrementalBuildEnabled()); - assertEquals(defaultInfo.getIncrementalBuildTarget(), builderInfo.getIncrementalBuildTarget()); - assertEquals(defaultInfo.isFullBuildEnabled(), builderInfo.isFullBuildEnabled()); - assertEquals(defaultInfo.getFullBuildTarget(), builderInfo.getFullBuildTarget()); - assertEquals(defaultInfo.isCleanBuildEnabled(), builderInfo.isCleanBuildEnabled()); - assertEquals(defaultInfo.getCleanBuildTarget(), builderInfo.getCleanBuildTarget()); - - } - - private void checkOverriddenProjectSettings(IProject project) throws Exception { - assertNotNull(project); - - // Check the rest of the project information - IMakeBuilderInfo builderInfo = MakeCorePlugin.createBuildInfo(project, MakeBuilder.BUILDER_ID); - assertEquals(OFF, builderInfo.isDefaultBuildCmd()); - assertEquals(ON, builderInfo.isStopOnError()); - assertEquals(new Path(OVR_BUILD_COMMAND), builderInfo.getBuildCommand()); - assertEquals(OVR_BUILD_ARGS, builderInfo.getBuildArguments()); - assertEquals(new Path(OVR_BUILD_LOCATION), builderInfo.getBuildLocation()); - } - - /** - * Create a new project named <code>name</code> or return the project in - * the workspace of the same name if it exists. - * - * @param name The name of the project to create or retrieve. - * @return - * @throws CoreException - */ - private IProject createProject(final String name) throws CoreException { - final Object[] result = new Object[1]; - ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { - - public void run(IProgressMonitor monitor) throws CoreException { - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - IProject project = root.getProject(name); - if (!project.exists()) { - project.create(null); - } else { - project.refreshLocal(IResource.DEPTH_INFINITE, null); - } - - if (!project.isOpen()) { - project.open(null); - } - CCorePlugin.getDefault().convertProjectToC(project, new NullProgressMonitor(), MakeCorePlugin.MAKE_PROJECT_ID); - result[0] = project; - } - }, null); - return (IProject)result[0]; - } - - /** - * Remove the <code>IProject</code> with the name specified in the argument from the - * receiver's workspace. - * - * @param name - */ - private void removeProject(String name) { - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - IProject project = root.getProject(name); - if (project.exists()) { - try { - project.delete(true, false, null); - } catch (CoreException e) { - assertTrue(false); - } - } - } - - /** - * Remove all the project information associated with the project used during test. - */ - public void testProjectCleanup() { - removeProject(PROJECT_NAME); - } - - public void testProjectConversion() throws Exception { - // Open the project - IProject project = null; - try { - project = createProject(PROJECT_NAME); - } catch (CoreException e) { - fail("StandardBuildTest testProjectConversion failed opening project: " + e.getLocalizedMessage()); - } - assertNotNull(project); - - // Check the settings (they should be the override values) - checkOverriddenProjectSettings(project); - - // Now convert the project - try { - CCorePlugin.getDefault().convertProjectFromCtoCC(project, new NullProgressMonitor()); - } catch (CoreException e) { - fail("StandardBuildTest testProjectConversion failed to convert project: " + e.getLocalizedMessage()); - } - - // Close, and Reopen the project - try { - project.close(new NullProgressMonitor()); - } catch (CoreException e) { - fail("StandardBuildTest testProjectConversion failed to close project " + e.getLocalizedMessage()); - } - try { - project.open(new NullProgressMonitor()); - } catch (CoreException e) { - fail ("StandardBuildTest testProjectConversion failed to open project " + e.getLocalizedMessage()); - } - - // Make sure it has a CCNature - try { - project.hasNature(CCProjectNature.CC_NATURE_ID); - } catch (CoreException e) { - fail("StandardBuildTest testProjectConversion failed getting nature: " + e.getLocalizedMessage()); - } - - // Nothing should have changed in the settings - checkOverriddenProjectSettings(project); - } - - /** - * - */ - public void testProjectCreation() throws Exception { - // Create a new project - IProject project = null; - try { - project = createProject(PROJECT_NAME); - // Convert the new project to a standard make project - MakeProjectNature.addNature(project, null); - } catch (CoreException e) { - fail("StandardBuildTest testProjectCreation failed creating project: " + e.getLocalizedMessage()); - } - assertNotNull(project); - - // Make sure it has a CNature - try { - project.hasNature(CProjectNature.C_NATURE_ID); - } catch (CoreException e) { - fail("StandardBuildTest testProjectCreation failed getting nature: " + e.getLocalizedMessage()); - } - // Make sure it has a MakeNature - try { - project.hasNature(MakeProjectNature.NATURE_ID); - } catch (CoreException e) { - fail("StandardBuildTest testProjectCreation failed getting nature: " + e.getLocalizedMessage()); - } - // Check the default settings - checkDefaultProjectSettings(project); - } - - public void testProjectSettings() throws Exception { - // Get the project - IProject project = null; - try { - project = createProject(PROJECT_NAME); - } catch (CoreException e) { - fail("StandardBuildTest testProjectSettings failed opening project: " + e.getLocalizedMessage()); - } - assertNotNull(project); - - // Use the build info for the rest of the settings - IMakeBuilderInfo builderInfo = MakeCorePlugin.createBuildInfo(project, MakeBuilder.BUILDER_ID); - builderInfo.setStopOnError(ON); - builderInfo.setUseDefaultBuildCmd(OFF); - builderInfo.setBuildCommand(new Path(OVR_BUILD_COMMAND)); - builderInfo.setBuildArguments(OVR_BUILD_ARGS); - builderInfo.setBuildLocation(new Path(OVR_BUILD_LOCATION)); - try { - project.close(new NullProgressMonitor()); - } catch (CoreException e) { - fail("StandardBuildTest testProjectSettings failed to close project " + e.getLocalizedMessage()); - } - try { - project.open(new NullProgressMonitor()); - } catch (CoreException e) { - fail ("StandardBuildTest testProjectSettings failed to open project " + e.getLocalizedMessage()); - } - - // Retest - checkOverriddenProjectSettings(project); - } -} diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java deleted file mode 100644 index e13b3ee3fc8..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/AutomatedIntegrationSuite.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 QNX Software Systems and others. All rights reserved. This - * program and the accompanying materials are made available under the terms of - * the Common Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: QNX Software Systems - initial API and implementation - ******************************************************************************/ -package org.eclipse.cdt.make.core.tests; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.cdt.make.builder.tests.StandardBuildTests; - -public class AutomatedIntegrationSuite extends TestSuite { - - public AutomatedIntegrationSuite() { - } - - public AutomatedIntegrationSuite(Class theClass, String name) { - super(theClass, name); - } - - public AutomatedIntegrationSuite(Class theClass) { - super(theClass); - } - - public AutomatedIntegrationSuite(String name) { - super(name); - } - - public static Test suite() { - final AutomatedIntegrationSuite suite = new AutomatedIntegrationSuite(); - - suite.addTest(StandardBuildTests.suite()); - return suite; - } - -} diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakeTestsPlugin.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakeTestsPlugin.java deleted file mode 100644 index 573d5eba8f1..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakeTestsPlugin.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.eclipse.cdt.make.core.tests; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; -import java.util.*; - -/** - * The main plugin class to be used in the desktop. - */ -public class MakeTestsPlugin extends Plugin { - //The shared instance. - private static MakeTestsPlugin plugin; - //Resource bundle. - private ResourceBundle resourceBundle; - - /** - * The constructor. - */ - public MakeTestsPlugin() { - super(); - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - resourceBundle = null; - } - - /** - * Returns the shared instance. - */ - public static MakeTestsPlugin getDefault() { - return plugin; - } - - /** - * Returns the string from the plugin's resource bundle, - * or 'key' if not found. - */ - public static String getResourceString(String key) { - ResourceBundle bundle = MakeTestsPlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - try { - if (resourceBundle == null) - resourceBundle = ResourceBundle.getBundle("org.eclipse.cdt.make.core.tests.MakeTestsPluginResources"); - } catch (MissingResourceException x) { - resourceBundle = null; - } - return resourceBundle; - } - -} |