De-localize Material and FlightDataType objects when persisting in ork files. Added...

[debian/openrocket] / core / test / net / sf / openrocket / preset / BodyTubePresetTests.java

diff --git a/core/test/net/sf/openrocket/preset/BodyTubePresetTests.java b/core/test/net/sf/openrocket/preset/BodyTubePresetTests.java
index 9d63798502e5d738db630db54bd1647e8ebbfe0e..182605f50d2fc9667615d5d823a9a8adc526ea61 100644 (file)
--- a/core/test/net/sf/openrocket/preset/BodyTubePresetTests.java
+++ b/core/test/net/sf/openrocket/preset/BodyTubePresetTests.java
@@ -235,7 +235,7 @@ public class BodyTubePresetTests {
                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());
@@ -253,7 +253,7 @@ public class BodyTubePresetTests {
                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