Skip to content

Use IType.newSupertypeHierarchy to determine the super type(s) of type #2918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eric-milles wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −25
Open

Use IType.newSupertypeHierarchy to determine the super type(s) of type #2918

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 12 additions & 25 deletions org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/TestSearchEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;

import org.eclipse.jface.operation.IRunnableContext;
Expand Down Expand Up @@ -64,38 +63,26 @@ public static Set<String> findTestMethods(IRunnableContext context, IJavaProject
var result= new HashSet<String>();
context.run(true, true, (progressMonitor) -> {
String message= Messages.format(JUnitMessages.TestSearchEngine_search_message_progress_monitor, type.getElementName());
SubMonitor subMonitor= SubMonitor.convert(progressMonitor, message, 1);
SubMonitor subMonitor= SubMonitor.convert(progressMonitor, message, 2);
try {
collectMethodNames(type, javaProject, testKind.getId(), result, subMonitor);
IType[] types= type.newSupertypeHierarchy(subMonitor.split(1)).getAllTypes();
Comment thread
trancexpress marked this conversation as resolved.

subMonitor= subMonitor.split(1);
subMonitor.setWorkRemaining(types.length);

for (IType it : types) {
if (!"java.lang.Object".equals(it.getFullyQualifiedName())) {//$NON-NLS-1$
collectDeclaredMethodNames(it, javaProject, testKind.getId(), result);
}
subMonitor.worked(1);
}
} catch (CoreException e) {
throw new InvocationTargetException(e);
}
});
return result;
}

private static void collectMethodNames(IType type, IJavaProject javaProject, String testKindId, Set<String> methodNames, IProgressMonitor monitor) throws JavaModelException {
if (type == null) {
return;
}

SubMonitor subMonitor= SubMonitor.convert(monitor, 3);

collectDeclaredMethodNames(type, javaProject, testKindId, methodNames);
subMonitor.split(1);

String superclassName= type.getSuperclassName();
IType superType= getResolvedType(superclassName, type, javaProject);
collectMethodNames(superType, javaProject, testKindId, methodNames, subMonitor.split(1));

String[] superInterfaceNames= type.getSuperInterfaceNames();
subMonitor.setWorkRemaining(superInterfaceNames.length);
for (String interfaceName : superInterfaceNames) {
superType= getResolvedType(interfaceName, type, javaProject);
collectMethodNames(superType, javaProject, testKindId, methodNames, subMonitor.split(1));
}
}

private static IType getResolvedType(String typeName, IType type, IJavaProject javaProject) throws JavaModelException {
IType resolvedType= null;
if (typeName != null) {
Expand Down
Loading