From 0faa6b124c7ddea02fcacc1e7338fe3dbc7c3b50 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Mon, 23 Feb 2004 04:33:38 +0000 Subject: [PATCH] more testing --- .../cdt/core/model/tests/CPathEntryTest.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 3438d9f730f..ca49d5d6cf4 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 @@ -50,6 +50,7 @@ public class CPathEntryTest extends TestCase { if (delta == null) { return ; } + int flags = delta.getFlags(); int kind = delta.getKind(); if (kind == ICElementDelta.CHANGED ) { @@ -140,8 +141,8 @@ public class CPathEntryTest extends TestCase { IPathEntry[] entries = testProject.getResolvedPathEntries(); assertTrue("No cpathentries", entries.length == 0); 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[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.setRawPathEntries(entries, new NullProgressMonitor()); entries = testProject.getResolvedPathEntries(); @@ -162,16 +163,16 @@ public class CPathEntryTest extends TestCase { } CProjectHelper.addSourceContainer(testProject, "foo"); 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"), new Path("/usr/include"), true); + entries[0] = CoreModel.newIncludeEntry(new Path("/cpathtest"), new Path("/usr/include"), true); + entries[1] = CoreModel.newIncludeEntry(new Path("foo"), new Path("/usr/include"), true); entries[2] = CoreModel.newLibraryEntry(new Path("/usr/lib/libc.so.1"), null, null, null); CElementListener listener = new CElementListener(); CoreModel.getDefault().addElementChangedListener(listener); testProject.setRawPathEntries(entries, new NullProgressMonitor()); entries = testProject.getResolvedPathEntries(); - CoreModel.getDefault().removeElementChangedListener(listener); + //CoreModel.getDefault().removeElementChangedListener(listener); testProject.setRawPathEntries(null, null); - assertTrue("Expecting 3 pathEntries deltas", listener.count >= 1); + assertTrue("Expecting 3 pathEntries deltas", listener.count > 1); } /** @@ -189,8 +190,8 @@ public class CPathEntryTest extends TestCase { public IPathEntry[] getPathEntries() { 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[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); return entries; }