Attachment #49585 for bug #156340

View | Details | Raw Unified | Return to bug 156340
Collapse All | Expand All




		removeLibraryEntry(JAVA_PROJECT, new Path("/JavaSearchBugs/lib/b148215.jar"));
	}
}

/**
 * Bug 156340: [search] searchAllTypeNames return nothing for empty prefix
 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=156340"
 */
public void testBug156340() throws CoreException {
	TypeNameRequestor requestor =  new SearchTests.SearchTypeNameRequestor();
	IPackageFragment fragment = getPackageFragment("JavaSearchBugs", getExternalJCLPathString(), "java.lang");
	IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] { fragment });
	new SearchEngine().searchAllTypeNames(
	   null,
		SearchPattern.R_EXACT_MATCH,
		CharOperation.NO_CHAR,
		SearchPattern.R_PREFIX_MATCH,
		IJavaSearchConstants.TYPE,
		scope,
		requestor,
		WAIT_UNTIL_READY_TO_SEARCH,
		null
   );
	assertSearchResults(
		"Unexpected all type names",
		"java.lang.Class\n" + 
		"java.lang.CloneNotSupportedException\n" + 
		"java.lang.Error\n" + 
		"java.lang.Exception\n" + 
		"java.lang.IllegalMonitorStateException\n" + 
		"java.lang.InterruptedException\n" + 
		"java.lang.Object\n" + 
		"java.lang.RuntimeException\n" + 
		"java.lang.String\n" + 
		"java.lang.Throwable",
		requestor);
}
}




			Util.verbose("	- scope: "+scope); //$NON-NLS-1$
		}

		// Return on invalid combination of package and type names
		if (packageName == null || packageName.length == 0) {
			if (typeName != null && typeName.length == 0) {
				// TODO (frederic) Throw a JME instead?
				if (VERBOSE) {
					Util.verbose("	=> return no result due to invalid empty values for package and type names!"); //$NON-NLS-1$
				}
				return;
			}
		}

		// Create pattern
		IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager();
		final char typeSuffix;

Return to bug 156340

Lines 6795-6798 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java (+34 lines)
6795	removeLibraryEntry(JAVA_PROJECT, new Path("/JavaSearchBugs/lib/b148215.jar"));	6830	removeLibraryEntry(JAVA_PROJECT, new Path("/JavaSearchBugs/lib/b148215.jar"));
6796	}	6831	}
6797	}	6832	}
		6833
		6834	/**
		6835	* Bug 156340: [search] searchAllTypeNames return nothing for empty prefix
		6836	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=156340"
		6837	*/
		6838	public void testBug156340() throws CoreException {
		6839	TypeNameRequestor requestor = new SearchTests.SearchTypeNameRequestor();
		6840	IPackageFragment fragment = getPackageFragment("JavaSearchBugs", getExternalJCLPathString(), "java.lang");
		6841	IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] { fragment });
		6842	new SearchEngine().searchAllTypeNames(
		6843	null,
		6844	SearchPattern.R_EXACT_MATCH,
		6845	CharOperation.NO_CHAR,
		6846	SearchPattern.R_PREFIX_MATCH,
		6847	IJavaSearchConstants.TYPE,
		6848	scope,
		6849	requestor,
		6850	WAIT_UNTIL_READY_TO_SEARCH,
		6851	null
		6852	);
		6853	assertSearchResults(
		6854	"Unexpected all type names",
		6855	"java.lang.Class\n" +
		6856	"java.lang.CloneNotSupportedException\n" +
		6857	"java.lang.Error\n" +
		6858	"java.lang.Exception\n" +
		6859	"java.lang.IllegalMonitorStateException\n" +
		6860	"java.lang.InterruptedException\n" +
		6861	"java.lang.Object\n" +
		6862	"java.lang.RuntimeException\n" +
		6863	"java.lang.String\n" +
		6864	"java.lang.Throwable",
		6865	requestor);
		6866	}
6798	}	6867	}

Lines 642-658 Link Here

(-)search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java (-11 lines)
642	Util.verbose(" - scope: "+scope); //$NON-NLS-1$	642	Util.verbose(" - scope: "+scope); //$NON-NLS-1$
643	}	643	}
644		644
645	// Return on invalid combination of package and type names
646	if (packageName == null \|\| packageName.length == 0) {
647	if (typeName != null && typeName.length == 0) {
648	// TODO (frederic) Throw a JME instead?
649	if (VERBOSE) {
650	Util.verbose(" => return no result due to invalid empty values for package and type names!"); //$NON-NLS-1$
651	}
652	return;
653	}
654	}
655
656	// Create pattern	645	// Create pattern
657	IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager();	646	IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager();
658	final char typeSuffix;	647	final char typeSuffix;