diff --git a/core/test/net/sf/openrocket/rocketcomponent/FlightConfigurationTest.java b/core/test/net/sf/openrocket/rocketcomponent/FlightConfigurationTest.java index 09e38984b..a0810549d 100644 --- a/core/test/net/sf/openrocket/rocketcomponent/FlightConfigurationTest.java +++ b/core/test/net/sf/openrocket/rocketcomponent/FlightConfigurationTest.java @@ -585,6 +585,24 @@ public class FlightConfigurationTest extends BaseTestCase { Rocket rocket = TestRockets.makeFalcon9Heavy(); FlightConfiguration selected = rocket.getSelectedConfiguration(); + // Test only motors + selected.setName("[{motors}]"); + + selected.setAllStages(); + assertEquals("[[Rocket.motorCount.noStageMotors]; M1350-0; 4\u00D7G77-0]", selected.getName()); + + // Test only manufacturers + selected.setName("[{manufacturers}]"); + + selected.setAllStages(); + assertEquals("[[Rocket.motorCount.noStageMotors]; AeroTech; 4\u00D7AeroTech]", selected.getName()); + + // Test only cases + selected.setName("[{cases}]"); + + selected.setAllStages(); + assertEquals("[[Rocket.motorCount.noStageMotors]; SU 75/512; 4×SU 29/180]", selected.getName()); + // Test only motors or only manufacturers selected.setName("[{motors}] - [{manufacturers}]"); @@ -634,6 +652,12 @@ public class FlightConfigurationTest extends BaseTestCase { selected._setStageActive(0, false); assertEquals("[; AeroTech | M1350-0; 4\u00D7AeroTech | G77-0]", selected.getName()); + // Test combination of motors, manufacturers and cases + selected.setName("[{motors manufacturers | cases}]"); + + selected.setAllStages(); + assertEquals("[[Rocket.motorCount.noStageMotors]; M1350-0 AeroTech | SU 75/512; 4×G77-0 AeroTech | SU 29/180]", selected.getName()); + // Test empty tags selected.setName("{}");