From 8858cc1fd3a2f84ddf74bb8e0fea7f0ad75008ba Mon Sep 17 00:00:00 2001 From: John Camelon Date: Tue, 19 Apr 2005 20:38:41 +0000 Subject: [PATCH] Fix broken tests. --- .../core/indexer/tests/SourceIndexerTests.java | 1 + .../org/eclipse/cdt/core/parser/ParserUtil.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/SourceIndexerTests.java b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/SourceIndexerTests.java index 4b48aaebd19..7c6ba10bbb2 100644 --- a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/SourceIndexerTests.java +++ b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/SourceIndexerTests.java @@ -577,6 +577,7 @@ public class SourceIndexerTests extends TestCase implements IIndexChangeListener public void testExactDeclarations() throws Exception { + //TODO Bogdan - you may want to import c.h here a.h includes it! - JC importFile("a.h","resources/dependency/a.h");//$NON-NLS-1$ //$NON-NLS-2$ //Make sure project got added to index diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/ParserUtil.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/ParserUtil.java index acd3eb195e7..9b57a9b6b0f 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/ParserUtil.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/ParserUtil.java @@ -120,10 +120,17 @@ public class ParserUtil if( root.getLocation().isPrefixOf( path ) ) path = path.removeFirstSegments(root.getLocation().segmentCount() ); - IResource resultingResource = root.getFile(path); - if( resultingResource != null && resultingResource.exists() ) - return resultingResource; - return null; + try + { + IFile resultingResource = root.getFile(path); + if( resultingResource != null && resultingResource.exists() ) + return resultingResource; + return null; + } + catch( IllegalArgumentException iae ) //thrown on invalid paths + { + return null; + } } /**