diff --git a/core/src/test/java/info/openrocket/core/l10n/TestResourceBundleTranslator.java b/core/src/test/java/info/openrocket/core/l10n/TestResourceBundleTranslator.java index 79d121ecc..9d3ef1a45 100644 --- a/core/src/test/java/info/openrocket/core/l10n/TestResourceBundleTranslator.java +++ b/core/src/test/java/info/openrocket/core/l10n/TestResourceBundleTranslator.java @@ -28,18 +28,18 @@ public class TestResourceBundleTranslator { @Test public void testSuccessfulDefault() { 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 public void testSuccessfulNonDefault() { - ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages"); - assertEquals(Locale.US, trans.get("debug.currentFile"), "messages_fr.properties"); + ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH); + assertEquals("messages_fr.properties", trans.get("debug.currentFile")); } @Test public void testFailure() { - ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages"); + ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.US); try { fail("Returned: " + trans.get("missing")); } catch (MissingResourceException e) { @@ -50,15 +50,15 @@ public class TestResourceBundleTranslator { @Test public void testGetEnglish() { ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH); - assertEquals(trans.get("material", "Paper (office)"), "Papier (bureau)"); - assertEquals(trans.get("material", "Paper (toilet)"), "Paper (toilet)"); + assertEquals("Papier (bureau)", trans.get("material", "Paper (office)")); + assertEquals("Paper (toilet)", trans.get("material", "Paper (toilet)")); } @Test public void testGetBase() { ResourceBundleTranslator trans = new ResourceBundleTranslator("l10n.messages", Locale.FRENCH); - assertEquals(trans.getBaseText("material", "Papier (bureau)"), "Paper (office)"); - assertEquals(trans.getBaseText("material", "Papier (toilet)"), "Papier (toilet)"); + assertEquals("Paper (office)", trans.getBaseText("material", "Papier (bureau)")); + assertEquals("Papier (toilet)", trans.getBaseText("material", "Papier (toilet)")); } } diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java index e1838166b..3c53a167a 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java @@ -80,12 +80,12 @@ public class ParameterSetTest extends BaseTestCase { FlightConfigurationId fcid2 = new FlightConfigurationId(); // i.e. requesting the value for a non-existent config id should return the // default - assertEquals(testSet.get(fcid2), testSet.getDefault(), "set stores id-value pair correctly : "); - assertEquals(testSet.size(), 0, "set contains wrong number of overrides: "); + assertEquals(testSet.getDefault(), testSet.get(fcid2), "set stores id-value pair correctly : "); + assertEquals(0, testSet.size(), "set contains wrong number of overrides: "); 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.size(), 1, "set should still contain zero overrides: "); + assertEquals(testSet.getDefault(), testSet.get(fcid_def), "retrieving the via the special default key should produce the default value: "); + assertEquals(0, testSet.size(), "set should still contain zero overrides: "); } @Test diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/RocketTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/RocketTest.java index 8fd80ed1b..606681553 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/RocketTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/RocketTest.java @@ -37,7 +37,7 @@ public class RocketTest extends BaseTestCase { assertEquals(config1.getId().key, fcid4.key, "fcids 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, "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: "); } { // 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); actLoc = actLocs[1]; assertEquals(actLoc, expLoc, ring.getName() + " not positioned correctly: "); @@ -325,7 +325,7 @@ public class RocketTest extends BaseTestCase { BodyTube body = (BodyTube) boosterStage.getChild(0); Coordinate[] bodyLocs = body.getComponentLocations(); 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); diff --git a/core/src/test/java/info/openrocket/core/simulation/DisableStageTest.java b/core/src/test/java/info/openrocket/core/simulation/DisableStageTest.java index f0f26752c..9726c5eb9 100644 --- a/core/src/test/java/info/openrocket/core/simulation/DisableStageTest.java +++ b/core/src/test/java/info/openrocket/core/simulation/DisableStageTest.java @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test; * @author Sibo Van Gool */ 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 @@ -54,7 +54,7 @@ public class DisableStageTest extends BaseTestCase { 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().setTimeStep(0.05); - compareSims(simRemoved, simDisabled, delta); + compareSims(simRemoved, simDisabled, DELTA); //// Test re-enabling the stage. Rocket rocketOriginal = TestRockets.makeBeta(); @@ -93,7 +93,7 @@ public class DisableStageTest extends BaseTestCase { 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().setTimeStep(0.05); - compareSims(simRemoved, simDisabled, delta); + compareSims(simRemoved, simDisabled, DELTA); //// Test re-enabling the stage. Rocket rocketOriginal = TestRockets.makeFalcon9Heavy(); @@ -198,7 +198,7 @@ public class DisableStageTest extends BaseTestCase { simDisabled.getActiveConfiguration().setAllStages(); - compareSims(simOriginal, simDisabled, delta); + compareSims(simOriginal, simDisabled, DELTA); } /** @@ -259,7 +259,7 @@ public class DisableStageTest extends BaseTestCase { 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 deploymentVelocityDisabled = simActual.getSimulatedData().getDeploymentVelocity(); - Assertions.assertEquals(maxAltitudeOriginal, maxAltitudeDisabled, maxAltitudeOriginal * delta); - Assertions.assertEquals(maxVelocityOriginal, maxVelocityDisabled, maxVelocityOriginal * delta); - Assertions.assertEquals(maxMachNumberOriginal, maxMachNumberDisabled, maxMachNumberOriginal * delta); - Assertions.assertEquals(flightTimeOriginal, flightTimeDisabled, flightTimeOriginal * delta); - Assertions.assertEquals(timeToApogeeOriginal, timeToApogeeDisabled, timeToApogeeOriginal * delta); + Assertions.assertEquals(maxAltitudeOriginal, maxAltitudeDisabled, calculateDelta(maxAltitudeOriginal, delta)); + Assertions.assertEquals(maxVelocityOriginal, maxVelocityDisabled, calculateDelta(maxVelocityOriginal, delta)); + Assertions.assertEquals(maxMachNumberOriginal, maxMachNumberDisabled, calculateDelta(maxMachNumberOriginal, delta)); + Assertions.assertEquals(flightTimeOriginal, flightTimeDisabled, calculateDelta(flightTimeOriginal, delta)); + Assertions.assertEquals(timeToApogeeOriginal, timeToApogeeDisabled, calculateDelta(timeToApogeeOriginal, delta)); Assertions.assertEquals(launchRodVelocityOriginal, launchRodVelocityDisabled, - launchRodVelocityOriginal * delta); + calculateDelta(launchRodVelocityOriginal, delta)); Assertions.assertEquals(deploymentVelocityOriginal, deploymentVelocityDisabled, - deploymentVelocityOriginal * delta); + calculateDelta(deploymentVelocityOriginal, delta)); } catch (SimulationException e) { Assertions.fail("Simulation failed: " + e); } } + + private static double calculateDelta(double value, double delta) { + return Double.isNaN(value) ? 0 : value * delta; + } }