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

Fix unit test bugs leftover from bump to JUnit 5

Browse Source 
I had to rewrite the unit tests using regex and a Python script (because of the scale of the unit test). That code still contained errors...
This commit is contained in:
SiboVG 2024-02-27 03:18:55 +01:00
parent 46849e14e1
commit 538710c55b
4 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/test/java/info/openrocket/core/l10n/TestResourceBundleTranslator.java
View File

@ -28,18 +28,18 @@ public class TestResourceBundleTranslator {
@Test @Test
public void testSuccessfulDefault() { public void testSuccessfulDefault() {
ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages"); ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages");
assertEquals(Locale.FRENCH, trans.get("debug.currentFile"), "messages_de.properties"); assertEquals("messages_de.properties", trans.get("debug.currentFile"));
} }
@Test @Test
public void testSuccessfulNonDefault() { public void testSuccessfulNonDefault() {
ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages"); ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH);
assertEquals(Locale.US, trans.get("debug.currentFile"), "messages_fr.properties"); assertEquals("messages_fr.properties", trans.get("debug.currentFile"));
} }
@Test @Test
public void testFailure() { public void testFailure() {
ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages"); ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.US);
try { try {
fail("Returned: " + trans.get("missing")); fail("Returned: " + trans.get("missing"));
} catch (MissingResourceException e) { } catch (MissingResourceException e) {
@ -50,15 +50,15 @@ public class TestResourceBundleTranslator {
@Test @Test
public void testGetEnglish() { public void testGetEnglish() {
ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH); ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH);
assertEquals(trans.get("material", "Paper (office)"), "Papier (bureau)"); assertEquals("Papier (bureau)", trans.get("material", "Paper (office)"));
assertEquals(trans.get("material", "Paper (toilet)"), "Paper (toilet)"); assertEquals("Paper (toilet)", trans.get("material", "Paper (toilet)"));
} }
@Test @Test
public void testGetBase() { public void testGetBase() {
ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH); ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH);
assertEquals(trans.getBaseText("material", "Papier (bureau)"), "Paper (office)"); assertEquals("Paper (office)", trans.getBaseText("material", "Papier (bureau)"));
assertEquals(trans.getBaseText("material", "Papier (toilet)"), "Papier (toilet)"); assertEquals("Papier (toilet)", trans.getBaseText("material", "Papier (toilet)"));
} }
} }

8
core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java
View File

@ -80,12 +80,12 @@ public class ParameterSetTest extends BaseTestCase {
FlightConfigurationId fcid2 = new FlightConfigurationId(); FlightConfigurationId fcid2 = new FlightConfigurationId();
// i.e. requesting the value for a non-existent config id should return the // i.e. requesting the value for a non-existent config id should return the
// default // default
assertEquals(testSet.get(fcid2), testSet.getDefault(), "set stores id-value pair correctly : "); assertEquals(testSet.getDefault(), testSet.get(fcid2), "set stores id-value pair correctly : ");
assertEquals(testSet.size(), 0, "set contains wrong number of overrides: "); assertEquals(0, testSet.size(), "set contains wrong number of overrides: ");
FlightConfigurationId fcid_def = FlightConfigurationId.DEFAULT_VALUE_FCID; FlightConfigurationId fcid_def = FlightConfigurationId.DEFAULT_VALUE_FCID;
assertEquals(testSet.get(fcid_def), testSet.getDefault(), "retrieving the via the special default key should produce the default value: "); assertEquals(testSet.getDefault(), testSet.get(fcid_def), "retrieving the via the special default key should produce the default value: ");
assertEquals(testSet.size(), 1, "set should still contain zero overrides: "); assertEquals(0, testSet.size(), "set should still contain zero overrides: ");
} }
@Test @Test

6
core/src/test/java/info/openrocket/core/rocketcomponent/RocketTest.java
View File

@ -37,7 +37,7 @@ public class RocketTest extends BaseTestCase {
assertEquals(config1.getId().key, fcid4.key, "fcids should match: "); assertEquals(config1.getId().key, fcid4.key, "fcids should match: ");
assertEquals(config1.getName(), config4.getName(), "names should match: "); assertEquals(config1.getName(), config4.getName(), "names should match: ");
assertEquals(config4.getName(), "name not right: ", "Test config 1"); assertEquals("Test config 1", config4.getName(), "name not right: ");
assertNotEquals(config1.configurationInstanceId, config4.configurationInstanceId, assertNotEquals(config1.configurationInstanceId, config4.configurationInstanceId,
"Configurations should be different: " + config1.toDebug() + "=?=" + config4.toDebug()); "Configurations should be different: " + config1.toDebug() + "=?=" + config4.toDebug());
@ -132,7 +132,7 @@ public class RocketTest extends BaseTestCase {
assertEquals(actLoc, expLoc, ring.getName() + " not positioned correctly: "); assertEquals(actLoc, expLoc, ring.getName() + " not positioned correctly: ");
} }
{ // second instance { // second instance
assertEquals(ring.getInstanceCount(), 1, ring.getName() + " not instanced correctly: "); assertEquals(ring.getInstanceCount(), 2, ring.getName() + " not instanced correctly: ");
expLoc = new Coordinate(0.245, 0, 0); expLoc = new Coordinate(0.245, 0, 0);
actLoc = actLocs[1]; actLoc = actLocs[1];
assertEquals(actLoc, expLoc, ring.getName() + " not positioned correctly: "); assertEquals(actLoc, expLoc, ring.getName() + " not positioned correctly: ");
@ -325,7 +325,7 @@ public class RocketTest extends BaseTestCase {
BodyTube body = (BodyTube) boosterStage.getChild(0); BodyTube body = (BodyTube) boosterStage.getChild(0);
Coordinate[] bodyLocs = body.getComponentLocations(); Coordinate[] bodyLocs = body.getComponentLocations();
expLoc = new Coordinate(0.27, 0, 0); expLoc = new Coordinate(0.27, 0, 0);
assertEquals(bodyLocs[0], 1, body.getName() + " not positioned correctly: "); assertEquals(bodyLocs[0], expLoc, body.getName() + " not positioned correctly: ");
{ {
TubeCoupler coupler = (TubeCoupler) body.getChild(0); TubeCoupler coupler = (TubeCoupler) body.getChild(0);

32
core/src/test/java/info/openrocket/core/simulation/DisableStageTest.java
View File

@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test;
* @author Sibo Van Gool <sibo.vangool@hotmail.com> * @author Sibo Van Gool <sibo.vangool@hotmail.com>
*/ */
public class DisableStageTest extends BaseTestCase { public class DisableStageTest extends BaseTestCase {
private final double delta = 0.05; // 5 % error margin (simulations are not exact) public static final double DELTA = 0.05; // 5 % error margin (simulations are not exact)
/** /**
* Tests that the simulation results are correct when a single stage is * Tests that the simulation results are correct when a single stage is
@ -54,7 +54,7 @@ public class DisableStageTest extends BaseTestCase {
simDisabled.getActiveConfiguration().setAllStages(); // Re-enable all stages. simDisabled.getActiveConfiguration().setAllStages(); // Re-enable all stages.
compareSims(simOriginal, simDisabled, delta); compareSims(simOriginal, simDisabled, DELTA);
} }
/** /**
@ -82,7 +82,7 @@ public class DisableStageTest extends BaseTestCase {
simDisabled.getOptions().setISAAtmosphere(true); simDisabled.getOptions().setISAAtmosphere(true);
simDisabled.getOptions().setTimeStep(0.05); simDisabled.getOptions().setTimeStep(0.05);
compareSims(simRemoved, simDisabled, delta); compareSims(simRemoved, simDisabled, DELTA);
//// Test re-enabling the stage. //// Test re-enabling the stage.
Rocket rocketOriginal = TestRockets.makeBeta(); Rocket rocketOriginal = TestRockets.makeBeta();
@ -93,7 +93,7 @@ public class DisableStageTest extends BaseTestCase {
simDisabled.getActiveConfiguration().setAllStages(); simDisabled.getActiveConfiguration().setAllStages();
compareSims(simOriginal, simDisabled, delta); compareSims(simOriginal, simDisabled, DELTA);
} }
/** /**
@ -185,7 +185,7 @@ public class DisableStageTest extends BaseTestCase {
simDisabled.getOptions().setISAAtmosphere(true); simDisabled.getOptions().setISAAtmosphere(true);
simDisabled.getOptions().setTimeStep(0.05); simDisabled.getOptions().setTimeStep(0.05);
compareSims(simRemoved, simDisabled, delta); compareSims(simRemoved, simDisabled, DELTA);
//// Test re-enabling the stage. //// Test re-enabling the stage.
Rocket rocketOriginal = TestRockets.makeFalcon9Heavy(); Rocket rocketOriginal = TestRockets.makeFalcon9Heavy();
@ -198,7 +198,7 @@ public class DisableStageTest extends BaseTestCase {
simDisabled.getActiveConfiguration().setAllStages(); simDisabled.getActiveConfiguration().setAllStages();
compareSims(simOriginal, simDisabled, delta); compareSims(simOriginal, simDisabled, DELTA);
} }
/** /**
@ -259,7 +259,7 @@ public class DisableStageTest extends BaseTestCase {
simDisabled.getActiveConfiguration().setAllStages(); simDisabled.getActiveConfiguration().setAllStages();
compareSims(simOriginal, simDisabled, delta); compareSims(simOriginal, simDisabled, DELTA);
} }
/** /**
@ -330,17 +330,21 @@ public class DisableStageTest extends BaseTestCase {
double launchRodVelocityDisabled = simActual.getSimulatedData().getLaunchRodVelocity(); double launchRodVelocityDisabled = simActual.getSimulatedData().getLaunchRodVelocity();
double deploymentVelocityDisabled = simActual.getSimulatedData().getDeploymentVelocity(); double deploymentVelocityDisabled = simActual.getSimulatedData().getDeploymentVelocity();
Assertions.assertEquals(maxAltitudeOriginal, maxAltitudeDisabled, maxAltitudeOriginal * delta); Assertions.assertEquals(maxAltitudeOriginal, maxAltitudeDisabled, calculateDelta(maxAltitudeOriginal, delta));
Assertions.assertEquals(maxVelocityOriginal, maxVelocityDisabled, maxVelocityOriginal * delta); Assertions.assertEquals(maxVelocityOriginal, maxVelocityDisabled, calculateDelta(maxVelocityOriginal, delta));
Assertions.assertEquals(maxMachNumberOriginal, maxMachNumberDisabled, maxMachNumberOriginal * delta); Assertions.assertEquals(maxMachNumberOriginal, maxMachNumberDisabled, calculateDelta(maxMachNumberOriginal, delta));
Assertions.assertEquals(flightTimeOriginal, flightTimeDisabled, flightTimeOriginal * delta); Assertions.assertEquals(flightTimeOriginal, flightTimeDisabled, calculateDelta(flightTimeOriginal, delta));
Assertions.assertEquals(timeToApogeeOriginal, timeToApogeeDisabled, timeToApogeeOriginal * delta); Assertions.assertEquals(timeToApogeeOriginal, timeToApogeeDisabled, calculateDelta(timeToApogeeOriginal, delta));
Assertions.assertEquals(launchRodVelocityOriginal, launchRodVelocityDisabled, Assertions.assertEquals(launchRodVelocityOriginal, launchRodVelocityDisabled,
launchRodVelocityOriginal * delta); calculateDelta(launchRodVelocityOriginal, delta));
Assertions.assertEquals(deploymentVelocityOriginal, deploymentVelocityDisabled, Assertions.assertEquals(deploymentVelocityOriginal, deploymentVelocityDisabled,
deploymentVelocityOriginal * delta); calculateDelta(deploymentVelocityOriginal, delta));
} catch (SimulationException e) { } catch (SimulationException e) {
Assertions.fail("Simulation failed: " + e); Assertions.fail("Simulation failed: " + e);
} }
} }
private static double calculateDelta(double value, double delta) {
return Double.isNaN(value) ? 0 : value * delta;
}
} }