From 6b23576c340ea03bc87c0da5a2181db484e048de Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Sun, 26 Jun 2022 00:00:44 +0200
Subject: [PATCH] Fix unit tests Because of the new behavior 'disable
 sub-stages when parent stage is disabled', some unit tests needed to be
 rewritten

---
 .../rocketcomponent/FlightConfiguration.java  | 29 ++++++++++++++-----
 .../FlightConfigurationTest.java              |  1 -
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index f94a34325..7bb3cfae3 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -179,23 +179,26 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	 */
 	public void setOnlyStage(final int stageNumber) {
 		_setAllStages(false);
-		_setStageActive(stageNumber, true);
+		_setStageActive(stageNumber, true, false);
 		updateMotors();
 		updateActiveInstances();
 	}
-	
-	/** 
+
+	/**
 	 * This method flags the specified stage as requested.  Other stages are unaffected.
-	 * 
+	 *
 	 * @param stageNumber   stage number to flag
 	 * @param _active       inactive (<code>false</code>) or active (<code>true</code>)
+	 * @param activateSubStages whether the sub-stages of the specified stage should be activated as well.
 	 */
-	public void _setStageActive(final int stageNumber, final boolean _active ) {
+	public void _setStageActive(final int stageNumber, final boolean _active, final boolean activateSubStages) {
 		if ((0 <= stageNumber) && (stages.containsKey(stageNumber))) {
 			stages.get(stageNumber).active = _active;
-			// Set the active state of all the sub-stages as well.
-			for (AxialStage stage : rocket.getStage(stageNumber).getSubStages()) {
-				stages.get(stage.getStageNumber()).active = _active;
+			if (activateSubStages) {
+				// Set the active state of all the sub-stages as well.
+				for (AxialStage stage : rocket.getStage(stageNumber).getSubStages()) {
+					stages.get(stage.getStageNumber()).active = _active;
+				}
 			}
 			fireChangeEvent();
 			return;
@@ -203,6 +206,16 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		log.error("error: attempt to retrieve via a bad stage number: " + stageNumber);
 	}
 	
+	/** 
+	 * This method flags the specified stage as requested.  Actives the sub-stages of the specified stage as well.
+	 * 
+	 * @param stageNumber   stage number to flag
+	 * @param _active       inactive (<code>false</code>) or active (<code>true</code>)
+	 */
+	public void _setStageActive(final int stageNumber, final boolean _active ) {
+		_setStageActive(stageNumber, _active, true);
+	}
+	
 	
 	public void toggleStage(final int stageNumber) {
 		if ((0 <= stageNumber) && (stages.containsKey(stageNumber))) {
diff --git a/core/test/net/sf/openrocket/rocketcomponent/FlightConfigurationTest.java b/core/test/net/sf/openrocket/rocketcomponent/FlightConfigurationTest.java
index 8a69a1ff4..51db91e7d 100644
--- a/core/test/net/sf/openrocket/rocketcomponent/FlightConfigurationTest.java
+++ b/core/test/net/sf/openrocket/rocketcomponent/FlightConfigurationTest.java
@@ -364,7 +364,6 @@ public class FlightConfigurationTest extends BaseTestCase {
 
 		selected.clearAllStages();
 		selected.toggleStage(1);
-		selected.toggleStage(2);
 
 		// vvvv Test Target vvvv
 		InstanceMap instances = selected.getActiveInstances();