Attachment #175843 for bug #311979




 *******************************************************************************/
package org.eclipse.pde.internal.junit.runtime;

import junit.framework.Assert;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;

/**
 * A Workbench that runs a test suite specified in the
 * command line arguments.
 */
public class NonUIThreadTestApplication implements IApplication {

	private static final String DEFAULT_HEADLESSAPP = "org.eclipse.pde.junit.runtime.coretestapplication"; //$NON-NLS-1$

	protected IApplication fApplication;

	/* (non-Javadoc)
	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
	 */
	public Object start(IApplicationContext context) throws Exception {
		String[] args = (String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS);
		Object app = getApplication(args);

		Assert.assertNotNull(app);

		return runApp(app, context, args);
	}

	protected Object runApp(Object app, IApplicationContext context, String[] args) throws Exception {
		if (app instanceof IApplication) {
			fApplication = (IApplication) app;
			return fApplication.start(context);
		}
		return ((IPlatformRunnable) app).run(args);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.equinox.app.IApplication#stop()
	 */
	public void stop() {
		if (fApplication != null)
			fApplication.stop();
	}

	/*
	 * return the application to run, or null if not even the default application
	 * is found.
	 */
	private Object getApplication(String[] args) throws CoreException {
		// Find the name of the application as specified by the PDE JUnit launcher.
		// If no application is specified, the 3.0 default workbench application
		// is returned.
		IExtension extension = Platform.getExtensionRegistry().getExtension(Platform.PI_RUNTIME, Platform.PT_APPLICATIONS, getApplicationToRun(args));

		Assert.assertNotNull(extension);

		// If the extension does not have the correct grammar, return null.
		// Otherwise, return the application object.
		IConfigurationElement[] elements = extension.getConfigurationElements();
		if (elements.length > 0) {
			IConfigurationElement[] runs = elements[0].getChildren("run"); //$NON-NLS-1$
			if (runs.length > 0) {
				Object runnable = runs[0].createExecutableExtension("class"); //$NON-NLS-1$
				if (runnable instanceof IPlatformRunnable || runnable instanceof IApplication)
					return runnable;
			}
		}
		return null;
	}

	/*
	 * The -testApplication argument specifies the application to be run.
	 * If the PDE JUnit launcher did not set this argument, then return
	 * the name of the default application.
	 * In 3.0, the default is the "org.eclipse.ui.ide.worbench" application.
	 *
	 * see bug 228044
	 *
	 */
	private String getApplicationToRun(String[] args) {
		for (int i = 0; i < args.length; i++) {
			if (args[i].equals("-testApplication") && i < args.length - 1) //$NON-NLS-1$
				return args[i + 1];
		}
		IProduct product = Platform.getProduct();
		if (product != null)
			return product.getApplication();
		return getDefaultApplicationId();
	}

	protected String getDefaultApplicationId() {
		return DEFAULT_HEADLESSAPP;
	}

}




 *******************************************************************************/
package org.eclipse.pde.internal.junit.runtime;

import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.testing.ITestHarness;

 * A Workbench that runs a test suite specified in the
 * command line arguments.
 */
public class UITestApplication extends NonUIThreadTestApplication implements ITestHarness {

	private static final String DEFAULT_APP_3_0 = "org.eclipse.ui.ide.workbench"; //$NON-NLS-1$

	protected TestableObject fTestableObject;
	protected IApplication fApplication;

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.junit.runtime.NonUIThreadTestApplication#getDefaultApplicationId()
	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
	 */
	public Object start(IApplicationContext context) throws Exception {
		String[] args = (String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS);
		Object app = getApplication(args);

		Assert.assertNotNull(app);

		fTestableObject = PlatformUI.getTestableObject();
		fTestableObject.setTestHarness(this);
		if (app instanceof IApplication) {
			fApplication = (IApplication) app;
			return fApplication.start(context);
		}
		return ((IPlatformRunnable) app).run(args);
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.equinox.app.IApplication#stop()
	 */
	protected String getDefaultApplicationId() {
		// In 3.0, the default is the "org.eclipse.ui.ide.worbench" application.
		return DEFAULT_APP_3_0;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.junit.runtime.NonUIThreadTestApplication#runApp(java.lang.Object, org.eclipse.equinox.app.IApplicationContext, java.lang.String[])
	 * is found.
	 */
	protected Object runApp(Object app, IApplicationContext context, String[] args) throws Exception {
		fTestableObject = PlatformUI.getTestableObject();
		fTestableObject.setTestHarness(this);
		return super.runApp(app, context, args);
		IExtension extension = Platform.getExtensionRegistry().getExtension(Platform.PI_RUNTIME, Platform.PT_APPLICATIONS, getApplicationToRun(args));

		Assert.assertNotNull(extension);

		// If the extension does not have the correct grammar, return null.
		// Otherwise, return the application object.
		IConfigurationElement[] elements = extension.getConfigurationElements();
		if (elements.length > 0) {
			IConfigurationElement[] runs = elements[0].getChildren("run"); //$NON-NLS-1$
			if (runs.length > 0) {
				Object runnable = runs[0].createExecutableExtension("class"); //$NON-NLS-1$
				if (runnable instanceof IPlatformRunnable || runnable instanceof IApplication)
					return runnable;
			}
		}
		return null;
	}

	/*
	 * The -testApplication argument specifies the application to be run.
	 * If the PDE JUnit launcher did not set this argument, then return
	 * the name of the default application.
	 * In 3.0, the default is the "org.eclipse.ui.ide.worbench" application.
	 * 
	 * see bug 228044
	 * 
	 */
	private String getApplicationToRun(String[] args) {
		for (int i = 0; i < args.length; i++) {
			if (args[i].equals("-testApplication") && i < args.length - 1) //$NON-NLS-1$
				return args[i + 1];
		}
		IProduct product = Platform.getProduct();
		if (product != null)
			return product.getApplication();
		return DEFAULT_APP_3_0;
	}

	/*

Return to bug 311979

Lines 10-27 Link Here

(-)src/org/eclipse/pde/internal/junit/runtime/NonUIThreadTestApplication.java (-6 / +85 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.junit.runtime;	11	package org.eclipse.pde.internal.junit.runtime;
12		12
13	import org.eclipse.core.runtime.Platform;	13	import junit.framework.Assert;
		14	import org.eclipse.core.runtime.*;
		15	import org.eclipse.equinox.app.IApplication;
		16	import org.eclipse.equinox.app.IApplicationContext;
14		17
15	/**	18	/**
16	* A Workbench that runs a test suite specified in the	19	* A Workbench that runs a test suite specified in the
17	* command line arguments.	20	* command line arguments.
18	*/	21	*/
19	public class NonUIThreadTestApplication extends UITestApplication {	22	public class NonUIThreadTestApplication implements IApplication {
20		23
21	public void runTests() {	24	private static final String DEFAULT_HEADLESSAPP = "org.eclipse.pde.junit.runtime.coretestapplication"; //$NON-NLS-1$
22	fTestableObject.testingStarting();	25
23	RemotePluginTestRunner.main(Platform.getCommandLineArgs());	26	protected IApplication fApplication;
24	fTestableObject.testingFinished();	27
		28	/* (non-Javadoc)
		29	* @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
		30	*/
		31	public Object start(IApplicationContext context) throws Exception {
		32	String[] args = (String[]) context.getArguments().get(IApplicationContext.APPLICATION_ARGS);
		33	Object app = getApplication(args);
		34
		35	Assert.assertNotNull(app);
		36
		37	return runApp(app, context, args);
		38	}
		39
		40	protected Object runApp(Object app, IApplicationContext context, String[] args) throws Exception {
		41	if (app instanceof IApplication) {
		42	fApplication = (IApplication) app;
		43	return fApplication.start(context);
		44	}
		45	return ((IPlatformRunnable) app).run(args);
		46	}
		47
		48	/* (non-Javadoc)
		49	* @see org.eclipse.equinox.app.IApplication#stop()
		50	*/
		51	public void stop() {
		52	if (fApplication != null)
		53	fApplication.stop();
		54	}
		55
		56	/*
		57	* return the application to run, or null if not even the default application
		58	* is found.
		59	*/
		60	private Object getApplication(String[] args) throws CoreException {
		61	// Find the name of the application as specified by the PDE JUnit launcher.
		62	// If no application is specified, the 3.0 default workbench application
		63	// is returned.
		64	IExtension extension = Platform.getExtensionRegistry().getExtension(Platform.PI_RUNTIME, Platform.PT_APPLICATIONS, getApplicationToRun(args));
		65
		66	Assert.assertNotNull(extension);
		67
		68	// If the extension does not have the correct grammar, return null.
		69	// Otherwise, return the application object.
		70	IConfigurationElement[] elements = extension.getConfigurationElements();
		71	if (elements.length > 0) {
		72	IConfigurationElement[] runs = elements[0].getChildren("run"); //$NON-NLS-1$
		73	if (runs.length > 0) {
		74	Object runnable = runs[0].createExecutableExtension("class"); //$NON-NLS-1$
		75	if (runnable instanceof IPlatformRunnable \|\| runnable instanceof IApplication)
		76	return runnable;
		77	}
		78	}
		79	return null;
		80	}
		81
		82	/*
		83	* The -testApplication argument specifies the application to be run.
		84	* If the PDE JUnit launcher did not set this argument, then return
		85	* the name of the default application.
		86	* In 3.0, the default is the "org.eclipse.ui.ide.worbench" application.
		87	*
		88	* see bug 228044
		89	*
		90	*/
		91	private String getApplicationToRun(String[] args) {
92	for (int i = 0; i < args.length; i++) {
93	if (args[i].equals("-testApplication") && i < args.length - 1) //$NON-NLS-1$
94	return args[i + 1];
95	}
96	IProduct product = Platform.getProduct();
97	if (product != null)
98	return product.getApplication();
99	return getDefaultApplicationId();
100	}
101
102	protected String getDefaultApplicationId() {
103	return DEFAULT_HEADLESSAPP;
25	}	104	}
26		105
27	}	106	}