Index: src/org/eclipse/jdt/core/tests/model/InclusionPatternsTests.java =================================================================== RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/InclusionPatternsTests.java,v retrieving revision 1.5 diff -u -r1.5 InclusionPatternsTests.java --- src/org/eclipse/jdt/core/tests/model/InclusionPatternsTests.java 8 Jun 2004 10:37:34 -0000 1.5 +++ src/org/eclipse/jdt/core/tests/model/InclusionPatternsTests.java 8 Jun 2004 10:52:18 -0000 @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.jdt.core.tests.model; +import org.eclipse.core.resources.*; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IWorkspaceRunnable; @@ -818,6 +819,61 @@ assertEquals( "Unexpected matches found", "", + resultCollector.toString()); +} +/* + * Ensure search finds matches in an included package. + * (case of setting the classpath) + */ +public void testSearchWithIncludedPackage1() throws CoreException { + createFolder("/P/src/p"); + createFile( + "/P/src/p/A.java", + "package p;\n" + + "public class A {\n" + + "}" + ); + setClasspath(new String[] {"/P/src", "p/"}); + + JavaSearchTests.JavaSearchResultCollector resultCollector = new JavaSearchTests.JavaSearchResultCollector(); + search( + "A", + IJavaSearchConstants.TYPE, + IJavaSearchConstants.DECLARATIONS, + SearchEngine.createJavaSearchScope(new IJavaProject[] {getJavaProject("P")}), + resultCollector); + assertEquals( + "Unexpected matches found", + "src/p/A.java p.A [A]", + resultCollector.toString()); +} +/* + * Ensure search finds matches in an included package. + * (case of opening the project) + */ +public void testSearchWithIncludedPackage2() throws CoreException { + setClasspath(new String[] {"/P/src", "p/"}); + createFolder("/P/src/p"); + createFile( + "/P/src/p/A.java", + "package p;\n" + + "public class A {\n" + + "}" + ); + IProject p = this.project.getProject(); + p.close(null); + p.open(null); + + JavaSearchTests.JavaSearchResultCollector resultCollector = new JavaSearchTests.JavaSearchResultCollector(); + search( + "A", + IJavaSearchConstants.TYPE, + IJavaSearchConstants.DECLARATIONS, + SearchEngine.createJavaSearchScope(new IJavaProject[] {getJavaProject("P")}), + resultCollector); + assertEquals( + "Unexpected matches found", + "src/p/A.java p.A [A]", resultCollector.toString()); } /*