projects / debian / openrocket / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Material localization support
[debian/openrocket] / core / test / net / sf / openrocket / preset / TransitionPresetTests.java
diff --git a/core/test/net/sf/openrocket/preset/TransitionPresetTests.java b/core/test/net/sf/openrocket/preset/TransitionPresetTests.java
index a2752eb3afb7a944abfb6d9e48b35d9dad0777b4..26593dd8e4ccd0bc8565922345b077607676cc65 100644 (file)
--- a/core/test/net/sf/openrocket/preset/TransitionPresetTests.java
+++ b/core/test/net/sf/openrocket/preset/TransitionPresetTests.java
@@ -18,205 +18,205 @@ import org.junit.Test;
  * 
  */
 public class TransitionPresetTests extends BaseTestCase {
-
+       
        @Test
        public void testManufacturerRequired() {
                try {
                        TypedPropertyMap presetspec = new TypedPropertyMap();
                        presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
                        ComponentPresetFactory.create(presetspec);
-               } catch ( InvalidComponentPresetException ex ) {
-                       PresetAssertHelper.assertInvalidPresetException( ex,
+               } catch (InvalidComponentPresetException ex) {
+                       PresetAssertHelper.assertInvalidPresetException(ex,
                                        new TypedKey<?>[] {
-                                       ComponentPreset.MANUFACTURER, 
-                                       ComponentPreset.PARTNO, 
-                                       ComponentPreset.LENGTH,
-                                       ComponentPreset.AFT_OUTER_DIAMETER,
-                                       ComponentPreset.FORE_OUTER_DIAMETER
-                       },
-                       new String[] {
-                                       "No Manufacturer specified",
-                                       "No PartNo specified",
-                                       "No Length specified",
-                                       "No AftOuterDiameter specified",
-                                       "No ForeOuterDiameter specified"
-                       }
+                                                       ComponentPreset.MANUFACTURER,
+                                                       ComponentPreset.PARTNO,
+                                                       ComponentPreset.LENGTH,
+                                                       ComponentPreset.AFT_OUTER_DIAMETER,
+                                                       ComponentPreset.FORE_OUTER_DIAMETER
+                                       },
+                                       new String[] {
+                                                       "No Manufacturer specified",
+                                                       "No PartNo specified",
+                                                       "No Length specified",
+                                                       "No AftOuterDiameter specified",
+                                                       "No ForeOuterDiameter specified"
+                                       }
                                        );
                }
        }
-
+       
        @Test
        public void testPartNoRequired() {
                try {
                        TypedPropertyMap presetspec = new TypedPropertyMap();
                        presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
-                       presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+                       presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
                        ComponentPresetFactory.create(presetspec);
-               } catch ( InvalidComponentPresetException ex ) {
-                       PresetAssertHelper.assertInvalidPresetException( ex,
+               } catch (InvalidComponentPresetException ex) {
+                       PresetAssertHelper.assertInvalidPresetException(ex,
                                        new TypedKey<?>[] {
-                                       ComponentPreset.PARTNO, 
-                                       ComponentPreset.LENGTH,
-                                       ComponentPreset.AFT_OUTER_DIAMETER,
-                                       ComponentPreset.FORE_OUTER_DIAMETER
-                       },
-                       new String[] {
-                                       "No PartNo specified",
-                                       "No Length specified",
-                                       "No AftOuterDiameter specified",
-                                       "No ForeOuterDiameter specified"
-                       }
+                                                       ComponentPreset.PARTNO,
+                                                       ComponentPreset.LENGTH,
+                                                       ComponentPreset.AFT_OUTER_DIAMETER,
+                                                       ComponentPreset.FORE_OUTER_DIAMETER
+                                       },
+                                       new String[] {
+                                                       "No PartNo specified",
+                                                       "No Length specified",
+                                                       "No AftOuterDiameter specified",
+                                                       "No ForeOuterDiameter specified"
+                                       }
                                        );
                }
        }
-
+       
        @Test
        public void testLengthRequired() {
                try {
                        TypedPropertyMap presetspec = new TypedPropertyMap();
                        presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
-                       presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-                       presetspec.put( ComponentPreset.PARTNO, "partno");
+                       presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+                       presetspec.put(ComponentPreset.PARTNO, "partno");
                        ComponentPresetFactory.create(presetspec);
-               } catch ( InvalidComponentPresetException ex ) {
-                       PresetAssertHelper.assertInvalidPresetException( ex,
+               } catch (InvalidComponentPresetException ex) {
+                       PresetAssertHelper.assertInvalidPresetException(ex,
                                        new TypedKey<?>[] {
-                                       ComponentPreset.LENGTH,
-                                       ComponentPreset.AFT_OUTER_DIAMETER,
-                                       ComponentPreset.FORE_OUTER_DIAMETER
-                       },
-                       new String[] {
-                                       "No Length specified",
-                                       "No AftOuterDiameter specified",
-                                       "No ForeOuterDiameter specified"
-                       }
+                                                       ComponentPreset.LENGTH,
+                                                       ComponentPreset.AFT_OUTER_DIAMETER,
+                                                       ComponentPreset.FORE_OUTER_DIAMETER
+                                       },
+                                       new String[] {
+                                                       "No Length specified",
+                                                       "No AftOuterDiameter specified",
+                                                       "No ForeOuterDiameter specified"
+                                       }
                                        );
                }
        }
-
+       
        @Test
        public void testAftOuterDiameterRequired() {
                try {
                        TypedPropertyMap presetspec = new TypedPropertyMap();
                        presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
-                       presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-                       presetspec.put( ComponentPreset.PARTNO, "partno");
-                       presetspec.put( ComponentPreset.LENGTH, 2.0);
-                       presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
+                       presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+                       presetspec.put(ComponentPreset.PARTNO, "partno");
+                       presetspec.put(ComponentPreset.LENGTH, 2.0);
+                       presetspec.put(ComponentPreset.SHAPE, Transition.Shape.CONICAL);
                        ComponentPresetFactory.create(presetspec);
-               } catch ( InvalidComponentPresetException ex ) {
-                       PresetAssertHelper.assertInvalidPresetException( ex,
+               } catch (InvalidComponentPresetException ex) {
+                       PresetAssertHelper.assertInvalidPresetException(ex,
                                        new TypedKey<?>[] {
-                                       ComponentPreset.AFT_OUTER_DIAMETER,
-                                       ComponentPreset.FORE_OUTER_DIAMETER
-                       },
-                       new String[] {
-                                       "No AftOuterDiameter specified",
-                                       "No ForeOuterDiameter specified"
-                       }
+                                                       ComponentPreset.AFT_OUTER_DIAMETER,
+                                                       ComponentPreset.FORE_OUTER_DIAMETER
+                                       },
+                                       new String[] {
+                                                       "No AftOuterDiameter specified",
+                                                       "No ForeOuterDiameter specified"
+                                       }
                                        );
                }
        }
-
-
+       
+       
        @Test
        public void testForeOuterDiameterRequired() {
                try {
                        TypedPropertyMap presetspec = new TypedPropertyMap();
                        presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
-                       presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-                       presetspec.put( ComponentPreset.PARTNO, "partno");
-                       presetspec.put( ComponentPreset.LENGTH, 2.0);
-                       presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
-                       presetspec.put( ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
+                       presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+                       presetspec.put(ComponentPreset.PARTNO, "partno");
+                       presetspec.put(ComponentPreset.LENGTH, 2.0);
+                       presetspec.put(ComponentPreset.SHAPE, Transition.Shape.CONICAL);
+                       presetspec.put(ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
                        ComponentPresetFactory.create(presetspec);
-               } catch ( InvalidComponentPresetException ex ) {
-                       PresetAssertHelper.assertInvalidPresetException( ex,
+               } catch (InvalidComponentPresetException ex) {
+                       PresetAssertHelper.assertInvalidPresetException(ex,
                                        new TypedKey<?>[] {
                                        ComponentPreset.FORE_OUTER_DIAMETER
-                       },
-                       new String[] {
+                                       },
+                                       new String[] {
                                        "No ForeOuterDiameter specified"
-                       }
+                                       }
                                        );
                }
        }
-
+       
        @Test
        public void testComputeDensityNoMaterial() throws Exception {
                TypedPropertyMap presetspec = new TypedPropertyMap();
                presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
-               presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-               presetspec.put( ComponentPreset.PARTNO, "partno");
-               presetspec.put( ComponentPreset.LENGTH, 2.0);
-               presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
-               presetspec.put( ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
-               presetspec.put( ComponentPreset.FORE_OUTER_DIAMETER, 1.0);
-               presetspec.put( ComponentPreset.FILLED, true);
-               presetspec.put( ComponentPreset.MASS, 100.0);
+               presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+               presetspec.put(ComponentPreset.PARTNO, "partno");
+               presetspec.put(ComponentPreset.LENGTH, 2.0);
+               presetspec.put(ComponentPreset.SHAPE, Transition.Shape.CONICAL);
+               presetspec.put(ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
+               presetspec.put(ComponentPreset.FORE_OUTER_DIAMETER, 1.0);
+               presetspec.put(ComponentPreset.FILLED, true);
+               presetspec.put(ComponentPreset.MASS, 100.0);
                ComponentPreset preset = ComponentPresetFactory.create(presetspec);
-
+               
                // constants put into the presetspec above.
-               double volume = /*base area*/ Math.PI  * ( 1.0 * 1.0 + 1.0 * 0.5 + 0.5 * 0.5);
+               double volume = /*base area*/Math.PI * (1.0 * 1.0 + 1.0 * 0.5 + 0.5 * 0.5);
+               
+               volume *= 2.0 /* times height *// 3.0; /* one third */
                
-               volume *= 2.0 /* times height */ / 3.0; /* one third */
-
                double density = 100.0 / volume;
                
-               assertEquals("TransitionCustom",preset.get(ComponentPreset.MATERIAL).getName());
-
-               assertEquals(density,preset.get(ComponentPreset.MATERIAL).getDensity(),0.01*density);
+               assertEquals("TransitionCustom", preset.get(ComponentPreset.MATERIAL).getName());
+               
+               assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.01 * density);
        }
-
+       
        @Test
        public void testMaterial() throws Exception {
                TypedPropertyMap presetspec = new TypedPropertyMap();
                presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
-               presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-               presetspec.put( ComponentPreset.PARTNO, "partno");
-               presetspec.put( ComponentPreset.LENGTH, 2.0);
-               presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
-               presetspec.put( ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
-               presetspec.put( ComponentPreset.FORE_OUTER_DIAMETER, 1.0);
-               presetspec.put( ComponentPreset.FILLED, true);
-               presetspec.put( ComponentPreset.MATERIAL, Material.newUserMaterial(Material.Type.BULK,"test", 2.0));
+               presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+               presetspec.put(ComponentPreset.PARTNO, "partno");
+               presetspec.put(ComponentPreset.LENGTH, 2.0);
+               presetspec.put(ComponentPreset.SHAPE, Transition.Shape.CONICAL);
+               presetspec.put(ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
+               presetspec.put(ComponentPreset.FORE_OUTER_DIAMETER, 1.0);
+               presetspec.put(ComponentPreset.FILLED, true);
+               presetspec.put(ComponentPreset.MATERIAL, Material.newMaterial(Material.Type.BULK, "test", 2.0, true));
                ComponentPreset preset = ComponentPresetFactory.create(presetspec);
-
-               assertEquals("test",preset.get(ComponentPreset.MATERIAL).getName());
-               assertEquals(2.0,preset.get(ComponentPreset.MATERIAL).getDensity(),0.0005);
+               
+               assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName());
+               assertEquals(2.0, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005);
                
        }
-
+       
        @Test
        public void testComputeDensityWithMaterial() throws Exception {
                TypedPropertyMap presetspec = new TypedPropertyMap();
                presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
-               presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-               presetspec.put( ComponentPreset.PARTNO, "partno");
-               presetspec.put( ComponentPreset.LENGTH, 2.0);
-               presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
-               presetspec.put( ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
-               presetspec.put( ComponentPreset.FORE_OUTER_DIAMETER, 1.0);
-               presetspec.put( ComponentPreset.FILLED, true);
-               presetspec.put( ComponentPreset.MASS, 100.0);
-               presetspec.put( ComponentPreset.MATERIAL, Material.newUserMaterial(Material.Type.BULK,"test", 2.0));
+               presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+               presetspec.put(ComponentPreset.PARTNO, "partno");
+               presetspec.put(ComponentPreset.LENGTH, 2.0);
+               presetspec.put(ComponentPreset.SHAPE, Transition.Shape.CONICAL);
+               presetspec.put(ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
+               presetspec.put(ComponentPreset.FORE_OUTER_DIAMETER, 1.0);
+               presetspec.put(ComponentPreset.FILLED, true);
+               presetspec.put(ComponentPreset.MASS, 100.0);
+               presetspec.put(ComponentPreset.MATERIAL, Material.newMaterial(Material.Type.BULK, "test", 2.0, true));
                ComponentPreset preset = ComponentPresetFactory.create(presetspec);
-
+               
                // constants put into the presetspec above.
-               double totvolume = /*base area*/ Math.PI;
+               double totvolume = /*base area*/Math.PI;
                
-               totvolume *= 4.0 /* times height */ / 3.0; /* one third */
-
-               double uppervolume = /*fore area*/ Math.PI * 0.5 * 0.5;
-               uppervolume *= 2.0 /* times height */ / 3.0; /* one third */
+               totvolume *= 4.0 /* times height *// 3.0; /* one third */
+               
+               double uppervolume = /*fore area*/Math.PI * 0.5 * 0.5;
+               uppervolume *= 2.0 /* times height *// 3.0; /* one third */
+               
+               double volume = totvolume - uppervolume;
                
-               double volume = totvolume-uppervolume;
-
                double density = 100.0 / volume;
                
-               assertEquals("test",preset.get(ComponentPreset.MATERIAL).getName());
-
-               assertEquals(density,preset.get(ComponentPreset.MATERIAL).getDensity(),0.01*density);
+               assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName());
+               
+               assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.01 * density);
        }
-
+       
 }
Debian packaging of openrocket