X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Ftest%2Fnet%2Fsf%2Fopenrocket%2Fpreset%2FTransitionPresetTests.java;h=a2752eb3afb7a944abfb6d9e48b35d9dad0777b4;hb=4da92a4e994992a78d62a7ca21c88d6c41292d6f;hp=a3f636a7b1f583dbc77f513c9b0e6ca9d107ff4d;hpb=d6033007b43b6969696d419f0c8d5b279136f430;p=debian%2Fopenrocket

diff --git a/core/test/net/sf/openrocket/preset/TransitionPresetTests.java b/core/test/net/sf/openrocket/preset/TransitionPresetTests.java
index a3f636a7..a2752eb3 100644
--- a/core/test/net/sf/openrocket/preset/TransitionPresetTests.java
+++ b/core/test/net/sf/openrocket/preset/TransitionPresetTests.java
@@ -1,7 +1,6 @@
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.Transition;
@@ -27,7 +26,22 @@ public class TransitionPresetTests extends BaseTestCase {
 			presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
 			ComponentPresetFactory.create(presetspec);
 		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("No Manufacturer specified"));
+			PresetAssertHelper.assertInvalidPresetException( ex,
+					new TypedKey<?>[] {
+					ComponentPreset.MANUFACTURER, 
+					ComponentPreset.PARTNO, 
+					ComponentPreset.LENGTH,
+					ComponentPreset.AFT_OUTER_DIAMETER,
+					ComponentPreset.FORE_OUTER_DIAMETER
+			},
+			new String[] {
+					"No Manufacturer specified",
+					"No PartNo specified",
+					"No Length specified",
+					"No AftOuterDiameter specified",
+					"No ForeOuterDiameter specified"
+			}
+					);
 		}
 	}
 
@@ -39,7 +53,20 @@ public class TransitionPresetTests extends BaseTestCase {
 			presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
 			ComponentPresetFactory.create(presetspec);
 		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("No PartNo specified"));
+			PresetAssertHelper.assertInvalidPresetException( ex,
+					new TypedKey<?>[] {
+					ComponentPreset.PARTNO, 
+					ComponentPreset.LENGTH,
+					ComponentPreset.AFT_OUTER_DIAMETER,
+					ComponentPreset.FORE_OUTER_DIAMETER
+			},
+			new String[] {
+					"No PartNo specified",
+					"No Length specified",
+					"No AftOuterDiameter specified",
+					"No ForeOuterDiameter specified"
+			}
+					);
 		}
 	}
 
@@ -52,7 +79,18 @@ public class TransitionPresetTests extends BaseTestCase {
 			presetspec.put( ComponentPreset.PARTNO, "partno");
 			ComponentPresetFactory.create(presetspec);
 		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("No Length specified"));
+			PresetAssertHelper.assertInvalidPresetException( ex,
+					new TypedKey<?>[] {
+					ComponentPreset.LENGTH,
+					ComponentPreset.AFT_OUTER_DIAMETER,
+					ComponentPreset.FORE_OUTER_DIAMETER
+			},
+			new String[] {
+					"No Length specified",
+					"No AftOuterDiameter specified",
+					"No ForeOuterDiameter specified"
+			}
+					);
 		}
 	}
 
@@ -67,7 +105,16 @@ public class TransitionPresetTests extends BaseTestCase {
 			presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
 			ComponentPresetFactory.create(presetspec);
 		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("No AftOuterDiameter"));
+			PresetAssertHelper.assertInvalidPresetException( ex,
+					new TypedKey<?>[] {
+					ComponentPreset.AFT_OUTER_DIAMETER,
+					ComponentPreset.FORE_OUTER_DIAMETER
+			},
+			new String[] {
+					"No AftOuterDiameter specified",
+					"No ForeOuterDiameter specified"
+			}
+					);
 		}
 	}
 
@@ -84,7 +131,14 @@ public class TransitionPresetTests extends BaseTestCase {
 			presetspec.put( ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
 			ComponentPresetFactory.create(presetspec);
 		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("No ForeOuterDiameter"));
+			PresetAssertHelper.assertInvalidPresetException( ex,
+					new TypedKey<?>[] {
+					ComponentPreset.FORE_OUTER_DIAMETER
+			},
+			new String[] {
+					"No ForeOuterDiameter specified"
+			}
+					);
 		}
 	}
 
@@ -110,10 +164,8 @@ public class TransitionPresetTests extends BaseTestCase {
 		double density = 100.0 / volume;
 		
 		assertEquals("TransitionCustom",preset.get(ComponentPreset.MATERIAL).getName());
-		// FIXME - I would expect the nc volume computation to be closer for such a simple shape.
-		// simple math yields 27.2837
-		// 100/nc.getComponentVolume yields 27.59832
-		assertEquals(density,preset.get(ComponentPreset.MATERIAL).getDensity(),0.5);
+
+		assertEquals(density,preset.get(ComponentPreset.MATERIAL).getDensity(),0.01*density);
 	}
 
 	@Test
@@ -127,7 +179,7 @@ public class TransitionPresetTests extends BaseTestCase {
 		presetspec.put( ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
 		presetspec.put( ComponentPreset.FORE_OUTER_DIAMETER, 1.0);
 		presetspec.put( ComponentPreset.FILLED, true);
-		presetspec.put( ComponentPreset.MATERIAL, new Material.Bulk("test", 2.0, true));
+		presetspec.put( ComponentPreset.MATERIAL, Material.newUserMaterial(Material.Type.BULK,"test", 2.0));
 		ComponentPreset preset = ComponentPresetFactory.create(presetspec);
 
 		assertEquals("test",preset.get(ComponentPreset.MATERIAL).getName());
@@ -147,7 +199,7 @@ public class TransitionPresetTests extends BaseTestCase {
 		presetspec.put( ComponentPreset.FORE_OUTER_DIAMETER, 1.0);
 		presetspec.put( ComponentPreset.FILLED, true);
 		presetspec.put( ComponentPreset.MASS, 100.0);
-		presetspec.put( ComponentPreset.MATERIAL, new Material.Bulk("test", 2.0, true));
+		presetspec.put( ComponentPreset.MATERIAL, Material.newUserMaterial(Material.Type.BULK,"test", 2.0));
 		ComponentPreset preset = ComponentPresetFactory.create(presetspec);
 
 		// constants put into the presetspec above.
@@ -163,8 +215,8 @@ public class TransitionPresetTests extends BaseTestCase {
 		double density = 100.0 / volume;
 		
 		assertEquals("test",preset.get(ComponentPreset.MATERIAL).getName());
-		// FIXME - I would expect the nc volume computation to be closer for such a simple shape.
-		assertEquals(density,preset.get(ComponentPreset.MATERIAL).getDensity(),1.5);
+
+		assertEquals(density,preset.get(ComponentPreset.MATERIAL).getDensity(),0.01*density);
 	}
 
 }