From 49bda3016905db6a8f1dc4e50022426a922bf6c8 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Sat, 21 Feb 2004 22:03:50 +0000 Subject: [PATCH] Refactor of ICPathEntry to IPathEntry --- core/org.eclipse.cdt.core.tests/ChangeLog | 9 +++++++ .../core/model/tests/CModelElementsTests.java | 1 - .../cdt/core/model/tests/CModelTests.java | 1 - .../cdt/core/model/tests/CPathEntryTest.java | 26 ++++++++++--------- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog index 5dcd4de6fd0..76725892083 100644 --- a/core/org.eclipse.cdt.core.tests/ChangeLog +++ b/core/org.eclipse.cdt.core.tests/ChangeLog @@ -1,3 +1,12 @@ +2004-02-21 Alain Magloire + Refactor of the ICPatEntry to IPathEntry + + * model/org/eclipse/cdt/core/model/tests/CPathEntryTests.java + + Remove of unused imports + * model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java + * model/org/eclipse/cdt/core/model/tests/CModelTests.java + 2004-02-19 Andrew Niefer remove order dependancy in ParserSymbolTableTests.testUsingDeclaration_2 diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java index 9a6cbb159e9..47ab4335032 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelElementsTests.java @@ -47,7 +47,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; public class CModelElementsTests extends TestCase { private ICProject fCProject; diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java index 1a717e939ae..0871a3feea9 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java @@ -27,7 +27,6 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; /** diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java index 6b8604943ab..670102c365b 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java @@ -16,7 +16,7 @@ import junit.framework.TestSuite; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ElementChangedEvent; import org.eclipse.cdt.core.model.ICElementDelta; -import org.eclipse.cdt.core.model.ICPathEntry; +import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IElementChangedListener; import org.eclipse.cdt.testplugin.CProjectHelper; @@ -124,45 +124,47 @@ public class CPathEntryTest extends TestCase { } /******************************************************************************************************************************* - * Check if the CPathEntry's are generated. + * Check if the PathEntry's are generated. * * @see CProjectHelper#createCProject */ public void testCPathEntries() throws CoreException { ICProject testProject; testProject = CProjectHelper.createCProject("cpathtest", "none"); - if (testProject == null) + if (testProject == null) { fail("Unable to create project"); - ICPathEntry[] entries = testProject.getResolvedCPathEntries(); + } + IPathEntry[] entries = testProject.getResolvedPathEntries(); assertTrue("No cpathentries", entries.length == 0); - entries = new ICPathEntry[3]; + entries = new IPathEntry[3]; entries[0] = CoreModel.newIncludeEntry(new Path("cpathtest"), new Path("/usr/include"), true); entries[1] = CoreModel.newIncludeEntry(new Path("cpaththest/foo.c"), new Path("/usr/include"), true); entries[2] = CoreModel.newLibraryEntry(new Path("/usr/lib/libc.so.1"), null, null, null); - testProject.setRawCPathEntries(entries, new NullProgressMonitor()); - entries = testProject.getResolvedCPathEntries(); + testProject.setRawPathEntries(entries, new NullProgressMonitor()); + entries = testProject.getResolvedPathEntries(); assertTrue("Tree cpathenties", entries.length == 3); } /******************************************************************************************************************************* - * Check if the CPathEntry's are generated. + * Check if the PathEntry's are generated. * * @see CProjectHelper#createCProject */ public void testCPathEntriesDelta() throws CoreException { ICProject testProject; testProject = CProjectHelper.createCProject("cpathtest2", "none"); - if (testProject == null) + if (testProject == null) { fail("Unable to create project"); - ICPathEntry[] entries = new ICPathEntry[3]; + } + IPathEntry[] entries = new IPathEntry[3]; entries[0] = CoreModel.newIncludeEntry(new Path("cpathtest"), new Path("/usr/include"), true); entries[1] = CoreModel.newIncludeEntry(new Path("cpaththest/foo.c"), new Path("/usr/include"), true); entries[2] = CoreModel.newLibraryEntry(new Path("/usr/lib/libc.so.1"), null, null, null); final int count = 0; CElementListener listener = new CElementListener(); CoreModel.getDefault().addElementChangedListener(listener); - testProject.setRawCPathEntries(entries, new NullProgressMonitor()); - entries = testProject.getResolvedCPathEntries(); + testProject.setRawPathEntries(entries, new NullProgressMonitor()); + entries = testProject.getResolvedPathEntries(); assertTrue("Tree cpathenties", listener.count == 2); } }