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

Merge pull request #1804 from JoePfeiffer/tweak-events-test

Browse Source 
Modify Falcon9H test rocket and FlightEventsTest to get predictable results
This commit is contained in:
Joe Pfeiffer 2022-11-09 16:18:12 -07:00 committed by GitHub
commit 884e8edd59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/util/TestRockets.java
View File

@ -217,7 +217,7 @@ public class TestRockets {
.setDiameter(0.029) .setDiameter(0.029)
.setLength(0.124) .setLength(0.124)
.setTimePoints(new double[] { 0, 1, 2 }) .setTimePoints(new double[] { 0, 1, 2 })
.setThrustPoints(new double[] { 0, 1, 0 }) .setThrustPoints(new double[] { 0, 20, 0 })
.setCGPoints(new Coordinate[] { .setCGPoints(new Coordinate[] {
new Coordinate(.062, 0, 0, 0.123),new Coordinate(.062, 0, 0, .0935),new Coordinate(.062, 0, 0, 0.064)}) new Coordinate(.062, 0, 0, 0.123),new Coordinate(.062, 0, 0, .0935),new Coordinate(.062, 0, 0, 0.064)})
.setDigest("digest G77 test") .setDigest("digest G77 test")

8
core/test/net/sf/openrocket/simulation/FlightEventsTest.java
View File

@ -76,10 +76,10 @@ public class FlightEventsTest extends BaseTestCase {
switch (b) { switch (b) {
case 0: case 0:
expectedEventTypes = new FlightEvent.Type[]{FlightEvent.Type.LAUNCH, FlightEvent.Type.IGNITION, FlightEvent.Type.IGNITION, expectedEventTypes = new FlightEvent.Type[]{FlightEvent.Type.LAUNCH, FlightEvent.Type.IGNITION, FlightEvent.Type.IGNITION,
FlightEvent.Type.LIFTOFF, FlightEvent.Type.LAUNCHROD, FlightEvent.Type.APOGEE, FlightEvent.Type.BURNOUT, FlightEvent.Type.LIFTOFF, FlightEvent.Type.LAUNCHROD, FlightEvent.Type.APOGEE,
FlightEvent.Type.BURNOUT, FlightEvent.Type.EJECTION_CHARGE, FlightEvent.Type.EJECTION_CHARGE, FlightEvent.Type.BURNOUT, FlightEvent.Type.EJECTION_CHARGE, FlightEvent.Type.STAGE_SEPARATION,
FlightEvent.Type.STAGE_SEPARATION, FlightEvent.Type.STAGE_SEPARATION, FlightEvent.Type.TUMBLE, FlightEvent.Type.GROUND_HIT, FlightEvent.Type.BURNOUT, FlightEvent.Type.EJECTION_CHARGE, FlightEvent.Type.STAGE_SEPARATION,
FlightEvent.Type.SIMULATION_END}; FlightEvent.Type.TUMBLE, FlightEvent.Type.GROUND_HIT, FlightEvent.Type.SIMULATION_END};
break; break;
case 1: case 1:
case 2: case 2: