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

diff --git a/core/test/net/sf/openrocket/preset/EngineBlockPresetTests.java b/core/test/net/sf/openrocket/preset/EngineBlockPresetTests.java
index 67971bc7..9e62ee50 100644
--- a/core/test/net/sf/openrocket/preset/EngineBlockPresetTests.java
+++ b/core/test/net/sf/openrocket/preset/EngineBlockPresetTests.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;
 
@@ -25,7 +24,19 @@ public class EngineBlockPresetTests {
 			presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.ENGINE_BLOCK);
 			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
+			},
+			new String[] {
+					"No Manufacturer specified",
+					"No PartNo specified",
+					"No Length specified",
+					"Preset dimensions underspecified"
+			}
+					);
 		}
 	}
 
@@ -37,7 +48,17 @@ public class EngineBlockPresetTests {
 			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
+			},
+			new String[] {
+					"No PartNo specified",
+					"No Length specified",
+					"Preset dimensions underspecified"
+			}
+					);
 		}
 	}
 
@@ -50,7 +71,15 @@ public class EngineBlockPresetTests {
 			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
+			},
+			new String[] {
+					"No Length specified",
+					"Preset dimensions underspecified"
+			}
+					);
 		}
 	}
 
@@ -65,7 +94,12 @@ public class EngineBlockPresetTests {
 			presetspec.put( ComponentPreset.OUTER_DIAMETER, 2.0);
 			ComponentPresetFactory.create(presetspec);
 		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("Preset underspecified"));
+			PresetAssertHelper.assertInvalidPresetException( ex,
+					null,
+			new String[] {
+					"Preset dimensions underspecified"
+			}
+					);
 		}
 	}
 
@@ -80,7 +114,12 @@ public class EngineBlockPresetTests {
 			presetspec.put( ComponentPreset.INNER_DIAMETER, 2.0);
 			ComponentPresetFactory.create(presetspec);
 		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("Preset underspecified"));
+			PresetAssertHelper.assertInvalidPresetException( ex,
+					null,
+			new String[] {
+					"Preset dimensions underspecified"
+			}
+					);
 		}
 	}
 
@@ -95,7 +134,12 @@ public class EngineBlockPresetTests {
 			presetspec.put( ComponentPreset.THICKNESS, 2.0);
 			ComponentPresetFactory.create(presetspec);
 		} catch ( InvalidComponentPresetException ex ) {
-			assertTrue("Wrong Exception Thrown", ex.getMessage().contains("Preset underspecified"));
+			PresetAssertHelper.assertInvalidPresetException( ex,
+					null,
+			new String[] {
+					"Preset dimensions underspecified"
+			}
+					);
 		}
 	}
 
@@ -191,7 +235,7 @@ public class EngineBlockPresetTests {
 		presetspec.put( ComponentPreset.LENGTH, 2.0);
 		presetspec.put( ComponentPreset.OUTER_DIAMETER, 2.0);
 		presetspec.put( ComponentPreset.INNER_DIAMETER, 1.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);
 
 		assertEquals("test",preset.get(ComponentPreset.MATERIAL).getName());
@@ -209,7 +253,7 @@ public class EngineBlockPresetTests {
 		presetspec.put( ComponentPreset.OUTER_DIAMETER, 2.0);
 		presetspec.put( ComponentPreset.INNER_DIAMETER, 1.0);
 		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);
 
 		// Compute the volume by hand here using a slightly different formula from