From 542e8b474eb8157e32175f561b11c00dcf1c3acf Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Fri, 28 Oct 2022 13:37:36 -0400 Subject: [PATCH] Make sure test does not leave projects around Part of #117 --- .../builder/tests/CDataProviderTests.java | 21 ++++++++----------- .../GCCPerFileBOPConsoleParserTests.java | 2 +- .../GCCScannerInfoConsoleParserTests.java | 2 +- .../ScannerConfigDiscoveryTests.java | 8 +++++-- .../ScannerConfigProfileTests.java | 7 +++++-- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/CDataProviderTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/CDataProviderTests.java index b058c29c43b..e5bb16e3e30 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/CDataProviderTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/CDataProviderTests.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.make.builder.tests; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase5; import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -28,11 +30,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import junit.framework.Test; -import junit.framework.TestCase; import junit.framework.TestSuite; @SuppressWarnings("nls") -public class CDataProviderTests extends TestCase { +public class CDataProviderTests extends BaseTestCase { /** * @param name */ @@ -41,18 +42,14 @@ public class CDataProviderTests extends TestCase { } public static Test suite() { - TestSuite suite = new TestSuite(CDataProviderTests.class); + return new TestSuite(CDataProviderTests.class); + } - // // 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")); - // - // suite.addTestSuite(ScannerConfigConsoleParserTests.class); - // suite.addTestSuite(ScannerConfigDiscoveryTests.class); + @Override + protected void tearDown() throws Exception { + BaseTestCase5.removeLeftOverProjects(); - return suite; + super.tearDown(); } public void testCData() throws Exception { diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java index a1fa688f8cd..3d93c1a498d 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java @@ -66,7 +66,6 @@ public class GCCPerFileBOPConsoleParserTests extends BaseBOPConsoleParserTests { @Override protected void tearDown() throws Exception { - super.tearDown(); if (fOutputParser != null) { fOutputParser.shutdown(); } @@ -74,6 +73,7 @@ public class GCCPerFileBOPConsoleParserTests extends BaseBOPConsoleParserTests { if (fCProject != null) { CProjectHelper.delete(fCProject); } + super.tearDown(); } public void testParsingIfStatement_bug197930() throws Exception { diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java index 7dba47183ef..6a93be0ed96 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java @@ -46,8 +46,8 @@ public class GCCScannerInfoConsoleParserTests extends BaseBOPConsoleParserTests @Override protected void tearDown() throws Exception { - super.tearDown(); fOutputParser.shutdown(); + super.tearDown(); } /* diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerConfigDiscoveryTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerConfigDiscoveryTests.java index eca38bad4dd..0ad79b38587 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerConfigDiscoveryTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerConfigDiscoveryTests.java @@ -21,6 +21,7 @@ import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.testplugin.ResourceHelper; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; +import org.eclipse.cdt.core.testplugin.util.BaseTestCase5; import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.cdt.make.core.MakeProjectNature; import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature; @@ -53,9 +54,11 @@ public class ScannerConfigDiscoveryTests extends BaseTestCase { @Override protected void setUp() throws Exception { + super.setUp(); fMonitor = new NullProgressMonitor(); - fCProject = StandardBuildTestHelper.createProject("SCD", (IPath) null, MakeCorePlugin.MAKE_PROJECT_ID); + fCProject = StandardBuildTestHelper.createProject("SCD" + getName(), (IPath) null, + MakeCorePlugin.MAKE_PROJECT_ID); fCFile = fCProject.getProject().getFile("main.c"); if (!fCFile.exists()) { fCFile.create(new ByteArrayInputStream(" \n".getBytes()), false, fMonitor); @@ -65,7 +68,8 @@ public class ScannerConfigDiscoveryTests extends BaseTestCase { @Override protected void tearDown() throws Exception { ResourceHelper.cleanUp(getName()); - StandardBuildTestHelper.removeProject("SCDC"); + fCProject.getProject().delete(true, true, null); + super.tearDown(); } public void testGetCCompilerBuiltins() throws CoreException { diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerConfigProfileTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerConfigProfileTests.java index 0eb43d73dd1..86ff9f3929c 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerConfigProfileTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/ScannerConfigProfileTests.java @@ -38,7 +38,9 @@ public class ScannerConfigProfileTests extends BaseTestCase { @Override protected void setUp() throws Exception { - fCProject = StandardBuildTestHelper.createProject("SCD", (IPath) null, MakeCorePlugin.MAKE_PROJECT_ID); + super.setUp(); + fCProject = StandardBuildTestHelper.createProject("SCD" + getName(), (IPath) null, + MakeCorePlugin.MAKE_PROJECT_ID); fCFile = fCProject.getProject().getFile("main.c"); if (!fCFile.exists()) { fCFile.create(new ByteArrayInputStream(" \n".getBytes()), false, new NullProgressMonitor()); @@ -48,7 +50,8 @@ public class ScannerConfigProfileTests extends BaseTestCase { @Override protected void tearDown() throws Exception { ResourceHelper.cleanUp(getName()); - StandardBuildTestHelper.removeProject("SCDC"); + fCProject.delete(true, true, null); + super.tearDown(); } /**