Material localization support

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

diff --git a/core/test/net/sf/openrocket/preset/StreamerComponentTests.java b/core/test/net/sf/openrocket/preset/StreamerComponentTests.java
index b36ada19fab250777468451fbf70f516430266d2..099a8d548038833f32478bc1555a32e851f00235 100644 (file)
--- a/core/test/net/sf/openrocket/preset/StreamerComponentTests.java
+++ b/core/test/net/sf/openrocket/preset/StreamerComponentTests.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.Streamer;
@@ -21,27 +19,27 @@ import org.junit.Test;
  * 
  */
 public class StreamerComponentTests extends BaseTestCase {
-
+       
        ComponentPreset preset;
        
        @Before
        public void createPreset() throws Exception {
                TypedPropertyMap presetspec = new TypedPropertyMap();
                presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.STREAMER);
-               presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-               presetspec.put( ComponentPreset.PARTNO, "partno");
-               presetspec.put( ComponentPreset.LENGTH, 20.0);
-               presetspec.put( ComponentPreset.WIDTH, 2.0);
-               Material m = Material.newUserMaterial(Material.Type.SURFACE,"testMaterial", 2.0);
-               presetspec.put( ComponentPreset.MATERIAL, m);
+               presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+               presetspec.put(ComponentPreset.PARTNO, "partno");
+               presetspec.put(ComponentPreset.LENGTH, 20.0);
+               presetspec.put(ComponentPreset.WIDTH, 2.0);
+               Material m = Material.newMaterial(Material.Type.SURFACE, "testMaterial", 2.0, true);
+               presetspec.put(ComponentPreset.MATERIAL, m);
                preset = ComponentPresetFactory.create(presetspec);
        }
-
+       
        @Test
        public void testComponentType() {
                Streamer cr = new Streamer();
                
-               assertSame( ComponentPreset.Type.STREAMER, cr.getPresetType() );
+               assertSame(ComponentPreset.Type.STREAMER, cr.getPresetType());
        }
        
        @Test
@@ -50,12 +48,12 @@ public class StreamerComponentTests extends BaseTestCase {
                
                cr.loadPreset(preset);
                
-               assertEquals( 20.0, cr.getStripLength(), 0.0 );
-               assertEquals( 2.0, cr.getStripWidth(), 0.0 );
-               assertEquals( 2.0, cr.getLength(), 0.0 );
+               assertEquals(20.0, cr.getStripLength(), 0.0);
+               assertEquals(2.0, cr.getStripWidth(), 0.0);
+               assertEquals(2.0, cr.getLength(), 0.0);
                
-               assertSame( preset.get( ComponentPreset.MATERIAL), cr.getMaterial() );
-               assertEquals( 80.0, cr.getMass(), 0.05);
+               assertSame(preset.get(ComponentPreset.MATERIAL), cr.getMaterial());
+               assertEquals(80.0, cr.getMass(), 0.05);
        }
        
        @Test
@@ -63,32 +61,32 @@ public class StreamerComponentTests extends BaseTestCase {
                Streamer cr = new Streamer();
                
                cr.loadPreset(preset);
-
+               
                cr.setStripLength(1.0);
                
-               assertNull( cr.getPresetComponent() );
+               assertNull(cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeWidthClearsPreset() {
                Streamer cr = new Streamer();
                
                cr.loadPreset(preset);
-
+               
                cr.setStripWidth(1.0);
                
-               assertNull( cr.getPresetComponent() );
+               assertNull(cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeMaterialClearsPreset() {
                Streamer cr = new Streamer();
                
                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());
        }
-
+       
 }