X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Ftest%2Fnet%2Fsf%2Fopenrocket%2Fpreset%2FBodyTubeComponentTests.java;h=891d9ed31427c540ea955b4638e30ecd48e27495;hb=4095cb0dd61a75b7b6b0bd811f8e803af5b27919;hp=bac720a61815a77d10369b170bf8c6d76fe6e90d;hpb=d6033007b43b6969696d419f0c8d5b279136f430;p=debian%2Fopenrocket

diff --git a/core/test/net/sf/openrocket/preset/BodyTubeComponentTests.java b/core/test/net/sf/openrocket/preset/BodyTubeComponentTests.java
index bac720a6..891d9ed3 100644
--- a/core/test/net/sf/openrocket/preset/BodyTubeComponentTests.java
+++ b/core/test/net/sf/openrocket/preset/BodyTubeComponentTests.java
@@ -20,27 +20,27 @@ import org.junit.Test;
  * 
  */
 public class BodyTubeComponentTests extends BaseTestCase {
-
+	
 	ComponentPreset preset;
 	
 	@Before
 	public void createPreset() throws Exception {
 		TypedPropertyMap presetspec = new TypedPropertyMap();
 		presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.BODY_TUBE);
-		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() {
 		BodyTube bt = new BodyTube();
 		
-		assertSame( ComponentPreset.Type.BODY_TUBE, bt.getPresetType() );
+		assertSame(ComponentPreset.Type.BODY_TUBE, bt.getPresetType());
 	}
 	
 	@Test
@@ -49,18 +49,18 @@ public class BodyTubeComponentTests extends BaseTestCase {
 		
 		bt.loadPreset(preset);
 		
-		assertEquals( 2.0, bt.getLength(), 0.0 );
-		assertEquals( 1.0, bt.getOuterRadius(), 0.0 );
-		assertEquals( 1.0, bt.getAftRadius(), 0.0 );
-		assertEquals( 0.5, bt.getInnerRadius(), 0.0 );
+		assertEquals(2.0, bt.getLength(), 0.0);
+		assertEquals(1.0, bt.getOuterRadius(), 0.0);
+		assertEquals(1.0, bt.getAftRadius(), 0.0);
+		assertEquals(0.5, bt.getInnerRadius(), 0.0);
 		
-		assertFalse( bt.isAftRadiusAutomatic() );
-		assertFalse( bt.isFilled() );
-		assertFalse( bt.isForeRadiusAutomatic() );
-		assertFalse( bt.isOuterRadiusAutomatic() );
+		assertFalse(bt.isAftRadiusAutomatic());
+		assertFalse(bt.isFilled());
+		assertFalse(bt.isForeRadiusAutomatic());
+		assertFalse(bt.isOuterRadiusAutomatic());
 		
-		assertSame( preset.get( ComponentPreset.MATERIAL), bt.getMaterial() );
-		assertEquals( 100.0, bt.getMass(), 0.05);
+		assertSame(preset.get(ComponentPreset.MATERIAL), bt.getMaterial());
+		assertEquals(100.0, bt.getMass(), 0.05);
 	}
 	
 	@Test
@@ -68,75 +68,75 @@ public class BodyTubeComponentTests extends BaseTestCase {
 		BodyTube bt = new BodyTube();
 		
 		bt.loadPreset(preset);
-
+		
 		bt.setLength(1.0);
 		
-		assertSame( preset, bt.getPresetComponent() );
+		assertSame(preset, bt.getPresetComponent());
 	}
-
+	
 	@Test
 	public void changeODClearsPreset() {
 		BodyTube bt = new BodyTube();
 		
 		bt.loadPreset(preset);
-
+		
 		bt.setOuterRadius(2.0);
 		
-		assertNull( bt.getPresetComponent() );
+		assertNull(bt.getPresetComponent());
 	}
-
+	
 	@Test
 	public void changeIDClearsPreset() {
 		BodyTube bt = new BodyTube();
 		
 		bt.loadPreset(preset);
-
+		
 		bt.setInnerRadius(0.75);
 		
-		assertNull( bt.getPresetComponent() );
+		assertNull(bt.getPresetComponent());
 	}
-
+	
 	@Test
 	public void changeThicknessClearsPreset() {
 		BodyTube bt = new BodyTube();
 		
 		bt.loadPreset(preset);
-
+		
 		bt.setThickness(0.1);
 		
-		assertNull( bt.getPresetComponent() );
+		assertNull(bt.getPresetComponent());
 	}
-
+	
 	@Test
 	public void changeMaterialClearsPreset() {
 		BodyTube bt = new BodyTube();
 		
 		bt.loadPreset(preset);
-
-		bt.setMaterial( new Material.Bulk("new", 1.0, true));
 		
-		assertNull( bt.getPresetComponent() );
+		bt.setMaterial(Material.newMaterial(Material.Type.BULK, "new", 1.0, true));
+		
+		assertNull(bt.getPresetComponent());
 	}
-
+	
 	@Test
 	public void changeFinishLeavesPreset() {
 		BodyTube bt = new BodyTube();
 		
 		bt.loadPreset(preset);
-
-		bt.setFinish( Finish.POLISHED );
 		
-		assertSame( preset, bt.getPresetComponent() );
+		bt.setFinish(Finish.POLISHED);
+		
+		assertSame(preset, bt.getPresetComponent());
 	}
-
+	
 	@Test
 	public void changeFillClearsPreset() {
 		BodyTube bt = new BodyTube();
 		
 		bt.loadPreset(preset);
-
-		bt.setFilled( true );
 		
-		assertNull( bt.getPresetComponent() );
+		bt.setFilled(true);
+		
+		assertNull(bt.getPresetComponent());
 	}
 }