From 23399e83eb3191294ac692ba41ca313a90d02eb3 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Fri, 28 Oct 2022 10:31:41 -0400 Subject: [PATCH] Clean up created projects in tearDown Part of #117 --- .../cdt/ui/tests/templateengine/TestProcesses.java | 12 ++++++++---- .../ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java | 10 ++++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java index de1c23033e8..f57c9a2ffca 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java @@ -41,16 +41,15 @@ public class TestProcesses extends BaseTestCase { private static final String H_EXT = ".h"; //$NON-NLS-1$ private static final String PROJECT_TYPE = "org.eclipse.cdt.core.tests.projectType"; //$NON-NLS-1$ + private IProject project; @Override protected void setUp() throws Exception { TemplateEngineTestsHelper.turnOffAutoBuild(); - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); + project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); IPath projectLocation = project.getRawLocation(); - if (project.exists()) { - project.delete(true, true, null); - } + assertFalse(project.exists()); IWorkspace workspace = ResourcesPlugin.getWorkspace(); IProjectDescription description = workspace.newProjectDescription(project.getName()); @@ -65,6 +64,11 @@ public class TestProcesses extends BaseTestCase { } + @Override + protected void tearDown() throws Exception { + project.delete(true, true, null); + } + public void testAddFile() { TemplateCore template = TemplateEngine.getDefault().getFirstTemplate(PROJECT_TYPE, null, ".*AddFile"); //$NON-NLS-1$ Map valueStore = template.getValueStore(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java index b16f2bb1c65..5b17d1eddcc 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java @@ -20,6 +20,7 @@ import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.internal.ui.CHelpProviderManager; import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor; import org.eclipse.cdt.internal.ui.text.CHelpSettings; @@ -35,14 +36,13 @@ import org.eclipse.core.runtime.Platform; import org.junit.Assert; import junit.framework.Test; -import junit.framework.TestCase; import junit.framework.TestSuite; /** * * CHelpProvider tests */ -public class CHelpTest extends TestCase { +public class CHelpTest extends BaseTestCase { public final static String TEST_EXTENSION_ID_PREFIX = "org.eclipse.cdt.ui.tests.chelp.extension"; //$NON-NLS-1$ private final static String C_PROJECT_NAME = "cHelpTestProject"; //$NON-NLS-1$ private final static String CC_PROJECT_NAME = "ccHelpTestProject"; //$NON-NLS-1$ @@ -114,6 +114,12 @@ public class CHelpTest extends TestCase { @Override protected void tearDown() throws Exception { CHelpTestInfoProvider.fgEnabled = false; + if (fCProject != null) { + fCProject.getProject().delete(true, true, null); + } + if (fCCProject != null) { + fCCProject.getProject().delete(true, true, null); + } super.tearDown(); }