Material localization support

[debian/openrocket] / core / test / net / sf / openrocket / preset / NoseConeComponentTests.java

diff --git a/core/test/net/sf/openrocket/preset/NoseConeComponentTests.java b/core/test/net/sf/openrocket/preset/NoseConeComponentTests.java
index e4a954e6da0c51e3085051d8bd6fc12b492f7faf..37f7dd4e45062030a4a887f4e9887274f2e01077 100644 (file)
--- a/core/test/net/sf/openrocket/preset/NoseConeComponentTests.java
+++ b/core/test/net/sf/openrocket/preset/NoseConeComponentTests.java
@@ -3,9 +3,9 @@ package net.sf.openrocket.preset;
 import static org.junit.Assert.*;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
+import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
 import net.sf.openrocket.rocketcomponent.NoseCone;
 import net.sf.openrocket.rocketcomponent.Transition;
-import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
 import net.sf.openrocket.util.BaseTestCase.BaseTestCase;
 
 import org.junit.Before;
@@ -21,31 +21,31 @@ import org.junit.Test;
  * 
  */
 public class NoseConeComponentTests extends BaseTestCase {
-
+       
        ComponentPreset preset;
        
        @Before
        public void createPreset() throws Exception {
                TypedPropertyMap presetspec = new TypedPropertyMap();
                presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.NOSE_CONE);
-               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.AFT_SHOULDER_LENGTH, 1.0);
-               presetspec.put( ComponentPreset.AFT_SHOULDER_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.AFT_SHOULDER_LENGTH, 1.0);
+               presetspec.put(ComponentPreset.AFT_SHOULDER_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));
                preset = ComponentPresetFactory.create(presetspec);
        }
-
+       
        @Test
        public void testComponentType() {
                NoseCone nc = new NoseCone();
                
-               assertSame( ComponentPreset.Type.NOSE_CONE, nc.getPresetType() );
+               assertSame(ComponentPreset.Type.NOSE_CONE, nc.getPresetType());
        }
        
        @Test
@@ -54,21 +54,21 @@ public class NoseConeComponentTests extends BaseTestCase {
                
                nc.loadPreset(preset);
                
-               assertEquals( 2.0, nc.getLength(), 0.0 );
-               assertSame( Transition.Shape.CONICAL, nc.getType() );
-               assertEquals( 1.0, nc.getAftRadius(), 0.0 );
-               assertEquals( 0.0, nc.getForeShoulderLength(), 0.0 );
-               assertEquals( 0.0, nc.getForeShoulderRadius(), 0.0 );
-               assertEquals( 1.0, nc.getAftShoulderLength(), 0.0 );
-               assertEquals( 0.5, nc.getAftShoulderRadius(), 0.0 );
-               assertEquals( 0.5, nc.getAftShoulderThickness(), 0.0 );
-
-               assertFalse( nc.isForeRadiusAutomatic() );
-               assertFalse( nc.isAftRadiusAutomatic() );
-               assertTrue( nc.isFilled() );
-               
-               assertSame( preset.get( ComponentPreset.MATERIAL), nc.getMaterial() );
-               assertEquals( 100.0, nc.getMass(), 0.05);
+               assertEquals(2.0, nc.getLength(), 0.0);
+               assertSame(Transition.Shape.CONICAL, nc.getType());
+               assertEquals(1.0, nc.getAftRadius(), 0.0);
+               assertEquals(0.0, nc.getForeShoulderLength(), 0.0);
+               assertEquals(0.0, nc.getForeShoulderRadius(), 0.0);
+               assertEquals(1.0, nc.getAftShoulderLength(), 0.0);
+               assertEquals(0.5, nc.getAftShoulderRadius(), 0.0);
+               assertEquals(0.5, nc.getAftShoulderThickness(), 0.0);
+               
+               assertFalse(nc.isForeRadiusAutomatic());
+               assertFalse(nc.isAftRadiusAutomatic());
+               assertTrue(nc.isFilled());
+               
+               assertSame(preset.get(ComponentPreset.MATERIAL), nc.getMaterial());
+               assertEquals(100.0, nc.getMass(), 0.05);
        }
        
        @Test
@@ -76,99 +76,99 @@ public class NoseConeComponentTests extends BaseTestCase {
                NoseCone nc = new NoseCone();
                
                nc.loadPreset(preset);
-
+               
                nc.setLength(1.0);
                
-               assertNull( nc.getPresetComponent() );
+               assertNull(nc.getPresetComponent());
        }
-
+       
        @Test
        public void changeAftRadiusClearsPreset() {
                NoseCone nc = new NoseCone();
                
                nc.loadPreset(preset);
-
+               
                nc.setAftRadius(2.0);
                
-               assertNull( nc.getPresetComponent() );
+               assertNull(nc.getPresetComponent());
        }
-
+       
        @Test
        public void changeAftRadiusAutomaticClearsPreset() {
                NoseCone nc = new NoseCone();
                
                nc.loadPreset(preset);
-
+               
                nc.setAftRadiusAutomatic(true);
                
-               assertNull( nc.getPresetComponent() );
+               assertNull(nc.getPresetComponent());
        }
-
+       
        @Test
        public void changeAftShoulderRadiusClearsPreset() {
                NoseCone nc = new NoseCone();
                
                nc.loadPreset(preset);
-
+               
                nc.setAftShoulderRadius(2.0);
                
-               assertNull( nc.getPresetComponent() );
+               assertNull(nc.getPresetComponent());
        }
-
+       
        @Test
        public void changeAftSholderLengthLeavesPreset() {
                NoseCone nc = new NoseCone();
                
                nc.loadPreset(preset);
-
+               
                nc.setAftShoulderLength(2.0);
                
-               assertSame( preset, nc.getPresetComponent() );
+               assertSame(preset, nc.getPresetComponent());
        }
-
+       
        @Test
        public void changeThicknessClearsPreset() {
                NoseCone nc = new NoseCone();
                
                nc.loadPreset(preset);
-
+               
                nc.setThickness(0.1);
                
-               assertNull( nc.getPresetComponent() );
+               assertNull(nc.getPresetComponent());
        }
-
-
+       
+       
        @Test
        public void changeFilledClearsPreset() {
                NoseCone nc = new NoseCone();
                
                nc.loadPreset(preset);
-
+               
                nc.setFilled(false);
                
-               assertNull( nc.getPresetComponent() );
+               assertNull(nc.getPresetComponent());
        }
-
+       
        @Test
        public void changeMaterialClearsPreset() {
                NoseCone nc = new NoseCone();
                
                nc.loadPreset(preset);
-
-               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"new", 1.0));
                
-               assertNull( nc.getPresetComponent() );
+               nc.setMaterial(Material.newMaterial(Material.Type.BULK, "new", 1.0, true));
+               
+               assertNull(nc.getPresetComponent());
        }
-
+       
        @Test
        public void changeFinishLeavesPreset() {
                NoseCone nc = new NoseCone();
                
                nc.loadPreset(preset);
-
-               nc.setFinish( Finish.POLISHED );
                
-               assertSame( preset, nc.getPresetComponent() );
+               nc.setFinish(Finish.POLISHED);
+               
+               assertSame(preset, nc.getPresetComponent());
        }
-
+       
 }