Attachment #47778 for bug #90628

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

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




 **********************************************************************/ 
package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import java.util.List;

import org.eclipse.core.resources.IContainer;
import org.eclipse.hyades.test.tools.ui.java.internal.util.TestJavaUtil;
import org.eclipse.hyades.test.ui.navigator.IFileProxyManager;
import org.eclipse.hyades.test.ui.navigator.IResourceChangeListenerProxyNode;
import org.eclipse.hyades.test.ui.navigator.ITestFolderContentValidator;

    /** the type of test that this provider proxy node covers */
    private String type;
    private String name;
    private List sourceFolders;
    private ITestFolderContentValidator validator;
    private IFileProxyManager fileProxyManager;
    

    }
    protected JUnitFolderProxyNode(IContainer container, ITestFolderContentValidator validator, String type, IFileProxyManager fileProxyManager, Object parent) {
        super(container, validator, fileProxyManager, false, parent);
        sourceFolders = TestJavaUtil.getSourceFolders(JavaCore.create(container.getProject()));
        this.validator = validator;
        this.fileProxyManager = fileProxyManager;
    }

Lines 139-144 Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/navigator/PackageProxyNode.java (-1 / +4 lines)
139	return null;	139	return null;
140	}	140	}
141	}	141	}
		142	if (adapter.isAssignableFrom(IPackageFragment.class)) {
		143	return fragment;
		144	}
142	return null;	145	return null;
143	}	146	}
144		147
Lines 329-335 Link Here
329	} else {	332	} else {
330	//- this should never arrive, because the proxy of a folder	333	//- this should never arrive, because the proxy of a folder
331	//- should be a IResourceChangeListenerProxyNode	334	//- should be a IResourceChangeListenerProxyNode
332	UiPlugin.logError("The proxy node derived from a folder should be a IResourceChangeListenerProxyNode"); // $NON-NLS-1$	335	UiPlugin.logError("The proxy node derived from a folder should be a IResourceChangeListenerProxyNode"); // $NON-NLS-1$ //$NON-NLS-1$
333	}	336	}
334	}	337	}
335	}	338	}

Lines 36-43 Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/navigator/JUnitTypeProvider.java (-4 / +8 lines)
36	public class JUnitTypeProvider implements ITypeProvider, IResourceChangeListener, IDisposable {	36	public class JUnitTypeProvider implements ITypeProvider, IResourceChangeListener, IDisposable {
37		37
38	/** The file proxy manager used to cache file proxies */	38	/** The file proxy manager used to cache file proxies */
39	private IFileProxyManager fileProxyManager;	39	protected IFileProxyManager fileProxyManager;
40	private IProxyNodeListener refresher;	40	protected IProxyNodeListener refresher;
41		41
42	private Map projectToProxyMap = new HashMap();	42	private Map projectToProxyMap = new HashMap();
43		43
Lines 53-61 Link Here
53	return null;	53	return null;
54	}	54	}
55	if(projectToProxyMap.containsKey(project)) {	55	if(projectToProxyMap.containsKey(project)) {
56	return (JUnitTypeProviderProxyNode) projectToProxyMap.get(project);	56	return (ITypeProviderProxyNode) projectToProxyMap.get(project);
57	} else {	57	} else {
58	JUnitTypeProviderProxyNode node = JUnitTypeProviderProxyNode.create(project, type, fileProxyManager, project);	58	ITypeProviderProxyNode node = createTypeProviderProxyNode(project, type);
59	if (node != null) {	59	if (node != null) {
60	projectToProxyMap.put(project, node);	60	projectToProxyMap.put(project, node);
61	}	61	}
Lines 69-74 Link Here
69	// return node;	69	// return node;
70	}	70	}
71		71
		72	protected ITypeProviderProxyNode createTypeProviderProxyNode(IProject project, String type) {
		73	return JUnitTypeProviderProxyNode.create(project, type, fileProxyManager, project);
		74	}
		75
72	/* (non-Javadoc)	76	/* (non-Javadoc)
73	* @see org.eclipse.hyades.test.ui.navigator.ITypeProvider#init(org.eclipse.hyades.test.ui.navigator.ITypeProviderContext)	77	* @see org.eclipse.hyades.test.ui.navigator.ITypeProvider#init(org.eclipse.hyades.test.ui.navigator.ITypeProviderContext)
74	*/	78	*/




        IPackageFragmentRoot root = getProjectAsSourceFolder(project);
        if(root == null) {
            //- the current project is not a source folder
            proxy = createNonSourceFolderProxyNode(project, type, fileProxyManager, parent);
        } else {
            proxy = createSourceFolderProxyNode(fileProxyManager, parent, root);
        }
        AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestSuiteMappingRegistry();
        IAssociationMapping associationMapping = registry.getAssociationMapping(HyadesUIPlugin.EP_TYPE_DESCRIPTIONS);

		this.fileProxyManager = fileProxyManager;
		this.parent = parent;
    }

	/**
	 * @param fileProxyManager
	 * @param parent
	 * @param root
	 * @return
	 */
	protected IProxyNode createSourceFolderProxyNode(IFileProxyManager fileProxyManager, Object parent, IPackageFragmentRoot root) {
		return SourceFolderProxyNode.create(root, validator, fileProxyManager, parent);
	}

	/**
	 * @param project
	 * @param type
	 * @param fileProxyManager
	 * @param parent
	 * @return
	 */
	protected IProxyNode createNonSourceFolderProxyNode(IProject project, String type, IFileProxyManager fileProxyManager, Object parent) {
		return JUnitFolderProxyNode.create(project, validator, type, fileProxyManager, parent);
	}
    
    protected IProxyNode getDelegate() {
        return proxy;
    }
    




import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.hyades.test.tools.core.common.TestCommon;
import org.eclipse.hyades.test.tools.core.java.JUnitTestSuiteFacade;
import org.eclipse.hyades.test.tools.ui.ToolsUiPlugin;
import org.eclipse.hyades.test.tools.ui.java.TestJavaImages;

     * @see Wizard#performFinish
     */
    public boolean performFinish() {
    	page1.saveDialogSettings();
        final List junitScripts = page1.getSelectedElements();
        final String type = page1.getSelectedType();
        IRunnableWithProgress operation = new WorkspaceModifyOperation() {
            public void execute(IProgressMonitor monitor) throws InvocationTargetException {
                try {

                        //- by construction all elements checked should be of type ICompilationUnit
                        if (object instanceof ICompilationUnit) {
                            ICompilationUnit cu = (ICompilationUnit) object;
                            generateTest(type, cu, new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
                        } else {
                        	ToolsUiPlugin.logError("Returned element of JUnit scripts selection page should be a Compilation Unit"); //$NON-NLS-1$
                        }

     * @param project
     * @param overwrite
     */
    protected void generateTest(String type, ICompilationUnit cu, SubProgressMonitor monitor) {
        monitor.beginTask(MessageFormat.format(ToolsUiPlugin.getString("GENERATING_LABEL"), new Object[]{ cu.getElementName()}), 1); //$NON-NLS-1$
        try {
        	JUnitTestSuiteFacade.createTestSuite(cu, type, /*force*/false);
        } catch (CoreException e) {
			UiPlugin.logError(e);
		} finally {


    public void addPages() {
        page1 = createJUnitScriptsSelectionPage();
        page1.init(selection);
        addPage(page1);
    }
    

Lines 11-39 Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/wizard/JUnitScriptsSelectionPage.java (-7 / +171 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.hyades.test.tools.ui.java.internal.junit.wizard;	12	package org.eclipse.hyades.test.tools.ui.java.internal.junit.wizard;
13		13
		14	import java.util.ArrayList;
		15	import java.util.Iterator;
14	import java.util.List;	16	import java.util.List;
15		17
16	import org.eclipse.core.resources.ResourcesPlugin;	18	import org.eclipse.core.resources.ResourcesPlugin;
		19	import org.eclipse.core.runtime.IAdaptable;
		20	import org.eclipse.core.runtime.Platform;
		21	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitExtensionsRegistry;
		22	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitExtensionsRegistry.JUnitTestSuiteFactoryDescriptor;
		23	import org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteFactory;
17	import org.eclipse.hyades.test.tools.ui.ToolsUiPlugin;	24	import org.eclipse.hyades.test.tools.ui.ToolsUiPlugin;
		25	import org.eclipse.hyades.test.ui.TestUIExtension;
		26	import org.eclipse.hyades.ui.HyadesUIPlugin;
		27	import org.eclipse.hyades.ui.extension.IAssociationDescriptor;
		28	import org.eclipse.hyades.ui.extension.IAssociationMapping;
		29	import org.eclipse.hyades.ui.internal.extension.AssociationMappingRegistry;
18	import org.eclipse.hyades.ui.util.TreeSelector;	30	import org.eclipse.hyades.ui.util.TreeSelector;
19	import org.eclipse.jdt.core.ICompilationUnit;	31	import org.eclipse.jdt.core.ICompilationUnit;
20	import org.eclipse.jdt.core.IJavaModel;	32	import org.eclipse.jdt.core.IJavaModel;
21	import org.eclipse.jdt.core.JavaCore;	33	import org.eclipse.jdt.core.JavaCore;
22	import org.eclipse.jdt.ui.JavaElementLabelProvider;	34	import org.eclipse.jdt.ui.JavaElementLabelProvider;
		35	import org.eclipse.jface.dialogs.IDialogSettings;
23	import org.eclipse.jface.viewers.CheckStateChangedEvent;	36	import org.eclipse.jface.viewers.CheckStateChangedEvent;
		37	import org.eclipse.jface.viewers.ComboViewer;
24	import org.eclipse.jface.viewers.ICheckStateListener;	38	import org.eclipse.jface.viewers.ICheckStateListener;
		39	import org.eclipse.jface.viewers.ISelection;
		40	import org.eclipse.jface.viewers.ISelectionChangedListener;
		41	import org.eclipse.jface.viewers.IStructuredContentProvider;
		42	import org.eclipse.jface.viewers.IStructuredSelection;
		43	import org.eclipse.jface.viewers.LabelProvider;
		44	import org.eclipse.jface.viewers.SelectionChangedEvent;
		45	import org.eclipse.jface.viewers.StructuredSelection;
		46	import org.eclipse.jface.viewers.Viewer;
25	import org.eclipse.jface.wizard.WizardPage;	47	import org.eclipse.jface.wizard.WizardPage;
26	import org.eclipse.swt.SWT;	48	import org.eclipse.swt.SWT;
		49	import org.eclipse.swt.graphics.Image;
27	import org.eclipse.swt.layout.GridData;	50	import org.eclipse.swt.layout.GridData;
28	import org.eclipse.swt.layout.GridLayout;	51	import org.eclipse.swt.layout.GridLayout;
29	import org.eclipse.swt.widgets.Composite;	52	import org.eclipse.swt.widgets.Composite;
		53	import org.eclipse.swt.widgets.Label;
30		54
31	/**	55	/**
32	* @author jgout	56	* @author jgout
33	*/	57	*/
34	public class JUnitScriptsSelectionPage extends WizardPage implements ICheckStateListener {	58	public class JUnitScriptsSelectionPage extends WizardPage implements ICheckStateListener {
35		59
36	private TreeSelector selector;	60	private static final String DS_TYPE = "type"; //$NON-NLS-1$
		61
		62	private TreeSelector selector;
		63	private ComboViewer testFactoryList;
		64	private JUnitWorkspaceContentProvider contentProvider;
		65	protected List initialSelection;
37		66
38	public JUnitScriptsSelectionPage() {	67	public JUnitScriptsSelectionPage() {
39	super("JUnitScriptSelectionPage"); //$NON-NLS-1$	68	super("JUnitScriptSelectionPage"); //$NON-NLS-1$
Lines 45-68 Link Here
45	public void createControl(Composite parent) {	74	public void createControl(Composite parent) {
46	initializeDialogUnits(parent);	75	initializeDialogUnits(parent);
47	Composite composite = new Composite(parent, SWT.NULL);	76	Composite composite = new Composite(parent, SWT.NULL);
48	GridLayout gl = new GridLayout();	77	GridLayout gl = new GridLayout(2, false);
49	gl.numColumns = 1;
50	composite.setLayout(gl);	78	composite.setLayout(gl);
51	composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL \| GridData.HORIZONTAL_ALIGN_FILL));	79	gl.verticalSpacing = 20;
		80	composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
52	composite.setFont(parent.getFont());	81	composite.setFont(parent.getFont());
		82
		83	Label label = new Label(composite, SWT.NONE);
		84	label.setText("Destination type:");
		85	label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
		86	testFactoryList = new ComboViewer(composite, SWT.DROP_DOWN \| SWT.READ_ONLY);
		87	testFactoryList.getControl().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
		88	testFactoryList.setContentProvider(new IStructuredContentProvider() {
		89	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		90	// n/a
		91	}
		92	public void dispose() {
		93	// NOP
		94	}
		95	public Object[] getElements(Object inputElement) {
		96	return JUnitExtensionsRegistry.getInstance().getAvailableFactories(/updateSupport/false);
		97	}
		98	});
		99	testFactoryList.setLabelProvider(new LabelProvider() {
		100	public String getText(Object element) {
		101	String type = ((JUnitExtensionsRegistry.JUnitTestSuiteFactoryDescriptor)element).getType();
		102	AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestSuiteMappingRegistry();
		103	IAssociationMapping associationMapping = registry.getAssociationMapping(HyadesUIPlugin.EP_TYPE_DESCRIPTIONS);
		104	IAssociationDescriptor descriptor = associationMapping.getDefaultAssociationDescriptor(type);
		105	return descriptor.getName();
		106	}
		107	public Image getImage(Object element) {
		108	String type = ((JUnitExtensionsRegistry.JUnitTestSuiteFactoryDescriptor)element).getType();
		109	AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestSuiteMappingRegistry();
		110	IAssociationMapping associationMapping = registry.getAssociationMapping(HyadesUIPlugin.EP_TYPE_DESCRIPTIONS);
		111	IAssociationDescriptor descriptor = associationMapping.getDefaultAssociationDescriptor(type);
		112	return descriptor.getImage();
		113	}
		114	});
		115	testFactoryList.setInput(ResourcesPlugin.getWorkspace().getRoot());
		116	testFactoryList.addSelectionChangedListener(new ISelectionChangedListener() {
		117	public void selectionChanged(SelectionChangedEvent event) {
		118	IJUnitTestSuiteFactory factory = getTestSuiteFactory();
		119	if (factory != null) {
		120	contentProvider.setJUnitTestSuiteFactory(factory);
		121	List checkedElements;
		122	if (initialSelection != null) {
		123	checkedElements = initialSelection;
		124	initialSelection = null;
		125	} else {
		126	checkedElements = selector.getSelectedElements();
		127	}
		128	IJavaModel javaWorkspace = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
		129	selector.setInput(null);
		130	selector.setInput(javaWorkspace);
		131	selector.setInitialCheckedElements(checkedElements);
		132	setPageComplete(true);
		133	setErrorMessage(null);
		134	} else {
		135	selector.setInput(null);
		136	setPageComplete(false);
		137	setErrorMessage("The selected generator has encountered an internal error");
		138	}
		139	}
		140	});
		141
53	//- build the selection widget	142	//- build the selection widget
54	IJavaModel javaWorkspace = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());	143	IJavaModel javaWorkspace = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
55	JavaElementLabelProvider javaLabelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);	144	JavaElementLabelProvider javaLabelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
56	JUnitWorkspaceContentProvider contentProvider = createContentProvider();	145	contentProvider = new JUnitWorkspaceContentProvider();
57	selector = new TreeSelector(composite, javaWorkspace, contentProvider, javaLabelProvider, SWT.BORDER);	146	selector = new TreeSelector(composite, javaWorkspace, contentProvider, javaLabelProvider, SWT.BORDER);
58	contentProvider.setRunnableContext(this.getContainer());	147	contentProvider.setRunnableContext(this.getContainer());
59	selector.getTreeViewer().addCheckStateListener(this);	148	selector.getTreeViewer().addCheckStateListener(this);
		149	selector.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
		150
		151	readDialogSettings();
		152
60	setPageComplete(false);	153	setPageComplete(false);
61	setControl(composite);	154	setControl(composite);
62	}	155	}
63		156
64	protected JUnitWorkspaceContentProvider createContentProvider() {	157	protected void init(IStructuredSelection selection) {
65	return new JUnitWorkspaceContentProvider();	158	Iterator it = selection.iterator();
		159	initialSelection = new ArrayList(selection.size());
		160	while (it.hasNext()) {
		161	Object o = it.next();
		162	if (o instanceof IAdaptable) {
		163	ICompilationUnit cu = (ICompilationUnit) ((IAdaptable)o).getAdapter(ICompilationUnit.class);
		164	if (cu != null) {
		165	initialSelection.add(cu);
		166	}
		167	}
		168	}
		169	}
		170
		171	protected IJUnitTestSuiteFactory getTestSuiteFactory() {
		172	ISelection selection = testFactoryList.getSelection();
		173	if (selection instanceof IStructuredSelection) {
		174	JUnitExtensionsRegistry.JUnitTestSuiteFactoryDescriptor descr =
		175	(JUnitExtensionsRegistry.JUnitTestSuiteFactoryDescriptor) ((IStructuredSelection)selection).getFirstElement();
		176	if (descr != null) {
		177	return descr.getFactory();
		178	}
		179	}
		180	return null;
		181	}
		182
		183	public String getSelectedType() {
		184	ISelection selection = testFactoryList.getSelection();
		185	if (selection instanceof IStructuredSelection) {
		186	JUnitTestSuiteFactoryDescriptor descr =
		187	(JUnitTestSuiteFactoryDescriptor) ((IStructuredSelection)selection).getFirstElement();
		188	if (descr != null) {
		189	return descr.getType();
		190	}
		191	}
		192	return null;
		193	}
		194
		195	public void setSelectedType(String type) {
		196	JUnitTestSuiteFactoryDescriptor descr = JUnitExtensionsRegistry.getInstance().getDescriptor(type);
		197	if (descr != null) {
		198	testFactoryList.setSelection(new StructuredSelection(descr));
		199	} else {
		200	testFactoryList.setSelection(StructuredSelection.EMPTY);
		201	}
66	}	202	}
67		203
68	public List getSelectedElements() {	204	public List getSelectedElements() {
Lines 72-75 Link Here
72	public void checkStateChanged(CheckStateChangedEvent event) {	208	public void checkStateChanged(CheckStateChangedEvent event) {
73	setPageComplete(selector.getSelectedElements().size() != 0);	209	setPageComplete(selector.getSelectedElements().size() != 0);
74	}	210	}
		211
		212	protected IDialogSettings getDialogSettings() {
		213	IDialogSettings pluginSettings = ToolsUiPlugin.getDefault().getDialogSettings();
		214	IDialogSettings settings = pluginSettings.getSection(JUnitScriptsSelectionPage.class.getName());
		215	if (settings == null) {
		216	settings = pluginSettings.addNewSection(JUnitScriptsSelectionPage.class.getName());
		217	}
		218	return settings;
		219	}
		220
		221	protected void readDialogSettings() {
		222	IDialogSettings settings = getDialogSettings();
		223	String type = settings.get(DS_TYPE);
		224	if (type != null) {
		225	setSelectedType(type);
		226	}
		227	if (getSelectedType() == null) {
		228	// Default to the first item in list
		229	Object o = testFactoryList.getElementAt(0);
		230	if (o != null) testFactoryList.setSelection(new StructuredSelection(o));
		231	}
		232	}
		233
		234	/package/ void saveDialogSettings() {
		235	IDialogSettings settings = getDialogSettings();
		236	settings.put(DS_TYPE, getSelectedType());
		237	}
		238
75	}	239	}

Lines 17-26 Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/wizard/JUnitWorkspaceContentProvider.java (-14 / +39 lines)
17	import java.util.List;	17	import java.util.List;
18	import java.util.Map;	18	import java.util.Map;
19		19
		20	import org.eclipse.core.resources.IFile;
		21	import org.eclipse.core.resources.IProject;
		22	import org.eclipse.core.runtime.CoreException;
20	import org.eclipse.core.runtime.IProgressMonitor;	23	import org.eclipse.core.runtime.IProgressMonitor;
21	import org.eclipse.core.runtime.NullProgressMonitor;	24	import org.eclipse.core.runtime.NullProgressMonitor;
22	import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;	25	import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
23	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater;	26	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater;
		27	import org.eclipse.hyades.test.tools.core.internal.plugin.util.PDEProjectUtil;
		28	import org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteFactory;
		29	import org.eclipse.hyades.test.tools.core.java.JUnitTestSuiteFacade;
24	import org.eclipse.hyades.test.tools.ui.ToolsUiPlugin;	30	import org.eclipse.hyades.test.tools.ui.ToolsUiPlugin;
25	import org.eclipse.jdt.core.ICompilationUnit;	31	import org.eclipse.jdt.core.ICompilationUnit;
26	import org.eclipse.jdt.core.IJavaElement;	32	import org.eclipse.jdt.core.IJavaElement;
Lines 41-49 Link Here
41		47
42	private Map children = new HashMap();	48	private Map children = new HashMap();
43	private IRunnableContext context;	49	private IRunnableContext context;
		50	private IJUnitTestSuiteFactory factory;
		51
		52	public void setJUnitTestSuiteFactory(IJUnitTestSuiteFactory factory) {
		53	if (factory != this.factory) {
		54	this.factory = factory;
		55	children.clear();
		56	}
		57	}
44		58
45	private Object[] initChildren(Object element) {	59	private Object[] initChildren(Object element) {
46
47	//- java project	60	//- java project
48	if (element instanceof IJavaProject) {	61	if (element instanceof IJavaProject) {
49	IJavaProject jProject = (IJavaProject) element;	62	IJavaProject jProject = (IJavaProject) element;
Lines 102-108 Link Here
102	try {	115	try {
103	IJavaElement [] compilationUnits = pack.getChildren();	116	IJavaElement [] compilationUnits = pack.getChildren();
104	for(int c = 0; c < compilationUnits.length; c++) {	117	for(int c = 0; c < compilationUnits.length; c++) {
105	if(isJUnitScript(compilationUnits[c])) {	118	if(isDisplayed(compilationUnits[c])) {
106	//- Actually, the current compilation unit is a JUnit script, we need to keep it	119	//- Actually, the current compilation unit is a JUnit script, we need to keep it
107	ret.add(compilationUnits[c]);	120	ret.add(compilationUnits[c]);
108	}	121	}
Lines 120-138 Link Here
120	* @param element	133	* @param element
121	* @return	134	* @return
122	*/	135	*/
123	private boolean isJUnitScript(IJavaElement element) {	136	private boolean isDisplayed(IJavaElement element) {
124	if (element instanceof ICompilationUnit) {	137	if (element instanceof ICompilationUnit) {
125	ICompilationUnit cu = (ICompilationUnit) element;	138	ICompilationUnit cu = (ICompilationUnit)element;
126	IType mainType = cu.findPrimaryType();	139	if (factory.isSupported(cu)) {
127	try {	140	try {
128	if (mainType != null) {	141	return JUnitModelUpdater.findTestSuiteFile((IFile)cu.getUnderlyingResource()) == null;
129	if (SourcePage.isTestImplementor(mainType)) {	142	} catch (JavaModelException e) {
130	// Has a TestSuite already been defined for this type?	143	return false;
131	return JUnitModelUpdater.findTestSuite(mainType, new ResourceSetImpl()) == null;	144	} catch (CoreException e) {
132	}	145	return false;
133	}	146	}
134	} catch (JavaModelException e) {
135	ToolsUiPlugin.logError(e);
136	}	147	}
137	}	148	}
138	return false;	149	return false;
Lines 140-146 Link Here
140		151
141	public Object[] getChildren(Object element) {	152	public Object[] getChildren(Object element) {
142	if (element instanceof IJavaModel) {	153	if (element instanceof IJavaModel) {
143	return super.getChildren(element);	154	Object[] projects = super.getChildren(element);
		155	return filterProjects(projects);
144	}	156	}
145	if (!children.containsKey(element)) {	157	if (!children.containsKey(element)) {
146	Object[] ch = initChildren(element);	158	Object[] ch = initChildren(element);
Lines 151-156 Link Here
151	}	163	}
152	}	164	}
153		165
		166	private Object[] filterProjects(Object[] projects) {
		167	if (factory == null) {
		168	return NO_CHILDREN;
		169	}
		170	ArrayList result = new ArrayList(projects.length);
		171	for (int i = 0; i < projects.length; i++) {
		172	if (factory.isSupported((IJavaProject)projects[i])) {
		173	result.add(projects[i]);
		174	}
		175	}
		176	return result.toArray();
		177	}
		178
154	public boolean hasChildren(Object element) {	179	public boolean hasChildren(Object element) {
155	if (element instanceof IJavaProject) {	180	if (element instanceof IJavaProject) {
156	// Always assume true. Digging into the project would be too	181	// Always assume true. Digging into the project would be too




               menubarPath="org.eclipse.ui.OpenWithSubMenu"
               id="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteOpenCode"/>
      </objectContribution>
      <objectContribution
            adaptable="false"
            id="org.eclipse.hyades.test.tools.ui.RegularJUnitTestSuiteContribution"
            objectClass="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.RegularJUnitTestSuiteProxyNode">
         <action
               class="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.actions.ImportRegularJUnitTestSuiteAction"
               enablesFor="*"
               id="org.eclipse.hyades.test.tools.ui.RegularJUnitTestSuiteImport"
               label="Create Model"
               menubarPath="org.eclipse.ui.OpenWithSubMenu"/>
      </objectContribution>
   </extension>   
   <extension
         point="org.eclipse.ui.popupMenus">

      </wizard>
   </extension>
   <extension
         point="org.eclipse.ui.importWizards">
      <wizard
            category="org.eclipse.tptp.platform.category.test.import"
            class="org.eclipse.hyades.test.tools.ui.plugin.internal.junit.wizard.PluginJUnitImportWizard"
            icon="icons/full/etool16/newpluginjsuite_wiz.gif"
            id="org.eclipse.hyades.test.tools.ui.plugin.import.junit"
            name="%PluginJUnitImportWizard.name">
         <description>
            %PluginJUnitImportWizard.description
         </description>
      </wizard>
   </extension>
   <extension
         point="org.eclipse.hyades.ui.editorExtensions">
      <editorExtension
            class="org.eclipse.hyades.test.tools.ui.java.internal.junit.editor.JUnitEditorExtension"

            recorderMessageHandlers="org.eclipse.hyades.execution.recorder.http.local.HttpRecorderDataProcessor"
            wizardPageProvider="org.eclipse.tptp.test.tools.internal.recorder.http.providers.HttpRecorderWizardProvider"/>
   </extension>
   <extension
         point="org.eclipse.hyades.ui.typeDescriptions">
      <typeDescription
            name="Other JUnit tests"
            icon="icons/full/obj16/java_jsuite.gif"
            type="org.eclipse.hyades.test.other.junit.testSuite"
            description="JUnit tests not imported to TPTP"
            extension="testsuite">
      </typeDescription>
      <typeDescription
            name="JUnit test method"
            icon="icons/full/obj16/java_test.gif"
            type="org.eclipse.hyades.test.other.junit.testCase"
            description="JUnit test method not imported to TPTP"
            extension="testcase">
      </typeDescription>
   </extension>
      <extension
            point="org.eclipse.hyades.test.ui.testNavigatorTypeProvider">
         <provider
               class="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.RegularJUnitProvider"
               label="Other JUnit tests"
               type="org.eclipse.hyades.test.other.junit.testSuite"/>
      </extension>
      <extension
            point="org.eclipse.ui.preferencePages">
         <page

Lines 475-480 Link Here

(-)plugin.properties (-3 lines)
475	WIZ_NEW_WORKBENCH_LOCATION_DSC = Creates a new location for an Eclipse workbench. A workbench location is used to specify where a TPTP JUnit Plug-in test will run.	475	WIZ_NEW_WORKBENCH_LOCATION_DSC = Creates a new location for an Eclipse workbench. A workbench location is used to specify where a TPTP JUnit Plug-in test will run.
476	WORKBENCH_PROPERTY_GROUP_TTL = Eclipse Workbench Properties	476	WORKBENCH_PROPERTY_GROUP_TTL = Eclipse Workbench Properties
477	WORKBENCH_PROPERTY_GROUP_DSC = This location defines the following workbench properties:	477	WORKBENCH_PROPERTY_GROUP_DSC = This location defines the following workbench properties:
478	PluginJUnitImportWizard.name = JUnit plug-in tests to TPTP
479	PluginJUnitImportWizard.description = Import JUnit Tests in the workspace as TPTP plug-in tests.
480	PluginJUnitImportWizard.title = Import JUnit plug-in tests to TPTP

Lines 36-41 Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/editor/SourceInfoViewer.java (-1 / +3 lines)
36	import org.eclipse.hyades.test.core.util.EMFUtil;	36	import org.eclipse.hyades.test.core.util.EMFUtil;
37	import org.eclipse.hyades.test.tools.core.CorePlugin;	37	import org.eclipse.hyades.test.tools.core.CorePlugin;
38	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater;	38	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater;
		39	import org.eclipse.hyades.test.tools.core.java.JUnitTestSuiteFacade;
39	import org.eclipse.hyades.test.tools.ui.ToolsUiPlugin;	40	import org.eclipse.hyades.test.tools.ui.ToolsUiPlugin;
40	import org.eclipse.hyades.test.tools.ui.java.internal.util.TestJavaUtil;	41	import org.eclipse.hyades.test.tools.ui.java.internal.util.TestJavaUtil;
41	import org.eclipse.hyades.test.ui.editor.form.util.EditorForm;	42	import org.eclipse.hyades.test.ui.editor.form.util.EditorForm;
Lines 466-472 Link Here
466	markDirty();	467	markDirty();
467	} else if (e.widget == updateFromCodeButton) {	468	} else if (e.widget == updateFromCodeButton) {
468	try {	469	try {
469	if (JUnitModelUpdater.updateTestSuiteFromCode((ITestSuite)getImplementor().getOwner())) {	470	ITestSuite testSuite = (ITestSuite)getImplementor().getOwner();
		471	if (JUnitModelUpdater.updateTestSuiteFromCode(testSuite, JUnitTestSuiteFacade.getJUnitSourceFile(testSuite))) {
470	markDirty();	472	markDirty();
471	}	473	}
472	} catch (CoreException e1) {	474	} catch (CoreException e1) {




/********************************************************************** 
 * Copyright (c) 2005 IBM Corporation and others. 
 * All rights reserved.   This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0 
 * which accompanies this distribution, and is available at 
 * http://www.eclipse.org/legal/epl-v10.html 
 * $Id: PackageProxyNode.java,v 1.3 2005/06/09 09:33:48 jgout Exp $ 
 * 
 * Contributors: 
 * IBM - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.ui.ISharedImages;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.swt.graphics.Image;

/**
 * Proxy node for a package. This proxy contains all JUnit test found in the corresponding java package.
 * @author jcanches
 * @since 4.3
 */
public class RegularJUnitPackageProxyNode extends JavaParentElementProxyNode {
    
    public static RegularJUnitPackageProxyNode create(IPackageFragment fragment, Object parent) {
        RegularJUnitPackageProxyNode proxy = new RegularJUnitPackageProxyNode(fragment, parent);
        if(proxy.getChildren().length > 0) {
            return proxy;
        }
        return null;
    }
    
    private RegularJUnitPackageProxyNode(IPackageFragment fragment, Object parent) {
    	super(fragment, parent);
    }
    
    public IPackageFragment getPackageFragment() {
    	return (IPackageFragment)getJavaElement();
    }
    
    /* (non-Javadoc)
     * @see org.eclipse.hyades.test.ui.navigator.IProxyNode#getText()
     */
    public String getText() {
    	String name = getJavaElement().getElementName();
    	if ("".equals(name)) { //$NON-NLS-1$
    		name = "(default package)";
    	}
        return name;
    }

    /* (non-Javadoc)
     * @see org.eclipse.hyades.test.ui.navigator.IProxyNode#getImage()
     */
    public Image getImage() {
        return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
    }

	protected JavaElementProxyNode createChildProxy(IJavaElement childElement) {
		if (childElement instanceof ICompilationUnit) {
			return RegularJUnitTestSuiteProxyNode.create((ICompilationUnit)childElement, this);
		}
		return null;
	}

}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.hyades.models.common.facades.behavioral.ITestCase;
import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;
import org.eclipse.hyades.models.common.testprofile.TPFTestSuite;
import org.eclipse.hyades.test.tools.core.common.TestCommon;
import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater;
import org.eclipse.hyades.test.tools.core.java.JUnitTestSuiteFacade;
import org.eclipse.hyades.test.tools.ui.ToolsUiPlugin;
import org.eclipse.hyades.test.tools.ui.java.internal.junit.wizard.SourcePage;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.test.ui.navigator.ITestSuiteProxyNode;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElementDelta;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;

public class RegularJUnitTestSuiteProxyNode extends JavaElementProxyNode implements ITestSuiteProxyNode/*, IPersistableProxyNode*/ {

	private IProxyNode[] children;

	public static RegularJUnitTestSuiteProxyNode create(ICompilationUnit cu, Object parent) {
		if (isJUnitScript(cu)) {
			return new RegularJUnitTestSuiteProxyNode(cu, parent);
		}
		return null;
	}
	
	/** Checks whether the given java element is a JUnit test script
	 * @param element 
	 * @return
	 */
	private static boolean isJUnitScript(ICompilationUnit element) {
		ICompilationUnit cu = (ICompilationUnit) element;
		IType mainType = cu.findPrimaryType();
		try {
			if (mainType != null) {
				if (SourcePage.isTestImplementor(mainType)) {
					// Has a TestSuite already been defined for this type?
					return JUnitModelUpdater.findTestSuite(mainType, new ResourceSetImpl()) == null;
				}
			}
		} catch (JavaModelException e) {
			ToolsUiPlugin.logError(e);
		}
		return false;
	}

	private RegularJUnitTestSuiteProxyNode(ICompilationUnit cu, Object parent) {
		super(cu, parent);
		computeChildren();
	}
	
	private void computeChildren() {
		try {
			ITestSuite testSuite = JUnitTestSuiteFacade.createTestSuite(getCompilationUnit(), TestCommon.JUNIT_TEST_SUITE_TYPE);
			List _children = new ArrayList(testSuite.getITestCases().size());
			Iterator it = testSuite.getITestCases().iterator();
			while (it.hasNext()) {
				ITestCase tc = (ITestCase) it.next();
				IProxyNode proxy = new RegularJUnitTestCaseProxyNode(tc, this);
				_children.add(proxy);
			}
			this.children = (IProxyNode[])_children.toArray(new IProxyNode[_children.size()]);
		} catch (CoreException e) {
			this.children = new IProxyNode[0];
		}
	}
	
	public ICompilationUnit getCompilationUnit() {
		return (ICompilationUnit)getJavaElement();
	}
	
	public TPFTestSuite getTestSuite() {
		try {
			return (TPFTestSuite) JUnitTestSuiteFacade.createTestSuite(getCompilationUnit(), TestCommon.JUNIT_TEST_SUITE_TYPE);
		} catch (CoreException e) {
			ToolsUiPlugin.logError(e);
			return null;
		}
	}

	public String getType() {
		return TestCommon.OTHER_JUNIT_TEST_SUITE_TYPE;
	}

	public IProxyNode[] getChildren() {
		return children;
	}

	public Image getImage() {
		// TODO Auto-generated method stub
		return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_TEST_SUITE);
	}

	public String getFactoryID() {
		// TODO Auto-generated method stub
		return null;
	}

	public boolean saveState(IMemento memento) {
		// TODO Auto-generated method stub
		return false;
	}

	public IProxyNode elementChanged(IJavaElementDelta delta) {
		if (delta.getKind() == IJavaElementDelta.CHANGED) {
			int flags = delta.getFlags();
			if ((flags & IJavaElementDelta.F_PRIMARY_RESOURCE) != 0) {
				computeChildren();
				return this;
			}
		}
		return null;
	}

}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaElementDelta;
import org.eclipse.jdt.core.IParent;
import org.eclipse.jdt.core.JavaModelException;

/**
 * Proxy node representing a java element that contains java elements.
 * @author jcanches
 * @since 4.3
 */
public abstract class JavaParentElementProxyNode extends JavaElementProxyNode {

	protected JavaElementProxyNode[] children;
	
	protected JavaParentElementProxyNode(IJavaElement element, Object parent) {
		super(element, parent);
		setChildren(computeChildren());
	}

	protected abstract JavaElementProxyNode createChildProxy(IJavaElement childElement);
    
	public IProxyNode[] getChildren() {
		return children;
	}
	
	protected final synchronized void setChildren(List _children) {
		children = (JavaElementProxyNode[])_children.toArray(new JavaElementProxyNode[_children.size()]);
	}

	protected List computeChildren() {
		if (getJavaElement() instanceof IParent) {
			try {
				IJavaElement[] elements = ((IParent)getJavaElement()).getChildren();
				List _children = new ArrayList(elements.length); 
				for (int i = 0; i < elements.length; i++) {
					JavaElementProxyNode proxy = createChildProxy(elements[i]);
					if (proxy != null) {
						_children.add(proxy);
					}
				}
				return _children;
			} catch (JavaModelException e) {
				return Collections.EMPTY_LIST;
			}
		}
		return Collections.EMPTY_LIST;
	}

	public IProxyNode elementChanged(IJavaElementDelta delta) {
		IProxyNode lowestChanged = null;
		IJavaElementDelta[] deltas = delta.getAffectedChildren();
		for (int i = 0; i < deltas.length; i++) {
			IJavaElementDelta childDelta = deltas[i];
			IJavaElement childElement = childDelta.getElement();
			IProxyNode lowestChild = null;
			switch(childDelta.getKind()) {
				case IJavaElementDelta.ADDED: {
					JavaElementProxyNode proxy = createChildProxy(childElement);
					if (proxy != null) {
						addChildProxy(proxy);
						lowestChild = this;
					}
					break;
				} case IJavaElementDelta.REMOVED: {
					JavaElementProxyNode proxy = getChildProxy(childElement);
					if (proxy != null) {
						removeChildProxy(proxy);
						lowestChild = this;
					}
					break;
				} case IJavaElementDelta.CHANGED: {
					JavaElementProxyNode proxy = getChildProxy(childElement);
					if (proxy != null) {
						lowestChild = proxy.elementChanged(childDelta);
						if (proxy.getChildren().length == 0) {
							removeChildProxy(proxy);
							lowestChild = this;
						}
					} else {
						proxy = createChildProxy(childElement);
						if (proxy != null) {
							addChildProxy(proxy);
							lowestChild = this;
						}
					}
					break;
				}
			}
			if (lowestChild != null) {
				if (lowestChanged == null) {
					lowestChanged = lowestChild;
				} else {
					lowestChanged = this;
				}
			}
		}
		return lowestChanged;
	}

    protected final JavaElementProxyNode getChildProxy(IJavaElement element) {
        for (int i = 0; i < children.length; i++) {
            if (element.equals(children[i].getJavaElement())) {
                return children[i];
            }
        }
        return null;
    }

    protected final void replaceChildProxy(JavaElementProxyNode oldProxy, JavaElementProxyNode newProxy) {
        for (int i = 0; i < children.length; i++) {
            if(children[i] == oldProxy) {
                children[i] = newProxy;
                break;
            }
        }
    }
 
	protected final boolean addChildProxy(JavaElementProxyNode proxy) {
        if(proxy == null) return false;
        JavaElementProxyNode[] newChildren = new JavaElementProxyNode[children.length + 1];
        for (int i = 0; i < children.length; i++) {
            //- if the proxy to add is already a child do not add it
            if(children[i].equals(proxy)) {
                return false;
            }
            newChildren[i] = children[i];
        }
        newChildren[children.length] = proxy;
        //- change the children of the current proxy node
        children = newChildren;
        return true;
	}

    protected final void removeChildProxy(JavaElementProxyNode proxy) {
    	JavaElementProxyNode[] newChildren = new JavaElementProxyNode[children.length - 1];
        int j = 0;
        for (int i = 0; i < children.length; i++) {
            if(children[i] != proxy) {
                newChildren[j++] = children[i];
            }
        }
        //- change the children of the current proxy node
        children = newChildren;
    }

}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import org.eclipse.core.resources.IResource;
import org.eclipse.hyades.models.common.facades.behavioral.ITestCase;
import org.eclipse.hyades.models.common.testprofile.TPFTestCase;
import org.eclipse.hyades.test.tools.core.common.TestCommon;
import org.eclipse.hyades.test.ui.TestUIExtension;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.test.ui.navigator.ITestCaseProxyNode;
import org.eclipse.hyades.ui.HyadesUIPlugin;
import org.eclipse.hyades.ui.extension.IAssociationDescriptor;
import org.eclipse.hyades.ui.extension.IAssociationMapping;
import org.eclipse.hyades.ui.internal.extension.AssociationMappingRegistry;
import org.eclipse.swt.graphics.Image;

public class RegularJUnitTestCaseProxyNode implements ITestCaseProxyNode {

	private RegularJUnitTestSuiteProxyNode parent;
	private String name;
	private String id;
	
	public RegularJUnitTestCaseProxyNode(ITestCase testCase, RegularJUnitTestSuiteProxyNode parent) {
		this.parent = parent;
		this.name = testCase.getName();
		this.id = testCase.getId();
	}
	
	public TPFTestCase getTestCase() {
		// TODO Auto-generated method stub
		return null;
	}

	public String getType() {
		return TestCommon.OTHER_JUNIT_TEST_CASE_TYPE;
	}

	public IProxyNode[] getChildren() {
		return new IProxyNode[0];
	}

	public Image getImage() {
		AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestCaseMappingRegistry();
		IAssociationMapping associationMapping = registry.getAssociationMapping(HyadesUIPlugin.EP_TYPE_DESCRIPTIONS);
		IAssociationDescriptor descriptor = associationMapping.getDefaultAssociationDescriptor(getType());	
		if(descriptor != null) {
			return descriptor.getImage();
		} else {
			//- the type of this element wasn't registered by any extension (hyades.ui.typeDescriptions)
			return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_TEST_CASE);
		}
	}

	public Object getParent() {
		return parent;
	}

	public String getText() {
		return name;
	}

	public Object getAdapter(Class adapter) {
		// TODO Auto-generated method stub
		return null;
	}

	public String getIdentifier() {
		return id;
	}

	public IResource getUnderlyingResource() {
		return parent.getUnderlyingResource();
	}

}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import org.eclipse.hyades.test.ui.TestUIExtension;
import org.eclipse.hyades.test.ui.UiPlugin;
import org.eclipse.hyades.test.ui.internal.navigator.TestNavigator;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.test.ui.navigator.ITypeProviderProxyNode;
import org.eclipse.hyades.ui.HyadesUIPlugin;
import org.eclipse.hyades.ui.extension.IAssociationDescriptor;
import org.eclipse.hyades.ui.extension.IAssociationMapping;
import org.eclipse.hyades.ui.internal.extension.AssociationMappingRegistry;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaElementDelta;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.swt.graphics.Image;

/**
 * Top-level proxy node under a project, for representing "other junit tests".
 * This proxy is associated to a Java project, and shows source folders as childs, or
 * directly packages if the java project is the source folder itself. 
 * @author jcanches
 * @since 4.3
 */
public class RegularJUnitProviderProxyNode extends JavaParentElementProxyNode implements ITypeProviderProxyNode {

	private String name;
	private String imageKey;
	
	public static RegularJUnitProviderProxyNode create(IJavaProject project, String type, Object parent) {
		RegularJUnitProviderProxyNode proxy = new RegularJUnitProviderProxyNode(project, type, parent);
        if(proxy.getChildren().length > 0) {
            return proxy;
        }
        return null;
	}
	
	protected RegularJUnitProviderProxyNode(IJavaProject project, String type, Object parent) {
		super(project, parent);
        AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestSuiteMappingRegistry();
        IAssociationMapping associationMapping = registry.getAssociationMapping(HyadesUIPlugin.EP_TYPE_DESCRIPTIONS);
        IAssociationDescriptor descriptor = associationMapping.getDefaultAssociationDescriptor(type);
        if (descriptor != null) {
            this.name = descriptor.getName();
        } else {
            this.name = "[Invalid Descriptor]"; //$NON-NLS-1$
        }
        this.imageKey = TestNavigator.getTypeProviderManager().getImageKeyFor(type);
	}
	
	protected JavaElementProxyNode createChildProxy(IJavaElement childElement) {
		if (childElement instanceof IPackageFragmentRoot) {
			return RegularJUnitSourceFolderProxyNode.create((IPackageFragmentRoot)childElement, this);
		}
		return null;
	}
	
	private boolean isSourceFolder() {
		if (children.length == 1) {
			return ((RegularJUnitSourceFolderProxyNode)children[0]).isProjectRoot();
		}
		return false;
	}
	
	public IJavaProject getJavaProject() {
		return (IJavaProject)getJavaElement();
	}
	
	public Image getImage() {
		return UiPlugin.getInstance().getImageRegistry().get(this.imageKey);
	}

	public String getText() {
        return name;
	}

	public IProxyNode elementChanged(IJavaElementDelta delta) {
		if (delta.getKind() == IJavaElementDelta.CHANGED) {
			IJavaElementDelta[] deltas = delta.getAffectedChildren();
			IProxyNode lowestChanged = null;
			for (int i = 0; i < deltas.length; i++) {
				IProxyNode lowestChild = null;
				IJavaElementDelta childDelta = deltas[i];
				IJavaElement elem = childDelta.getElement();
				if (elem.getElementType() == IJavaElement.PACKAGE_FRAGMENT_ROOT) {
					if (childDelta.getKind() == IJavaElementDelta.ADDED
						|| (childDelta.getKind() == IJavaElementDelta.CHANGED
							&& (childDelta.getFlags() & IJavaElementDelta.F_ADDED_TO_CLASSPATH) > 0)) {
						lowestChild = packageFragmentRootAdded((IPackageFragmentRoot)elem);
					} else if (childDelta.getKind() == IJavaElementDelta.REMOVED
							   || (childDelta.getKind() == IJavaElementDelta.CHANGED
								   && (childDelta.getFlags() & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) > 0)) {
						lowestChild = packageFragmentRootRemoved((IPackageFragmentRoot)elem);
					} else if (childDelta.getKind() == IJavaElementDelta.CHANGED
							   && (childDelta.getFlags() & IJavaElementDelta.F_CHILDREN) > 0) {
						lowestChild = packageFragmentRootChanged((IPackageFragmentRoot)elem, childDelta);
					}
				}
				if (lowestChild != null) {
	                if(lowestChanged == null) {
	                    lowestChanged = lowestChild;
	                } else {
	                    lowestChanged = this;
	                }
				}
			}
			return lowestChanged;
		}
		return null;
	}

	private IProxyNode packageFragmentRootAdded(IPackageFragmentRoot root) {
		RegularJUnitSourceFolderProxyNode proxy = RegularJUnitSourceFolderProxyNode.create(root, this);
		if (proxy != null) {
			addChildProxy(proxy);
			return this;
		}
		return null;
	}

	private IProxyNode packageFragmentRootRemoved(IPackageFragmentRoot root) {
		JavaElementProxyNode proxy = getChildProxy(root);
		if (proxy != null) {
			removeChildProxy(proxy);
			return this;
		}
		return null;
	}
	
	private IProxyNode packageFragmentRootChanged(IPackageFragmentRoot root, IJavaElementDelta delta) {
		JavaElementProxyNode proxy = getChildProxy(root);
		if (proxy != null) {
			IProxyNode lowestChanged  = proxy.elementChanged(delta);
			if (proxy.getChildren().length == 0) {
				removeChildProxy(proxy);
				return this;
			}
			return lowestChanged;
		} else {
			proxy = RegularJUnitSourceFolderProxyNode.create(root, this);
			if (proxy != null) {
				addChildProxy(proxy);
				return this;
			}
		}
		return null;
	}

}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.resources.IProject;
import org.eclipse.hyades.test.ui.navigator.IFileProxyManager;
import org.eclipse.hyades.test.ui.navigator.IProxyNodeListener;
import org.eclipse.hyades.test.ui.navigator.ITypeProvider;
import org.eclipse.hyades.test.ui.navigator.ITypeProviderContext;
import org.eclipse.hyades.test.ui.navigator.ITypeProviderProxyNode;
import org.eclipse.hyades.ui.util.IDisposable;
import org.eclipse.jdt.core.ElementChangedEvent;
import org.eclipse.jdt.core.IElementChangedListener;
import org.eclipse.jdt.core.IJavaElementDelta;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;

/**
 * A provider showing Java projects content, with non-JUnit classes filtered out.
 * @author jcanches
 * @since 4.3
 */
public class RegularJUnitProvider implements ITypeProvider, IElementChangedListener, IDisposable {

    /** The file proxy manager used to cache file proxies */
    protected IFileProxyManager fileProxyManager;
	protected IProxyNodeListener refresher;

	private Map projectToProxyMap = new HashMap();
	
	public RegularJUnitProvider() {
        JavaCore.addElementChangedListener(this, ElementChangedEvent.POST_CHANGE);
	}
	
    /* (non-Javadoc)
     * @see org.eclipse.hyades.test.ui.navigator.ITypeProvider#get(org.eclipse.core.resources.IProject, java.lang.String)
     */
    public ITypeProviderProxyNode get(IProject project, String type) {
    	IJavaProject jproject = JavaCore.create(project);
        if(!jproject.exists()) return null;
        RegularJUnitProviderProxyNode proxy = (RegularJUnitProviderProxyNode) projectToProxyMap.get(jproject);
        if(proxy == null) {
        	proxy = RegularJUnitProviderProxyNode.create(jproject, type, this);
        	if (proxy != null) {
        		projectToProxyMap.put(jproject, proxy);
        	}
        }
        return proxy;
    }
    
    /* (non-Javadoc)
     * @see org.eclipse.hyades.test.ui.navigator.ITypeProvider#init(org.eclipse.hyades.test.ui.navigator.ITypeProviderContext)
     */
    public void init(ITypeProviderContext context) {
        fileProxyManager = context.getFileProxyManager();
		refresher = context.getProxyNodeListener();
    }

    public void dispose() {
        JavaCore.removeElementChangedListener(this);
    }

	public void elementChanged(ElementChangedEvent event) {
		IJavaElementDelta[] children = event.getDelta().getAffectedChildren();
		for(int i = 0; i < children.length; i++) {
			IJavaProject jproject = (IJavaProject) children[i].getElement();
			RegularJUnitProviderProxyNode node = (RegularJUnitProviderProxyNode) projectToProxyMap.get(jproject);
			if (node != null) {
				Object lowestChange = node.elementChanged(children[i]);
				if(node.getChildren().length == 0) {
                    lowestChange = jproject.getProject();
                    projectToProxyMap.remove(jproject);
                }
				if (lowestChange != null) {
					refresher.nodeChanged(lowestChange);
				}
			}
		}
	}
	
	public void notifyChanged(RegularJUnitProviderProxyNode proxy) {
		if (proxy.getChildren().length == 0) {
			IJavaProject project = proxy.getJavaProject();
			projectToProxyMap.remove(project);
			refresher.nodeChanged(project);
		} else {
			refresher.nodeChanged(proxy);
		}
	}

}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import org.eclipse.core.resources.IResource;
import org.eclipse.hyades.test.tools.ui.ToolsUiPlugin;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaModelException;

/**
 * Proxy node representing a java element.
 * @author jcanches
 * @since 4.3
 */
public abstract class JavaElementProxyNode implements IJavaElementChangedListenerProxyNode {

	protected static final JavaElementProxyNode[] NO_CHILDREN = new JavaElementProxyNode[0];

	private Object parent;
	private IJavaElement element;
	
	protected JavaElementProxyNode(IJavaElement element, Object parent) {
		this.parent = parent;
		this.element = element;
	}
	
	public IProxyNode[] getChildren() {
		return NO_CHILDREN;
	}

	public Object getParent() {
		return parent;
	}

	public String getText() {
		return element.getElementName();
	}

	public Object getAdapter(Class adapter) {
		if (adapter.isAssignableFrom(element.getClass())) {
			return element;
		}
		try {
			IResource res = element.getCorrespondingResource();
			if (adapter.isAssignableFrom(res.getClass())) {
				return res;
			}
		} catch (JavaModelException e) {
			return null;
		}
		return null;
	}

	public String getIdentifier() {
		return element.getHandleIdentifier();
	}

	public IResource getUnderlyingResource() {
		try {
			return element.getUnderlyingResource();
		} catch (JavaModelException e) {
			ToolsUiPlugin.logError(e);
			return null;
		}
	}
	
	public IJavaElement getJavaElement() {
		return element;
	}
	
}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.jdt.core.IJavaElementDelta;

/**
 * A proxy node that is able to modify itself in reaction to changes in the java model.
 * @author jcanches
 * @since 4.3
 */
public interface IJavaElementChangedListenerProxyNode extends IProxyNode {

	/**
	 * Processes the delta, rooted at the java element that this proxy is associated to.
	 * @param delta
	 * @return The lowest proxy, in the subtree of the proxy, that needs to be refreshed
	 * by a viewer. This may be this proxy itself.
	 */
	IProxyNode elementChanged(IJavaElementDelta delta);
	
}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.actions;

import org.eclipse.hyades.test.tools.ui.java.internal.junit.wizard.JUnitImportWizard;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.ui.IActionDelegate;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;

public class ImportRegularJUnitTestSuiteAction implements IActionDelegate {

	private IStructuredSelection selection;
	
	public void run(IAction action) {
		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
		JUnitImportWizard wizard = new JUnitImportWizard();
		wizard.init(window.getWorkbench(), selection);
		WizardDialog dialog = new WizardDialog(window.getShell(), wizard);
		dialog.open();
	}

	public void selectionChanged(IAction action, ISelection selection) {
		if (selection instanceof IStructuredSelection) {
            this.selection = (IStructuredSelection) selection;
        }
	}

}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.ui.ISharedImages;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.swt.graphics.Image;

/**
 * Proxy node for a source folder. This proxy represents a package fragment root,
 * and has package proxy as children.
 * @author jcanches
 * @since 4.3
 */
public class RegularJUnitSourceFolderProxyNode extends JavaParentElementProxyNode {

	private boolean isProjectRoot;
	
	public static RegularJUnitSourceFolderProxyNode create(IPackageFragmentRoot root, Object parent) {
		RegularJUnitSourceFolderProxyNode proxy = new RegularJUnitSourceFolderProxyNode(root, parent);
		if (proxy.getChildren().length == 0) {
			return null;
		}
		return proxy;
	}
	
	private RegularJUnitSourceFolderProxyNode(IPackageFragmentRoot root, Object parent) {
		super(root, parent);
		isProjectRoot = root.getPath().equals(root.getJavaProject().getPath());
	}

    public Image getImage() {
		return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKFRAG_ROOT);
	}

	protected JavaElementProxyNode createChildProxy(IJavaElement childElement) {
		if (childElement instanceof IPackageFragment) {
			return RegularJUnitPackageProxyNode.create((IPackageFragment)childElement, this);
		}
		return null;
	}
	
	public boolean isProjectRoot() {
		return isProjectRoot;
	}

	public String getText() {
		if (isProjectRoot) {
			return "[project root]";
		}
		return super.getText();
	}
	
}

Lines 54-57 Link Here

(-)src/org/eclipse/hyades/test/tools/core/common/TestCommon.java (+3 lines)
54		54
55	public final static String PLUGIN_JUNIT_TEST_SUITE_TYPE = "org.eclipse.hyades.test.plugin.junit.testSuite"; //$NON-NLS-1$	55	public final static String PLUGIN_JUNIT_TEST_SUITE_TYPE = "org.eclipse.hyades.test.plugin.junit.testSuite"; //$NON-NLS-1$
56		56
		57	public final static String OTHER_JUNIT_TEST_SUITE_TYPE = "org.eclipse.hyades.test.other.junit.testSuite"; //$NON-NLS-1$
		58	public final static String OTHER_JUNIT_TEST_CASE_TYPE = "org.eclipse.hyades.test.other.junit.testCase"; //$NON-NLS-1$
		59
57	}	60	}

Lines 4-10 Link Here

(-)src/org/eclipse/hyades/test/tools/core/internal/java/codegen/GenTestSuite.java (-1 / +1 lines)
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: GenTestSuite.java,v 1.11 2006/07/29 01:57:42 sschneid Exp $	7	* $Id$
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation

Lines 4-10 Link Here

(-)src/org/eclipse/hyades/test/tools/core/internal/java/codegen/GenTestSuiteConstructor.java (-1 / +1 lines)
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: GenTestSuiteConstructor.java,v 1.2 2006/07/29 01:57:42 sschneid Exp $	7	* $Id$
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation

Lines 4-10 Link Here

(-)src/org/eclipse/hyades/test/tools/core/internal/java/codegen/GenSuiteMethod.java (-1 / +1 lines)
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: GenSuiteMethod.java,v 1.10 2006/07/29 21:36:45 sschneid Exp $	7	* $Id$
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation

Lines 4-10 Link Here

(-)src/org/eclipse/hyades/test/tools/core/internal/java/codegen/GenTestMethod.java (-1 / +1 lines)
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: GenTestMethod.java,v 1.9 2006/07/29 21:36:45 sschneid Exp $	7	* $Id$
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation




import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.hyades.models.common.facades.behavioral.ITestCase;
import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;
import org.eclipse.hyades.models.common.facades.behavioral.impl.HyadesFactory;
import org.eclipse.hyades.models.common.util.ICommonConstants;
import org.eclipse.hyades.test.core.util.EMFUtil;
import org.eclipse.hyades.test.tools.core.CorePlugin;
import org.eclipse.hyades.test.tools.core.common.TestCommon;
import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitExtensionsRegistry;
import org.eclipse.hyades.test.tools.core.internal.common.codegen.Helper;
import org.eclipse.hyades.test.tools.core.internal.java.codegen.JUnitGenerator;
import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater;
import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitProjectBuilder;
import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitTypeFactory;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.osgi.util.NLS;

/**
 * <p>Provides high-level methods for navigating between JUnit source files (as JDT model
 * elements) and TPTP concepts (as TPTP Test Model elements).</p>
 * <p><b>This API is provisional and is subject to changes in future releases.</b></p>
 * @author jcanches
 * @since 4.1
 */
public class JUnitTestSuiteFacade {


    public static ITestSuite createTestSuite(ICompilationUnit junitTestCompilationUnit, String type, boolean force) throws CoreException {
   		String name = junitTestCompilationUnit.getElementName();
		name = name.substring(0, name.indexOf('.'));
		IFile javaFile = (IFile)junitTestCompilationUnit.getCorrespondingResource();
		IFile testSuiteFile = javaFile
				.getParent()
				.getFile(new Path(name + "." + ICommonConstants.TEST_SUITE_FILE_EXTENSION)); //$NON-NLS-1$

		ITestSuite testSuite = createTestSuite(junitTestCompilationUnit, type);
		testSuite.setName(name);
		saveTestSuite(testSuite, testSuiteFile, force);
		return testSuite;
    }
    
    public static ITestSuite createTestSuite(ICompilationUnit cu, String type) throws CoreException {
    	IJUnitTestSuiteFactory factory = JUnitExtensionsRegistry.getInstance().getFactory(type);
    	if (factory == null) {
    		throw new CoreException(makeErrorStatus(NLS.bind("No JUnit test suite factory registered for the type {0}", type), null)); //$NON-NLS-1$
    	}
		ITestSuite testSuite = factory.generate(cu);
		// Store in the Test Suite the reference to the JUnit code:
		testSuite.getImplementor().setLocation(getPackageFragmentRoot(cu).getCorrespondingResource().getFullPath().toString());
		testSuite.getImplementor().setResource(cu.findPrimaryType().getFullyQualifiedName());
		return testSuite;
    }
    
    public static void saveTestSuite(ITestSuite testSuite, IFile file, boolean force) throws CoreException {
		if (file.exists()) {
			if (force) {
				file.delete(/*force*/true, /*keepHistory*/true, null);
			} else {
				throw new CoreException(makeErrorStatus(NLS.bind("Resource {0} already exists.", file.getFullPath()), null)); //$NON-NLS-1$
			}
		}
		ResourceSet resourceSet = new ResourceSetImpl();
		URI uri = URI.createPlatformResourceURI(file.getFullPath().toString());
		Resource resource = resourceSet.createResource(uri);
		IJUnitTestSuiteFactory factory = new JUnitTypeFactory();
		resource.getContents().add(testSuite);

		try {
			// This TestSuite has a code-implemented behavior:
			JUnitModelUpdater.setImplementorBlock(testSuite.getImplementor(), null);
			// Store in the Test Suite the reference to the JUnit code:
			testSuite.getImplementor().setLocation(getPackageFragmentRoot(junitTestCompilationUnit).getCorrespondingResource().getFullPath().toString());
			testSuite.getImplementor().setResource(junitTestCompilationUnit.findPrimaryType().getFullyQualifiedName());
			
			populateTestCases(testSuite, junitTestCompilationUnit);
			
			EMFUtil.save(resource);
			JUnitProjectBuilder.installBuilder(testSuiteFile.getProject());
			JUnitProjectBuilder.installBuilder(javaFile.getProject());
			JUnitModelUpdater.associateTestSuiteToJUnitSourceFile(javaFile, testSuiteFile);
			return testSuite;
		} catch (Exception e) {
			throw new CoreException(makeErrorStatus("Problem in saving resource " + file.getFullPath(), e)); //$NON-NLS-1$
			return null;
		}
		JUnitProjectBuilder.installBuilder(file.getProject());
		IFile javaFile = getJUnitSourceFile(testSuite);
		JUnitProjectBuilder.installBuilder(javaFile.getProject());
		JUnitModelUpdater.associateTestSuiteToJUnitSourceFile(javaFile, file);
	 * in compilation unit cu.
	 * For the more generic case where the ITestSuite already owns ITestCase children which
	 * need to updated according to the new state of the source code, see 
	 * ModelUpdater.updateTestSuiteFromCode(ITestSuite).
	 * @param testSuite
	 * @param cu
	 * @throws JavaModelException
	 * @see org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater#updateTestSuiteFromCode(ITestSuite)
	 */
    private static void populateTestCases(ITestSuite testSuite, ICompilationUnit cu) throws JavaModelException {
		boolean isExternalBehavior = testSuite.getImplementor().isExternalImplementor();
    	IType mainType = cu.findPrimaryType();
    	if (mainType != null) {
    		IMethod[] methods = mainType.getMethods();
    		//List testCases = testSuite.getITestCases();
    		for (int i = 0; i < methods.length; i++) {
    			if (JUnitGenerator.isTestMethod(methods[i])) {
					String methodName = methods[i].getElementName();
					ITestCase tc = TestCommonUtil.createTestCase(testSuite, TestCommon.JUNIT_TEST_CASE_TYPE, /*externalBehavior*/true, methodName);
					Helper.setTestMethodName(tc, methodName);
    			}
    		}
    	}
    }

	/**

		return null;
	}

	private static IStatus makeErrorStatus(String message, Throwable exception) {
		return new Status(IStatus.ERROR,
				CorePlugin.PLUGIN_ID,
				1,
				message,
				exception);
	}
	

}

Lines 4-10 Link Here

(-)src/org/eclipse/hyades/test/tools/core/internal/manual/codegen/GenTestSuite.java (-1 / +1 lines)
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: GenTestSuite.java,v 1.11 2006/07/29 01:57:42 sschneid Exp $	7	* $Id$
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM - Initial API and implementation	10	* IBM - Initial API and implementation





package org.eclipse.hyades.test.tools.core.internal.java.modelsync;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;

import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.hyades.models.common.configuration.CFGClass;
import org.eclipse.hyades.models.common.configuration.CFGInstance;
import org.eclipse.hyades.models.common.facades.behavioral.IBlock;
import org.eclipse.hyades.models.common.facades.behavioral.IImplementor;
import org.eclipse.hyades.models.common.facades.behavioral.ITestCase;
import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;
import org.eclipse.hyades.models.common.fragments.BVRInteraction;
import org.eclipse.hyades.models.common.interactions.BVRLifeline;

import org.eclipse.hyades.models.common.util.ICommonConstants;
import org.eclipse.hyades.test.core.util.EMFUtil;
import org.eclipse.hyades.test.tools.core.CorePlugin;
import org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteFactory;
import org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteUpdateFactory;
import org.eclipse.hyades.test.tools.core.internal.common.codegen.ASTHelper;
import org.eclipse.hyades.test.tools.core.internal.common.codegen.Helper;
import org.eclipse.hyades.test.tools.core.internal.java.codegen.JUnitGenerator;
import org.eclipse.hyades.test.tools.core.java.JUnitTestSuiteFacade;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.TagElement;

/**
 * This class provides methods for creating/updating a JUnit TestSuite model

	
	/**
	 * Update the Test Suite model in order to take the last changes from the code
	 * into account. This is done by invoking the registered update factory for the type
	 * of the test suite. If no update factory is registered, this method does nothing and return
	 * <code>false</code>.
	 * <ul>
	 *   <li>For each test method (ie "void testXxxx()") in the code, ensures that there is a TestCase
	 *   associated to it. If not, creates a TestCase with the same name as the test method.</li>
	 *   <li>For each TestCase, ensures that the method it is associated with still exists.
	 *   If not, deletes the TestCase.</li>
	 * </ul>
	 * @param testSuite
	 * @param javaFile 
	 * @return <code>true</code> if any update was applied to the specified test suite,
	 * or <code>false</code> if the test suite was already up-to-date.
	 * @throws CoreException
	 */
	public static boolean updateTestSuiteFromCode(ITestSuite testSuite, IFile junitCode) throws CoreException {
		boolean changed = false;
		IJUnitTestSuiteFactory factory = JUnitExtensionsRegistry.getInstance().getFactory(testSuite.getType());
		if (factory instanceof IJUnitTestSuiteUpdateFactory) {
			IJUnitTestSuiteUpdateFactory ufactory = (IJUnitTestSuiteUpdateFactory) factory;
			ICompilationUnit cu = JavaCore.createCompilationUnitFrom(junitCode);
			return ufactory.update(testSuite, cu);
				throw new CoreException(makeErrorStatus("JUnit Compilation Unit structure is unknown", null)); //$NON-NLS-1$
			}
			IType primaryType = cu.findPrimaryType();
			if (cu == null) {
				throw new CoreException(makeErrorStatus("JUnit Compilation Unit has no primary type", null)); //$NON-NLS-1$
			}
			boolean isExternalBehavior = testSuite.getImplementor().isExternalImplementor();
			// Search for new test methods (=do not have a matching test case)
			IMethod[] methods = primaryType.getMethods();
			List usedTestCases = new ArrayList(methods.length);
			for (int i = 0; i < methods.length; i++) {
    			if (JUnitGenerator.isTestMethod(methods[i])) {
					ITestCase testCase = findTestCase(testSuite, methods[i]);
					if (testCase == null) {
						String methodName = methods[i].getElementName();
						testCase = TestCommonUtil.createTestCase(testSuite, TestCommon.JUNIT_TEST_CASE_TYPE, isExternalBehavior, methodName);
						testCase.getImplementor().setResource(methodName);
						changed = true;
					}
					usedTestCases.add(testCase);
					if (updateTestCaseDescription(methods[i], testCase)) {
						changed = true;
					}
    			}
			}
			// Search for Test Cases that do not have a matching test method
			List unusedTestCases = new ArrayList();
			Iterator it = testSuite.getITestCases().iterator();
			while (it.hasNext()) {
				ITestCase testCase = (ITestCase) it.next();
				if (!usedTestCases.contains(testCase)) {
					String methodName = Helper.getTestMethodName(testCase);
					if (methodName != null) {
						IMethod method = primaryType.getMethod(methodName, new String[0]);
						if (!method.exists()) {
							unusedTestCases.add(testCase);
						}
					}
				}
			}
			// Remove test cases that are not associated to a test method any more
			it = unusedTestCases.iterator();
			while (it.hasNext()) {
				EObject testCase = (EObject)it.next();
				EMFUtil.remove(testCase);
				changed = true;
			}
		}
		return changed;
	}
	
	private static boolean updateTestCaseDescription(IMethod method, ITestCase testCase) throws JavaModelException {
		TagElement sourceTag = ASTHelper.getJavadocDescription(method);
		if (sourceTag == null) {
			if (testCase.getDescription() != null && testCase.getDescription().length() > 0) {
				testCase.setDescription(null);
				return true;
			}
			return false;
		}
		
		String sourceDescription = ASTHelper.extractDescription(sourceTag);
		if (sourceDescription.startsWith(testCase.getName())) {
			sourceDescription = sourceDescription.substring(testCase.getName().length());
			if (sourceDescription.startsWith("\n")) sourceDescription = sourceDescription.substring("\n".length());  //$NON-NLS-1$//$NON-NLS-2$
		}
		
		String tcDescription = testCase.getDescription();
		if (tcDescription == null) tcDescription = ""; //$NON-NLS-1$
		if (!Helper.compareJavaComments(sourceDescription, tcDescription)) {
			testCase.setDescription(sourceDescription.trim());
			return true;
		}
		return false;
	}
	
	private static ITestCase findTestCase(ITestSuite testSuite, IMethod testMethod) {
		Iterator it = testSuite.getITestCases().iterator();
		Helper helper = new Helper();
		try {
			String testMethodName = testMethod.getElementName();
			while (it.hasNext()) {
				ITestCase testCase = (ITestCase) it.next();
				String methodName = Helper.getTestMethodName(testCase);
				if (testMethodName.equals(methodName)) {
					return testCase;
				}
			}
		} finally {
			helper.dispose();
		}
		return null;
	}
	
	private static IStatus makeErrorStatus(String message, Throwable exception) {
		return new Status(IStatus.ERROR,
				CorePlugin.PLUGIN_ID,
				1,
				message,
				exception);
	}

	/**
	 * This method is temporarily public. Clients should not use it.
	 * @param implementor

		}
	}
	
	public static IFile findTestSuiteFile(IFile javaFile) throws CoreException {
		// First method (typical): use the marker to find the test suite definition
		IFile file = getRegisteredTestSuiteFile(javaFile);
		if (file != null) {

Lines 124-130 Link Here

(-)src/org/eclipse/hyades/test/tools/core/internal/java/modelsync/JUnitProjectBuilder.java (-1 / +1 lines)
124	try {	124	try {
125	TPFTestSuite testSuite = (TPFTestSuite)JUnitTestSuiteFacade.findTestSuite(javaFile, new ResourceSetImpl());	125	TPFTestSuite testSuite = (TPFTestSuite)JUnitTestSuiteFacade.findTestSuite(javaFile, new ResourceSetImpl());
126	if (testSuite != null) {	126	if (testSuite != null) {
127	if (JUnitModelUpdater.updateTestSuiteFromCode(testSuite)) {	127	if (JUnitModelUpdater.updateTestSuiteFromCode(testSuite, javaFile)) {
128	SaveManager.saveResource(testSuite);	128	SaveManager.saveResource(testSuite);
129	IFile file = EMFUtil.getWorkspaceFile(testSuite);	129	IFile file = EMFUtil.getWorkspaceFile(testSuite);
130	file.refreshLocal(0, null);	130	file.refreshLocal(0, null);




<plugin>

    	<extension-point id="nodeHandlers" name="org.eclipse.hyades.test.tools.core.nodeHandlers" schema="schema/nodeHandlers.exsd"/>
     <extension-point id="junitFactory" name="JUnit Test Model Factory" schema="schema/junitFactory.exsd"/>
	
   <extension
         point="org.eclipse.hyades.test.core.launchconfigLaunchableType">

		<service class="org.eclipse.hyades.test.tools.core.services.AgentControllerVerificationService"/>
	</extension>
 <extension
       point="org.eclipse.hyades.test.tools.core.junitFactory">
    <factory
          class="org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitTypeFactory"
          type="org.eclipse.hyades.test.java.junit.testSuite"
          updateSupport="true"/>
    <factory
          class="org.eclipse.hyades.test.tools.core.internal.plugin.modelsync.JUnitPluginTypeFactory"
          type="org.eclipse.hyades.test.plugin.junit.testSuite"
          updateSupport="true"/>
 </extension>
 <extension
       id="junit"
       name="TPTP JUnit source metadata"
       point="org.eclipse.core.resources.markers">




<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.eclipse.hyades.test.tools.core">
<annotation>
      <appInfo>
         <meta.schema plugin="org.eclipse.hyades.test.tools.core" id="junitFactory" name="JUnit Test Model Factory"/>
      </appInfo>
      <documentation>
         This extension point registers a JUnit test model factory. A JUnit test model factory generates a TPTP test model from a java source file. Such a factory has also the optional capability of updating a test model to reflect changes occurred in the java source file it is associated to.
      </documentation>
   </annotation>

   <element name="extension">
      <complexType>
         <sequence minOccurs="0" maxOccurs="unbounded">
            <element ref="factory"/>
         </sequence>
         <attribute name="point" type="string" use="required">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="id" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
            </annotation>
         </attribute>
         <attribute name="name" type="string">
            <annotation>
               <documentation>
                  
               </documentation>
               <appInfo>
                  <meta.attribute translatable="true"/>
               </appInfo>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <element name="factory">
      <complexType>
         <attribute name="class" type="string" use="required">
            <annotation>
               <documentation>
                  The class implementing the factory.
               </documentation>
               <appInfo>
                  <meta.attribute kind="java" basedOn="org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteFactory"/>
               </appInfo>
            </annotation>
         </attribute>
         <attribute name="updateSupport" type="boolean" use="required">
            <annotation>
               <documentation>
                  Whether the class supports test suite model update. If true, class must implement org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteUpdateFactory.
               </documentation>
            </annotation>
         </attribute>
         <attribute name="type" type="string" use="required">
            <annotation>
               <documentation>
                  The type of test suite that this factory generates.
               </documentation>
            </annotation>
         </attribute>
      </complexType>
   </element>

   <annotation>
      <appInfo>
         <meta.section type="since"/>
      </appInfo>
      <documentation>
         [Enter the first release in which this extension point appears.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="examples"/>
      </appInfo>
      <documentation>
         [Enter extension point usage example here.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="apiInfo"/>
      </appInfo>
      <documentation>
         [Enter API information here.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="implementation"/>
      </appInfo>
      <documentation>
         [Enter information about supplied implementation of this extension point.]
      </documentation>
   </annotation>

   <annotation>
      <appInfo>
         <meta.section type="copyright"/>
      </appInfo>
      <documentation>
         
      </documentation>
   </annotation>

</schema>




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.core.internal.java.modelsync;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
import org.eclipse.hyades.test.tools.core.CorePlugin;
import org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteFactory;
import org.eclipse.jface.resource.ImageDescriptor;

public class JUnitExtensionsRegistry {

	private static JUnitExtensionsRegistry instance;
	private final static String EXT_POINT_ID = CorePlugin.getID() + ".junitFactory"; //$NON-NLS-1$
	
	public static JUnitExtensionsRegistry getInstance() {
		if (instance == null) {
			instance = new JUnitExtensionsRegistry();
		}
		return instance;
	}
	
	private Map factoryDescriptors;
	
	private JUnitExtensionsRegistry() {
		registerFactories();
	}
	
	public class JUnitTestSuiteFactoryDescriptor {
		private IConfigurationElement element;
		private IJUnitTestSuiteFactory factory;
		public JUnitTestSuiteFactoryDescriptor(IConfigurationElement element) {
			this.element = element;
		}
		public String getType() {
			return element.getAttribute("type"); //$NON-NLS-1$
		}
		public boolean isUpdateCapable() {
			return Boolean.valueOf(element.getAttribute("updateSupport")).booleanValue(); //$NON-NLS-1$
		}
		public IJUnitTestSuiteFactory getFactory() {
			if (factory == null) {
				try {
					factory =(IJUnitTestSuiteFactory)element.createExecutableExtension("class"); //$NON-NLS-1$
				} catch (CoreException e) {
					CorePlugin.logError(e);
					invalidFactory(this);
				}
			}
			return factory;
		}
		public boolean equals(Object obj) {
			if (!(obj instanceof JUnitTestSuiteFactoryDescriptor)) return false;
			if (getType() == null) return false; // This is an error case
			JUnitTestSuiteFactoryDescriptor other = (JUnitTestSuiteFactoryDescriptor) obj;
			return getType().equals(other.getType());
		}
		public int hashCode() {
			String type = getType();
			if (type == null) return super.hashCode();
			else return type.hashCode();
		}
		
	}
	
	protected void invalidFactory(JUnitTestSuiteFactoryDescriptor descr) {
		factoryDescriptors.remove(descr.getType());
	}
	
	public IJUnitTestSuiteFactory getFactory(String type) {
		JUnitTestSuiteFactoryDescriptor descr = getDescriptor(type);
		if (descr != null) {
			return descr.getFactory();
		}
		return null;
	}
	
	public JUnitTestSuiteFactoryDescriptor getDescriptor(String type) {
		return (JUnitTestSuiteFactoryDescriptor) factoryDescriptors.get(type);
	}
	
	public JUnitTestSuiteFactoryDescriptor[] getAvailableFactories(boolean updateSupport) {
		Collection list;
		if (updateSupport) {
			list = getUpdateCapableFactories();
		} else {
			list = factoryDescriptors.values();
		}
		JUnitTestSuiteFactoryDescriptor[] ret = new JUnitTestSuiteFactoryDescriptor[list.size()];
		return (JUnitTestSuiteFactoryDescriptor[]) factoryDescriptors.values().toArray(ret);
	}
	
	private Collection getUpdateCapableFactories() {
		Collection values = factoryDescriptors.values();
		ArrayList ret = new ArrayList(values.size());
		Iterator it = values.iterator();
		while (it.hasNext()) {
			JUnitTestSuiteFactoryDescriptor descr = (JUnitTestSuiteFactoryDescriptor) it.next();
			if (descr.isUpdateCapable()) {
				ret.add(descr);
			}
		}
		return ret;
	}

	private void registerFactories() {
		factoryDescriptors = new HashMap();
		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(EXT_POINT_ID);
		IExtension[] extensions = point.getExtensions();
		for (int i = 0; i < extensions.length; i++) {
			IExtension extension = extensions[i];
			IConfigurationElement[] elements = extension.getConfigurationElements();
			for (int j = 0; j < elements.length; j++) {
				IConfigurationElement element = elements[j];
				JUnitTestSuiteFactoryDescriptor descr = new JUnitTestSuiteFactoryDescriptor(element);
				factoryDescriptors.put(descr.getType(), descr);
			}
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.core.java;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;
import org.eclipse.jdt.core.ICompilationUnit;

/**
 * A factory capable of generating and updating a test suite model from a compilation
 * unit.
 * @author jcanches
 * @since 4.3
 */
public interface IJUnitTestSuiteUpdateFactory extends IJUnitTestSuiteFactory {

	/**
	 * Updates a test suite model to take the changes occurred in a compilation
	 * unit since the last time the test suite model was generated or updated.
	 * @param testSuite A test suite that has been generated or updated by this
	 * factory in a point in the past.
	 * @param cu A compilation that may have arbitrary changes since the last update
	 * or generation.
	 * @return Whether the testSuite was changed by the update. Returning <code>false</code>
	 * means that the changes in the compilation unit did not have any effect on the test
	 * suite model.
	 */
	boolean update(ITestSuite testSuite, ICompilationUnit cu) throws CoreException;

}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.core.internal.plugin.modelsync;

import org.eclipse.core.resources.IProject;
import org.eclipse.hyades.test.tools.core.common.TestCommon;
import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitTypeFactory;
import org.eclipse.hyades.test.tools.core.internal.plugin.util.PDEProjectUtil;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaModelException;

/**
 * This test suite factory handles the generation and update of test suite models
 * of type "TPTP Plug-in JUnit". It is identical in all aspects to {@link JUnitTypeFactory},
 * except that generated test suites are of JUnit plug-in type.
 * @author jcanches
 * @since 4.3
 */
public class JUnitPluginTypeFactory extends JUnitTypeFactory {

	protected String getTestSuiteType() {
		return TestCommon.PLUGIN_JUNIT_TEST_SUITE_TYPE;
	}

	public boolean isSupported(ICompilationUnit cu) {
		try {
			IProject project = cu.getUnderlyingResource().getProject();
			if (!PDEProjectUtil.isStrictPluginProject(project)) {
				return false;
			}
		} catch (JavaModelException e) {
			return false;
		}
		return super.isSupported(cu);
	}
	
	public boolean isSupported(IJavaProject project) {
		IProject rproject = project.getProject();
		if (!PDEProjectUtil.isStrictPluginProject(rproject)) {
			return false;
		}
		return super.isSupported(project);
	}
	
}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.core.java;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;

/**
 * A factory capable of generating a test suite model from a JUnit source.
 * @author jcanches
 * @since 4.3
 */
public interface IJUnitTestSuiteFactory {

	/**
	 * Returns whether this factory supports test suite generation for a given compilation unit.
	 * @param cu A compilation unit
	 * @return Whether test suite generaton is supported for <code>cu</code>.
	 */
	boolean isSupported(ICompilationUnit cu);
	
	/**
	 * Generates a test suite for a given compilation unit.
	 * @param cu A compilation unit
	 * @return A test suite.
	 */
	ITestSuite generate(ICompilationUnit cu) throws CoreException;

	/**
	 * Determines whether the factory supports test suite generation for compilation
	 * units found in the given project. This method exists for improving performance, and
	 * as such should respond quicky. In no way it should dig into a complete project to check if
	 * there is a supported compilation unit. In case of doubt, it should return <code>true</code>.
	 * @param project A java project.
	 * @return <code>true</code> if this factory may support generation for compilation
	 * units in the project (even if it does not support generation for <strong>all</strong>
	 * the compilation units of the project), and <code>false</code> if it does not support
	 * generation for the project at all.
	 */
	public boolean isSupported(IJavaProject project);
	

}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.hyades.test.tools.core.internal.java.modelsync;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
import org.eclipse.hyades.models.common.facades.behavioral.ITestCase;
import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;
import org.eclipse.hyades.models.common.facades.behavioral.impl.HyadesFactory;
import org.eclipse.hyades.test.core.util.EMFUtil;
import org.eclipse.hyades.test.tools.core.CorePlugin;
import org.eclipse.hyades.test.tools.core.common.TestCommon;
import org.eclipse.hyades.test.tools.core.common.util.TestCommonUtil;
import org.eclipse.hyades.test.tools.core.internal.common.codegen.ASTHelper;
import org.eclipse.hyades.test.tools.core.internal.common.codegen.Helper;
import org.eclipse.hyades.test.tools.core.internal.java.codegen.JUnitGenerator;
import org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteUpdateFactory;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.ITypeHierarchy;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.TagElement;

/**
 * This test suite factory handles the generation and update of test suite models
 * of type "TPTP JUnit".
 * @author jcanches
 * @since 4.3
 */
public class JUnitTypeFactory implements IJUnitTestSuiteUpdateFactory {

	/**
	 * Sub-classes should redefine this method to support an additional type.
	 * @return The test suite type that this factory can generate.
	 */
	protected String getTestSuiteType() {
		return TestCommon.JUNIT_TEST_SUITE_TYPE;
	}

    /**
     * This implementation accepts generation for the given compilation unit provided that
     * its main type implements a JUnit test interface.
     */
	public boolean isSupported(ICompilationUnit cu) {
		try {
			IType type = cu.findPrimaryType();
			if (type != null) {
				ITypeHierarchy typeHier= type.newSupertypeHierarchy(null);
				IType[] superInterfaces= typeHier.getAllInterfaces();
				for (int i= 0; i < superInterfaces.length; i++) {
					if (superInterfaces[i].getFullyQualifiedName().equals(Helper.JUNIT_TEST_CLASS_NAME))
						return true;
				}
			}
			return false;
		} catch (JavaModelException e) {
			return false;
		}
	}

	/**
	 * Generates a basic model, with no model behavior, and one test case per test method.
	 */
	public ITestSuite generate(ICompilationUnit cu) throws JavaModelException {
		Resource resource = new ResourceImpl();
		ITestSuite testSuite = HyadesFactory.INSTANCE.createTestSuite(resource);
		testSuite.setType(getTestSuiteType());

		HyadesFactory.INSTANCE.createImplementor(testSuite, /*isExternalImplementor*/true);
		// This TestSuite has a code-implemented behavior:
		JUnitModelUpdater.setImplementorBlock(testSuite.getImplementor(), null);
		
		populateTestCases(testSuite, cu);
		return testSuite;
	}

	/**
	 * Updates the Test Suite model in order to take the last changes from the code
	 * into account. Invoking this method updates the list of TestCases belonging to
	 * the specified TestSuite.<br>
	 * This method does the following:
	 * <ul>
	 *   <li>for each test method (ie "void testXxxx()") in the code, ensures that there is a TestCase
	 *   associated to it. If not, creates a TestCase with the same name as the test method.</li>
	 *   <li>for each TestCase, ensures that the method it is associated with still exists.
	 *   If not, deletes the TestCase.</li>
	 * </ul>
	 * @param testSuite
	 * @param cu
	 * @return <code>true</code> if any update was applied to the specified test suite,
	 * or <code>false</code> if the test suite was already up-to-date.
	 * @throws CoreException
	 */
	public boolean update(ITestSuite testSuite, ICompilationUnit cu) throws CoreException {
		boolean changed = false;
		if (!cu.isStructureKnown()) {
			throw new CoreException(makeErrorStatus("JUnit Compilation Unit structure is unknown", null)); //$NON-NLS-1$
		}
		IType primaryType = cu.findPrimaryType();
		if (cu == null) {
			throw new CoreException(makeErrorStatus("JUnit Compilation Unit has no primary type", null)); //$NON-NLS-1$
		}
		boolean isExternalBehavior = testSuite.getImplementor().isExternalImplementor();
		// Search for new test methods (=do not have a matching test case)
		IMethod[] methods = primaryType.getMethods();
		List usedTestCases = new ArrayList(methods.length);
		for (int i = 0; i < methods.length; i++) {
			if (JUnitGenerator.isTestMethod(methods[i])) {
				ITestCase testCase = findTestCase(testSuite, methods[i]);
				if (testCase == null) {
					String methodName = methods[i].getElementName();
					testCase = TestCommonUtil.createTestCase(testSuite, TestCommon.JUNIT_TEST_CASE_TYPE, isExternalBehavior, methodName);
					testCase.getImplementor().setResource(methodName);
					changed = true;
				}
				usedTestCases.add(testCase);
				if (updateTestCaseDescription(methods[i], testCase)) {
					changed = true;
				}
			}
		}
		// Search for Test Cases that do not have a matching test method
		List unusedTestCases = new ArrayList();
		Iterator it = testSuite.getITestCases().iterator();
		while (it.hasNext()) {
			ITestCase testCase = (ITestCase) it.next();
			if (!usedTestCases.contains(testCase)) {
				String methodName = Helper.getTestMethodName(testCase);
				if (methodName != null) {
					IMethod method = primaryType.getMethod(methodName, new String[0]);
					if (!method.exists()) {
						unusedTestCases.add(testCase);
					}
				}
			}
		}
		// Remove test cases that are not associated to a test method any more
		it = unusedTestCases.iterator();
		while (it.hasNext()) {
			EObject testCase = (EObject)it.next();
			EMFUtil.remove(testCase);
			changed = true;
		}
		return changed;
	}
	
	private static boolean updateTestCaseDescription(IMethod method, ITestCase testCase) throws JavaModelException {
		TagElement sourceTag = ASTHelper.getJavadocDescription(method);
		if (sourceTag == null) {
			if (testCase.getDescription() != null && testCase.getDescription().length() > 0) {
				testCase.setDescription(null);
				return true;
			}
			return false;
		}
		
		String sourceDescription = ASTHelper.extractDescription(sourceTag);
		if (sourceDescription.startsWith(testCase.getName())) {
			sourceDescription = sourceDescription.substring(testCase.getName().length());
			if (sourceDescription.startsWith("\n")) sourceDescription = sourceDescription.substring("\n".length());  //$NON-NLS-1$//$NON-NLS-2$
		}
		
		String tcDescription = testCase.getDescription();
		if (tcDescription == null) tcDescription = ""; //$NON-NLS-1$
		if (!Helper.compareJavaComments(sourceDescription, tcDescription)) {
			testCase.setDescription(sourceDescription.trim());
			return true;
		}
		return false;
	}

	/**
	 * Populates an empty JUnit ITestSuite with one ITestCase for each test method found
	 * in compilation unit cu.
	 * For the more generic case where the ITestSuite already owns ITestCase children which
	 * need to updated according to the new state of the source code, see 
	 * ModelUpdater.updateTestSuiteFromCode(ITestSuite).
	 * @param testSuite
	 * @param cu
	 * @throws JavaModelException
	 * @see org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater#updateTestSuiteFromCode(ITestSuite)
	 */
    private static void populateTestCases(ITestSuite testSuite, ICompilationUnit cu) throws JavaModelException {
		boolean isExternalBehavior = testSuite.getImplementor().isExternalImplementor();
    	IType mainType = cu.findPrimaryType();
    	if (mainType != null) {
    		IMethod[] methods = mainType.getMethods();
    		//List testCases = testSuite.getITestCases();
    		for (int i = 0; i < methods.length; i++) {
    			if (JUnitGenerator.isTestMethod(methods[i])) {
					String methodName = methods[i].getElementName();
					ITestCase tc = TestCommonUtil.createTestCase(testSuite, TestCommon.JUNIT_TEST_CASE_TYPE, /*externalBehavior*/true, methodName);
					Helper.setTestMethodName(tc, methodName);
    			}
    		}
    	}
    }

    /**
     * Returns the test case matching a given test method, or <code>null</code> if there
     * is none.
     * @param testSuite
     * @param testMethod
     * @return
     */
	private static ITestCase findTestCase(ITestSuite testSuite, IMethod testMethod) {
		Iterator it = testSuite.getITestCases().iterator();
		Helper helper = new Helper();
		try {
			String testMethodName = testMethod.getElementName();
			while (it.hasNext()) {
				ITestCase testCase = (ITestCase) it.next();
				String methodName = Helper.getTestMethodName(testCase);
				if (testMethodName.equals(methodName)) {
					return testCase;
				}
			}
		} finally {
			helper.dispose();
		}
		return null;
	}
	
	private static IStatus makeErrorStatus(String message, Throwable exception) {
		return new Status(IStatus.ERROR,
				CorePlugin.PLUGIN_ID,
				1,
				message,
				exception);
	}

	public boolean isSupported(IJavaProject project) {
		return true;
	}
	
}

Return to bug 90628

Lines 440-445 Link Here

(-)plugin.xml (-13 / +35 lines)
440	menubarPath="org.eclipse.ui.OpenWithSubMenu"	440	menubarPath="org.eclipse.ui.OpenWithSubMenu"
441	id="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteOpenCode"/>	441	id="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteOpenCode"/>
442	</objectContribution>	442	</objectContribution>
		443	<objectContribution
		444	adaptable="false"
		445	id="org.eclipse.hyades.test.tools.ui.RegularJUnitTestSuiteContribution"
		446	objectClass="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.RegularJUnitTestSuiteProxyNode">
		447	<action
		448	class="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.actions.ImportRegularJUnitTestSuiteAction"
		449	enablesFor="*"
		450	id="org.eclipse.hyades.test.tools.ui.RegularJUnitTestSuiteImport"
		451	label="Create Model"
		452	menubarPath="org.eclipse.ui.OpenWithSubMenu"/>
		453	</objectContribution>
443	</extension>	454	</extension>
444	<extension	455	<extension
445	point="org.eclipse.ui.popupMenus">	456	point="org.eclipse.ui.popupMenus">
Lines 514-532 Link Here
514	</wizard>	525	</wizard>
515	</extension>	526	</extension>
516	<extension	527	<extension
517	point="org.eclipse.ui.importWizards">
518	<wizard
519	category="org.eclipse.tptp.platform.category.test.import"
520	class="org.eclipse.hyades.test.tools.ui.plugin.internal.junit.wizard.PluginJUnitImportWizard"
521	icon="icons/full/etool16/newpluginjsuite_wiz.gif"
522	id="org.eclipse.hyades.test.tools.ui.plugin.import.junit"
523	name="%PluginJUnitImportWizard.name">
524	<description>
525	%PluginJUnitImportWizard.description
526	</description>
527	</wizard>
528	</extension>
529	<extension
530	point="org.eclipse.hyades.ui.editorExtensions">	528	point="org.eclipse.hyades.ui.editorExtensions">
531	<editorExtension	529	<editorExtension
532	class="org.eclipse.hyades.test.tools.ui.java.internal.junit.editor.JUnitEditorExtension"	530	class="org.eclipse.hyades.test.tools.ui.java.internal.junit.editor.JUnitEditorExtension"
Lines 580-585 Link Here
580	recorderMessageHandlers="org.eclipse.hyades.execution.recorder.http.local.HttpRecorderDataProcessor"	578	recorderMessageHandlers="org.eclipse.hyades.execution.recorder.http.local.HttpRecorderDataProcessor"
581	wizardPageProvider="org.eclipse.tptp.test.tools.internal.recorder.http.providers.HttpRecorderWizardProvider"/>	579	wizardPageProvider="org.eclipse.tptp.test.tools.internal.recorder.http.providers.HttpRecorderWizardProvider"/>
582	</extension>	580	</extension>
		581	<extension
		582	point="org.eclipse.hyades.ui.typeDescriptions">
		583	<typeDescription
		584	name="Other JUnit tests"
		585	icon="icons/full/obj16/java_jsuite.gif"
		586	type="org.eclipse.hyades.test.other.junit.testSuite"
		587	description="JUnit tests not imported to TPTP"
		588	extension="testsuite">
		589	</typeDescription>
		590	<typeDescription
		591	name="JUnit test method"
		592	icon="icons/full/obj16/java_test.gif"
		593	type="org.eclipse.hyades.test.other.junit.testCase"
		594	description="JUnit test method not imported to TPTP"
		595	extension="testcase">
		596	</typeDescription>
		597	</extension>
		598	<extension
		599	point="org.eclipse.hyades.test.ui.testNavigatorTypeProvider">
		600	<provider
		601	class="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.RegularJUnitProvider"
		602	label="Other JUnit tests"
		603	type="org.eclipse.hyades.test.other.junit.testSuite"/>
		604	</extension>
583	<extension	605	<extension
584	point="org.eclipse.ui.preferencePages">	606	point="org.eclipse.ui.preferencePages">
585	<page	607	<page

Lines 113-121 Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/navigator/JUnitTypeProviderProxyNode.java (-3 / +24 lines)
113	IPackageFragmentRoot root = getProjectAsSourceFolder(project);	113	IPackageFragmentRoot root = getProjectAsSourceFolder(project);
114	if(root == null) {	114	if(root == null) {
115	//- the current project is not a source folder	115	//- the current project is not a source folder
116	proxy = JUnitFolderProxyNode.create(project, validator, type, fileProxyManager, parent);	116	proxy = createNonSourceFolderProxyNode(project, type, fileProxyManager, parent);
117	} else {	117	} else {
118	proxy = SourceFolderProxyNode.create(root, validator, fileProxyManager, parent);	118	proxy = createSourceFolderProxyNode(fileProxyManager, parent, root);
119	}	119	}
120	AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestSuiteMappingRegistry();	120	AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestSuiteMappingRegistry();
121	IAssociationMapping associationMapping = registry.getAssociationMapping(HyadesUIPlugin.EP_TYPE_DESCRIPTIONS);	121	IAssociationMapping associationMapping = registry.getAssociationMapping(HyadesUIPlugin.EP_TYPE_DESCRIPTIONS);
Lines 130-137 Link Here
130	this.fileProxyManager = fileProxyManager;	130	this.fileProxyManager = fileProxyManager;
131	this.parent = parent;	131	this.parent = parent;
132	}	132	}
		133
		134	/**
		135	* @param fileProxyManager
		136	* @param parent
		137	* @param root
		138	* @return
		139	*/
		140	protected IProxyNode createSourceFolderProxyNode(IFileProxyManager fileProxyManager, Object parent, IPackageFragmentRoot root) {
		141	return SourceFolderProxyNode.create(root, validator, fileProxyManager, parent);
		142	}
		143
		144	/**
		145	* @param project
		146	* @param type
		147	* @param fileProxyManager
		148	* @param parent
		149	* @return
		150	*/
		151	protected IProxyNode createNonSourceFolderProxyNode(IProject project, String type, IFileProxyManager fileProxyManager, Object parent) {
		152	return JUnitFolderProxyNode.create(project, validator, type, fileProxyManager, parent);
		153	}
133		154
134	private IProxyNode getDelegate() {	155	protected IProxyNode getDelegate() {
135	return proxy;	156	return proxy;
136	}	157	}
137		158

Added Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/navigator/RegularJUnitPackageProxyNode.java (+69 lines)
1	/**********************************************************************
2	* Copyright (c) 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: PackageProxyNode.java,v 1.3 2005/06/09 09:33:48 jgout Exp $
8	*
9	* Contributors:
10	* IBM - Initial API and implementation
11	**********************************************************************/
12	package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;
13
14	import org.eclipse.jdt.core.ICompilationUnit;
15	import org.eclipse.jdt.core.IJavaElement;
16	import org.eclipse.jdt.core.IPackageFragment;
17	import org.eclipse.jdt.ui.ISharedImages;
18	import org.eclipse.jdt.ui.JavaUI;
19	import org.eclipse.swt.graphics.Image;
20
21	/**
22	* Proxy node for a package. This proxy contains all JUnit test found in the corresponding java package.
23	* @author jcanches
24	* @since 4.3
25	*/
26	public class RegularJUnitPackageProxyNode extends JavaParentElementProxyNode {
27
28	public static RegularJUnitPackageProxyNode create(IPackageFragment fragment, Object parent) {
29	RegularJUnitPackageProxyNode proxy = new RegularJUnitPackageProxyNode(fragment, parent);
30	if(proxy.getChildren().length > 0) {
31	return proxy;
32	}
33	return null;
34	}
35
36	private RegularJUnitPackageProxyNode(IPackageFragment fragment, Object parent) {
37	super(fragment, parent);
38	}
39
40	public IPackageFragment getPackageFragment() {
41	return (IPackageFragment)getJavaElement();
42	}
43
44	/* (non-Javadoc)
45	* @see org.eclipse.hyades.test.ui.navigator.IProxyNode#getText()
46	*/
47	public String getText() {
48	String name = getJavaElement().getElementName();
49	if ("".equals(name)) { //$NON-NLS-1$
50	name = "(default package)";
51	}
52	return name;
53	}
54
55	/* (non-Javadoc)
56	* @see org.eclipse.hyades.test.ui.navigator.IProxyNode#getImage()
57	*/
58	public Image getImage() {
59	return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
60	}
61
62	protected JavaElementProxyNode createChildProxy(IJavaElement childElement) {
63	if (childElement instanceof ICompilationUnit) {
64	return RegularJUnitTestSuiteProxyNode.create((ICompilationUnit)childElement, this);
65	}
66	return null;
67	}
68
69	}

Added Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/navigator/RegularJUnitTestSuiteProxyNode.java (+138 lines)
1	/*******************************************************************************
2	* Copyright (c) 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	* $Id: $
8	*
9	* Contributors:
10	* IBM Corporation - initial API and implementation
11	*******************************************************************************/
12
13	package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;
14
15	import java.util.ArrayList;
16	import java.util.Iterator;
17	import java.util.List;
18
19	import org.eclipse.core.runtime.CoreException;
20	import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
21	import org.eclipse.hyades.models.common.facades.behavioral.ITestCase;
22	import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;
23	import org.eclipse.hyades.models.common.testprofile.TPFTestSuite;
24	import org.eclipse.hyades.test.tools.core.common.TestCommon;
25	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater;
26	import org.eclipse.hyades.test.tools.core.java.JUnitTestSuiteFacade;
27	import org.eclipse.hyades.test.tools.ui.ToolsUiPlugin;
28	import org.eclipse.hyades.test.tools.ui.java.internal.junit.wizard.SourcePage;
29	import org.eclipse.hyades.test.ui.TestUIImages;
30	import org.eclipse.hyades.test.ui.navigator.IProxyNode;
31	import org.eclipse.hyades.test.ui.navigator.ITestSuiteProxyNode;
32	import org.eclipse.jdt.core.ICompilationUnit;
33	import org.eclipse.jdt.core.IJavaElementDelta;
34	import org.eclipse.jdt.core.IType;
35	import org.eclipse.jdt.core.JavaModelException;
36	import org.eclipse.swt.graphics.Image;
37	import org.eclipse.ui.IMemento;
38
39	public class RegularJUnitTestSuiteProxyNode extends JavaElementProxyNode implements ITestSuiteProxyNode/, IPersistableProxyNode/ {
40
41	private IProxyNode[] children;
42
43	public static RegularJUnitTestSuiteProxyNode create(ICompilationUnit cu, Object parent) {
44	if (isJUnitScript(cu)) {
45	return new RegularJUnitTestSuiteProxyNode(cu, parent);
46	}
47	return null;
48	}
49
50	/** Checks whether the given java element is a JUnit test script
51	* @param element
52	* @return
53	*/
54	private static boolean isJUnitScript(ICompilationUnit element) {
55	ICompilationUnit cu = (ICompilationUnit) element;
56	IType mainType = cu.findPrimaryType();
57	try {
58	if (mainType != null) {
59	if (SourcePage.isTestImplementor(mainType)) {
60	// Has a TestSuite already been defined for this type?
61	return JUnitModelUpdater.findTestSuite(mainType, new ResourceSetImpl()) == null;
62	}
63	}
64	} catch (JavaModelException e) {
65	ToolsUiPlugin.logError(e);
66	}
67	return false;
68	}
69
70	private RegularJUnitTestSuiteProxyNode(ICompilationUnit cu, Object parent) {
71	super(cu, parent);
72	computeChildren();
73	}
74
75	private void computeChildren() {
76	try {
77	ITestSuite testSuite = JUnitTestSuiteFacade.createTestSuite(getCompilationUnit(), TestCommon.JUNIT_TEST_SUITE_TYPE);
78	List _children = new ArrayList(testSuite.getITestCases().size());
79	Iterator it = testSuite.getITestCases().iterator();
80	while (it.hasNext()) {
81	ITestCase tc = (ITestCase) it.next();
82	IProxyNode proxy = new RegularJUnitTestCaseProxyNode(tc, this);
83	_children.add(proxy);
84	}
85	this.children = (IProxyNode[])_children.toArray(new IProxyNode[_children.size()]);
86	} catch (CoreException e) {
87	this.children = new IProxyNode[0];
88	}
89	}
90
91	public ICompilationUnit getCompilationUnit() {
92	return (ICompilationUnit)getJavaElement();
93	}
94
95	public TPFTestSuite getTestSuite() {
96	try {
97	return (TPFTestSuite) JUnitTestSuiteFacade.createTestSuite(getCompilationUnit(), TestCommon.JUNIT_TEST_SUITE_TYPE);
98	} catch (CoreException e) {
99	ToolsUiPlugin.logError(e);
100	return null;
101	}
102	}
103
104	public String getType() {
105	return TestCommon.OTHER_JUNIT_TEST_SUITE_TYPE;
106	}
107
108	public IProxyNode[] getChildren() {
109	return children;
110	}
111
112	public Image getImage() {
113	// TODO Auto-generated method stub
114	return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_TEST_SUITE);
115	}
116
117	public String getFactoryID() {
118	// TODO Auto-generated method stub
119	return null;
120	}
121
122	public boolean saveState(IMemento memento) {
123	// TODO Auto-generated method stub
124	return false;
125	}
126
127	public IProxyNode elementChanged(IJavaElementDelta delta) {
128	if (delta.getKind() == IJavaElementDelta.CHANGED) {
129	int flags = delta.getFlags();
130	if ((flags & IJavaElementDelta.F_PRIMARY_RESOURCE) != 0) {
131	computeChildren();
132	return this;
133	}
134	}
135	return null;
136	}
137
138	}

Lines 24-54 Link Here

(-)src/org/eclipse/hyades/test/tools/core/java/JUnitTestSuiteFacade.java (-72 / +55 lines)
24	import org.eclipse.emf.ecore.resource.Resource;	24	import org.eclipse.emf.ecore.resource.Resource;
25	import org.eclipse.emf.ecore.resource.ResourceSet;	25	import org.eclipse.emf.ecore.resource.ResourceSet;
26	import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;	26	import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
27	import org.eclipse.hyades.models.common.facades.behavioral.ITestCase;
28	import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;	27	import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;
29	import org.eclipse.hyades.models.common.facades.behavioral.impl.HyadesFactory;
30	import org.eclipse.hyades.models.common.util.ICommonConstants;	28	import org.eclipse.hyades.models.common.util.ICommonConstants;
31	import org.eclipse.hyades.test.core.util.EMFUtil;	29	import org.eclipse.hyades.test.core.util.EMFUtil;
32	import org.eclipse.hyades.test.tools.core.CorePlugin;	30	import org.eclipse.hyades.test.tools.core.CorePlugin;
33	import org.eclipse.hyades.test.tools.core.common.TestCommon;	31	import org.eclipse.hyades.test.tools.core.common.TestCommon;
34	import org.eclipse.hyades.test.tools.core.common.util.TestCommonUtil;	32	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitExtensionsRegistry;
35	import org.eclipse.hyades.test.tools.core.internal.common.codegen.Helper;
36	import org.eclipse.hyades.test.tools.core.internal.java.codegen.JUnitGenerator;
37	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater;	33	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater;
38	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitProjectBuilder;	34	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitProjectBuilder;
		35	import org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitTypeFactory;
39	import org.eclipse.jdt.core.ICompilationUnit;	36	import org.eclipse.jdt.core.ICompilationUnit;
40	import org.eclipse.jdt.core.IJavaElement;	37	import org.eclipse.jdt.core.IJavaElement;
41	import org.eclipse.jdt.core.IMethod;
42	import org.eclipse.jdt.core.IPackageFragmentRoot;	38	import org.eclipse.jdt.core.IPackageFragmentRoot;
43	import org.eclipse.jdt.core.IType;	39	import org.eclipse.jdt.core.IType;
44	import org.eclipse.jdt.core.JavaCore;	40	import org.eclipse.jdt.core.JavaCore;
45	import org.eclipse.jdt.core.JavaModelException;	41	import org.eclipse.jdt.core.JavaModelException;
		42	import org.eclipse.osgi.util.NLS;
46		43
47	/**	44	/**
48	* <p>Provides high-level methods for navigating between JUnit source files (as JDT model	45	* <p>Provides high-level methods for navigating between JUnit source files (as JDT model
49	* elements) and TPTP concepts (as TPTP Test Model elements).</p>	46	* elements) and TPTP concepts (as TPTP Test Model elements).</p>
50	* <p><b>This API is provisional and is subject to changes in future releases.</b></p>	47	* <p><b>This API is provisional and is subject to changes in future releases.</b></p>
51	* @author jcanches	48	* @author jcanches
		49	* @since 4.1
52	*/	50	*/
53	public class JUnitTestSuiteFacade {	51	public class JUnitTestSuiteFacade {
54		52
Lines 82-157 Link Here
82	public static ITestSuite createTestSuite(ICompilationUnit junitTestCompilationUnit, String type, boolean force) throws CoreException {	80	public static ITestSuite createTestSuite(ICompilationUnit junitTestCompilationUnit, String type, boolean force) throws CoreException {
83	String name = junitTestCompilationUnit.getElementName();	81	String name = junitTestCompilationUnit.getElementName();
84	name = name.substring(0, name.indexOf('.'));	82	name = name.substring(0, name.indexOf('.'));
85	try {	83	IFile javaFile = (IFile)junitTestCompilationUnit.getCorrespondingResource();
86	IFile javaFile = (IFile)junitTestCompilationUnit.getCorrespondingResource();	84	IFile testSuiteFile = javaFile
87	IFile testSuiteFile = javaFile	85	.getParent()
88	.getParent()	86	.getFile(new Path(name + "." + ICommonConstants.TEST_SUITE_FILE_EXTENSION)); //$NON-NLS-1$
89	.getFile(new Path(name + "." + ICommonConstants.TEST_SUITE_FILE_EXTENSION)); //$NON-NLS-1$	87
90		88	ITestSuite testSuite = createTestSuite(junitTestCompilationUnit, type);
91	if (testSuiteFile.exists()) {	89	testSuite.setName(name);
92	if (force) {	90	saveTestSuite(testSuite, testSuiteFile, force);
93	testSuiteFile.delete(/force/true, /keepHistory/true, null);	91	return testSuite;
94	} else {	92	}
95	throw new CoreException(new Status(	93
96	IStatus.ERROR,	94	public static ITestSuite createTestSuite(ICompilationUnit cu, String type) throws CoreException {
97	CorePlugin.PLUGIN_ID,	95	IJUnitTestSuiteFactory factory = JUnitExtensionsRegistry.getInstance().getFactory(type);
98	1,	96	if (factory == null) {
99	"Resource already exists: " + testSuiteFile.getFullPath(), //$NON-NLS-1$	97	throw new CoreException(makeErrorStatus(NLS.bind("No JUnit test suite factory registered for the type {0}", type), null)); //$NON-NLS-1$
100	null));	98	}
101	}	99	ITestSuite testSuite = factory.generate(cu);
		100	// Store in the Test Suite the reference to the JUnit code:
		101	testSuite.getImplementor().setLocation(getPackageFragmentRoot(cu).getCorrespondingResource().getFullPath().toString());
		102	testSuite.getImplementor().setResource(cu.findPrimaryType().getFullyQualifiedName());
		103	return testSuite;
		104	}
		105
		106	public static void saveTestSuite(ITestSuite testSuite, IFile file, boolean force) throws CoreException {
		107	if (file.exists()) {
		108	if (force) {
		109	file.delete(/force/true, /keepHistory/true, null);
		110	} else {
		111	throw new CoreException(makeErrorStatus(NLS.bind("Resource {0} already exists.", file.getFullPath()), null)); //$NON-NLS-1$
102	}	112	}
103	ResourceSet resourceSet = new ResourceSetImpl();	113	}
104	URI uri = URI.createPlatformResourceURI(testSuiteFile.getFullPath().toString());	114	ResourceSet resourceSet = new ResourceSetImpl();
105	Resource resource = resourceSet.createResource(uri);	115	URI uri = URI.createPlatformResourceURI(file.getFullPath().toString());
106	ITestSuite testSuite = HyadesFactory.INSTANCE.createTestSuite(resource);	116	Resource resource = resourceSet.createResource(uri);
107	testSuite.setType(type);	117	IJUnitTestSuiteFactory factory = new JUnitTypeFactory();
108	testSuite.setName(name);	118	resource.getContents().add(testSuite);
109		119
110	HyadesFactory.INSTANCE.createImplementor(testSuite, /isExternalImplementor/true);	120	try {
111	// This TestSuite has a code-implemented behavior:
112	JUnitModelUpdater.setImplementorBlock(testSuite.getImplementor(), null);
113	// Store in the Test Suite the reference to the JUnit code:
114	testSuite.getImplementor().setLocation(getPackageFragmentRoot(junitTestCompilationUnit).getCorrespondingResource().getFullPath().toString());
115	testSuite.getImplementor().setResource(junitTestCompilationUnit.findPrimaryType().getFullyQualifiedName());
116
117	populateTestCases(testSuite, junitTestCompilationUnit);
118
119	EMFUtil.save(resource);	121	EMFUtil.save(resource);
120	JUnitProjectBuilder.installBuilder(testSuiteFile.getProject());
121	JUnitProjectBuilder.installBuilder(javaFile.getProject());
122	JUnitModelUpdater.associateTestSuiteToJUnitSourceFile(javaFile, testSuiteFile);
123	return testSuite;
124	} catch (Exception e) {	122	} catch (Exception e) {
125	CorePlugin.logError(e);	123	throw new CoreException(makeErrorStatus("Problem in saving resource " + file.getFullPath(), e)); //$NON-NLS-1$
126	return null;
127	}	124	}
128	}	125	JUnitProjectBuilder.installBuilder(file.getProject());
129		126	IFile javaFile = getJUnitSourceFile(testSuite);
130	/**	127	JUnitProjectBuilder.installBuilder(javaFile.getProject());
131	* Populates an empty JUnit ITestSuite with one ITestCase for each test method found	128	JUnitModelUpdater.associateTestSuiteToJUnitSourceFile(javaFile, file);
132	* in compilation unit cu.
133	* For the more generic case where the ITestSuite already owns ITestCase children which
134	* need to updated according to the new state of the source code, see
135	* ModelUpdater.updateTestSuiteFromCode(ITestSuite).
136	* @param testSuite
137	* @param cu
138	* @throws JavaModelException
139	* @see org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitModelUpdater#updateTestSuiteFromCode(ITestSuite)
140	*/
141	private static void populateTestCases(ITestSuite testSuite, ICompilationUnit cu) throws JavaModelException {
142	boolean isExternalBehavior = testSuite.getImplementor().isExternalImplementor();
143	IType mainType = cu.findPrimaryType();
144	if (mainType != null) {
145	IMethod[] methods = mainType.getMethods();
146	//List testCases = testSuite.getITestCases();
147	for (int i = 0; i < methods.length; i++) {
148	if (JUnitGenerator.isTestMethod(methods[i])) {
149	String methodName = methods[i].getElementName();
150	ITestCase tc = TestCommonUtil.createTestCase(testSuite, TestCommon.JUNIT_TEST_CASE_TYPE, /externalBehavior/true, methodName);
151	Helper.setTestMethodName(tc, methodName);
152	}
153	}
154	}
155	}	129	}
156		130
157	/**	131	/**
Lines 209-212 Link Here
209	return null;	183	return null;
210	}	184	}
211		185
		186	private static IStatus makeErrorStatus(String message, Throwable exception) {
		187	return new Status(IStatus.ERROR,
		188	CorePlugin.PLUGIN_ID,
		189	1,
		190	message,
		191	exception);
		192	}
		193
		194
212	}	195	}

Lines 12-20 Link Here

(-)src/org/eclipse/hyades/test/tools/core/internal/java/modelsync/JUnitModelUpdater.java (-126 / +12 lines)
12		12
13	package org.eclipse.hyades.test.tools.core.internal.java.modelsync;	13	package org.eclipse.hyades.test.tools.core.internal.java.modelsync;
14		14
15	import java.util.ArrayList;
16	import java.util.Iterator;	15	import java.util.Iterator;
17	import java.util.List;
18		16
19	import org.eclipse.core.resources.IContainer;	17	import org.eclipse.core.resources.IContainer;
20	import org.eclipse.core.resources.IFile;	18	import org.eclipse.core.resources.IFile;
Lines 24-39 Link Here
24	import org.eclipse.core.resources.ResourcesPlugin;	22	import org.eclipse.core.resources.ResourcesPlugin;
25	import org.eclipse.core.runtime.CoreException;	23	import org.eclipse.core.runtime.CoreException;
26	import org.eclipse.core.runtime.IProgressMonitor;	24	import org.eclipse.core.runtime.IProgressMonitor;
27	import org.eclipse.core.runtime.IStatus;
28	import org.eclipse.core.runtime.Path;	25	import org.eclipse.core.runtime.Path;
29	import org.eclipse.core.runtime.Status;
30	import org.eclipse.emf.ecore.EObject;	26	import org.eclipse.emf.ecore.EObject;
31	import org.eclipse.emf.ecore.resource.ResourceSet;	27	import org.eclipse.emf.ecore.resource.ResourceSet;
32	import org.eclipse.hyades.models.common.configuration.CFGClass;	28	import org.eclipse.hyades.models.common.configuration.CFGClass;
33	import org.eclipse.hyades.models.common.configuration.CFGInstance;	29	import org.eclipse.hyades.models.common.configuration.CFGInstance;
34	import org.eclipse.hyades.models.common.facades.behavioral.IBlock;	30	import org.eclipse.hyades.models.common.facades.behavioral.IBlock;
35	import org.eclipse.hyades.models.common.facades.behavioral.IImplementor;	31	import org.eclipse.hyades.models.common.facades.behavioral.IImplementor;
36	import org.eclipse.hyades.models.common.facades.behavioral.ITestCase;
37	import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;	32	import org.eclipse.hyades.models.common.facades.behavioral.ITestSuite;
38	import org.eclipse.hyades.models.common.fragments.BVRInteraction;	33	import org.eclipse.hyades.models.common.fragments.BVRInteraction;
39	import org.eclipse.hyades.models.common.interactions.BVRLifeline;	34	import org.eclipse.hyades.models.common.interactions.BVRLifeline;
Lines 43-60 Link Here
43	import org.eclipse.hyades.models.common.util.ICommonConstants;	38	import org.eclipse.hyades.models.common.util.ICommonConstants;
44	import org.eclipse.hyades.test.core.util.EMFUtil;	39	import org.eclipse.hyades.test.core.util.EMFUtil;
45	import org.eclipse.hyades.test.tools.core.CorePlugin;	40	import org.eclipse.hyades.test.tools.core.CorePlugin;
46	import org.eclipse.hyades.test.tools.core.common.TestCommon;	41	import org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteFactory;
47	import org.eclipse.hyades.test.tools.core.common.util.TestCommonUtil;	42	import org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteUpdateFactory;
48	import org.eclipse.hyades.test.tools.core.internal.common.codegen.ASTHelper;
49	import org.eclipse.hyades.test.tools.core.internal.common.codegen.Helper;
50	import org.eclipse.hyades.test.tools.core.internal.java.codegen.JUnitGenerator;
51	import org.eclipse.hyades.test.tools.core.java.JUnitTestSuiteFacade;
52	import org.eclipse.jdt.core.ICompilationUnit;	43	import org.eclipse.jdt.core.ICompilationUnit;
53	import org.eclipse.jdt.core.IMethod;
54	import org.eclipse.jdt.core.IType;	44	import org.eclipse.jdt.core.IType;
55	import org.eclipse.jdt.core.JavaCore;	45	import org.eclipse.jdt.core.JavaCore;
56	import org.eclipse.jdt.core.JavaModelException;
57	import org.eclipse.jdt.core.dom.TagElement;
58		46
59	/**	47	/**
60	* This class provides methods for creating/updating a JUnit TestSuite model	48	* This class provides methods for creating/updating a JUnit TestSuite model
Lines 69-196 Link Here
69		57
70	/**	58	/**
71	* Update the Test Suite model in order to take the last changes from the code	59	* Update the Test Suite model in order to take the last changes from the code
72	* into account. Invoking this method updates the list of TestCases belonging to	60	* into account. This is done by invoking the registered update factory for the type
73	* the specified TestSuite.<br>	61	* of the test suite. If no update factory is registered, this method does nothing and return
74	* This method does the following:	62	* <code>false</code>.
75	* <ul>
76	* <li>For each test method (ie "void testXxxx()") in the code, ensures that there is a TestCase
77	* associated to it. If not, creates a TestCase with the same name as the test method.</li>
78	* <li>For each TestCase, ensures that the method it is associated with still exists.
79	* If not, deletes the TestCase.</li>
80	* </ul>
81	* @param testSuite	63	* @param testSuite
		64	* @param javaFile
82	* @return <code>true</code> if any update was applied to the specified test suite,	65	* @return <code>true</code> if any update was applied to the specified test suite,
83	* or <code>false</code> if the test suite was already up-to-date.	66	* or <code>false</code> if the test suite was already up-to-date.
84	* @throws CoreException	67	* @throws CoreException
85	*/	68	*/
86	public static boolean updateTestSuiteFromCode(ITestSuite testSuite) throws CoreException {	69	public static boolean updateTestSuiteFromCode(ITestSuite testSuite, IFile junitCode) throws CoreException {
87	boolean changed = false;	70	boolean changed = false;
88	IFile junitCode = JUnitTestSuiteFacade.getJUnitSourceFile(testSuite);	71	IJUnitTestSuiteFactory factory = JUnitExtensionsRegistry.getInstance().getFactory(testSuite.getType());
89	if (junitCode != null) {	72	if (factory instanceof IJUnitTestSuiteUpdateFactory) {
		73	IJUnitTestSuiteUpdateFactory ufactory = (IJUnitTestSuiteUpdateFactory) factory;
90	ICompilationUnit cu = JavaCore.createCompilationUnitFrom(junitCode);	74	ICompilationUnit cu = JavaCore.createCompilationUnitFrom(junitCode);
91	if (!cu.isStructureKnown()) {	75	return ufactory.update(testSuite, cu);
92	throw new CoreException(makeErrorStatus("JUnit Compilation Unit structure is unknown", null)); //$NON-NLS-1$
93	}
94	IType primaryType = cu.findPrimaryType();
95	if (cu == null) {
96	throw new CoreException(makeErrorStatus("JUnit Compilation Unit has no primary type", null)); //$NON-NLS-1$
97	}
98	boolean isExternalBehavior = testSuite.getImplementor().isExternalImplementor();
99	// Search for new test methods (=do not have a matching test case)
100	IMethod[] methods = primaryType.getMethods();
101	List usedTestCases = new ArrayList(methods.length);
102	for (int i = 0; i < methods.length; i++) {
103	if (JUnitGenerator.isTestMethod(methods[i])) {
104	ITestCase testCase = findTestCase(testSuite, methods[i]);
105	if (testCase == null) {
106	String methodName = methods[i].getElementName();
107	testCase = TestCommonUtil.createTestCase(testSuite, TestCommon.JUNIT_TEST_CASE_TYPE, isExternalBehavior, methodName);
108	testCase.getImplementor().setResource(methodName);
109	changed = true;
110	}
111	usedTestCases.add(testCase);
112	if (updateTestCaseDescription(methods[i], testCase)) {
113	changed = true;
114	}
115	}
116	}
117	// Search for Test Cases that do not have a matching test method
118	List unusedTestCases = new ArrayList();
119	Iterator it = testSuite.getITestCases().iterator();
120	while (it.hasNext()) {
121	ITestCase testCase = (ITestCase) it.next();
122	if (!usedTestCases.contains(testCase)) {
123	String methodName = Helper.getTestMethodName(testCase);
124	if (methodName != null) {
125	IMethod method = primaryType.getMethod(methodName, new String[0]);
126	if (!method.exists()) {
127	unusedTestCases.add(testCase);
128	}
129	}
130	}
131	}
132	// Remove test cases that are not associated to a test method any more
133	it = unusedTestCases.iterator();
134	while (it.hasNext()) {
135	EObject testCase = (EObject)it.next();
136	EMFUtil.remove(testCase);
137	changed = true;
138	}
139	}
140	return changed;
141	}
142
143	private static boolean updateTestCaseDescription(IMethod method, ITestCase testCase) throws JavaModelException {
144	TagElement sourceTag = ASTHelper.getJavadocDescription(method);
145	if (sourceTag == null) {
146	if (testCase.getDescription() != null && testCase.getDescription().length() > 0) {
147	testCase.setDescription(null);
148	return true;
149	}
150	return false;
151	}
152
153	String sourceDescription = ASTHelper.extractDescription(sourceTag);
154	if (sourceDescription.startsWith(testCase.getName())) {
155	sourceDescription = sourceDescription.substring(testCase.getName().length());
156	if (sourceDescription.startsWith("\n")) sourceDescription = sourceDescription.substring("\n".length()); //$NON-NLS-1$//$NON-NLS-2$
157	}
158
159	String tcDescription = testCase.getDescription();
160	if (tcDescription == null) tcDescription = ""; //$NON-NLS-1$
161	if (!Helper.compareJavaComments(sourceDescription, tcDescription)) {
162	testCase.setDescription(sourceDescription.trim());
163	return true;
164	}	76	}
165	return false;	77	return false;
166	}	78	}
167		79
168	private static ITestCase findTestCase(ITestSuite testSuite, IMethod testMethod) {
169	Iterator it = testSuite.getITestCases().iterator();
170	Helper helper = new Helper();
171	try {
172	String testMethodName = testMethod.getElementName();
173	while (it.hasNext()) {
174	ITestCase testCase = (ITestCase) it.next();
175	String methodName = Helper.getTestMethodName(testCase);
176	if (testMethodName.equals(methodName)) {
177	return testCase;
178	}
179	}
180	} finally {
181	helper.dispose();
182	}
183	return null;
184	}
185
186	private static IStatus makeErrorStatus(String message, Throwable exception) {
187	return new Status(IStatus.ERROR,
188	CorePlugin.PLUGIN_ID,
189	1,
190	message,
191	exception);
192	}
193
194	/**	80	/**
195	* This method is temporarily public. Clients should not use it.	81	* This method is temporarily public. Clients should not use it.
196	* @param implementor	82	* @param implementor
Lines 270-276 Link Here
270	}	156	}
271	}	157	}
272		158
273	private static IFile findTestSuiteFile(IFile javaFile) throws CoreException {	159	public static IFile findTestSuiteFile(IFile javaFile) throws CoreException {
274	// First method (typical): use the marker to find the test suite definition	160	// First method (typical): use the marker to find the test suite definition
275	IFile file = getRegisteredTestSuiteFile(javaFile);	161	IFile file = getRegisteredTestSuiteFile(javaFile);
276	if (file != null) {	162	if (file != null) {

Lines 3-8 Link Here

(-)plugin.xml (+12 lines)
3	<plugin>	3	<plugin>
4		4
5	<extension-point id="nodeHandlers" name="org.eclipse.hyades.test.tools.core.nodeHandlers" schema="schema/nodeHandlers.exsd"/>	5	<extension-point id="nodeHandlers" name="org.eclipse.hyades.test.tools.core.nodeHandlers" schema="schema/nodeHandlers.exsd"/>
		6	<extension-point id="junitFactory" name="JUnit Test Model Factory" schema="schema/junitFactory.exsd"/>
6		7
7	<extension	8	<extension
8	point="org.eclipse.hyades.test.core.launchconfigLaunchableType">	9	point="org.eclipse.hyades.test.core.launchconfigLaunchableType">
Lines 285-290 Link Here
285	<service class="org.eclipse.hyades.test.tools.core.services.AgentControllerVerificationService"/>	286	<service class="org.eclipse.hyades.test.tools.core.services.AgentControllerVerificationService"/>
286	</extension>	287	</extension>
287	<extension	288	<extension
		289	point="org.eclipse.hyades.test.tools.core.junitFactory">
		290	<factory
		291	class="org.eclipse.hyades.test.tools.core.internal.java.modelsync.JUnitTypeFactory"
		292	type="org.eclipse.hyades.test.java.junit.testSuite"
		293	updateSupport="true"/>
		294	<factory
		295	class="org.eclipse.hyades.test.tools.core.internal.plugin.modelsync.JUnitPluginTypeFactory"
		296	type="org.eclipse.hyades.test.plugin.junit.testSuite"
		297	updateSupport="true"/>
		298	</extension>
		299	<extension
288	id="junit"	300	id="junit"
289	name="TPTP JUnit source metadata"	301	name="TPTP JUnit source metadata"
290	point="org.eclipse.core.resources.markers">	302	point="org.eclipse.core.resources.markers">

Added Link Here

(-)schema/junitFactory.exsd (+119 lines)
1	<?xml version='1.0' encoding='UTF-8'?>
2	<!-- Schema file written by PDE -->
3	<schema targetNamespace="org.eclipse.hyades.test.tools.core">
4	<annotation>
5	<appInfo>
6	<meta.schema plugin="org.eclipse.hyades.test.tools.core" id="junitFactory" name="JUnit Test Model Factory"/>
7	</appInfo>
8	<documentation>
9	This extension point registers a JUnit test model factory. A JUnit test model factory generates a TPTP test model from a java source file. Such a factory has also the optional capability of updating a test model to reflect changes occurred in the java source file it is associated to.
10	</documentation>
11	</annotation>
12
13	<element name="extension">
14	<complexType>
15	<sequence minOccurs="0" maxOccurs="unbounded">
16	<element ref="factory"/>
17	</sequence>
18	<attribute name="point" type="string" use="required">
19	<annotation>
20	<documentation>
21
22	</documentation>
23	</annotation>
24	</attribute>
25	<attribute name="id" type="string">
26	<annotation>
27	<documentation>
28
29	</documentation>
30	</annotation>
31	</attribute>
32	<attribute name="name" type="string">
33	<annotation>
34	<documentation>
35
36	</documentation>
37	<appInfo>
38	<meta.attribute translatable="true"/>
39	</appInfo>
40	</annotation>
41	</attribute>
42	</complexType>
43	</element>
44
45	<element name="factory">
46	<complexType>
47	<attribute name="class" type="string" use="required">
48	<annotation>
49	<documentation>
50	The class implementing the factory.
51	</documentation>
52	<appInfo>
53	<meta.attribute kind="java" basedOn="org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteFactory"/>
54	</appInfo>
55	</annotation>
56	</attribute>
57	<attribute name="updateSupport" type="boolean" use="required">
58	<annotation>
59	<documentation>
60	Whether the class supports test suite model update. If true, class must implement org.eclipse.hyades.test.tools.core.java.IJUnitTestSuiteUpdateFactory.
61	</documentation>
62	</annotation>
63	</attribute>
64	<attribute name="type" type="string" use="required">
65	<annotation>
66	<documentation>
67	The type of test suite that this factory generates.
68	</documentation>
69	</annotation>
70	</attribute>
71	</complexType>
72	</element>
73
74	<annotation>
75	<appInfo>
76	<meta.section type="since"/>
77	</appInfo>
78	<documentation>
79	[Enter the first release in which this extension point appears.]
80	</documentation>
81	</annotation>
82
83	<annotation>
84	<appInfo>
85	<meta.section type="examples"/>
86	</appInfo>
87	<documentation>
88	[Enter extension point usage example here.]
89	</documentation>
90	</annotation>
91
92	<annotation>
93	<appInfo>
94	<meta.section type="apiInfo"/>
95	</appInfo>
96	<documentation>
97	[Enter API information here.]
98	</documentation>
99	</annotation>
100
101	<annotation>
102	<appInfo>
103	<meta.section type="implementation"/>
104	</appInfo>
105	<documentation>
106	[Enter information about supplied implementation of this extension point.]
107	</documentation>
108	</annotation>
109
110	<annotation>
111	<appInfo>
112	<meta.section type="copyright"/>
113	</appInfo>
114	<documentation>
115
116	</documentation>
117	</annotation>
118
119	</schema>