(no commit message)

diff --git a/test/com/billkuker/rocketry/motorsim/test/FuelIOTest.java b/test/com/billkuker/rocketry/motorsim/test/FuelIOTest.java
index 0e54a018d9b31080bc0e6deea5b9eea4e6478226..850d5eb598d3229749230b3feb92266afe5e4022 100644 (file)
--- 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;
 \r
 import com.billkuker.rocketry.motorsim.Fuel;\r
 import com.billkuker.rocketry.motorsim.RocketScience;\r
-import com.billkuker.rocketry.motorsim.fuel.SaintRobertFuel;\r
 import com.billkuker.rocketry.motorsim.fuel.editable.EditablePiecewiseLinearFuel;\r
 import com.billkuker.rocketry.motorsim.fuel.editable.EditablePiecewiseSaintRobertFuel;\r
 import com.billkuker.rocketry.motorsim.io.MotorIO;\r

diff --git a/test/com/billkuker/rocketry/motorsim/test/MotorIOTest.java b/test/com/billkuker/rocketry/motorsim/test/MotorIOTest.java
index b77dba9546203852a8f6a82df0f3600ceb6646f8..f6e14d6194286de1931450d4dbb9a915bd271c6f 100644 (file)
--- 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;\r
 import java.io.FileInputStream;\r
 import java.io.FileOutputStream;\r
+import java.net.URI;\r
 \r
 import javax.measure.unit.SI;\r
 \r
@@ -13,7 +14,7 @@ import org.junit.Test;
 import com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle;\r
 import com.billkuker.rocketry.motorsim.CylindricalChamber;\r
 import com.billkuker.rocketry.motorsim.Motor;\r
-import com.billkuker.rocketry.motorsim.fuel.KNSU;\r
+import com.billkuker.rocketry.motorsim.fuel.FuelResolver;\r
 import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain;\r
 import com.billkuker.rocketry.motorsim.grain.MultiGrain;\r
 import com.billkuker.rocketry.motorsim.io.MotorIO;\r
@@ -24,7 +25,7 @@ public class MotorIOTest {
        public void testReadWrite() throws Exception {\r
                Motor m = new Motor();\r
                m.setName("IOTestMotor");\r
-               m.setFuel(new KNSU());\r
+               m.setFuel(FuelResolver.getFuel(new URI("motorsim:KNSB")));\r
 \r
                CylindricalChamber c = new CylindricalChamber();\r
                c.setLength(Amount.valueOf(200, SI.MILLIMETER));\r