From e32d139aadc9039962f602ea33924237ee54eacc Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Mon, 22 Nov 2010 01:22:08 +0000 Subject: [PATCH] --- test/com/billkuker/rocketry/motorsim/test/FuelIOTest.java | 1 - test/com/billkuker/rocketry/motorsim/test/MotorIOTest.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/com/billkuker/rocketry/motorsim/test/FuelIOTest.java b/test/com/billkuker/rocketry/motorsim/test/FuelIOTest.java index 0e54a01..850d5eb 100644 --- a/test/com/billkuker/rocketry/motorsim/test/FuelIOTest.java +++ b/test/com/billkuker/rocketry/motorsim/test/FuelIOTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import com.billkuker.rocketry.motorsim.Fuel; import com.billkuker.rocketry.motorsim.RocketScience; -import com.billkuker.rocketry.motorsim.fuel.SaintRobertFuel; import com.billkuker.rocketry.motorsim.fuel.editable.EditablePiecewiseLinearFuel; import com.billkuker.rocketry.motorsim.fuel.editable.EditablePiecewiseSaintRobertFuel; import com.billkuker.rocketry.motorsim.io.MotorIO; diff --git a/test/com/billkuker/rocketry/motorsim/test/MotorIOTest.java b/test/com/billkuker/rocketry/motorsim/test/MotorIOTest.java index b77dba9..f6e14d6 100644 --- a/test/com/billkuker/rocketry/motorsim/test/MotorIOTest.java +++ b/test/com/billkuker/rocketry/motorsim/test/MotorIOTest.java @@ -4,6 +4,7 @@ import java.beans.PropertyVetoException; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.net.URI; import javax.measure.unit.SI; @@ -13,7 +14,7 @@ import org.junit.Test; import com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle; import com.billkuker.rocketry.motorsim.CylindricalChamber; import com.billkuker.rocketry.motorsim.Motor; -import com.billkuker.rocketry.motorsim.fuel.KNSU; +import com.billkuker.rocketry.motorsim.fuel.FuelResolver; import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain; import com.billkuker.rocketry.motorsim.grain.MultiGrain; import com.billkuker.rocketry.motorsim.io.MotorIO; @@ -24,7 +25,7 @@ public class MotorIOTest { public void testReadWrite() throws Exception { Motor m = new Motor(); m.setName("IOTestMotor"); - m.setFuel(new KNSU()); + m.setFuel(FuelResolver.getFuel(new URI("motorsim:KNSB"))); CylindricalChamber c = new CylindricalChamber(); c.setLength(Amount.valueOf(200, SI.MILLIMETER)); -- 2.30.2