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

update unit tests to match new motor code (also fixed a couple bugs the

Browse Source 
unittests turned up!)
This commit is contained in:
JoePfeiffer 2021-09-25 14:20:06 -06:00
parent a17f6d9b1a
commit 3d0396bc00
5 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/net/sf/openrocket/database/motor/ThrustCurveMotorSet.java
View File

@ -221,7 +221,7 @@ public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
return false;
}
if (!designation.equalsIgnoreCase(m.getDesignation()))
if (!commonName.equalsIgnoreCase(m.getCommonName()))
return false;
if (caseInfo != null && !caseInfo.equalsIgnoreCase(m.getCaseInfo()))
@ -348,11 +348,12 @@ public class ThrustCurveMotorSet implements Comparable<ThrustCurveMotorSet> {
@Override
public int compare(ThrustCurveMotor o1, ThrustCurveMotor o2) {
// 1. Designation
if (!o1.getDesignation().equals(o2.getDesignation())) {
return o1.getDesignation().compareTo(o2.getDesignation());
}
// 2. Number of data points (more is better)
if (o1.getSampleSize() != o2.getSampleSize()) {
return o2.getSampleSize() - o1.getSampleSize();

2
core/src/net/sf/openrocket/motor/DesignationComparator.java
View File

@ -90,4 +90,4 @@ public class DesignationComparator implements Comparator<String> {
return COLLATOR.compare(o1, o2);
}
}
}
}

4
core/src/net/sf/openrocket/motor/ThrustCurveMotor.java
View File

@ -158,7 +158,7 @@ public class ThrustCurveMotor implements Motor, Comparable<ThrustCurveMotor>, Se
* @return the simplified designation, or the string itself if the format was not detected
*/
private static final Pattern SIMPLIFY_PATTERN = Pattern.compile("^[0-9]*[ -]*([A-Z][0-9]+).*");
static String simplifyDesignation(String str) {
public static String simplifyDesignation(String str) {
str = str.trim();
Matcher m = SIMPLIFY_PATTERN.matcher(str);
if (m.matches()) {
@ -244,7 +244,7 @@ public class ThrustCurveMotor implements Motor, Comparable<ThrustCurveMotor>, Se
// If I don't have a motor common name (will be the case if I read the thrustcurve from a flle)
// apply the motor code simplification heuristics to generate a common name
if (motor.commonName.equals("")) {
motor.commonName = motor.designation;
motor.commonName = simplifyDesignation(motor.designation);
}

38
core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java
View File

@ -22,6 +22,7 @@ public class ThrustCurveMotorSetTest {
private static final ThrustCurveMotor motor1 = new ThrustCurveMotor.Builder()
.setManufacturer(Manufacturer.getManufacturer("A"))
.setCommonName("F12")
.setDesignation("F12X")
.setDescription("Desc")
.setMotorType(Motor.Type.UNKNOWN)
@ -36,6 +37,7 @@ public class ThrustCurveMotorSetTest {
private static final ThrustCurveMotor motor2 = new ThrustCurveMotor.Builder()
.setManufacturer(Manufacturer.getManufacturer("A"))
.setCommonName("F12")
.setDesignation("F12H")
.setDescription("Desc")
.setMotorType(Motor.Type.SINGLE)
@ -50,7 +52,7 @@ public class ThrustCurveMotorSetTest {
private static final ThrustCurveMotor motor3 = new ThrustCurveMotor.Builder()
.setManufacturer(Manufacturer.getManufacturer("A"))
.setDesignation("F12")
.setCode("F12")
.setDescription("Desc")
.setMotorType(Motor.Type.UNKNOWN)
.setStandardDelays(new double[] { 0, Motor.PLUGGED_DELAY })
@ -65,7 +67,7 @@ public class ThrustCurveMotorSetTest {
private static final ThrustCurveMotor motor4 = new ThrustCurveMotor.Builder()
.setManufacturer(Manufacturer.getManufacturer("A"))
.setDesignation("F12")
.setDesignation("Desc")
.setDescription("Desc")
.setMotorType(Motor.Type.HYBRID)
.setStandardDelays(new double[] { 0 })
.setDiameter(0.024)
@ -75,20 +77,7 @@ public class ThrustCurveMotorSetTest {
.setCGPoints(new Coordinate[] { Coordinate.NUL, Coordinate.NUL, Coordinate.NUL })
.setDigest("digestD")
.build();
@Test
public void testSimplifyDesignation() {
assertEquals("J115", ThrustCurveMotorSet.simplifyDesignation("J115"));
assertEquals("J115", ThrustCurveMotorSet.simplifyDesignation(" J115 "));
assertEquals("H115", ThrustCurveMotorSet.simplifyDesignation("241H115-KS"));
assertEquals("J115", ThrustCurveMotorSet.simplifyDesignation("384 J115"));
assertEquals("J115", ThrustCurveMotorSet.simplifyDesignation("384-J115"));
assertEquals("A2", ThrustCurveMotorSet.simplifyDesignation("A2T"));
assertEquals("1/2A2T", ThrustCurveMotorSet.simplifyDesignation("1/2A2T"));
assertEquals("MicroMaxxII", ThrustCurveMotorSet.simplifyDesignation("Micro Maxx II"));
}
@Test
public void testAdding() {
ThrustCurveMotorSet set = new ThrustCurveMotorSet();
@ -108,7 +97,7 @@ public class ThrustCurveMotorSetTest {
assertEquals(1, set.getMotors().size());
assertEquals(motor1, set.getMotors().get(0));
assertEquals(Collections.emptyList(), set.getDelays());
// Add motor1 again
assertTrue(set.matches(motor1));
set.addMotor(motor1);
@ -120,12 +109,12 @@ public class ThrustCurveMotorSetTest {
assertEquals(1, set.getMotors().size());
assertEquals(motor1, set.getMotors().get(0));
assertEquals(Collections.emptyList(), set.getDelays());
// Add motor2
assertTrue(set.matches(motor2));
set.addMotor(motor2);
assertEquals(motor1.getManufacturer(), set.getManufacturer());
assertEquals(motor3.getDesignation(), set.getDesignation());
assertEquals(motor3.getCommonName(), set.getCommonName());
assertEquals(Motor.Type.SINGLE, set.getType());
assertEquals(motor1.getDiameter(), set.getDiameter(), 0.00001);
assertEquals(motor1.getLength(), set.getLength(), 0.00001);
@ -133,21 +122,26 @@ public class ThrustCurveMotorSetTest {
assertEquals(motor2, set.getMotors().get(0));
assertEquals(motor1, set.getMotors().get(1));
assertEquals(Arrays.asList(5.0), set.getDelays());
// Add motor3
assertTrue(set.matches(motor3));
set.addMotor(motor3);
assertEquals(motor1.getManufacturer(), set.getManufacturer());
assertEquals(motor3.getDesignation(), set.getDesignation());
assertEquals(motor3.getCommonName(), set.getCommonName());
assertEquals(Motor.Type.SINGLE, set.getType());
assertEquals(motor1.getDiameter(), set.getDiameter(), 0.00001);
assertEquals(motor1.getLength(), set.getLength(), 0.00001);
assertEquals(3, set.getMotors().size());
System.out.println("motor set");
System.out.println(set.getMotors());
System.out.println(motor3);
System.out.println(motor2);
System.out.println(motor1);
assertEquals(motor3, set.getMotors().get(0));
assertEquals(motor2, set.getMotors().get(1));
assertEquals(motor1, set.getMotors().get(2));
assertEquals(Arrays.asList(0.0, 5.0, Motor.PLUGGED_DELAY), set.getDelays());
// Test that adding motor4 fails
assertFalse(set.matches(motor4));
try {

12
core/test/net/sf/openrocket/motor/ThrustCurveMotorTest.java
View File

@ -186,4 +186,16 @@ public class ThrustCurveMotorTest {
}
@Test
public void testSimplifyDesignation() {
assertEquals("J115", ThrustCurveMotor.Builder.simplifyDesignation("J115"));
assertEquals("J115", ThrustCurveMotor.Builder.simplifyDesignation(" J115 "));
assertEquals("H115", ThrustCurveMotor.Builder.simplifyDesignation("241H115-KS"));
assertEquals("J115", ThrustCurveMotor.Builder.simplifyDesignation("384 J115"));
assertEquals("J115", ThrustCurveMotor.Builder.simplifyDesignation("384-J115"));
assertEquals("A2", ThrustCurveMotor.Builder.simplifyDesignation("A2T"));
assertEquals("1/2A2T", ThrustCurveMotor.Builder.simplifyDesignation("1/2A2T"));
assertEquals("MicroMaxxII", ThrustCurveMotor.Builder.simplifyDesignation("Micro Maxx II"));
}
}