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 / TransitionComponentTests.java
diff --git a/core/test/net/sf/openrocket/preset/TransitionComponentTests.java b/core/test/net/sf/openrocket/preset/TransitionComponentTests.java
index 3cc5f9ff4295ad9d9caf37a298a11578f9ad0eef..9826613cdd2191313d72c460a80c39950a5a1f48 100644 (file)
--- a/core/test/net/sf/openrocket/preset/TransitionComponentTests.java
+++ b/core/test/net/sf/openrocket/preset/TransitionComponentTests.java
@@ -1,10 +1,6 @@
 package net.sf.openrocket.preset;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
@@ -24,34 +20,34 @@ import org.junit.Test;
  * 
  */
 public class TransitionComponentTests extends BaseTestCase {
-
+       
        ComponentPreset preset;
        
        @Before
        public void createPreset() 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.AFT_SHOULDER_LENGTH, 1.0);
-               presetspec.put( ComponentPreset.AFT_SHOULDER_DIAMETER, 1.0);
-               presetspec.put( ComponentPreset.FORE_SHOULDER_LENGTH, 1.0);
-               presetspec.put( ComponentPreset.FORE_SHOULDER_DIAMETER, 0.5);
-               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.AFT_SHOULDER_LENGTH, 1.0);
+               presetspec.put(ComponentPreset.AFT_SHOULDER_DIAMETER, 1.0);
+               presetspec.put(ComponentPreset.FORE_SHOULDER_LENGTH, 1.0);
+               presetspec.put(ComponentPreset.FORE_SHOULDER_DIAMETER, 0.5);
+               presetspec.put(ComponentPreset.FILLED, true);
+               presetspec.put(ComponentPreset.MASS, 100.0);
+               presetspec.put(ComponentPreset.MATERIAL, Material.newMaterial(Material.Type.BULK, "test", 2.0, true));
                preset = ComponentPresetFactory.create(presetspec);
        }
-
+       
        @Test
        public void testComponentType() {
                Transition tr = new Transition();
                
-               assertSame( ComponentPreset.Type.TRANSITION, tr.getPresetType() );
+               assertSame(ComponentPreset.Type.TRANSITION, tr.getPresetType());
        }
        
        @Test
@@ -60,22 +56,22 @@ public class TransitionComponentTests extends BaseTestCase {
                
                tr.loadPreset(preset);
                
-               assertEquals( 2.0, tr.getLength(), 0.0 );
-               assertSame( Transition.Shape.CONICAL, tr.getType() );
-               assertEquals( 1.0, tr.getAftRadius(), 0.0 );
-               assertEquals( 1.0, tr.getForeShoulderLength(), 0.0 );
-               assertEquals( 0.25, tr.getForeShoulderRadius(), 0.0 );
-               assertEquals( 0.25, tr.getForeShoulderThickness(), 0.0 );
-               assertEquals( 1.0, tr.getAftShoulderLength(), 0.0 );
-               assertEquals( 0.5, tr.getAftShoulderRadius(), 0.0 );
-               assertEquals( 0.5, tr.getAftShoulderThickness(), 0.0 );
-
-               assertFalse( tr.isForeRadiusAutomatic() );
-               assertFalse( tr.isAftRadiusAutomatic() );
-               assertTrue( tr.isFilled() );
-               
-               assertSame( preset.get( ComponentPreset.MATERIAL), tr.getMaterial() );
-               assertEquals( 100.0, tr.getMass(), 1.0);
+               assertEquals(2.0, tr.getLength(), 0.0);
+               assertSame(Transition.Shape.CONICAL, tr.getType());
+               assertEquals(1.0, tr.getAftRadius(), 0.0);
+               assertEquals(1.0, tr.getForeShoulderLength(), 0.0);
+               assertEquals(0.25, tr.getForeShoulderRadius(), 0.0);
+               assertEquals(0.25, tr.getForeShoulderThickness(), 0.0);
+               assertEquals(1.0, tr.getAftShoulderLength(), 0.0);
+               assertEquals(0.5, tr.getAftShoulderRadius(), 0.0);
+               assertEquals(0.5, tr.getAftShoulderThickness(), 0.0);
+               
+               assertFalse(tr.isForeRadiusAutomatic());
+               assertFalse(tr.isAftRadiusAutomatic());
+               assertTrue(tr.isFilled());
+               
+               assertSame(preset.get(ComponentPreset.MATERIAL), tr.getMaterial());
+               assertEquals(100.0, tr.getMass(), 1.0);
        }
        
        @Test
@@ -83,132 +79,132 @@ public class TransitionComponentTests extends BaseTestCase {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
+               
                tr.setLength(1.0);
                
-               assertNull( tr.getPresetComponent() );
+               assertNull(tr.getPresetComponent());
        }
-
+       
        @Test
        public void changeAftRadiusClearsPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
+               
                tr.setAftRadius(2.0);
                
-               assertNull( tr.getPresetComponent() );
+               assertNull(tr.getPresetComponent());
        }
-
+       
        @Test
        public void changeAftRadiusAutomaticClearsPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
+               
                tr.setAftRadiusAutomatic(true);
                
-               assertNull( tr.getPresetComponent() );
+               assertNull(tr.getPresetComponent());
        }
-
+       
        @Test
        public void changeForeRadiusClearsPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
+               
                tr.setForeRadius(2.0);
                
-               assertNull( tr.getPresetComponent() );
+               assertNull(tr.getPresetComponent());
        }
-
+       
        @Test
        public void changeForeRadiusAutomaticClearsPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
+               
                tr.setForeRadiusAutomatic(true);
                
-               assertNull( tr.getPresetComponent() );
+               assertNull(tr.getPresetComponent());
        }
-
+       
        @Test
        public void changeForeShoulderRadiusClearsPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
+               
                tr.setForeShoulderRadius(2.0);
                
-               assertNull( tr.getPresetComponent() );
+               assertNull(tr.getPresetComponent());
        }
-
+       
        @Test
        public void changeAftShoulderRadiusClearsPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
+               
                tr.setAftShoulderRadius(2.0);
                
-               assertNull( tr.getPresetComponent() );
+               assertNull(tr.getPresetComponent());
        }
-
+       
        @Test
        public void changeAftSholderLengthLeavesPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
+               
                tr.setAftShoulderLength(2.0);
                
-               assertSame( preset, tr.getPresetComponent() );
+               assertSame(preset, tr.getPresetComponent());
        }
-
+       
        @Test
        public void changeThicknessClearsPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
+               
                tr.setThickness(0.1);
                
-               assertNull( tr.getPresetComponent() );
+               assertNull(tr.getPresetComponent());
        }
-
-
+       
+       
        @Test
        public void changeFilledClearsPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
+               
                tr.setFilled(false);
                
-               assertNull( tr.getPresetComponent() );
+               assertNull(tr.getPresetComponent());
        }
-
+       
        @Test
        public void changeMaterialClearsPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
-               tr.setMaterial( Material.newUserMaterial(Material.Type.BULK,"new", 1.0));
                
-               assertNull( tr.getPresetComponent() );
+               tr.setMaterial(Material.newMaterial(Material.Type.BULK, "new", 1.0, true));
+               
+               assertNull(tr.getPresetComponent());
        }
-
+       
        @Test
        public void changeFinishLeavesPreset() {
                Transition tr = new Transition();
                
                tr.loadPreset(preset);
-
-               tr.setFinish( Finish.POLISHED );
                
-               assertSame( preset, tr.getPresetComponent() );
+               tr.setFinish(Finish.POLISHED);
+               
+               assertSame(preset, tr.getPresetComponent());
        }
-
+       
 }
Debian packaging of openrocket