From a04fc455e972348cc4d24dcd6acc5e94eff4706f Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Wed, 16 Nov 2022 09:57:17 -0700
Subject: [PATCH] Update unit tests for modified continuity check Also, make
 testIsContinuous public in AerodynamicCalcutor, primarily for the benefit of
 unit tests.

---
 .../aerodynamics/AerodynamicCalculator.java    |  5 +++++
 .../aerodynamics/BarrowmanCalculator.java      |  5 +++--
 .../aerodynamics/BarrowmanCalculatorTest.java  | 18 +++++++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/core/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java b/core/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java
index 141f78f16..9889a4987 100644
--- a/core/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java
+++ b/core/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java
@@ -67,4 +67,9 @@ public interface AerodynamicCalculator extends Monitorable {
 	 * @return	a new, independent instance of this aerodynamic calculator type
 	 */
 	public AerodynamicCalculator newInstance();
+
+	/**
+	 * Test component assembly for continuity (esp. diameter), and post any needed warnings
+	 */
+	public void testIsContinuous(FlightConfiguration configuration, final RocketComponent component, WarningSet warnings);
 }
diff --git a/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java
index 80f33b99f..ac75e95a4 100644
--- a/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java
+++ b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java
@@ -274,8 +274,9 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
 
 		return assemblyForces;
 	}
-	
-	private void testIsContinuous(FlightConfiguration configuration, final RocketComponent treeRoot, WarningSet warnings ){
+
+	@Override
+	public void testIsContinuous(FlightConfiguration configuration, final RocketComponent treeRoot, WarningSet warnings ){
 		Queue<RocketComponent> queue = new LinkedList<>();
 		for (RocketComponent child : treeRoot.getChildren()) {
 			// Ignore inactive stages
diff --git a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
index 90d8044c0..d113cf003 100644
--- a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
+++ b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
@@ -288,8 +288,10 @@ public class BarrowmanCalculatorTest {
 		Rocket rocket = TestRockets.makeEstesAlphaIII();
 		AerodynamicCalculator calc = new BarrowmanCalculator();
 		FlightConfiguration configuration = rocket.getSelectedConfiguration();
+		WarningSet warnings = new WarningSet();
 		
-		assertTrue("Estes Alpha III should be continuous: ", calc.isContinuous(configuration, rocket));
+		calc.testIsContinuous(configuration, rocket, warnings);
+		assertTrue("Estes Alpha III should be continuous: ", warnings.isEmpty());		
 	}
 	
 	@Test
@@ -297,8 +299,10 @@ public class BarrowmanCalculatorTest {
 		Rocket rocket = TestRockets.makeFalcon9Heavy();
 		AerodynamicCalculator calc = new BarrowmanCalculator();
 		FlightConfiguration configuration = rocket.getSelectedConfiguration();
+		WarningSet warnings = new WarningSet();
 		
-		assertTrue("F9H should be continuous: ", calc.isContinuous(configuration, rocket));
+		calc.testIsContinuous(configuration, rocket, warnings);
+		assertTrue("F9H should be continuous: ", warnings.isEmpty());		
 	}
 	
 	@Test
@@ -306,6 +310,7 @@ public class BarrowmanCalculatorTest {
 		Rocket rocket = TestRockets.makeEstesAlphaIII();
 		AerodynamicCalculator calc = new BarrowmanCalculator();
 		FlightConfiguration configuration = rocket.getSelectedConfiguration();
+		WarningSet warnings = new WarningSet();
 		
 		NoseCone nose = (NoseCone)rocket.getChild(0).getChild(0);
 		BodyTube body = (BodyTube)rocket.getChild(0).getChild(1);
@@ -313,8 +318,9 @@ public class BarrowmanCalculatorTest {
 		nose.setAftRadius(0.015);
 		body.setOuterRadius( 0.012 );
 		body.setName( body.getName()+"  << discontinuous");
-		
-		assertFalse(" Estes Alpha III has an undetected discontinuity:", calc.isContinuous(configuration, rocket));
+
+		calc.testIsContinuous(configuration, rocket, warnings);
+		assertFalse(" Estes Alpha III has an undetected discontinuity:", warnings.isEmpty());		
 	}
 	
 	@Test
@@ -322,6 +328,7 @@ public class BarrowmanCalculatorTest {
 		Rocket rocket = TestRockets.makeFalcon9Heavy();
 		AerodynamicCalculator calc = new BarrowmanCalculator();
 		FlightConfiguration configuration = rocket.getSelectedConfiguration();
+		WarningSet warnings = new WarningSet();
 		
 		final AxialStage coreStage = (AxialStage)rocket.getChild(1);
 		final ParallelStage booster = (ParallelStage)coreStage.getChild(0).getChild(0);
@@ -333,7 +340,8 @@ public class BarrowmanCalculatorTest {
 		body.setOuterRadius( 0.012 );
 		body.setName( body.getName()+"  << discontinuous");
 		
-		assertFalse(" Missed discontinuity in Falcon 9 Heavy:", calc.isContinuous(configuration, rocket));
+		calc.testIsContinuous(configuration, rocket, warnings);
+		assertFalse(" Missed discontinuity in Falcon 9 Heavy:" , warnings.isEmpty());		
 	}
 
 	@Test