mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

Remove incorrect assumptions of lifecycle of test

Browse source 
Maybe once upon a time this lifecycle did something,
but now in setUp fProject is always null and therefore
the project was never getting deleted as the fProject
that deleteProject saw was different than
the tests.

Part of #117
This commit is contained in:
Jonah Graham 2022-10-26 21:53:05 -04:00
parent 858a194b68
commit 61eac9d982
3 changed files with 16 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java
View file

@ -55,7 +55,6 @@ public class IndexIncludeTest extends IndexTestBase {
public static TestSuite suite() {
TestSuite suite = suite(IndexIncludeTest.class, "_");
suite.addTest(new IndexIncludeTest("deleteProject"));
return suite;
}
@ -69,28 +68,22 @@ public class IndexIncludeTest extends IndexTestBase {
@Override
public void setUp() throws Exception {
super.setUp();
if (fProject == null) {
fProject = createProject(true, "resources/indexTests/includes");
IPathEntry[] entries = new IPathEntry[] {
CoreModel.newIncludeEntry(fProject.getPath(), null, fProject.getResource().getLocation()) };
fProject.setRawPathEntries(entries, npm());
IndexerPreferences.set(fProject.getProject(), IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG,
"false");
}
fProject = createProject(true, "resources/indexTests/includes");
IPathEntry[] entries = new IPathEntry[] {
CoreModel.newIncludeEntry(fProject.getPath(), null, fProject.getResource().getLocation()) };
fProject.setRawPathEntries(entries, npm());
IndexerPreferences.set(fProject.getProject(), IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG,
"false");
fIndex = CCorePlugin.getIndexManager().getIndex(fProject);
}
@Override
public void tearDown() throws Exception {
CProjectHelper.delete(fProject);
super.tearDown();
}
public void deleteProject() {
if (fProject != null) {
CProjectHelper.delete(fProject);
}
}
public void testFastIndexer() throws Exception {
CCorePlugin.getIndexManager().setIndexerId(fProject, IPDOMManager.ID_FAST_INDEXER);
IndexerPreferences.set(fProject.getProject(), IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG,

7
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java
View file

@ -45,7 +45,6 @@ public class IndexSearchTest extends IndexTestBase {
public static TestSuite suite() {
TestSuite suite = suite(IndexSearchTest.class, "_");
suite.addTest(new IndexSearchTest("deleteProject"));
return suite;
}
@ -59,9 +58,8 @@ public class IndexSearchTest extends IndexTestBase {
@Override
public void setUp() throws Exception {
super.setUp();
if (fProject == null) {
fProject = createProject(true, "resources/indexTests/search");
}
fProject = createProject(true, "resources/indexTests/search");
fIndex = CCorePlugin.getIndexManager().getIndex(fProject);
fIndex.acquireReadLock();
}
@ -75,7 +73,6 @@ public class IndexSearchTest extends IndexTestBase {
super.tearDown();
}
private void checkIsClass(IIndexBinding binding) {
assertTrue(binding instanceof ICPPClassType);
}

24
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexUpdateTests.java
View file

@ -85,7 +85,6 @@ public class IndexUpdateTests extends IndexTestBase {
public static TestSuite suite() {
TestSuite suite = suite(IndexUpdateTests.class, "_");
suite.addTest(new IndexUpdateTests("deleteProject"));
return suite;
}
@ -104,12 +103,8 @@ public class IndexUpdateTests extends IndexTestBase {
@Override
public void setUp() throws Exception {
super.setUp();
if (fCppProject == null) {
fCppProject = CProjectHelper.createCCProject("indexUpdateTestsCpp", null, IPDOMManager.ID_FAST_INDEXER);
}
if (fCProject == null) {
fCProject = CProjectHelper.createCProject("indexUpdateTestsC", null, IPDOMManager.ID_FAST_INDEXER);
}
fCppProject = CProjectHelper.createCCProject("indexUpdateTestsCpp", null, IPDOMManager.ID_FAST_INDEXER);
fCProject = CProjectHelper.createCProject("indexUpdateTestsC", null, IPDOMManager.ID_FAST_INDEXER);
waitForIndexer(fCppProject);
waitForIndexer(fCProject);
fIndex = CCorePlugin.getIndexManager().getIndex(new ICProject[] { fCProject, fCppProject });
@ -164,18 +159,11 @@ public class IndexUpdateTests extends IndexTestBase {
if (fHeader != null) {
fHeader.delete(true, npm());
}
super.tearDown();
}
public void deleteProject() {
if (fCProject != null) {
CProjectHelper.delete(fCProject);
fCProject = null;
}
if (fCppProject != null) {
CProjectHelper.delete(fCppProject);
fCppProject = null;
}
CProjectHelper.delete(fCProject);
CProjectHelper.delete(fCppProject);
super.tearDown();
}
// int globalVar;