Attachment #31095 for bug #119177

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




				IType[] types= cu.getTypes();
				for (int j= 0; j < types.length; j++) {
					IType type= types[j];
					List testTypes = searchTypeForTestImplementors(type);
					typesArrayList.addAll(testTypes);
				}
			}
			return typesArrayList.toArray();

		}
	}
	
	List searchTypeForTestImplementors(IType type) throws JavaModelException {
		List testTypes = new ArrayList();
		if (type.isClass()) {
			if (! Flags.isAbstract(type.getFlags()) && TestSearchEngine.isTestImplementor(type))
				testTypes.add(type);
			IType[] memberTypes = type.getTypes();
			for ( int i = 0; i < memberTypes.length; i++ ) {
				IType memberType = memberTypes[i];
				if ( Flags.isPublic(memberType.getFlags()) )
					testTypes.addAll(searchTypeForTestImplementors(memberTypes[i]));
			}
		}
		return testTypes;
	}
	
	public void dispose() {
	}
	

Lines 240-246 Link Here

(-)plugins\Copy of org.eclipse.jdt.junit\src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java (-1 / +1 lines)
240	IType testType= (IType) selectedClasses[i];	240	IType testType= (IType) selectedClasses[i];
241	IMethod suiteMethod= testType.getMethod("suite", new String[] {}); //$NON-NLS-1$	241	IMethod suiteMethod= testType.getMethod("suite", new String[] {}); //$NON-NLS-1$
242	if (!suiteMethod.exists()) {	242	if (!suiteMethod.exists()) {
243	suite.append("suite.addTestSuite("+testType.getElementName()+".class);"); //$NON-NLS-1$ //$NON-NLS-2$	243	suite.append("suite.addTestSuite("+testType.getTypeQualifiedName('.')+".class);"); //$NON-NLS-1$ //$NON-NLS-2$
244	} else {	244	} else {
245	suite.append("suite.addTest("+testType.getElementName()+".suite());"); //$NON-NLS-1$ //$NON-NLS-2$	245	suite.append("suite.addTest("+testType.getElementName()+".suite());"); //$NON-NLS-1$ //$NON-NLS-2$
246	}	246	}

Lines 275-281 Link Here

(-)plugins\Copy of org.eclipse.jdt.junit\src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java (-1 / +1 lines)
275		275
276	fClassesInSuiteTable.getTable().setLayoutData(gd);	276	fClassesInSuiteTable.getTable().setLayoutData(gd);
277	fClassesInSuiteTable.setContentProvider(new SuiteClassesContentProvider());	277	fClassesInSuiteTable.setContentProvider(new SuiteClassesContentProvider());
278	fClassesInSuiteTable.setLabelProvider(new JavaElementLabelProvider());	278	fClassesInSuiteTable.setLabelProvider(new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_QUALIFIED));
279	fClassesInSuiteTable.addCheckStateListener(new ICheckStateListener() {	279	fClassesInSuiteTable.addCheckStateListener(new ICheckStateListener() {
280	public void checkStateChanged(CheckStateChangedEvent event) {	280	public void checkStateChanged(CheckStateChangedEvent event) {
281	handleFieldChanged(CLASSES_IN_SUITE);	281	handleFieldChanged(CLASSES_IN_SUITE);

Return to bug 119177

Lines 41-48 Link Here

(-)plugins\Copy of org.eclipse.jdt.junit\src/org/eclipse/jdt/internal/junit/wizards/SuiteClassesContentProvider.java (-2 / +17 lines)
41	IType[] types= cu.getTypes();	41	IType[] types= cu.getTypes();
42	for (int j= 0; j < types.length; j++) {	42	for (int j= 0; j < types.length; j++) {
43	IType type= types[j];	43	IType type= types[j];
44	if (type.isClass() && ! Flags.isAbstract(type.getFlags()) && TestSearchEngine.isTestImplementor(type))	44	List testTypes = searchTypeForTestImplementors(type);
45	typesArrayList.add(types[j]);	45	typesArrayList.addAll(testTypes);
46	}	46	}
47	}	47	}
48	return typesArrayList.toArray();	48	return typesArrayList.toArray();
Lines 52-57 Link Here
52	}	52	}
53	}	53	}
54		54
		55	List searchTypeForTestImplementors(IType type) throws JavaModelException {
		56	List testTypes = new ArrayList();
		57	if (type.isClass()) {
		58	if (! Flags.isAbstract(type.getFlags()) && TestSearchEngine.isTestImplementor(type))
		59	testTypes.add(type);
		60	IType[] memberTypes = type.getTypes();
		61	for ( int i = 0; i < memberTypes.length; i++ ) {
		62	IType memberType = memberTypes[i];
		63	if ( Flags.isPublic(memberType.getFlags()) )
		64	testTypes.addAll(searchTypeForTestImplementors(memberTypes[i]));
		65	}
		66	}
		67	return testTypes;
		68	}
		69
55	public void dispose() {	70	public void dispose() {
56	}	71	}
57		72