Bug 546589: Remove "Unselect" event for radio menu items

Change-Id: Ida5819a08ed67413dc93cdab025bb4a25daa09d7

25 files changed, 191 insertions, 74 deletions

diff --git a/core/org.eclipse.rcptt.core.ecl.core/src/org/eclipse/rcptt/core/internal/ecl/core/Utils.java b/core/org.eclipse.rcptt.core.ecl.core/src/org/eclipse/rcptt/core/internal/ecl/core/Utils.java
index 39472dc5b..135d9469f 100644
--- a/core/org.eclipse.rcptt.core.ecl.core/src/org/eclipse/rcptt/core/internal/ecl/core/Utils.java
+++ b/core/org.eclipse.rcptt.core.ecl.core/src/org/eclipse/rcptt/core/internal/ecl/core/Utils.java
@@ -32,6 +32,11 @@ public class Utils {
 		try {
 			runnable.run();
 			ReportHelper.setResult(nde, createStatus(IStatus.OK, " "));
+		} catch (CoreException e) {
+			IStatus status = e.getStatus();
+			setResult(nde, status);
+			ReportHelper.takeSnapshot(nde);
+			throw new CoreException(status);
 		} catch (Throwable e) {
 			IStatus status = RcpttPlugin.createStatus(e);
 			setResult(nde, status);
diff --git a/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/internal/core/RcpttPlugin.java b/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/internal/core/RcpttPlugin.java
index f91428bbc..7c2d3329f 100644
--- a/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/internal/core/RcpttPlugin.java
+++ b/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/internal/core/RcpttPlugin.java
@@ -96,8 +96,11 @@ public class RcpttPlugin extends Plugin {
 	}
 
 	public static IStatus createStatus(Throwable t) {
-		if (t instanceof CoreException)
-			return ((CoreException) t).getStatus();
+		if (t instanceof CoreException) {
+			IStatus result = ((CoreException) t).getStatus();
+			if (result.getException() != null || result.getChildren().length != 0)
+				return result;
+		}
 		return new Status(Status.ERROR, PLUGIN_ID, t.getMessage(), t);
 	}
 
diff --git a/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/src/org/eclipse/rcptt/ecl/internal/debug/core/EclDebugTarget.java b/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/src/org/eclipse/rcptt/ecl/internal/debug/core/EclDebugTarget.java
index 6fd654118..3541cbbf7 100644
--- a/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/src/org/eclipse/rcptt/ecl/internal/debug/core/EclDebugTarget.java
+++ b/ecl/plugins/org.eclipse.rcptt.ecl.debug.core/src/org/eclipse/rcptt/ecl/internal/debug/core/EclDebugTarget.java
@@ -32,6 +32,7 @@ import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.IBreakpointManager;
 import org.eclipse.debug.core.IBreakpointManagerListener;
 import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.ILineBreakpoint;
@@ -109,7 +110,8 @@ public class EclDebugTarget extends EclDebugElement implements IDebugTarget,
 	}
 
 	public String getName() throws DebugException {
-		return getLaunch().getLaunchConfiguration().getName();
+		ILaunchConfiguration configuration = getLaunch().getLaunchConfiguration();
+		return configuration != null ? configuration.getName() : "Unknown";
 	}
 
 	public boolean canTerminate() {
diff --git a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/internal/launching/ext/Q7TargetPlatformManager.java b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/internal/launching/ext/Q7TargetPlatformManager.java
index 0250b231a..f62ebf8e5 100644
--- a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/internal/launching/ext/Q7TargetPlatformManager.java
+++ b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/internal/launching/ext/Q7TargetPlatformManager.java
@@ -18,11 +18,10 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationListener;
-import org.eclipse.rcptt.internal.core.RcpttPlugin;
 import org.eclipse.rcptt.launching.IQ7Launch;
 import org.eclipse.rcptt.launching.target.ITargetPlatformHelper;
 import org.eclipse.rcptt.launching.target.TargetPlatformManager;
@@ -48,9 +47,9 @@ public class Q7TargetPlatformManager {
 			return cached;
 		}
 
-		monitor.beginTask("Initialize target platform...", 2);
+		SubMonitor subMonitor = SubMonitor.convert(monitor, "Initialize target platform...", 2);
 		ITargetPlatformHelper info = TargetPlatformManager.findTarget(
-				targetPlatform, new SubProgressMonitor(monitor, 1), true);
+				targetPlatform, subMonitor.split(1), true);
 		assert info.getStatus().isOK();
 		monitor.worked(1);
 		monitor.done();
@@ -77,11 +76,11 @@ public class Q7TargetPlatformManager {
 
 		String targetPlatformName = getTargetPlatformName(config);
 
-		monitor.beginTask("Initialize target platform...", 2);
-		ITargetPlatformHelper info = TargetPlatformManager.findTarget(targetPlatformName, new SubProgressMonitor(monitor, 1), true);
+		SubMonitor subMonitor = SubMonitor.convert(monitor, "Initialize target platform...", 2);
+		ITargetPlatformHelper info = TargetPlatformManager.findTarget(targetPlatformName, subMonitor.split(1), true);
 
 		if (info == null) {
-			info = newTargetPlatform(config, new SubProgressMonitor(monitor, 1), location);
+			info = newTargetPlatform(config, subMonitor.split(1), location);
 			assert info != null;
 		} else {
 			monitor.worked(1);
@@ -120,12 +119,11 @@ public class Q7TargetPlatformManager {
 		}
 		ITargetPlatformHelper platform = null;
 		try {
-			monitor.beginTask("Create AUT configuration", 100);
+			SubMonitor subMonitor = SubMonitor.convert(monitor, "Create AUT configuration", 100);
 			platform = TargetPlatformManager
-					.createTargetPlatform(location, new SubProgressMonitor(monitor,
-							50));
+					.createTargetPlatform(location, subMonitor.split(50));
 			throwOnError(platform.getStatus());
-			IStatus rv = Q7TargetPlatformInitializer.initialize(platform, new SubProgressMonitor(monitor, 50));
+			IStatus rv = Q7TargetPlatformInitializer.initialize(platform, subMonitor.split(50));
 			throwOnError(rv);
 			isOk = true;
 			return platform;
@@ -150,13 +148,7 @@ public class Q7TargetPlatformManager {
 	 * @throws CoreException
 	 */
 	public static String getTargetPlatformName(ILaunchConfiguration config) {
-		String defValue = getTargetPlatformName(config.getName());
-		try {
-			return config.getAttribute(IQ7Launch.TARGET_PLATFORM, defValue);
-		} catch (CoreException e) {
-			RcpttPlugin.log(e);
-			return defValue;
-		}
+		return getTargetPlatformName(config.getName());
 	}
 
 	public static String getTargetPlatformName(String name) {
@@ -171,10 +163,12 @@ public class Q7TargetPlatformManager {
 						new ILaunchConfigurationListener() {
 							public void launchConfigurationRemoved(
 									ILaunchConfiguration configuration) {
-								String target = getTargetPlatformName(configuration);
-								if (target != null) {
-									TargetPlatformManager
-											.deleteTargetPlatform(target);
+								if (configuration.exists()) {
+									String target = getTargetPlatformName(configuration);
+									if (target != null) {
+										TargetPlatformManager
+												.deleteTargetPlatform(target);
+									}
 									cachedHelpers.remove(target);
 								}
 							}
diff --git a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/Q7LaunchingUtil.java b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/Q7LaunchingUtil.java
index fdb4e7f1e..2517ba48c 100644
--- a/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/Q7LaunchingUtil.java
+++ b/launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/Q7LaunchingUtil.java
@@ -110,8 +110,6 @@ public class Q7LaunchingUtil {
 			Q7TargetPlatformManager.delete(target.getName());
 			Q7TargetPlatformManager.setHelper(target.getName(), target);
 
-			config.setAttribute(IQ7Launch.TARGET_PLATFORM, target.getName());
-
 			String product = target.getDefaultProduct();
 			if (product != null) {
 				config.setAttribute("useProduct", true);
diff --git a/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/Q7Process.java b/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/Q7Process.java
index 2a841534d..b1c072466 100644
--- a/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/Q7Process.java
+++ b/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/Q7Process.java
@@ -34,7 +34,11 @@ public class Q7Process implements IProcess {
 	private final TestCaseDebugger debugger;
 
 	public Q7Process(ILaunch launch, AutLaunch aut, BiFunction<String, Integer, DebuggerTransport> debugTransport) throws CoreException {
+		if (launch == null)
+			throw new NullPointerException("null launch");
 		this.launch = launch;
+		if (aut == null)
+			throw new NullPointerException("null autLaunch");
 		this.aut = aut;
 		launch.addProcess(this);
 
diff --git a/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/launching/IQ7Launch.java b/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/launching/IQ7Launch.java
index d9f2aff06..e83edd246 100644
--- a/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/launching/IQ7Launch.java
+++ b/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/launching/IQ7Launch.java
@@ -184,12 +184,6 @@ public interface IQ7Launch {
 	String AUT_LOCATION = "aut-location"; //$NON-NLS-1$
 
 	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * associated platform.
-	 */
-	String TARGET_PLATFORM = "aut-target-platform"; //$NON-NLS-1$
-
-	/**
 	 * Do not try to create target one more time
 	 */
 	String UPDATE_TARGET_SUPPORTED = "aut-target-updatable";//$NON-NLS-1$
diff --git a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java
index 9a6ca74cd..35bd81f06 100644
--- a/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java
+++ b/modules/rap/bundles/launching/org.eclipse.rcptt.launching.rap.ui/src/org/eclipse/rcptt/internal/launching/rap/ui/AUTLocationBlock.java
@@ -189,7 +189,6 @@ public class AUTLocationBlock {
 			info.setTargetName(Q7TargetPlatformManager
 					.getTargetPlatformName(config));
 			info.save();
-			config.setAttribute(IQ7Launch.TARGET_PLATFORM, info.getName());
 			Q7TargetPlatformManager.setHelper(info.getName(), info);
 		}
 		config.setAttribute(IQ7Launch.UPDATE_TARGET_SUPPORTED, true);
diff --git a/rcp/org.eclipse.rcptt.launching.ext.ui/src/org/eclipse/rcptt/internal/launching/ext/ui/AUTLocationBlock.java b/rcp/org.eclipse.rcptt.launching.ext.ui/src/org/eclipse/rcptt/internal/launching/ext/ui/AUTLocationBlock.java
index b70371f37..6497d8578 100644
--- a/rcp/org.eclipse.rcptt.launching.ext.ui/src/org/eclipse/rcptt/internal/launching/ext/ui/AUTLocationBlock.java
+++ b/rcp/org.eclipse.rcptt.launching.ext.ui/src/org/eclipse/rcptt/internal/launching/ext/ui/AUTLocationBlock.java
@@ -188,7 +188,6 @@ public class AUTLocationBlock {
 			info.setTargetName(Q7TargetPlatformManager
 					.getTargetPlatformName(config));
 			info.save();
-			config.setAttribute(IQ7Launch.TARGET_PLATFORM, info.getName());
 			Q7TargetPlatformManager.setHelper(info.getName(), info);
 		}
 		config.setAttribute(IQ7Launch.UPDATE_TARGET_SUPPORTED, true);
diff --git a/rcpttTests/2019-03_regression.suite b/rcpttTests/2019-03_regression.suite
index f1b8e2aa4..1e680999b 100644
--- a/rcpttTests/2019-03_regression.suite
+++ b/rcpttTests/2019-03_regression.suite
@@ -4,8 +4,8 @@ Element-Name: 2019-03_regression
 Element-Type: testsuite
 Element-Version: 2.0
 Id: _7BRNEFRJEemY1KVRTSK_ug
-Runtime-Version: 2.4.1.qualifier
-Save-Time: 4/2/19 12:21 PM
+Runtime-Version: 2.4.2.qualifier
+Save-Time: 4/23/19 9:12 PM
 
 ------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
 Content-Type: text/testcase
@@ -38,5 +38,10 @@ _RtglkCbJEeS6GLpDYENyEA	// kind: 'test' name: 'Autocomplete' path: 'ECL_IDE_modu
 _EdBBULVEEeGHo51xlkPHGw	// kind: 'test' name: 'ContextMenuActionsRecordingForBrowser' path: 'platform_tests/Recording/ContextMenuActionsRecordingForBrowser.test'
 _GODpIF0IEeGDGrudSYLu8w	// kind: 'test' name: 'AddTaskToScriptEditor' path: 'ECL_IDE_module/editors/ScenarioEditor/TasksInScriptEditor/AddTaskToScriptEditor.test'
 _EdCW8CYfEeGbAuIIX5cVWQ	// kind: 'test' name: 'Ignore Some Files At Clearing Workspace' path: 'platform_tests/Editing/Context/Workspace Context/Create/Ignore Some Files At Clearing Workspace.test'
+_KiWwwBOIEeOQfY3M4mNcSA	// kind: 'test' name: 'AddVerificationIntoTestCase' path: 'ECL_IDE_module/selfAUTTests/verifications/Time/AddVerificationIntoTestCase.test'
+_rjE6IBZzEeWfXuiNKOMhqw	// kind: 'test' name: 'Allow/Not Alow Uncaptured Children' path: 'ECL_IDE_module/selfAUTTests/verifications/TableTree/Allow_Not Alow Uncaptured Children.test'
+_BRzvUauEEeCWRZbw2IzBOQ	// kind: 'test' name: 'CheckResourceModifications' path: 'platform_tests/q7Explorer/CheckResourceModifications.test'
+_NuUnkD2QEeSxD9UFwnFS6w	// kind: 'test' name: 'Encrypt passwords during test recording' path: 'platform_tests/selfAUTTests/Encrypt passwords during test recording.test'
+_KSuaANiJEeSXouPau0KnWQ	// kind: 'test' name: 'FormToolkitRecording' path: 'platform_tests/Recording/EclipseForms/FormToolkitRecording.test'
 
 ------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/ResumeDebugging.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/ResumeDebugging.test
index 0e9647d29..74c3c1ff3 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/ResumeDebugging.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/ResumeDebugging.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _3L6JYNY5EeG4bYZCjcRwJg
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 4:27 PM
+Runtime-Version: 2.4.2.qualifier
+Save-Time: 4/24/19 12:11 PM
 Tags: selfAUT, Debug
 Testcase-Type: ecl
 
@@ -58,11 +58,13 @@ with [get-button "Resume (F8)"] {
 
 get-button "Resume (F8)" | click
 get-button "RCPTT perspective" | click
-with [get-view "Execution View"] {
-    get-tree | get-property itemCount | equals 1 | verify-true
-    get-label -after [get-label "Runs:"] | get-property caption | equals "1/1" | verify-true
-    get-label -after [get-label "Stops:"]  | get-property caption | equals 0 | verify-true
-    get-label -after [get-label "Failures:"] | get-property caption | equals 0 | verify-true
+try -times 20 -delay 1000 -command {
+	with [get-view "Execution View"] {
+	    get-tree | get-property itemCount | equals 1 | verify-true
+	    get-label -after [get-label "Runs:"] | get-property caption | equals "1/1" | verify-true
+	    get-label -after [get-label "Stops:"]  | get-property caption | equals 0 | verify-true
+	    get-label -after [get-label "Failures:"] | get-property caption | equals 0 | verify-true
+	}
 }
 
 
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Step Return.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Step Return.test
index 1b1fa2c66..37252fc7b 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Step Return.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/Set Breakpoint In Proc_Step Into_Step Return.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _pLS-0CBTEeOjX5Yww5t2_A
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 4:44 PM
+Runtime-Version: 2.4.2.qualifier
+Save-Time: 4/24/19 12:12 PM
 Tags: selfAUT, Debug
 Testcase-Type: ecl
 
@@ -55,7 +55,9 @@ with [get-view Debug | get-tree] {
         click
         click
         click
-        click
+        try -times 5 -delay 1000 -command {
+	        click
+	    }
         click
     }
 
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointByShortKey.test b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointByShortKey.test
index 2c1e44d06..39c6dbe5a 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointByShortKey.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/debugging/SetBreakpointByShortKey.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: http://jira4.xored.com/browse/QS-1696
 Id: _uxBnMDv7EeGWcueqnS9xrA
-Runtime-Version: 2.0.0.201505131625
-Save-Time: 5/14/15 4:49 PM
+Runtime-Version: 2.4.2.qualifier
+Save-Time: 4/24/19 12:13 PM
 Tags: selfAUT, Debug
 Testcase-Type: ecl
 
@@ -43,7 +43,7 @@ with [get-editor CreateJavaProject | get-section Script | get-text-viewer] {
 }
 exec-with-options -disableJobWaiting -command {
 	get-view "Test Explorer" | get-tree | select "MyProject/CreateJavaProject" | get-menu "Debug As/.* Test Cases" | click
-	try -times 100 -delay 100 -command {
+	try -times 20 -delay 1000 -command {
 		get-view Debug | get-tree 
     | get-item "CreateJavaProject \\[RCPTT Test Suite\\]/CreateJavaProject/ECL Thread/get-button \\(CreateJavaProject: 6\\)" 
     | get-property caption | equals "get-button (CreateJavaProject: 6)" | verify-true
diff --git a/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/RunFailedTestCases.test b/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/RunFailedTestCases.test
index 4b012024d..c2883502c 100644
--- a/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/RunFailedTestCases.test
+++ b/rcpttTests/ECL_IDE_module/selfAUTTests/executionView/RunFailedTestCases.test
@@ -1,14 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
 Contexts: _ymiyse5IEeCU6db9MgIBkA,_bbpo0a2vEeCqpoE1MJ1fFQ,_18rr8K25EeCZfrGRg7GXDg
 Element-Name: RunFailedTestCases
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _vI7vQPMdEeCE19s6EOk3LA
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:04 PM
+Runtime-Version: 2.4.2.qualifier
+Save-Time: 4/24/19 12:10 PM
 Tags: selfAUT, Runtime, TestCase, ExecutionView
 Testcase-Type: ecl
 
@@ -40,8 +39,9 @@ with [get-view "Test Explorer" | get-tree] {
     select "q7project/simpleTest1" "q7project/simpleTest2" "q7project/simpleTest3"
     get-menu "Run As/1 Test Cases" | click
 }
-wait 10000
-get-view "Execution View" | get-button "Run Failed Test Cases" | click
+try -times 20 -delay 1000 -command {
+	get-view "Execution View" | get-button "Run Failed Test Cases" | click
+}
 with [get-view "Execution View"] {
     get-label "1/1" | get-property caption | equals "1/1" | verify-true
     get-tree | get-item "simpleTest2.*" | get-property caption | equals "simpleTest2.*" 
diff --git a/rcpttTests/contexts/SetupAUTMockup.ctx b/rcpttTests/contexts/SetupAUTMockup.ctx
index dd9d943ef..42e183ce3 100644
--- a/rcpttTests/contexts/SetupAUTMockup.ctx
+++ b/rcpttTests/contexts/SetupAUTMockup.ctx
@@ -5,8 +5,8 @@ Element-Name: SetupAUTMockup
 Element-Type: context
 Element-Version: 2.0
 Id: _cQEZwD2QEeSxD9UFwnFS6w
-Runtime-Version: 1.5.3.201409120955
-Save-Time: 9/18/14 4:23 PM
+Runtime-Version: 2.4.2.201904300817
+Save-Time: 4/30/19 8:24 PM
 
 ------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
 Content-Type: text/ecl
@@ -23,7 +23,7 @@ proc "has-property" [val control -input] [val property] {
 
 //invoke-AUT selfQ7Mockups -args "-nosplash" -vmargs "-Xmx512m -XX:MaxPermSize=256m"
 invoke-AUT mockupsQ7 -inject [site-injection "https://hudson.eclipse.org/rcptt/job/mockups/lastSuccessfulBuild/artifact/repository/target/repository/"]
- -args "-nosplash" -vmargs "-Xmx512m -XX:MaxPermSize=256m"
+ -args "-nosplash" -vmargs "-Xmx512m"
 
 
 loop [val count 0] {
diff --git a/rcpttTests/eclipse_base/working_sets/project_explorer/view_menu/ActivateWorkingSetViaProjectExplorerViewMenu.test b/rcpttTests/eclipse_base/working_sets/project_explorer/view_menu/ActivateWorkingSetViaProjectExplorerViewMenu.test
new file mode 100644
index 000000000..1b90e1b2e
--- /dev/null
+++ b/rcpttTests/eclipse_base/working_sets/project_explorer/view_menu/ActivateWorkingSetViaProjectExplorerViewMenu.test
@@ -0,0 +1,55 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _F4UGQGHLEemi1p1zI885UA,_F4fFYGHLEemi1p1zI885UA
+Element-Name: ActivateWorkingSetViaProjectExplorerViewMenu
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: 
+Id: _EEhNYGHLEemi1p1zI885UA
+Runtime-Version: 2.4.2.qualifier
+Save-Time: 4/22/19 11:57 AM
+Testcase-Type: ecl
+Verifications: _UnfUID8XEeSyDoCDFnaFCg
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+get-button "View Menu" | click
+with [get-view "Project Explorer"] {
+  get-menu -path "Top Level Elements/Working Sets" | click
+  get-menu -path "Select Working Set..." | click
+}
+with [get-window "Select Working Set"] {
+    try -command {
+	    with [get-table] {
+	        get-item -path ws1 | check
+	    } 
+	} -catch  {
+        get-button "New..." | click
+    	with [get-window "New Working Set"] {
+	        get-table | select Resource | double-click
+	        get-editbox -after [get-label "Working set name:"] | set-text ws1
+	        get-button Finish | click
+	    }
+	    with [get-table] {
+	        get-item -path ws1 | check
+	    } 
+    }
+    get-button OK | click
+}
+get-button "View Menu" | click
+get-view "Project Explorer" | get-menu -path "Edit Active Working Set..." | click
+with [get-window "Edit Working Set"] {
+    with [get-tree] {
+        get-item -path belongsToWs1 | check
+        select belongsToWs1
+    }
+    get-button Finish | click
+}
+with [get-view "Project Explorer"] {
+	get-menu -path "Deselect Working Set" | click
+	get-menu -path ".* ws1" | click
+    get-tree | select "ws1.*/belongsToWs1.*"
+}
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/eclipse_base/working_sets/project_explorer/view_menu/OneGeneralProject.ctx b/rcpttTests/eclipse_base/working_sets/project_explorer/view_menu/OneGeneralProject.ctx
new file mode 100644
index 000000000..7d1d3189d
--- /dev/null
+++ b/rcpttTests/eclipse_base/working_sets/project_explorer/view_menu/OneGeneralProject.ctx
@@ -0,0 +1,32 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.workspace
+Element-Name: OneGeneralProject
+Element-Type: context
+Element-Version: 2.0
+Id: _F4UGQGHLEemi1p1zI885UA
+Runtime-Version: 2.4.2.201904041327
+Save-Time: 4/18/19 6:14 PM
+
+------=_contents/belongsToWs1/.project-8b5bb6dc-cbfb-3a84-a985-baf5d23e5f3f
+Content-Type: q7/binary
+Entry-Name: contents/belongsToWs1/.project
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAABVjsEOgjAQRM/yFaR3
+rdw8lHIx/IAYz1A2pKbdbbrF+PlWVCK3NzM7m1HN07vyAZEtYS2qw1GUgIZGi1Mtrl27P4lGFypEuoNJ
+Z2ATbUj5WBc7hb0HPYAjnLijG1dKLlaODHkPmLSSP8rm9wu/Wf6LYbZuvAQwS7JR2Kc5wqey8treDHoB
+UEsHCEw2ItWFAAAAzQAAAFBLAQIUABQACAgIAAAAIQBMNiLVhQAAAM0AAAAIAAkAAAAAAAAAAAAAAAAA
+AAAuY29udGVudFVUBQABAAAAAFBLBQYAAAAAAQABAD8AAADEAAAAAAA=
+------=_contents/belongsToWs1/.project-8b5bb6dc-cbfb-3a84-a985-baf5d23e5f3f--
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf
+Content-Type: q7/binary
+Entry-Name: .q7.content
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVkE1LxDAQhu/9FWHu
+JlYUSmm7iGhdUFRwWW9Ss7M1mi+SaIu/3nS36VW8zQzP+wwz1WpUknyj88LoGnJ6CgQ1Nzuh+xq+wv6k
+gFWTVcb1FLkU1iN13IZAeRjpYNyntx3HcpuqK6MDjoGMSpSL9mzSxkXal3Few3sItmRsGAZqVE+jnL3c
+rxPyx64lnpgpfuBY5NjCAdGdivSDxhY1uk4+OvOBPAARuxpeb8437VN7e3eNSuQ2/1kXxcXmEpqMkIpP
+V+gw1bGzx5yfhW8oje79s9n6HI5IhPZCYiLonAA2G1hSHOxs0Vfsv49tsl9QSwcIGgi71O0AAACzAQAA
+UEsBAhQAFAAICAgAAAAhABoIu9TtAAAAswEAAAgACQAAAAAAAAAAAAAAAAAAAC5jb250ZW50VVQFAAEA
+AAAAUEsFBgAAAAABAAEAPwAAACwBAAAAAA==
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf--
diff --git a/rcpttTests/eclipse_base/working_sets/project_explorer/view_menu/OnlyProjectExplorer.ctx b/rcpttTests/eclipse_base/working_sets/project_explorer/view_menu/OnlyProjectExplorer.ctx
new file mode 100644
index 000000000..d9ac627e7
--- /dev/null
+++ b/rcpttTests/eclipse_base/working_sets/project_explorer/view_menu/OnlyProjectExplorer.ctx
@@ -0,0 +1,22 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.workbench
+Element-Name: OnlyProjectExplorer
+Element-Type: context
+Element-Version: 2.0
+Id: _F4fFYGHLEemi1p1zI885UA
+Runtime-Version: 2.4.2.201904041327
+Save-Time: 4/18/19 6:14 PM
+
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf
+Content-Type: q7/binary
+Entry-Name: .q7.content
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVkMtKxDAUhvd9ipC9
+iRWFUtIOIjNaUJyN6Kykpmc60SYnJOlFn96M0lEGXLg9//dfOGIx6Y4M4LxCU9CUnVICRmKjTFvQPmxP
+MrooE4GuZSA7ZT0wJ20IzEswtVOYP6J7e4me3RWaAFMgk1b5IfFsnxg7jM/jvaC7EGzO+TiODHXLYi5/
+uqtm5O+ag3OW984vhGtsoOMzGP3ogBJTayjovene1w5fQYblZLuoOEpUU9Dn1fl2tbm+uV2CVqlNP6os
+u3i4pMTG5TbiaoAqcr8X9Yo58Ng7CesfipYJIWJQMPryiDb1oNo6oGNHGwT/5hPB//HZMvkEUEsHCJ8d
+Z0b3AAAArwEAAFBLAQIUABQACAgIAAAAIQCfHWdG9wAAAK8BAAAIAAkAAAAAAAAAAAAAAAAAAAAuY29u
+dGVudFVUBQABAAAAAFBLBQYAAAAAAQABAD8AAAA2AQAAAAA=
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf--
diff --git a/rcpttTests/platform_tests/dialogs/TestOptionsPopup.test b/rcpttTests/platform_tests/dialogs/TestOptionsPopup.test
index 0c311faff..68ecdebec 100644
--- a/rcpttTests/platform_tests/dialogs/TestOptionsPopup.test
+++ b/rcpttTests/platform_tests/dialogs/TestOptionsPopup.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _3eCdMFXJEeSTRuu0NM-TtA
-Runtime-Version: 2.2.0.qualifier
-Save-Time: 5/22/17 11:44 AM
+Runtime-Version: 2.4.2.qualifier
+Save-Time: 4/24/19 12:31 PM
 Tags: Dialog, ControlPanel
 Testcase-Type: ecl
 
@@ -36,7 +36,7 @@ with [get-window New] {
     get-tree | select "General/File"
     get-button "Next >" | click
 }
-with [get-window "New File"] {
+with [get-window ".*New File"] {
     get-editbox -after [get-label "File name:"] | set-text Text
     get-button Finish | click
 }
diff --git a/rcpttTests/platform_tests/q7Explorer/CheckResourceModifications.test b/rcpttTests/platform_tests/q7Explorer/CheckResourceModifications.test
index b5699563e..ad214636c 100644
--- a/rcpttTests/platform_tests/q7Explorer/CheckResourceModifications.test
+++ b/rcpttTests/platform_tests/q7Explorer/CheckResourceModifications.test
@@ -1,14 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
 Contexts: _tlWZcGphEeCzId1Gnkds9A,_4zI9AWpgEeCzId1Gnkds9A
 Element-Name: CheckResourceModifications
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _BRzvUauEEeCWRZbw2IzBOQ
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:10 PM
+Runtime-Version: 2.4.2.qualifier
+Save-Time: 4/24/19 11:26 AM
 Tags: Create, Delete, Q7Explorer
 Testcase-Type: ecl
 
@@ -59,7 +58,7 @@ with [get-window New] {
     get-tree | select "General/File"
     get-button "Next >" | click
 }
-with [get-window "New File"] {
+with [get-window ".*New File"] {
     get-editbox -after [get-label "File name:"] | set-text file
     get-button Finish | click
 }
diff --git a/rcpttTests/platform_tests/selfAUTTests/Bug444899_Preferences dialog can't be closed by Workbench context or with Cancel button once RCPTT ECL Editor preference is changed_.test b/rcpttTests/platform_tests/selfAUTTests/Bug444899_Preferences dialog can't be closed by Workbench context or with Cancel button once RCPTT ECL Editor preference is changed_.test
index 857296541..35f5f4359 100644
--- a/rcpttTests/platform_tests/selfAUTTests/Bug444899_Preferences dialog can't be closed by Workbench context or with Cancel button once RCPTT ECL Editor preference is changed_.test
+++ b/rcpttTests/platform_tests/selfAUTTests/Bug444899_Preferences dialog can't be closed by Workbench context or with Cancel button once RCPTT ECL Editor preference is changed_.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: https://bugs.eclipse.org/bugs/show_bug.cgi?id=444899
 Id: _2o--AHl3EeSxJeam03ptGg
-Runtime-Version: 2.0.0.201505142314
-Save-Time: 5/15/15 11:36 AM
+Runtime-Version: 2.4.2.qualifier
+Save-Time: 4/24/19 12:01 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -39,10 +39,13 @@ get-view "Test Explorer" | get-tree | select "Project/OpenDialog" | double-click
 get-editor OpenDialog | get-button Replay | click
 get-view "Test Explorer" | get-tree | select "Project/WbContext" | double-click
 get-editor WbContext | get-button Apply | click
-get-view "Execution View" | get-editbox -after [get-label "Message:"] | get-property text 
+with [get-view "Execution View"] {
+  maximize
+  get-editbox -after [get-label "Message:"] | get-property text 
     | equals "Failed to execute context: WbContext Cause: Failed to close dialogs\n"
     + "  Failed to close dialogs\n"
     + "    My Title" | verify-true
+}
     
     
 get-aut "mockupsQ7" | eval {
diff --git a/rcpttTests/platform_tests/toolbar/CreateNewObjectFromToolbar.test b/rcpttTests/platform_tests/toolbar/CreateNewObjectFromToolbar.test
index 5c9f09fb3..8333537ac 100644
--- a/rcpttTests/platform_tests/toolbar/CreateNewObjectFromToolbar.test
+++ b/rcpttTests/platform_tests/toolbar/CreateNewObjectFromToolbar.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _MOxZYM71EeCw4ppgsBRMGg
-Runtime-Version: 1.5.3.201409120955
-Save-Time: 9/24/14 2:11 PM
+Runtime-Version: 2.4.2.qualifier
+Save-Time: 4/23/19 9:05 PM
 Tags: Toolbar, Create, Context, TestCase, TestSuite, Folder, Project
 Testcase-Type: ecl
 
@@ -122,6 +122,7 @@ get-editor WS
 get-editor TestSuite | get-property active | equals true | verify-true
 
 with [get-view "Test Explorer" | get-tree] {
+	expand-all // Workaround for Common Navigator Framework bug that fails to show label for some resources
     get-item TestProject | get-property childCount | equals 4 | verify-true
     get-property itemCount | equals 1 | verify-true
     get-item "TestProject/Folder" | get-property childCount | equals 1 | verify-true
diff --git a/rcpttTests/pom-base.xml b/rcpttTests/pom-base.xml
index d337a2941..1ca9a14c5 100644
--- a/rcpttTests/pom-base.xml
+++ b/rcpttTests/pom-base.xml
@@ -35,7 +35,7 @@
 
   <properties>
     <rcptt-maven-group>org.eclipse.rcptt</rcptt-maven-group>
-    <rcptt-maven-version>2.4.1-SNAPSHOT</rcptt-maven-version>
+    <rcptt-maven-version>2.4.2-SNAPSHOT</rcptt-maven-version>
     <rcptt-maven-plugin>rcptt-maven-plugin</rcptt-maven-plugin>
     <runner-version>2.4.2-SNAPSHOT</runner-version>
     <autRepository>file://${basedir}/../modules/repository/target/repository</autRepository>
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/internal/ui/player/SWTUIPlayer.java b/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/internal/ui/player/SWTUIPlayer.java
index cd964dcd2..7fa8232e9 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/internal/ui/player/SWTUIPlayer.java
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.swt/src/org/eclipse/rcptt/tesla/internal/ui/player/SWTUIPlayer.java
@@ -978,14 +978,12 @@ public final class SWTUIPlayer {
 				while (lowBound >= 0 && (items[lowBound].getStyle() & SWT.RADIO) != 0
 						&& !items[lowBound].isDisposed()) {
 					items[lowBound].setSelection(false);
-					events.sendEvent(items[lowBound], SWT.Selection);
 					--lowBound;
 				}
 				int upperBound = index + 1;
 				while (upperBound < items.length && (items[upperBound].getStyle() & SWT.RADIO) != 0
 						&& !items[upperBound].isDisposed()) {
 					items[upperBound].setSelection(false);
-					events.sendEvent(items[upperBound], SWT.Selection);
 					++upperBound;
 				}
 			}
diff --git a/testing/org.eclipse.rcptt.testing.ecl/src/org/eclipse/rcptt/testing/InvokeAUTService.java b/testing/org.eclipse.rcptt.testing.ecl/src/org/eclipse/rcptt/testing/InvokeAUTService.java
index c447a90f5..568743c94 100644
--- a/testing/org.eclipse.rcptt.testing.ecl/src/org/eclipse/rcptt/testing/InvokeAUTService.java
+++ b/testing/org.eclipse.rcptt.testing.ecl/src/org/eclipse/rcptt/testing/InvokeAUTService.java
@@ -94,7 +94,7 @@ public class InvokeAUTService implements ICommandService {
 				.createTargetPlatform(location,
 						new NullProgressMonitor());
 
-		platform.setTargetName(cmd.getName());
+		platform.setTargetName(Q7TargetPlatformManager.getTargetPlatformName(cmd.getName()));
 		
 		InjectionConfiguration configuration = InjectionFactory.eINSTANCE.createInjectionConfiguration();
 		configuration.getEntries().addAll(cmd.getInject());