Renamed the PresetTest helper class to PresetAssertHelper. This keeps ant unittest from carping about a *Test.java file which contains no tests.
This commit is contained in:
parent
51e2dfe6c7
commit
5cd524e675
@ -24,7 +24,7 @@ public class BodyTubePresetTests {
|
||||
presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.BODY_TUBE);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.MANUFACTURER,
|
||||
ComponentPreset.PARTNO,
|
||||
@ -48,7 +48,7 @@ public class BodyTubePresetTests {
|
||||
presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.PARTNO,
|
||||
ComponentPreset.LENGTH
|
||||
@ -71,7 +71,7 @@ public class BodyTubePresetTests {
|
||||
presetspec.put( ComponentPreset.PARTNO, "partno");
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LENGTH
|
||||
},
|
||||
@ -94,7 +94,7 @@ public class BodyTubePresetTests {
|
||||
presetspec.put( ComponentPreset.OUTER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
@ -114,7 +114,7 @@ public class BodyTubePresetTests {
|
||||
presetspec.put( ComponentPreset.INNER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
@ -134,7 +134,7 @@ public class BodyTubePresetTests {
|
||||
presetspec.put( ComponentPreset.THICKNESS, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
|
@ -24,7 +24,7 @@ public class BulkHeadPresetTests {
|
||||
presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.BULK_HEAD);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.MANUFACTURER,
|
||||
ComponentPreset.PARTNO,
|
||||
@ -49,7 +49,7 @@ public class BulkHeadPresetTests {
|
||||
presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.PARTNO,
|
||||
ComponentPreset.LENGTH,
|
||||
@ -73,7 +73,7 @@ public class BulkHeadPresetTests {
|
||||
presetspec.put( ComponentPreset.PARTNO, "partno");
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LENGTH,
|
||||
ComponentPreset.OUTER_DIAMETER
|
||||
@ -96,7 +96,7 @@ public class BulkHeadPresetTests {
|
||||
presetspec.put( ComponentPreset.LENGTH, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.OUTER_DIAMETER
|
||||
},
|
||||
|
@ -24,7 +24,7 @@ public class CenteringRingPresetTests {
|
||||
presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.CENTERING_RING);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.MANUFACTURER,
|
||||
ComponentPreset.PARTNO,
|
||||
@ -48,7 +48,7 @@ public class CenteringRingPresetTests {
|
||||
presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.PARTNO,
|
||||
ComponentPreset.LENGTH
|
||||
@ -71,7 +71,7 @@ public class CenteringRingPresetTests {
|
||||
presetspec.put( ComponentPreset.PARTNO, "partno");
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LENGTH
|
||||
},
|
||||
@ -94,7 +94,7 @@ public class CenteringRingPresetTests {
|
||||
presetspec.put( ComponentPreset.OUTER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
@ -114,7 +114,7 @@ public class CenteringRingPresetTests {
|
||||
presetspec.put( ComponentPreset.INNER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
@ -134,7 +134,7 @@ public class CenteringRingPresetTests {
|
||||
presetspec.put( ComponentPreset.THICKNESS, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
|
@ -24,7 +24,7 @@ public class EngineBlockPresetTests {
|
||||
presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.ENGINE_BLOCK);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.MANUFACTURER,
|
||||
ComponentPreset.PARTNO,
|
||||
@ -48,7 +48,7 @@ public class EngineBlockPresetTests {
|
||||
presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.PARTNO,
|
||||
ComponentPreset.LENGTH
|
||||
@ -71,7 +71,7 @@ public class EngineBlockPresetTests {
|
||||
presetspec.put( ComponentPreset.PARTNO, "partno");
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LENGTH
|
||||
},
|
||||
@ -94,7 +94,7 @@ public class EngineBlockPresetTests {
|
||||
presetspec.put( ComponentPreset.OUTER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
@ -114,7 +114,7 @@ public class EngineBlockPresetTests {
|
||||
presetspec.put( ComponentPreset.INNER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
@ -134,7 +134,7 @@ public class EngineBlockPresetTests {
|
||||
presetspec.put( ComponentPreset.THICKNESS, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
|
@ -24,7 +24,7 @@ public class LaunchLugPresetTests {
|
||||
presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.LAUNCH_LUG);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.MANUFACTURER,
|
||||
ComponentPreset.PARTNO,
|
||||
@ -48,7 +48,7 @@ public class LaunchLugPresetTests {
|
||||
presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.PARTNO,
|
||||
ComponentPreset.LENGTH
|
||||
@ -71,7 +71,7 @@ public class LaunchLugPresetTests {
|
||||
presetspec.put( ComponentPreset.PARTNO, "partno");
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LENGTH
|
||||
},
|
||||
@ -94,7 +94,7 @@ public class LaunchLugPresetTests {
|
||||
presetspec.put( ComponentPreset.OUTER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
@ -114,7 +114,7 @@ public class LaunchLugPresetTests {
|
||||
presetspec.put( ComponentPreset.INNER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
@ -134,7 +134,7 @@ public class LaunchLugPresetTests {
|
||||
presetspec.put( ComponentPreset.THICKNESS, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
|
@ -26,7 +26,7 @@ public class NoseConePresetTests extends BaseTestCase {
|
||||
presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.NOSE_CONE);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.MANUFACTURER,
|
||||
ComponentPreset.PARTNO,
|
||||
@ -53,7 +53,7 @@ public class NoseConePresetTests extends BaseTestCase {
|
||||
presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.PARTNO,
|
||||
ComponentPreset.LENGTH,
|
||||
@ -79,7 +79,7 @@ public class NoseConePresetTests extends BaseTestCase {
|
||||
presetspec.put( ComponentPreset.PARTNO, "partno");
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LENGTH,
|
||||
ComponentPreset.AFT_OUTER_DIAMETER,
|
||||
@ -104,7 +104,7 @@ public class NoseConePresetTests extends BaseTestCase {
|
||||
presetspec.put( ComponentPreset.LENGTH, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.AFT_OUTER_DIAMETER,
|
||||
ComponentPreset.SHAPE
|
||||
@ -128,7 +128,7 @@ public class NoseConePresetTests extends BaseTestCase {
|
||||
presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.AFT_OUTER_DIAMETER
|
||||
},
|
||||
|
@ -22,7 +22,7 @@ public class ParachutePresetTests {
|
||||
presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.PARACHUTE);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.MANUFACTURER,
|
||||
ComponentPreset.PARTNO,
|
||||
@ -49,7 +49,7 @@ public class ParachutePresetTests {
|
||||
presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.PARTNO,
|
||||
ComponentPreset.DIAMETER,
|
||||
@ -75,7 +75,7 @@ public class ParachutePresetTests {
|
||||
presetspec.put( ComponentPreset.PARTNO, "partno");
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.DIAMETER,
|
||||
ComponentPreset.LINE_COUNT,
|
||||
@ -100,7 +100,7 @@ public class ParachutePresetTests {
|
||||
presetspec.put( ComponentPreset.DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LINE_COUNT,
|
||||
ComponentPreset.LINE_LENGTH
|
||||
@ -124,7 +124,7 @@ public class ParachutePresetTests {
|
||||
presetspec.put( ComponentPreset.LINE_COUNT, 6);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LINE_LENGTH
|
||||
},
|
||||
|
@ -2,7 +2,7 @@ package net.sf.openrocket.preset;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
public abstract class PresetTest {
|
||||
public abstract class PresetAssertHelper {
|
||||
|
||||
public static void assertInvalidPresetException( InvalidComponentPresetException exceptions, TypedKey<?>[] keys, String[] messages ) {
|
||||
if ( keys != null ) {
|
@ -22,7 +22,7 @@ public class StreamerPresetTests {
|
||||
presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.STREAMER);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.MANUFACTURER,
|
||||
ComponentPreset.PARTNO,
|
||||
@ -47,7 +47,7 @@ public class StreamerPresetTests {
|
||||
presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.PARTNO,
|
||||
ComponentPreset.LENGTH,
|
||||
@ -71,7 +71,7 @@ public class StreamerPresetTests {
|
||||
presetspec.put( ComponentPreset.PARTNO, "partno");
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LENGTH,
|
||||
ComponentPreset.WIDTH
|
||||
@ -94,7 +94,7 @@ public class StreamerPresetTests {
|
||||
presetspec.put( ComponentPreset.LENGTH, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.WIDTH
|
||||
},
|
||||
|
@ -26,7 +26,7 @@ public class TransitionPresetTests extends BaseTestCase {
|
||||
presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TRANSITION);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.MANUFACTURER,
|
||||
ComponentPreset.PARTNO,
|
||||
@ -53,7 +53,7 @@ public class TransitionPresetTests extends BaseTestCase {
|
||||
presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.PARTNO,
|
||||
ComponentPreset.LENGTH,
|
||||
@ -79,7 +79,7 @@ public class TransitionPresetTests extends BaseTestCase {
|
||||
presetspec.put( ComponentPreset.PARTNO, "partno");
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LENGTH,
|
||||
ComponentPreset.AFT_OUTER_DIAMETER,
|
||||
@ -105,7 +105,7 @@ public class TransitionPresetTests extends BaseTestCase {
|
||||
presetspec.put( ComponentPreset.SHAPE, Transition.Shape.CONICAL);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.AFT_OUTER_DIAMETER,
|
||||
ComponentPreset.FORE_OUTER_DIAMETER
|
||||
@ -131,7 +131,7 @@ public class TransitionPresetTests extends BaseTestCase {
|
||||
presetspec.put( ComponentPreset.AFT_OUTER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.FORE_OUTER_DIAMETER
|
||||
},
|
||||
|
@ -24,7 +24,7 @@ public class TubeCouplerPresetTests {
|
||||
presetspec.put(ComponentPreset.TYPE, ComponentPreset.Type.TUBE_COUPLER);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.MANUFACTURER,
|
||||
ComponentPreset.PARTNO,
|
||||
@ -48,7 +48,7 @@ public class TubeCouplerPresetTests {
|
||||
presetspec.put( ComponentPreset.MANUFACTURER, Manufacturer.getManufacturer("manufacturer"));
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.PARTNO,
|
||||
ComponentPreset.LENGTH
|
||||
@ -71,7 +71,7 @@ public class TubeCouplerPresetTests {
|
||||
presetspec.put( ComponentPreset.PARTNO, "partno");
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
new TypedKey<?>[] {
|
||||
ComponentPreset.LENGTH
|
||||
},
|
||||
@ -94,7 +94,7 @@ public class TubeCouplerPresetTests {
|
||||
presetspec.put( ComponentPreset.OUTER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
@ -114,7 +114,7 @@ public class TubeCouplerPresetTests {
|
||||
presetspec.put( ComponentPreset.INNER_DIAMETER, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
@ -134,7 +134,7 @@ public class TubeCouplerPresetTests {
|
||||
presetspec.put( ComponentPreset.THICKNESS, 2.0);
|
||||
ComponentPresetFactory.create(presetspec);
|
||||
} catch ( InvalidComponentPresetException ex ) {
|
||||
PresetTest.assertInvalidPresetException( ex,
|
||||
PresetAssertHelper.assertInvalidPresetException( ex,
|
||||
null,
|
||||
new String[] {
|
||||
"Preset dimensions underspecified"
|
||||
|
Loading…
x
Reference in New Issue
Block a user