Material localization support

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

diff --git a/core/test/net/sf/openrocket/preset/ParachuterComponentTests.java b/core/test/net/sf/openrocket/preset/ParachuterComponentTests.java
index 6263957de50587f1cd5abe1f22d167f6b0b26a11..e2489960c580860bacd731269eb1bd7feec21bf1 100644 (file)
--- a/core/test/net/sf/openrocket/preset/ParachuterComponentTests.java
+++ b/core/test/net/sf/openrocket/preset/ParachuterComponentTests.java
@@ -1,8 +1,6 @@
 package net.sf.openrocket.preset;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.*;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.Parachute;
@@ -21,30 +19,30 @@ import org.junit.Test;
  * 
  */
 public class ParachuterComponentTests extends BaseTestCase {
-
+       
        ComponentPreset preset;
        
        @Before
        public void createPreset() throws Exception {
                TypedPropertyMap presetspec = new TypedPropertyMap();
                presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.PARACHUTE);
-               presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-               presetspec.put( ComponentPreset.PARTNO, "partno");
-               presetspec.put( ComponentPreset.DIAMETER, 20.0);
-               presetspec.put( ComponentPreset.LINE_COUNT, 8);
-               presetspec.put( ComponentPreset.LINE_LENGTH, 12.0);
-               Material m = Material.newUserMaterial(Material.Type.SURFACE,"testMaterial", 2.0);
-               presetspec.put( ComponentPreset.MATERIAL, m);
-               m = Material.newUserMaterial(Material.Type.LINE,"testLineMaterial", 3);
-               presetspec.put( ComponentPreset.LINE_MATERIAL, m);
+               presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+               presetspec.put(ComponentPreset.PARTNO, "partno");
+               presetspec.put(ComponentPreset.DIAMETER, 20.0);
+               presetspec.put(ComponentPreset.LINE_COUNT, 8);
+               presetspec.put(ComponentPreset.LINE_LENGTH, 12.0);
+               Material m = Material.newMaterial(Material.Type.SURFACE, "testMaterial", 2.0, true);
+               presetspec.put(ComponentPreset.MATERIAL, m);
+               m = Material.newMaterial(Material.Type.LINE, "testLineMaterial", 3, true);
+               presetspec.put(ComponentPreset.LINE_MATERIAL, m);
                preset = ComponentPresetFactory.create(presetspec);
        }
-
+       
        @Test
        public void testComponentType() {
                Parachute cr = new Parachute();
                
-               assertSame( ComponentPreset.Type.PARACHUTE, cr.getPresetType() );
+               assertSame(ComponentPreset.Type.PARACHUTE, cr.getPresetType());
        }
        
        @Test
@@ -53,12 +51,12 @@ public class ParachuterComponentTests extends BaseTestCase {
                
                cr.loadPreset(preset);
                
-               assertEquals( 20.0, cr.getDiameter(), 0.0 );
-               assertEquals( 8, cr.getLineCount(), 0.0 );
-               assertEquals( 12.0, cr.getLineLength(), 0.0 );
+               assertEquals(20.0, cr.getDiameter(), 0.0);
+               assertEquals(8, cr.getLineCount(), 0.0);
+               assertEquals(12.0, cr.getLineLength(), 0.0);
                
-               assertSame( preset.get( ComponentPreset.MATERIAL), cr.getMaterial() );
-               assertSame( preset.get( ComponentPreset.LINE_MATERIAL), cr.getLineMaterial() );
+               assertSame(preset.get(ComponentPreset.MATERIAL), cr.getMaterial());
+               assertSame(preset.get(ComponentPreset.LINE_MATERIAL), cr.getLineMaterial());
        }
        
        @Test
@@ -66,65 +64,65 @@ public class ParachuterComponentTests extends BaseTestCase {
                Parachute cr = new Parachute();
                
                cr.loadPreset(preset);
-
+               
                cr.setDiameter(1.0);
                
-               assertNull( cr.getPresetComponent() );
+               assertNull(cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeAreaClearsPreset() {
                Parachute cr = new Parachute();
                
                cr.loadPreset(preset);
-
+               
                cr.setArea(1.0);
                
-               assertNull( cr.getPresetComponent() );
+               assertNull(cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeLineCountClearsPreset() {
                Parachute cr = new Parachute();
                
                cr.loadPreset(preset);
-
+               
                cr.setLineCount(12);
                
-               assertNull( cr.getPresetComponent() );
+               assertNull(cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeLineLengthLeavesPreset() {
                Parachute cr = new Parachute();
                
                cr.loadPreset(preset);
-
+               
                cr.setLineLength(24);
                
-               assertSame( preset, cr.getPresetComponent() );
+               assertSame(preset, cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeMaterialClearsPreset() {
                Parachute cr = new Parachute();
                
                cr.loadPreset(preset);
-
-               cr.setMaterial( Material.newUserMaterial(Material.Type.SURFACE,"new", 1.0));
                
-               assertNull( cr.getPresetComponent() );
+               cr.setMaterial(Material.newMaterial(Material.Type.SURFACE, "new", 1.0, true));
+               
+               assertNull(cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeLineMaterialLeavesPreset() {
                Parachute cr = new Parachute();
                
                cr.loadPreset(preset);
-
-               cr.setLineMaterial( Material.newUserMaterial(Material.Type.LINE,"new", 1.0));
                
-               assertSame( preset, cr.getPresetComponent() );
+               cr.setLineMaterial(Material.newMaterial(Material.Type.LINE, "new", 1.0, true));
+               
+               assertSame(preset, cr.getPresetComponent());
        }
-
+       
 }