From 254e5670dadba71a9e8d7f7ee7a2beef5c97c9d2 Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Tue, 22 May 2012 20:39:29 +0000 Subject: [PATCH] Fix ComponentCompare and ComponentCompareTest. ComponentCompare needed to not verify the getMotorMounts method which was recently added. ComponentCompareTest needed to extend BaseTestCase so the materials db was initialized. --- .../sf/openrocket/rocketcomponent/ComponentCompare.java | 2 +- .../openrocket/rocketcomponent/ComponentCompareTest.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/test/net/sf/openrocket/rocketcomponent/ComponentCompare.java b/core/test/net/sf/openrocket/rocketcomponent/ComponentCompare.java index fb231dc04..aa3fc486d 100644 --- a/core/test/net/sf/openrocket/rocketcomponent/ComponentCompare.java +++ b/core/test/net/sf/openrocket/rocketcomponent/ComponentCompare.java @@ -18,7 +18,7 @@ public class ComponentCompare { "getStageNumber", "getComponentName", // Rocket specific methods: "getModID", "getMassModID", "getAerodynamicModID", "getTreeModID", "getFunctionalModID", - "getMotorConfigurationIDs", "getDefaultConfiguration" + "getMotorConfigurationIDs", "getDefaultConfiguration", "getMotorMounts" }; diff --git a/core/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java b/core/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java index 46c8f21d2..647750ccc 100644 --- a/core/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java +++ b/core/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java @@ -1,16 +1,19 @@ package net.sf.openrocket.rocketcomponent; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.awt.Color; import java.util.Iterator; import net.sf.openrocket.gui.util.ColorConversion; import net.sf.openrocket.util.Coordinate; +import net.sf.openrocket.util.BaseTestCase.BaseTestCase; import org.junit.Test; -public class ComponentCompareTest { +public class ComponentCompareTest extends BaseTestCase { @Test public void testComponentEquality() {