X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Ftest%2Fnet%2Fsf%2Fopenrocket%2Fpreset%2FNoseConePresetTests.java;h=56e849c5b8566613f1b5be99815a7b2d08a80232;hb=4095cb0dd61a75b7b6b0bd811f8e803af5b27919;hp=f36d026efe08e771cd358ce7f029ee1e210eec01;hpb=b4d058f49c3241d99f090e2892f36a3ed9804666;p=debian%2Fopenrocket

diff --git a/core/test/net/sf/openrocket/preset/NoseConePresetTests.java b/core/test/net/sf/openrocket/preset/NoseConePresetTests.java
index f36d026e..56e849c5 100644
--- a/core/test/net/sf/openrocket/preset/NoseConePresetTests.java
+++ b/core/test/net/sf/openrocket/preset/NoseConePresetTests.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;
@@ -19,136 +18,191 @@ import org.junit.Test;
  * 
  */
 public class NoseConePresetTests extends BaseTestCase {
-
+	
 	@Test
 	public void testManufacturerRequired() {
 		try {
 			TypedPropertyMap presetspec = new TypedPropertyMap();
 			presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.NOSE_CONE);
 			ComponentPresetFactory.create(presetspec);
-		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("No Manufacturer specified"));
+		} catch (InvalidComponentPresetException ex) {
+			PresetAssertHelper.assertInvalidPresetException(ex,
+					new TypedKey<?>[] {
+							ComponentPreset.MANUFACTURER,
+							ComponentPreset.PARTNO,
+							ComponentPreset.LENGTH,
+							ComponentPreset.AFT_OUTER_DIAMETER,
+							ComponentPreset.SHAPE
+					},
+					new String[] {
+							"No Manufacturer specified",
+							"No PartNo specified",
+							"No Length specified",
+							"No AftOuterDiameter specified",
+							"No Shape specified"
+					}
+					);
 		}
 	}
-
+	
 	@Test
 	public void testPartNoRequired() {
 		try {
 			TypedPropertyMap presetspec = new TypedPropertyMap();
 			presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.NOSE_CONE);
-			presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+			presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
 			ComponentPresetFactory.create(presetspec);
-		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("No PartNo specified"));
+		} catch (InvalidComponentPresetException ex) {
+			PresetAssertHelper.assertInvalidPresetException(ex,
+					new TypedKey<?>[] {
+							ComponentPreset.PARTNO,
+							ComponentPreset.LENGTH,
+							ComponentPreset.AFT_OUTER_DIAMETER,
+							ComponentPreset.SHAPE
+					},
+					new String[] {
+							"No PartNo specified",
+							"No Length specified",
+							"No AftOuterDiameter specified",
+							"No Shape specified"
+					}
+					);
 		}
 	}
-
+	
 	@Test
 	public void testLengthRequired() {
 		try {
 			TypedPropertyMap presetspec = new TypedPropertyMap();
 			presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.NOSE_CONE);
-			presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-			presetspec.put( ComponentPreset.PARTNO, "partno");
+			presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+			presetspec.put(ComponentPreset.PARTNO, "partno");
 			ComponentPresetFactory.create(presetspec);
-		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("No Length specified"));
+		} catch (InvalidComponentPresetException ex) {
+			PresetAssertHelper.assertInvalidPresetException(ex,
+					new TypedKey<?>[] {
+							ComponentPreset.LENGTH,
+							ComponentPreset.AFT_OUTER_DIAMETER,
+							ComponentPreset.SHAPE
+					},
+					new String[] {
+							"No Length specified",
+							"No AftOuterDiameter specified",
+							"No Shape specified"
+					}
+					);
 		}
 	}
-
+	
 	@Test
 	public void testShapeRequired() {
 		try {
 			TypedPropertyMap presetspec = new TypedPropertyMap();
 			presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.NOSE_CONE);
-			presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-			presetspec.put( ComponentPreset.PARTNO, "partno");
-			presetspec.put( ComponentPreset.LENGTH, 2.0);
+			presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+			presetspec.put(ComponentPreset.PARTNO, "partno");
+			presetspec.put(ComponentPreset.LENGTH, 2.0);
 			ComponentPresetFactory.create(presetspec);
-		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("No Shape"));
+		} catch (InvalidComponentPresetException ex) {
+			PresetAssertHelper.assertInvalidPresetException(ex,
+					new TypedKey<?>[] {
+							ComponentPreset.AFT_OUTER_DIAMETER,
+							ComponentPreset.SHAPE
+					},
+					new String[] {
+							"No AftOuterDiameter specified",
+							"No Shape specified"
+					}
+					);
 		}
 	}
-
+	
 	@Test
 	public void testAftOuterDiameterRequired() {
 		try {
 			TypedPropertyMap presetspec = new TypedPropertyMap();
 			presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.NOSE_CONE);
-			presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-			presetspec.put( ComponentPreset.PARTNO, "partno");
-			presetspec.put( ComponentPreset.LENGTH, 2.0);
-			presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
+			presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+			presetspec.put(ComponentPreset.PARTNO, "partno");
+			presetspec.put(ComponentPreset.LENGTH, 2.0);
+			presetspec.put(ComponentPreset.SHAPE, Transition.Shape.CONICAL);
 			ComponentPresetFactory.create(presetspec);
-		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("No AftOuterDiameter"));
+		} catch (InvalidComponentPresetException ex) {
+			PresetAssertHelper.assertInvalidPresetException(ex,
+					new TypedKey<?>[] {
+					ComponentPreset.AFT_OUTER_DIAMETER
+					},
+					new String[] {
+					"No AftOuterDiameter specified"
+					}
+					);
 		}
 	}
-
+	
 	@Test
 	public void testComputeDensityNoMaterial() throws Exception {
 		TypedPropertyMap presetspec = new TypedPropertyMap();
 		presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.NOSE_CONE);
-		presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-		presetspec.put( ComponentPreset.PARTNO, "partno");
-		presetspec.put( ComponentPreset.LENGTH, 2.0);
-		presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
-		presetspec.put( ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
-		presetspec.put( ComponentPreset.FILLED, true);
-		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.SHAPE, Transition.Shape.CONICAL);
+		presetspec.put(ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
+		presetspec.put(ComponentPreset.FILLED, true);
+		presetspec.put(ComponentPreset.MASS, 100.0);
 		ComponentPreset preset = ComponentPresetFactory.create(presetspec);
-
+		
 		// constants put into the presetspec above.
-		double volume = /*base area*/ Math.PI;
-		volume *= 2.0 /* times height */ / 3.0; /* one third */
+		double volume = /*base area*/Math.PI;
+		volume *= 2.0 /* times height *// 3.0; /* one third */
 		
 		double density = 100.0 / volume;
 		
-		assertEquals("NoseConeCustom",preset.get(ComponentPreset.MATERIAL).getName());
+		assertEquals("NoseConeCustom", preset.get(ComponentPreset.MATERIAL).getName());
 		// note - epsilon is 1% of the simple computation of density
-		assertEquals(density,preset.get(ComponentPreset.MATERIAL).getDensity(),0.01*density);
+		assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.01 * density);
 	}
-
+	
 	@Test
 	public void testMaterial() throws Exception {
 		TypedPropertyMap presetspec = new TypedPropertyMap();
 		presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.NOSE_CONE);
-		presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-		presetspec.put( ComponentPreset.PARTNO, "partno");
-		presetspec.put( ComponentPreset.LENGTH, 2.0);
-		presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
-		presetspec.put( ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
-		presetspec.put( ComponentPreset.MATERIAL, new Material.Bulk("test", 2.0, true));
+		presetspec.put(ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+		presetspec.put(ComponentPreset.PARTNO, "partno");
+		presetspec.put(ComponentPreset.LENGTH, 2.0);
+		presetspec.put(ComponentPreset.SHAPE, Transition.Shape.CONICAL);
+		presetspec.put(ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
+		presetspec.put(ComponentPreset.MATERIAL, Material.newMaterial(Material.Type.BULK, "test", 2.0, true));
 		ComponentPreset preset = ComponentPresetFactory.create(presetspec);
-
-		assertEquals("test",preset.get(ComponentPreset.MATERIAL).getName());
-		assertEquals(2.0,preset.get(ComponentPreset.MATERIAL).getDensity(),0.0005);
+		
+		assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName());
+		assertEquals(2.0, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005);
 		
 	}
-
+	
 	@Test
 	public void testComputeDensityWithMaterial() throws Exception {
 		TypedPropertyMap presetspec = new TypedPropertyMap();
 		presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.NOSE_CONE);
-		presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
-		presetspec.put( ComponentPreset.PARTNO, "partno");
-		presetspec.put( ComponentPreset.LENGTH, 2.0);
-		presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
-		presetspec.put( ComponentPreset.AFT_OUTER_DIAMETER, 2.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.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
+		presetspec.put(ComponentPreset.PARTNO, "partno");
+		presetspec.put(ComponentPreset.LENGTH, 2.0);
+		presetspec.put(ComponentPreset.SHAPE, Transition.Shape.CONICAL);
+		presetspec.put(ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
+		presetspec.put(ComponentPreset.FILLED, true);
+		presetspec.put(ComponentPreset.MASS, 100.0);
+		presetspec.put(ComponentPreset.MATERIAL, Material.newMaterial(Material.Type.BULK, "test", 2.0, true));
 		ComponentPreset preset = ComponentPresetFactory.create(presetspec);
-
+		
 		// constants put into the presetspec above.
-		double volume = /*base area*/ Math.PI;
-		volume *= 2.0 /* times height */ / 3.0; /* one third */
+		double volume = /*base area*/Math.PI;
+		volume *= 2.0 /* times height *// 3.0; /* one third */
 		
 		double density = 100.0 / volume;
 		
-		assertEquals("test",preset.get(ComponentPreset.MATERIAL).getName());
+		assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName());
 		// note - epsilon is 1% of the simple computation of density
-		assertEquals(density,preset.get(ComponentPreset.MATERIAL).getDensity(),0.01*density);
+		assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.01 * density);
 	}
-
+	
 }