diff --git a/core/test/net/sf/openrocket/preset/BodyTubePresetTests.java b/core/test/net/sf/openrocket/preset/BodyTubePresetTests.java index cca185cc0..33d75293b 100644 --- a/core/test/net/sf/openrocket/preset/BodyTubePresetTests.java +++ b/core/test/net/sf/openrocket/preset/BodyTubePresetTests.java @@ -222,7 +222,7 @@ public class BodyTubePresetTests { double density = 100.0 / volume; - assertEquals("[material:TubeCustom]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("TubeCustom", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } @@ -264,7 +264,7 @@ public class BodyTubePresetTests { double density = 100.0 / volume; - assertEquals("[material:test]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } diff --git a/core/test/net/sf/openrocket/preset/BulkHeadPresetTests.java b/core/test/net/sf/openrocket/preset/BulkHeadPresetTests.java index 61dc2b1a4..2f393bac3 100644 --- a/core/test/net/sf/openrocket/preset/BulkHeadPresetTests.java +++ b/core/test/net/sf/openrocket/preset/BulkHeadPresetTests.java @@ -126,7 +126,7 @@ public class BulkHeadPresetTests { double density = 100.0 / volume; - assertEquals("[material:BulkHeadCustom]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("BulkHeadCustom", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } @@ -166,7 +166,7 @@ public class BulkHeadPresetTests { double density = 100.0 / volume; - assertEquals("[material:test]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } diff --git a/core/test/net/sf/openrocket/preset/CenteringRingPresetTests.java b/core/test/net/sf/openrocket/preset/CenteringRingPresetTests.java index 17a528669..718e4be59 100644 --- a/core/test/net/sf/openrocket/preset/CenteringRingPresetTests.java +++ b/core/test/net/sf/openrocket/preset/CenteringRingPresetTests.java @@ -222,7 +222,7 @@ public class CenteringRingPresetTests { double density = 100.0 / volume; - assertEquals("[material:CenteringRingCustom]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("CenteringRingCustom", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } @@ -264,7 +264,7 @@ public class CenteringRingPresetTests { double density = 100.0 / volume; - assertEquals("[material:test]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } diff --git a/core/test/net/sf/openrocket/preset/EngineBlockPresetTests.java b/core/test/net/sf/openrocket/preset/EngineBlockPresetTests.java index e8158e716..d032b5134 100644 --- a/core/test/net/sf/openrocket/preset/EngineBlockPresetTests.java +++ b/core/test/net/sf/openrocket/preset/EngineBlockPresetTests.java @@ -222,7 +222,7 @@ public class EngineBlockPresetTests { double density = 100.0 / volume; - assertEquals("[material:EngineBlockCustom]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("EngineBlockCustom", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } @@ -264,7 +264,7 @@ public class EngineBlockPresetTests { double density = 100.0 / volume; - assertEquals("[material:test]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } diff --git a/core/test/net/sf/openrocket/preset/LaunchLugPresetTests.java b/core/test/net/sf/openrocket/preset/LaunchLugPresetTests.java index f7f7f7b13..207931d3c 100644 --- a/core/test/net/sf/openrocket/preset/LaunchLugPresetTests.java +++ b/core/test/net/sf/openrocket/preset/LaunchLugPresetTests.java @@ -222,7 +222,7 @@ public class LaunchLugPresetTests { double density = 100.0 / volume; - assertEquals("[material:TubeCustom]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("TubeCustom", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } @@ -264,7 +264,7 @@ public class LaunchLugPresetTests { double density = 100.0 / volume; - assertEquals("[material:test]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } diff --git a/core/test/net/sf/openrocket/preset/NoseConePresetTests.java b/core/test/net/sf/openrocket/preset/NoseConePresetTests.java index 0cef4d55b..56e849c5b 100644 --- a/core/test/net/sf/openrocket/preset/NoseConePresetTests.java +++ b/core/test/net/sf/openrocket/preset/NoseConePresetTests.java @@ -158,7 +158,7 @@ public class NoseConePresetTests extends BaseTestCase { double density = 100.0 / volume; - assertEquals("[material: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); } @@ -200,7 +200,7 @@ public class NoseConePresetTests extends BaseTestCase { double density = 100.0 / volume; - assertEquals("[material: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); } diff --git a/core/test/net/sf/openrocket/preset/TransitionPresetTests.java b/core/test/net/sf/openrocket/preset/TransitionPresetTests.java index e182a5bf2..26593dd8e 100644 --- a/core/test/net/sf/openrocket/preset/TransitionPresetTests.java +++ b/core/test/net/sf/openrocket/preset/TransitionPresetTests.java @@ -163,7 +163,7 @@ public class TransitionPresetTests extends BaseTestCase { double density = 100.0 / volume; - assertEquals("[material:TransitionCustom]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("TransitionCustom", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.01 * density); } @@ -214,7 +214,7 @@ public class TransitionPresetTests extends BaseTestCase { double density = 100.0 / volume; - assertEquals("[material:test]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.01 * density); } diff --git a/core/test/net/sf/openrocket/preset/TubeCouplerPresetTests.java b/core/test/net/sf/openrocket/preset/TubeCouplerPresetTests.java index f7c9a66ad..7ef16ede9 100644 --- a/core/test/net/sf/openrocket/preset/TubeCouplerPresetTests.java +++ b/core/test/net/sf/openrocket/preset/TubeCouplerPresetTests.java @@ -222,7 +222,7 @@ public class TubeCouplerPresetTests { double density = 100.0 / volume; - assertEquals("[material:TubeCustom]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("TubeCustom", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); } @@ -264,7 +264,7 @@ public class TubeCouplerPresetTests { double density = 100.0 / volume; - assertEquals("[material:test]", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("test", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); }