Attachment #108192 for bug #241804

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 241804
Collapse All | Expand All

Lines 1-5 Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/navigator/JUnitTestSuiteProxyFactory.java (-6 / +23 lines)
1	/**********************************************************************	1	/**********************************************************************
2	* Copyright (c) 2005 IBM Corporation and others.	2	* Copyright (c) 2005, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
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
Lines 12-17 Link Here
12	package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;	12	package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;
13		13
14	import org.eclipse.hyades.models.common.testprofile.TPFTest;	14	import org.eclipse.hyades.models.common.testprofile.TPFTest;
		15	import org.eclipse.hyades.models.common.testprofile.TPFTestCase;
15	import org.eclipse.hyades.models.common.testprofile.TPFTestSuite;	16	import org.eclipse.hyades.models.common.testprofile.TPFTestSuite;
16	import org.eclipse.hyades.test.ui.TestUIConstants;	17	import org.eclipse.hyades.test.ui.TestUIConstants;
17	import org.eclipse.hyades.test.ui.navigator.DefaultTypedElementProxyFactory;	18	import org.eclipse.hyades.test.ui.navigator.DefaultTypedElementProxyFactory;
Lines 19-29 Link Here
19	import org.eclipse.ui.IMemento;	20	import org.eclipse.ui.IMemento;
20		21
21	/**	22	/**
22	* This factory is responsible to create special proxy node for JUnit test suite.	23	* This factory is responsible to create special proxy nodes for JUnit test cases and suites.
		24	* <p/>
		25	* Those test cases should have the type org.eclipse.hyades.test.java.junit.testCase.
		26	* <p/>
23	* Those test suites should have the type org.eclipse.hyades.test.java.junit.testSuite.	27	* Those test suites should have the type org.eclipse.hyades.test.java.junit.testSuite.
		28	* <p/>
		29	*
24	*	30	*
25	* @author jgout	31	* @author Jerome Gout
26	* @since 4.0	32	* @author Paul E. Slauenwhite
		33	* @version July 23, 2008
		34	* @since March 25, 2005
27	*/	35	*/
28	public class JUnitTestSuiteProxyFactory extends DefaultTypedElementProxyFactory {	36	public class JUnitTestSuiteProxyFactory extends DefaultTypedElementProxyFactory {
29		37
Lines 35-40 Link Here
35	TPFTestSuite ts = (TPFTestSuite) test;	43	TPFTestSuite ts = (TPFTestSuite) test;
36	return new JUnitTestSuiteProxyNode(ts, parent);	44	return new JUnitTestSuiteProxyNode(ts, parent);
37	}	45	}
		46	else if (test instanceof TPFTestCase) {
		47	TPFTestCase tc = (TPFTestCase) test;
		48	return new JUnitTestCaseProxyNode(tc, parent);
		49	}
		50
38	return super.create(test, parent);	51	return super.create(test, parent);
39	}	52	}
40		53
Lines 45-52 Link Here
45	String nodeKind = memento.getString(TestUIConstants.TAG_NODE_KIND);	58	String nodeKind = memento.getString(TestUIConstants.TAG_NODE_KIND);
46	if(nodeKind.equals(TestUIConstants.TESTSUITE_NODE)) {	59	if(nodeKind.equals(TestUIConstants.TESTSUITE_NODE)) {
47	return new JUnitTestSuiteProxyNode(memento, parent);	60	return new JUnitTestSuiteProxyNode(memento, parent);
48	} else {	61	}
49	//- since this is not a saved test suite, let's default factory handle this memento	62	else if(nodeKind.equals(TestUIConstants.TESTCASE_NODE)) {
		63	return (new JUnitTestCaseProxyNode(memento, parent));
		64	}
		65	else {
		66	//- since this is not a saved test case or suite, let's default factory handle this memento
50	return super.recreate(memento, parent);	67	return super.recreate(memento, parent);
51	}	68	}
52	}	69	}




      <typedElement
            type="org.eclipse.hyades.test.java.junit.testSuite"
            factoryID="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteFactory"/>
      <typedElement
            type="org.eclipse.hyades.test.java.junit.testCase"
            factoryID="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteFactory"/>
   </extension>
   <extension
         point="org.eclipse.ui.popupMenus">
         
     <!-- Open JUnit test method from TPTP JUnit test case: -->
     <objectContribution
            adaptable="false"
            objectClass="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.JUnitTestCaseProxyNode"
            id="org.eclipse.hyades.test.tools.ui.JUnitTestCaseContribution">
         <action
               enablesFor="1"
               label="%OPEN_JUNIT_TEST_SUITE_CODE"
               class="org.eclipse.hyades.test.tools.ui.java.internal.junit.actions.OpenJUnitTestCaseCodeAction"
               menubarPath="org.eclipse.ui.OpenWithSubMenu"
               id="org.eclipse.hyades.test.tools.ui.JUnitTestCaseOpenCode"/>
      </objectContribution>

     <!-- Open JUnit test class from TPTP JUnit test suite: -->
      <objectContribution
            adaptable="false"
            objectClass="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.JUnitTestSuiteProxyNode"

               menubarPath="org.eclipse.ui.OpenWithSubMenu"
               id="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteOpenCode"/>
      </objectContribution>

     <!-- Import a JUnit test class to a TPTP JUnit test suite: -->
      <objectContribution
            adaptable="false"
            id="org.eclipse.hyades.test.tools.ui.RegularJUnitTestSuiteContribution"

               menubarPath="group.import"/>
      </objectContribution>
   </extension>   
   <extension
         point="org.eclipse.ui.popupMenus">
      <objectContribution
            adaptable="false"
            objectClass="org.eclipse.hyades.test.ui.internal.navigator.proxy.DefaultTestCaseProxyNode"
            id="org.eclipse.hyades.test.tools.ui.JUnitTestCaseContribution">
         <action
               enablesFor="1"
               label="%OPEN_JUNIT_TEST_SUITE_CODE"
               class="org.eclipse.hyades.test.tools.ui.java.internal.junit.actions.OpenJUnitTestSuiteCodeAction"
               menubarPath="org.eclipse.ui.OpenWithSubMenu"
               id="org.eclipse.hyades.test.tools.ui.JUnitTestCaseOpenCode"/>
      </objectContribution>
   </extension>   
   
   
   <extension
         point="org.eclipse.hyades.ui.typeDescriptions">




/********************************************************************** 
 * Copyright (c) 2005, 2008 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 

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

import org.eclipse.core.resources.IFile;
import org.eclipse.hyades.models.common.testprofile.TPFTestCase;
import org.eclipse.hyades.models.common.testprofile.TPFTestSuite;
import org.eclipse.hyades.test.tools.core.java.JUnitTestSuiteFacade;
import org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.JUnitTestSuiteProxyNode;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.DefaultTestCaseProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.ui.internal.util.UIUtil;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.ui.IActionDelegate;

/**
 * Action to open the source code of a JUnit test suite.
 * </p>
 * 
 * 
 * @author  Jerome Gout
 * @author  Julien Canches
 * @author  Paul E. Slauenwhite
 * @version July 23, 2008
 * @since   September 1, 2006
 */
public class OpenJUnitTestSuiteCodeAction implements IActionDelegate {

    private IStructuredSelection selection = null;

    /* (non-Javadoc)
     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
     */
    public void run(IAction action) {
    	
    	IProxyNode proxy = (IProxyNode) selection.getFirstElement();
    	
    	if (proxy instanceof JUnitTestSuiteProxyNode) {
    	
    		TPFTestSuite ts = ((JUnitTestSuiteProxyNode)proxy).getTestSuite();
    		IFile javaFile = JUnitTestSuiteFacade.getJUnitSourceFile(ts);
	        
    		if(javaFile != null) {
	            UIUtil.openEditor(javaFile, null, false);
	        }
    		
	        if(ts.eResource() != null) {
	            ts.eResource().unload();
	        }
    	} 
    		DefaultTestCaseProxyNode tcpn = (DefaultTestCaseProxyNode)proxy;
    		if (tcpn.getParent() instanceof JUnitTestSuiteProxyNode) {
    			TPFTestCase tc = tcpn.getTestCase();
    			OpenTestMethodAction tcAction = new OpenTestMethodAction(null);
    			tcAction.selectionChanged(new StructuredSelection(tc));
    			tcAction.run();
    		}
    	}
    }

    /* (non-Javadoc)
     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
     */
    public void selectionChanged(IAction action, ISelection selection) {
       
    	if (selection instanceof IStructuredSelection) {
            this.selection = (IStructuredSelection) selection;
        }
    }

}




/********************************************************************** 
 * Copyright (c) 2008 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 - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;

import org.eclipse.hyades.models.common.testprofile.TPFTestCase;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.DefaultTestCaseProxyNode;
import org.eclipse.hyades.test.ui.navigator.ITestCaseProxyNode;
import org.eclipse.ui.IMemento;

/**
 * JUnit test case proxy node to specialize the actions in the context menu 
 * of the Test Navigator.
 * <p/>
 * 
 * 
 * @author  Paul E. Slauenwhite
 * @version	July 23, 2008
 * @since 	July 23, 2008
 */
public class JUnitTestCaseProxyNode extends DefaultTestCaseProxyNode implements ITestCaseProxyNode {

    public JUnitTestCaseProxyNode(TPFTestCase ts, Object parent) {
        super(ts, parent);
    }
    
    public JUnitTestCaseProxyNode(IMemento memento, Object parent) {
        super(memento, parent);
    }
    
    /* (non-Javadoc)
     * @see org.eclipse.hyades.test.ui.internal.navigator.proxy.DefaultTestCaseProxyNode#getFactoryID()
     */
    public String getFactoryID() {
        return "org.eclipse.hyades.test.tools.ui.JUnitTestSuiteFactory"; //$NON-NLS-1$
    }
}




/********************************************************************** 
 * Copyright (c) 2008 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 - Initial API and implementation 
 **********************************************************************/ 
package org.eclipse.hyades.test.tools.ui.java.internal.junit.actions;

import org.eclipse.hyades.models.common.testprofile.TPFTestCase;
import org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.JUnitTestCaseProxyNode;
import org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.JUnitTestSuiteProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.ui.IActionDelegate;

/**
 * Action to open the source code of a JUnit test case.
 * </p>
 * 
 * 
 * @author  Paul E. Slauenwhite
 * @version July 23, 2008
 * @since   July 23, 2008
 */
public class OpenJUnitTestCaseCodeAction implements IActionDelegate {

    private IStructuredSelection selection = null;

    /* (non-Javadoc)
     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
     */
    public void run(IAction action) {
    	
    	IProxyNode proxy = ((IProxyNode)(selection.getFirstElement()));

    	if (proxy instanceof JUnitTestCaseProxyNode) {
    	
    		JUnitTestCaseProxyNode tcpn = ((JUnitTestCaseProxyNode)(proxy));
    		
    		if (tcpn.getParent() instanceof JUnitTestSuiteProxyNode) {
    		
    			TPFTestCase tc = tcpn.getTestCase();
    			
    			OpenTestMethodAction tcAction = new OpenTestMethodAction(null);
    			tcAction.selectionChanged(new StructuredSelection(tc));
    			tcAction.run();
    		}
    	}
    }

    /* (non-Javadoc)
     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
     */
    public void selectionChanged(IAction action, ISelection selection) {
        
    	if (selection instanceof IStructuredSelection) {
            this.selection = ((IStructuredSelection)(selection));
        }
    }
}

Return to bug 241804

Lines 275-283 Link Here

(-)plugin.xml (-15 / +20 lines)
275	<typedElement	275	<typedElement
276	type="org.eclipse.hyades.test.java.junit.testSuite"	276	type="org.eclipse.hyades.test.java.junit.testSuite"
277	factoryID="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteFactory"/>	277	factoryID="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteFactory"/>
		278	<typedElement
		279	type="org.eclipse.hyades.test.java.junit.testCase"
		280	factoryID="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteFactory"/>
278	</extension>	281	</extension>
279	<extension	282	<extension
280	point="org.eclipse.ui.popupMenus">	283	point="org.eclipse.ui.popupMenus">
		284
		285	<!-- Open JUnit test method from TPTP JUnit test case: -->
		286	<objectContribution
		287	adaptable="false"
		288	objectClass="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.JUnitTestCaseProxyNode"
		289	id="org.eclipse.hyades.test.tools.ui.JUnitTestCaseContribution">
		290	<action
		291	enablesFor="1"
		292	label="%OPEN_JUNIT_TEST_SUITE_CODE"
		293	class="org.eclipse.hyades.test.tools.ui.java.internal.junit.actions.OpenJUnitTestCaseCodeAction"
		294	menubarPath="org.eclipse.ui.OpenWithSubMenu"
		295	id="org.eclipse.hyades.test.tools.ui.JUnitTestCaseOpenCode"/>
		296	</objectContribution>
		297
		298	<!-- Open JUnit test class from TPTP JUnit test suite: -->
281	<objectContribution	299	<objectContribution
282	adaptable="false"	300	adaptable="false"
283	objectClass="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.JUnitTestSuiteProxyNode"	301	objectClass="org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator.JUnitTestSuiteProxyNode"
Lines 289-294 Link Here
289	menubarPath="org.eclipse.ui.OpenWithSubMenu"	307	menubarPath="org.eclipse.ui.OpenWithSubMenu"
290	id="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteOpenCode"/>	308	id="org.eclipse.hyades.test.tools.ui.JUnitTestSuiteOpenCode"/>
291	</objectContribution>	309	</objectContribution>
		310
		311	<!-- Import a JUnit test class to a TPTP JUnit test suite: -->
292	<objectContribution	312	<objectContribution
293	adaptable="false"	313	adaptable="false"
294	id="org.eclipse.hyades.test.tools.ui.RegularJUnitTestSuiteContribution"	314	id="org.eclipse.hyades.test.tools.ui.RegularJUnitTestSuiteContribution"
Lines 301-321 Link Here
301	menubarPath="group.import"/>	321	menubarPath="group.import"/>
302	</objectContribution>	322	</objectContribution>
303	</extension>	323	</extension>
304	<extension
305	point="org.eclipse.ui.popupMenus">
306	<objectContribution
307	adaptable="false"
308	objectClass="org.eclipse.hyades.test.ui.internal.navigator.proxy.DefaultTestCaseProxyNode"
309	id="org.eclipse.hyades.test.tools.ui.JUnitTestCaseContribution">
310	<action
311	enablesFor="1"
312	label="%OPEN_JUNIT_TEST_SUITE_CODE"
313	class="org.eclipse.hyades.test.tools.ui.java.internal.junit.actions.OpenJUnitTestSuiteCodeAction"
314	menubarPath="org.eclipse.ui.OpenWithSubMenu"
315	id="org.eclipse.hyades.test.tools.ui.JUnitTestCaseOpenCode"/>
316	</objectContribution>
317	</extension>
318
319		324
320	<extension	325	<extension
321	point="org.eclipse.hyades.ui.typeDescriptions">	326	point="org.eclipse.hyades.ui.typeDescriptions">

Added Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/navigator/JUnitTestCaseProxyNode.java (+45 lines)
1	/**********************************************************************
2	* Copyright (c) 2008 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 - Initial API and implementation
11	**********************************************************************/
12	package org.eclipse.hyades.test.tools.ui.java.internal.junit.navigator;
13
14	import org.eclipse.hyades.models.common.testprofile.TPFTestCase;
15	import org.eclipse.hyades.test.ui.internal.navigator.proxy.DefaultTestCaseProxyNode;
16	import org.eclipse.hyades.test.ui.navigator.ITestCaseProxyNode;
17	import org.eclipse.ui.IMemento;
18
19	/**
20	* JUnit test case proxy node to specialize the actions in the context menu
21	* of the Test Navigator.
22	* <p/>
23	*
24	*
25	* @author Paul E. Slauenwhite
26	* @version July 23, 2008
27	* @since July 23, 2008
28	*/
29	public class JUnitTestCaseProxyNode extends DefaultTestCaseProxyNode implements ITestCaseProxyNode {
30
31	public JUnitTestCaseProxyNode(TPFTestCase ts, Object parent) {
32	super(ts, parent);
33	}
34
35	public JUnitTestCaseProxyNode(IMemento memento, Object parent) {
36	super(memento, parent);
37	}
38
39	/* (non-Javadoc)
40	* @see org.eclipse.hyades.test.ui.internal.navigator.proxy.DefaultTestCaseProxyNode#getFactoryID()
41	*/
42	public String getFactoryID() {
43	return "org.eclipse.hyades.test.tools.ui.JUnitTestSuiteFactory"; //$NON-NLS-1$
44	}
45	}