Merge branch 'release/2.8'

Author: basilevs

launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunch.java

@@ -441,9 +441,14 @@ public void restart() {
 		try {
 			setState(AutLaunchState.RESTART);
 			ILaunchConfiguration launchConfiguration = launch.getLaunchConfiguration();
-			final ILaunchConfigurationWorkingCopy copy = launchConfiguration.getWorkingCopy();
-			LaunchInfoCache.copyCache(launchConfiguration, copy);
-			LaunchInfoCache.remove(launchConfiguration);
+			final ILaunchConfigurationWorkingCopy copy;
+			if (launchConfiguration instanceof ILaunchConfigurationWorkingCopy w) {
+				copy = w;
+			} else {
+				copy = launchConfiguration.getWorkingCopy();
+				LaunchInfoCache.copyCache(launchConfiguration, copy);
+				LaunchInfoCache.remove(launchConfiguration);
+			}
 			// To disable clear area during restart
 			boolean configClearArea = copy.getAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, false);
 			copy.setAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, false);
@@ -460,7 +465,6 @@ public void restart() {
 			copy.setAttribute(IPDEConstants.RESTART, false);
 			copy.setAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, configClearArea);
 			copy.setAttribute(IQ7Launch.ATTR_AUT_ID, "");
-			copy.doSave();
 			BaseAutManager.INSTANCE.handleRestart(BaseAutLaunch.this, oldLaunch, launch);
 		} catch (Exception e) {
 			terminated(e);

launching/tests/org.eclipse.rcptt.launching.ext.tests/src/org/eclipse/rcptt/launching/ext/Q7ExternalLaunchDelegateTest.java

@@ -12,10 +12,7 @@
 
 import static java.lang.System.currentTimeMillis;
 import static java.nio.file.Files.isDirectory;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -141,6 +139,8 @@ public void runtimeIsInjected() throws CoreException, IOException, InterruptedEx
 	public void surviveRestart() throws InterruptedException, CoreException, IOException {
 		Path installDir = expandAut();
 		AutLaunch launch = startAut(installDir, List.of("-consoleLog"));
+		ILaunchConfiguration originalConfiguration = launch.getAut().getConfig();
+		var originalAttributes = new HashMap<>(originalConfiguration.getAttributes());
 		launch.ping();
 		Command command = parse("restart-aut");
 		int attemptCount = Integer.getInteger(Q7ExternalLaunchDelegateTest.class.getName() + ".restartAttempts", 3);
@@ -171,6 +171,7 @@ public void surviveRestart() throws InterruptedException, CoreException, IOExcep
 				}
 			}
 			launch.ping();
+			assertEquals(originalAttributes, originalConfiguration.getAttributes());
 		}
 		assertNoErrorsInOutput();
 	}

rcpttTests/mockups/tests/EmptyWindowInAssertionMode.test

@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _Hgh7cLN3EeSIB87DbOtJCQ
-Runtime-Version: 2.8.0.202602281641
-Save-Time: 3/10/26, 9:28 PM
+Runtime-Version: 2.9.0.qualifier
+Save-Time: 3/17/26, 9:51 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -29,6 +29,8 @@ get-aut "mockupsQ7" | eval {
 get-view Applications | click
 get-button "Record a Snippet" | click
 
+try { get-window "Control Panel - mockupsQ7 [Recording]" } -times 10 -delay 5000
+
 with [get-window "Control Panel - mockupsQ7 [Recording]"] {
     get-button "Switch to Assertion Mode" | click
 }