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

Merge pull request #2105 from SiboVG/issue-2103

Browse Source 
[#2103] Fix type in default pressure setter
This commit is contained in:
Sibo Van Gool 2023-03-08 21:35:54 +01:00 committed by GitHub
commit cfea331712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/simulation/DefaultSimulationOptionFactory.java
View File

@ -46,7 +46,7 @@ public class DefaultSimulationOptionFactory {
defaults.setISAAtmosphere(prefs.getBoolean(SIMCONDITION_ATMOS_STD, defaults.isISAAtmosphere()));
defaults.setLaunchTemperature(prefs.getDouble(SIMCONDITION_ATMOS_TEMP, defaults.getLaunchTemperature()));
defaults.setLaunchPressure(prefs.getDouble(SIMCONDITION_ATMOS_PRESSURE, defaults.getLaunchTemperature()));
defaults.setLaunchPressure(prefs.getDouble(SIMCONDITION_ATMOS_PRESSURE, defaults.getLaunchPressure()));
defaults.setLaunchIntoWind(prefs.getBoolean(SIMCONDITION_ROD_INTO_WIND, defaults.getLaunchIntoWind()));
defaults.setLaunchRodLength(prefs.getDouble(SIMCONDITION_ROD_LENGTH, defaults.getLaunchRodLength()));

79
core/test/net/sf/openrocket/simulation/SimulationConditionsTest.java Normal file
View File

@ -0,0 +1,79 @@
package net.sf.openrocket.simulation;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.util.Modules;
import net.sf.openrocket.ServicesForTesting;
import net.sf.openrocket.formatting.RocketDescriptor;
import net.sf.openrocket.formatting.RocketDescriptorImpl;
import net.sf.openrocket.l10n.DebugTranslator;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.plugin.PluginModule;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.startup.MockPreferences;
import net.sf.openrocket.startup.Preferences;
import net.sf.openrocket.util.MathUtil;
import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class SimulationConditionsTest {
private final static double EPSILON = MathUtil.EPSILON;
@BeforeClass
public static void setUp() throws Exception {
Module applicationModule = new PreferencesModule();
Module debugTranslator = new AbstractModule() {
@Override
protected void configure() {
bind(Translator.class).toInstance(new DebugTranslator(null));
}
};
Module pluginModule = new PluginModule();
Injector injector = Guice.createInjector(Modules.override(applicationModule).with(debugTranslator), pluginModule);
Application.setInjector(injector);
}
@Test
public void testDefaultSimulationOptionFactory() {
Application.getInjector().injectMembers(this);
DefaultSimulationOptionFactory factory = Application.getInjector().getInstance(DefaultSimulationOptionFactory.class);
SimulationOptions options = factory.getDefault();
assertNotNull(options);
assertEquals(28.61, options.getLaunchLatitude(), EPSILON);
assertEquals(0.0, options.getLaunchAltitude(), EPSILON);
assertEquals(-80.60, options.getLaunchLongitude(), EPSILON);
assertTrue(options.isISAAtmosphere());
assertEquals(288.15, options.getLaunchTemperature(), EPSILON);
assertEquals(101325, options.getLaunchPressure(), EPSILON);
assertEquals(1.0, options.getLaunchRodLength(), EPSILON);
assertEquals(Math.PI / 2, options.getLaunchRodDirection(), EPSILON);
assertEquals(0.0, options.getLaunchRodAngle(), EPSILON);
assertTrue(options.getLaunchIntoWind());
assertEquals(Math.PI / 2, options.getWindDirection(), EPSILON);
assertEquals(0.1, options.getWindTurbulenceIntensity(), EPSILON);
assertEquals(2.0, options.getWindSpeedAverage(), EPSILON);
assertEquals(0.2, options.getWindSpeedDeviation(), EPSILON);
assertEquals(0.05, options.getTimeStep(), EPSILON);
assertEquals(3 * Math.PI / 180, options.getMaximumStepAngle(), EPSILON);
}
private static class PreferencesModule extends AbstractModule {
@Override
protected void configure() {
bind(Preferences.class).to(MockPreferences.class);
bind(Translator.class).toProvider(ServicesForTesting.TranslatorProviderForTesting.class);
bind(RocketDescriptor.class).to(RocketDescriptorImpl.class);
}
}
}

2
core/test/net/sf/openrocket/startup/MockPreferences.java
View File

@ -3,11 +3,13 @@ package net.sf.openrocket.startup;
import java.util.Set;
import java.util.prefs.BackingStoreException;
import com.google.inject.Singleton;
import net.sf.openrocket.material.Material;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.ComponentPreset.Type;
import net.sf.openrocket.util.BugException;
@Singleton
public class MockPreferences extends Preferences {
private final String NODENAME = "OpenRocket-test-mock";