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

minor unit test fixes: pstage, finset

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-12-20 12:21:21 -05:00
parent 4a075fcc2e
commit 8e2d4f1b95
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java
View File

@ -3,6 +3,9 @@ package net.sf.openrocket.rocketcomponent;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.Test;
import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.AerodynamicForces;
import net.sf.openrocket.aerodynamics.FlightConditions; import net.sf.openrocket.aerodynamics.FlightConditions;
import net.sf.openrocket.aerodynamics.WarningSet; import net.sf.openrocket.aerodynamics.WarningSet;
@ -18,8 +21,6 @@ import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.LineStyle; import net.sf.openrocket.util.LineStyle;
import net.sf.openrocket.util.BaseTestCase.BaseTestCase; import net.sf.openrocket.util.BaseTestCase.BaseTestCase;
import org.junit.Test;
public class FinSetTest extends BaseTestCase { public class FinSetTest extends BaseTestCase {
@Test @Test
@ -163,7 +164,7 @@ public class FinSetTest extends BaseTestCase {
AerodynamicForces forces = new AerodynamicForces(); AerodynamicForces forces = new AerodynamicForces();
WarningSet warnings = new WarningSet(); WarningSet warnings = new WarningSet();
calc.calculateNonaxialForces(conditions, forces, warnings); calc.calculateNonaxialForces(conditions, forces, warnings);
System.out.println(forces); //System.out.println(forces);
assertEquals(0.023409, forces.getCP().x, 0.0001); assertEquals(0.023409, forces.getCP().x, 0.0001);
} }

35
core/test/net/sf/openrocket/rocketcomponent/ParallelStageTest.java
View File

@ -60,7 +60,6 @@ public class ParallelStageTest extends BaseTestCase {
ParallelStage strapon = new ParallelStage(); ParallelStage strapon = new ParallelStage();
strapon.setName("Booster Stage"); strapon.setName("Booster Stage");
strapon.setAutoRadialOffset(true);
RocketComponent boosterNose = new NoseCone(Transition.Shape.CONICAL, 2.0, tubeRadius); RocketComponent boosterNose = new NoseCone(Transition.Shape.CONICAL, 2.0, tubeRadius);
boosterNose.setName("Booster Nosecone"); boosterNose.setName("Booster Nosecone");
strapon.addChild(boosterNose); strapon.addChild(boosterNose);
@ -76,6 +75,7 @@ public class ParallelStageTest extends BaseTestCase {
strapon.setInstanceCount(3); strapon.setInstanceCount(3);
strapon.setRadialOffset(1.8); strapon.setRadialOffset(1.8);
strapon.setAutoRadialOffset(false);
return strapon; return strapon;
} }
@ -232,7 +232,7 @@ public class ParallelStageTest extends BaseTestCase {
} }
@Test @Test
public void testBoosterInitialization() { public void testBoosterInitializationSimple() {
// setup // setup
RocketComponent rocket = createTestRocket(); RocketComponent rocket = createTestRocket();
AxialStage core = (AxialStage) rocket.getChild(1); AxialStage core = (AxialStage) rocket.getChild(1);
@ -241,12 +241,11 @@ public class ParallelStageTest extends BaseTestCase {
double targetOffset = 0; double targetOffset = 0;
set0.setAxialOffset(Position.BOTTOM, targetOffset); set0.setAxialOffset(Position.BOTTOM, targetOffset);
// vv function under test
set0.setAutoRadialOffset(true);
set0.setInstanceCount(2);
set0.setRadialOffset(4.0);
set0.setAngularOffset(Math.PI / 2);
// vvvv function under test
set0.setInstanceCount(2);
set0.setRadialOffset(4.0);
set0.setAngularOffset(Math.PI / 2);
// ^^ function under test // ^^ function under test
String treeDump = rocket.toDebugTree(); String treeDump = rocket.toDebugTree();
@ -267,6 +266,28 @@ public class ParallelStageTest extends BaseTestCase {
assertEquals(" 'setAngularOffset(double)' failed:\n" + treeDump + " angular offset: ", expectedAngularOffset, angularOffset, EPSILON); assertEquals(" 'setAngularOffset(double)' failed:\n" + treeDump + " angular offset: ", expectedAngularOffset, angularOffset, EPSILON);
} }
@Test
public void testBoosterInitializationAutoRadius() {
// setup
RocketComponent rocket = createTestRocket();
AxialStage core = (AxialStage) rocket.getChild(1);
ParallelStage set0 = createBooster();
core.addChild(set0);
double targetOffset = 0;
set0.setAxialOffset(Position.BOTTOM, targetOffset);
// vvvv function under test
set0.setAutoRadialOffset(true);
set0.setRadialOffset(4.0); // this called will be overriden by the AutoRadialOffset above
// ^^^^ function under test
String treeDump = rocket.toDebugTree();
double expectedRadialOffset = 2.2;
double radialOffset = set0.getRadialOffset();
assertEquals(" 'setRadialOffset(double)' failed: \n" + treeDump + " radial offset: ", expectedRadialOffset, radialOffset, EPSILON);
}
@Test @Test
public void testAddStraponAuto() { public void testAddStraponAuto() {