hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better compare sim warnings

Browse Source
This commit is contained in:
JoePfeiffer 2024-10-16 06:35:35 -06:00
parent fbaaa8f74c
commit 03acca208a
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/test/java/info/openrocket/core/simulation/FlightEventsTest.java
View File

@ -170,9 +170,25 @@ public class FlightEventsTest extends BaseTestCase {
// time, from the right sources // time, from the right sources
for (int i = 0; i < Math.min(expectedEvents.length, actualEvents.length); i++) { for (int i = 0; i < Math.min(expectedEvents.length, actualEvents.length); i++) {
final FlightEvent expected = expectedEvents[i]; final FlightEvent expected = expectedEvents[i];
Warning expectedWarning = null;
if (expected.getType() == FlightEvent.Type.SIM_WARN) {
expectedWarning = (Warning) expected.getData();
}
final FlightEvent actual = actualEvents[i]; final FlightEvent actual = actualEvents[i];
Warning actualWarning = null;
if (actual.getType() == FlightEvent.Type.SIM_WARN) {
actualWarning = (Warning) actual.getData();
}
assertTrue(((expectedWarning == null) && (actualWarning == null)) ||
((expectedWarning != null) && expectedWarning.equals(actualWarning)) ||
((actualWarning != null) && actualWarning.equals(expectedWarning)),
"Branch " + branchNo + " FlightEvent " + i + ": " + expectedWarning
+ " not found; " + actualWarning + " found instead");
assertSame(expected.getType(), actual.getType(), assertSame(expected.getType(), actual.getType(),
"Branch " + branchNo + " FlightEvent " + i + " type " + expected.getType() "Branch " + branchNo + " FlightEvent " + i + ": type " + expected.getType()
+ " not found; FlightEvent " + actual.getType() + " found instead"); + " not found; FlightEvent " + actual.getType() + " found instead");
if (1200 != expected.getTime()) { if (1200 != expected.getTime()) {