From b5610b092690b849081cc8aca461fdd932fdb84e Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Thu, 25 Apr 2013 11:16:31 -0500 Subject: [PATCH] Fix the expectations in the PresetTests to account for changes in the DebugTranslator for material names. --- core/test/net/sf/openrocket/preset/BodyTubePresetTests.java | 4 ++-- core/test/net/sf/openrocket/preset/BulkHeadPresetTests.java | 4 ++-- .../net/sf/openrocket/preset/CenteringRingPresetTests.java | 4 ++-- .../test/net/sf/openrocket/preset/EngineBlockPresetTests.java | 4 ++-- core/test/net/sf/openrocket/preset/LaunchLugPresetTests.java | 4 ++-- core/test/net/sf/openrocket/preset/NoseConePresetTests.java | 4 ++-- core/test/net/sf/openrocket/preset/TransitionPresetTests.java | 4 ++-- .../test/net/sf/openrocket/preset/TubeCouplerPresetTests.java | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/test/net/sf/openrocket/preset/BodyTubePresetTests.java b/core/test/net/sf/openrocket/preset/BodyTubePresetTests.java index 33d75293b..cca185cc0 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("TubeCustom", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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("test", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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 2f393bac3..61dc2b1a4 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("BulkHeadCustom", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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("test", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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 718e4be59..17a528669 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("CenteringRingCustom", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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("test", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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 d032b5134..e8158e716 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("EngineBlockCustom", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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("test", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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 207931d3c..f7f7f7b13 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("TubeCustom", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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("test", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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 56e849c5b..0cef4d55b 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("NoseConeCustom", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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("test", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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 26593dd8e..e182a5bf2 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("TransitionCustom", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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("test", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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 7ef16ede9..f7c9a66ad 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("TubeCustom", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material: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("test", preset.get(ComponentPreset.MATERIAL).getName()); + assertEquals("[material:test]", preset.get(ComponentPreset.MATERIAL).getName()); assertEquals(density, preset.get(ComponentPreset.MATERIAL).getDensity(), 0.0005); }