Material localization support

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

diff --git a/core/test/net/sf/openrocket/preset/CenteringRingComponentTests.java b/core/test/net/sf/openrocket/preset/CenteringRingComponentTests.java
index 2b63865587b5142e81943bc1865b8e025df11668..dac3f8fd31701327254bfbc46a460173303c106e 100644 (file)
--- a/core/test/net/sf/openrocket/preset/CenteringRingComponentTests.java
+++ b/core/test/net/sf/openrocket/preset/CenteringRingComponentTests.java
@@ -1,9 +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.*;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.CenteringRing;
@@ -22,27 +19,27 @@ import org.junit.Test;
  * 
  */
 public class CenteringRingComponentTests extends BaseTestCase {
-
+       
        ComponentPreset preset;
        
        @Before
        public void createPreset() throws Exception {
                TypedPropertyMap presetspec = new TypedPropertyMap();
                presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.CENTERING_RING);
-               presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-               presetspec.put( ComponentPreset.PARTNO, "partno");
-               presetspec.put( ComponentPreset.LENGTH, 2.0);
-               presetspec.put( ComponentPreset.OUTER_DIAMETER, 2.0);
-               presetspec.put( ComponentPreset.INNER_DIAMETER, 1.0);
-               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.OUTER_DIAMETER, 2.0);
+               presetspec.put(ComponentPreset.INNER_DIAMETER, 1.0);
+               presetspec.put(ComponentPreset.MASS, 100.0);
                preset = ComponentPresetFactory.create(presetspec);
        }
-
+       
        @Test
        public void testComponentType() {
                CenteringRing cr = new CenteringRing();
                
-               assertSame( ComponentPreset.Type.CENTERING_RING, cr.getPresetType() );
+               assertSame(ComponentPreset.Type.CENTERING_RING, cr.getPresetType());
        }
        
        @Test
@@ -51,14 +48,14 @@ public class CenteringRingComponentTests extends BaseTestCase {
                
                cr.loadPreset(preset);
                
-               assertEquals( 2.0, cr.getLength(), 0.0 );
-               assertEquals( 1.0, cr.getOuterRadius(), 0.0 );
-               assertEquals( 0.5, cr.getInnerRadius(), 0.0 );
+               assertEquals(2.0, cr.getLength(), 0.0);
+               assertEquals(1.0, cr.getOuterRadius(), 0.0);
+               assertEquals(0.5, cr.getInnerRadius(), 0.0);
                
-               assertFalse( cr.isOuterRadiusAutomatic() );
+               assertFalse(cr.isOuterRadiusAutomatic());
                
-               assertSame( preset.get( ComponentPreset.MATERIAL), cr.getMaterial() );
-               assertEquals( 100.0, cr.getMass(), 0.05);
+               assertSame(preset.get(ComponentPreset.MATERIAL), cr.getMaterial());
+               assertEquals(100.0, cr.getMass(), 0.05);
        }
        
        @Test
@@ -66,54 +63,54 @@ public class CenteringRingComponentTests extends BaseTestCase {
                CenteringRing cr = new CenteringRing();
                
                cr.loadPreset(preset);
-
+               
                cr.setLength(1.0);
                
-               assertSame( preset, cr.getPresetComponent() );
+               assertSame(preset, cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeODClearsPreset() {
                CenteringRing cr = new CenteringRing();
                
                cr.loadPreset(preset);
-
+               
                cr.setOuterRadius(2.0);
                
-               assertNull( cr.getPresetComponent() );
+               assertNull(cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeIDClearsPreset() {
                CenteringRing cr = new CenteringRing();
                
                cr.loadPreset(preset);
-
+               
                cr.setInnerRadius(0.75);
                
-               assertNull( cr.getPresetComponent() );
+               assertNull(cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeThicknessClearsPreset() {
                CenteringRing cr = new CenteringRing();
                
                cr.loadPreset(preset);
-
+               
                cr.setThickness(0.1);
                
-               assertNull( cr.getPresetComponent() );
+               assertNull(cr.getPresetComponent());
        }
-
+       
        @Test
        public void changeMaterialClearsPreset() {
                CenteringRing cr = new CenteringRing();
                
                cr.loadPreset(preset);
-
-               cr.setMaterial( Material.newUserMaterial(Material.Type.BULK,"new", 1.0));
                
-               assertNull( cr.getPresetComponent() );
+               cr.setMaterial(Material.newMaterial(Material.Type.BULK, "new", 1.0, true));
+               
+               assertNull(cr.getPresetComponent());
        }
-
+       
 }