1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

Refactor of ICPathEntry to IPathEntry

This commit is contained in:
Alain Magloire 2004-02-21 22:03:50 +00:00
parent 31196e5d83
commit 49bda30169
4 changed files with 23 additions and 14 deletions

View file

@ -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 2004-02-19 Andrew Niefer
remove order dependancy in ParserSymbolTableTests.testUsingDeclaration_2 remove order dependancy in ParserSymbolTableTests.testUsingDeclaration_2

View file

@ -47,7 +47,6 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
public class CModelElementsTests extends TestCase { public class CModelElementsTests extends TestCase {
private ICProject fCProject; private ICProject fCProject;

View file

@ -27,7 +27,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
/** /**

View file

@ -16,7 +16,7 @@ import junit.framework.TestSuite;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ElementChangedEvent; import org.eclipse.cdt.core.model.ElementChangedEvent;
import org.eclipse.cdt.core.model.ICElementDelta; 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.ICProject;
import org.eclipse.cdt.core.model.IElementChangedListener; import org.eclipse.cdt.core.model.IElementChangedListener;
import org.eclipse.cdt.testplugin.CProjectHelper; 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 * @see CProjectHelper#createCProject
*/ */
public void testCPathEntries() throws CoreException { public void testCPathEntries() throws CoreException {
ICProject testProject; ICProject testProject;
testProject = CProjectHelper.createCProject("cpathtest", "none"); testProject = CProjectHelper.createCProject("cpathtest", "none");
if (testProject == null) if (testProject == null) {
fail("Unable to create project"); fail("Unable to create project");
ICPathEntry[] entries = testProject.getResolvedCPathEntries(); }
IPathEntry[] entries = testProject.getResolvedPathEntries();
assertTrue("No cpathentries", entries.length == 0); 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[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[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); entries[2] = CoreModel.newLibraryEntry(new Path("/usr/lib/libc.so.1"), null, null, null);
testProject.setRawCPathEntries(entries, new NullProgressMonitor()); testProject.setRawPathEntries(entries, new NullProgressMonitor());
entries = testProject.getResolvedCPathEntries(); entries = testProject.getResolvedPathEntries();
assertTrue("Tree cpathenties", entries.length == 3); assertTrue("Tree cpathenties", entries.length == 3);
} }
/******************************************************************************************************************************* /*******************************************************************************************************************************
* Check if the CPathEntry's are generated. * Check if the PathEntry's are generated.
* *
* @see CProjectHelper#createCProject * @see CProjectHelper#createCProject
*/ */
public void testCPathEntriesDelta() throws CoreException { public void testCPathEntriesDelta() throws CoreException {
ICProject testProject; ICProject testProject;
testProject = CProjectHelper.createCProject("cpathtest2", "none"); testProject = CProjectHelper.createCProject("cpathtest2", "none");
if (testProject == null) if (testProject == null) {
fail("Unable to create project"); 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[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[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); entries[2] = CoreModel.newLibraryEntry(new Path("/usr/lib/libc.so.1"), null, null, null);
final int count = 0; final int count = 0;
CElementListener listener = new CElementListener(); CElementListener listener = new CElementListener();
CoreModel.getDefault().addElementChangedListener(listener); CoreModel.getDefault().addElementChangedListener(listener);
testProject.setRawCPathEntries(entries, new NullProgressMonitor()); testProject.setRawPathEntries(entries, new NullProgressMonitor());
entries = testProject.getResolvedCPathEntries(); entries = testProject.getResolvedPathEntries();
assertTrue("Tree cpathenties", listener.count == 2); assertTrue("Tree cpathenties", listener.count == 2);
} }
} }