From 5598a1537ed1eda9d17de5fc17e4bee82fea2fa2 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Mon, 20 Oct 2003 18:16:38 +0000 Subject: [PATCH] fixed unit test for testGetChildren in BinaryTest --- core/org.eclipse.cdt.core.tests/ChangeLog | 8 ++++++++ .../core/build/managed/tests/StandardBuildTests.java | 2 +- .../eclipse/cdt/core/model/tests/BinaryTests.java | 12 ++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog index ec1fcfce714..912ff4c5aa8 100644 --- a/core/org.eclipse.cdt.core.tests/ChangeLog +++ b/core/org.eclipse.cdt.core.tests/ChangeLog @@ -1,3 +1,11 @@ +2003-10-20 David Inglis + + use project owner ID in plugin class + * build/org/eclipse/cdt/core/build/managed/tests/StandardBuildTests.java + + set gnu elf parser since it can read the debug info. + * model/org/eclipse/cdt/core/model/tests/BinaryTests.java + 2003-10-01 Andrew Niefer added testBug43951 to CompleteParseASTTest diff --git a/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/StandardBuildTests.java b/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/StandardBuildTests.java index d96591ab95e..99b4967cf72 100644 --- a/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/StandardBuildTests.java +++ b/core/org.eclipse.cdt.core.tests/build/org/eclipse/cdt/core/build/managed/tests/StandardBuildTests.java @@ -266,7 +266,7 @@ public class StandardBuildTests extends TestCase { try { project = createProject(PROJECT_NAME); // Convert the new project to a standard make project - CCorePlugin.getDefault().convertProjectToCC(project, new NullProgressMonitor(), MakeCorePlugin.getUniqueIdentifier() + ".make"); + CCorePlugin.getDefault().convertProjectToCC(project, new NullProgressMonitor(), MakeCorePlugin.MAKE_PROJECT_ID); MakeProjectNature.addNature(project, null); } catch (CoreException e) { fail("StandardBuildTest testProjectCreation failed creating project: " + e.getLocalizedMessage()); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java index db1212af97a..acbcc110441 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/BinaryTests.java @@ -12,6 +12,8 @@ import java.io.FileNotFoundException; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.ICDescriptor; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; @@ -101,6 +103,16 @@ public class BinaryTests extends TestCase { */ testProject=CProjectHelper.createCProject("filetest", "none"); + + // since our test require that we can read the debug info from the exe whne must set the GNU elf + // binary parser since the default (generic elf binary parser) does not do this. + ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(testProject.getProject()); + desc.remove(CCorePlugin.BINARY_PARSER_UNIQ_ID); + desc.create(CCorePlugin.BINARY_PARSER_UNIQ_ID, "org.eclipse.cdt.core.GNU_ELF"); + + // Reset the binary parser the paths may have change. + CCorePlugin.getDefault().getCoreModel().resetBinaryParser(testProject.getProject()); + if (testProject==null) fail("Unable to create project");