Test organization

diff --git a/test/UnitTests.java b/test/UnitTests.java
index 05f38017d31dc0b0c7fd9ff8e275f30bc2573464..a3365f1bc56504000c31d5d0c191ed5efa0f4f71 100644 (file)
--- a/test/UnitTests.java
+++ b/test/UnitTests.java
@@ -1,4 +1,18 @@
+import org.junit.runner.RunWith;\r
+import org.junit.runners.Suite;\r
+import org.junit.runners.Suite.SuiteClasses;\r
 \r
+import com.billkuker.rocketry.motorsim.test.ConvergentDivergentNozzleTest;\r
+import com.billkuker.rocketry.motorsim.test.CoredCylindricalGrainTest;\r
+import com.billkuker.rocketry.motorsim.test.CylindricalChamberTest;\r
+import com.billkuker.rocketry.motorsim.test.KNSUTest;\r
+import com.billkuker.rocketry.motorsim.test.MotorIOTest;\r
+import com.billkuker.rocketry.motorsim.test.ShapeUtilTest;\r
+\r
+@RunWith(Suite.class)\r
+@SuiteClasses({ ConvergentDivergentNozzleTest.class,\r
+               CoredCylindricalGrainTest.class, CylindricalChamberTest.class,\r
+               KNSUTest.class, MotorIOTest.class, ShapeUtilTest.class })\r
 public class UnitTests {\r
 \r
 }\r

diff --git a/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java b/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java
new file mode 100644 (file)
index 0000000..986ccba
--- /dev/null
+++ b/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java
@@ -0,0 +1,25 @@
+package com.billkuker.rocketry.motorsim.test;\r
+\r
+import javax.measure.unit.SI;\r
+import javax.measure.unit.Unit;\r
+\r
+import org.jscience.physics.amount.Amount;\r
+import org.junit.Assert;\r
+\r
+public abstract class AbstractRocketTest {\r
+       \r
+       protected static final Unit<javax.measure.quantity.Area> sqMM = SI.MILLIMETER.pow(2).asType(javax.measure.quantity.Area.class);\r
+       \r
+       \r
+       protected static final Unit<javax.measure.quantity.Volume> cubeMM = SI.MILLIMETER.pow(3).asType(javax.measure.quantity.Volume.class);\r
+\r
+       @SuppressWarnings("unchecked")\r
+       protected void assertApproximate(Amount a, Amount b){\r
+               Assert.assertTrue("" + a.to(b.getUnit()) + " !~ " + b , a.approximates(b));\r
+       }\r
+       \r
+       @SuppressWarnings("unchecked")\r
+       protected void assertApproximate(Amount a, Amount b, Amount diff){\r
+               Assert.assertTrue("" + a.to(b.getUnit()) + " !~~ " + b ,  a.minus(b).abs().isLessThan(diff));\r
+       }\r
+}\r

diff --git a/test/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java b/test/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java
index f9ee4c25baf0d3b349f5902f2b961a8df04734c7..64bc299dfd1b7585fda8150099115c570d52fbf3 100644 (file)
--- a/test/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java
+++ b/test/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java
@@ -13,7 +13,7 @@ import org.junit.Test;
 import com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle;\r
 import com.billkuker.rocketry.motorsim.fuel.KNSU;\r
 \r
-public class ConvergentDivergentNozzleTest extends RocketTest {\r
+public class ConvergentDivergentNozzleTest extends AbstractRocketTest {\r
        \r
        ConvergentDivergentNozzle n = new ConvergentDivergentNozzle();\r
        \r

diff --git a/test/com/billkuker/rocketry/motorsim/test/CoredCylindricalGrainTest.java b/test/com/billkuker/rocketry/motorsim/test/CoredCylindricalGrainTest.java
index b20291e076f4dce2befb9a8399c4f50c8cb543bf..e461f557751be6696fd83d6ddabc2e890653f9b3 100644 (file)
--- a/test/com/billkuker/rocketry/motorsim/test/CoredCylindricalGrainTest.java
+++ b/test/com/billkuker/rocketry/motorsim/test/CoredCylindricalGrainTest.java
@@ -11,7 +11,7 @@ import org.junit.Test;
 \r
 import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain;\r
 \r
-public class CoredCylindricalGrainTest extends RocketTest {\r
+public class CoredCylindricalGrainTest extends AbstractRocketTest {\r
 \r
        @Test\r
        public void testSurfaceArea() throws PropertyVetoException {\r

diff --git a/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java b/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java
index 60600a7893f28db478eb2db7f01629677f14e935..333cdfbd606a351df710315777838037a139f47f 100644 (file)
--- a/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java
+++ b/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java
@@ -8,7 +8,7 @@ import org.junit.Test;
 \r
 import com.billkuker.rocketry.motorsim.CylindricalChamber;\r
 \r
-public class CylindricalChamberTest extends RocketTest {\r
+public class CylindricalChamberTest extends AbstractRocketTest {\r
 \r
        @Test\r
        public void testBurstPressure() {\r

diff --git a/test/com/billkuker/rocketry/motorsim/test/KNSUTest.java b/test/com/billkuker/rocketry/motorsim/test/KNSUTest.java
index 9845a6f239bea8a3b6cebb02c76f7ab9b440fe22..20448dfa0e7321fd6b830f6abdf564b0f16f3527 100644 (file)
--- a/test/com/billkuker/rocketry/motorsim/test/KNSUTest.java
+++ b/test/com/billkuker/rocketry/motorsim/test/KNSUTest.java
@@ -8,7 +8,7 @@ import org.junit.Test;
 \r
 import com.billkuker.rocketry.motorsim.fuel.KNSU;\r
 \r
-public class KNSUTest extends RocketTest {\r
+public class KNSUTest extends AbstractRocketTest {\r
 \r
        @Test\r
        public void testBurnRate() {\r

diff --git a/test/com/billkuker/rocketry/motorsim/test/RocketTest.java b/test/com/billkuker/rocketry/motorsim/test/RocketTest.java
deleted file mode 100644 (file)
index 149c47e..0000000
--- a/test/com/billkuker/rocketry/motorsim/test/RocketTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.billkuker.rocketry.motorsim.test;\r
-\r
-import javax.measure.unit.SI;\r
-import javax.measure.unit.Unit;\r
-\r
-import org.jscience.physics.amount.Amount;\r
-import org.junit.Assert;\r
-\r
-public class RocketTest {\r
-       \r
-       protected static final Unit<javax.measure.quantity.Area> sqMM = SI.MILLIMETER.pow(2).asType(javax.measure.quantity.Area.class);\r
-       \r
-       \r
-       protected static final Unit<javax.measure.quantity.Volume> cubeMM = SI.MILLIMETER.pow(3).asType(javax.measure.quantity.Volume.class);\r
-\r
-       @SuppressWarnings("unchecked")\r
-       protected void assertApproximate(Amount a, Amount b){\r
-               Assert.assertTrue("" + a.to(b.getUnit()) + " !~ " + b , a.approximates(b));\r
-       }\r
-       \r
-       @SuppressWarnings("unchecked")\r
-       protected void assertApproximate(Amount a, Amount b, Amount diff){\r
-               Assert.assertTrue("" + a.to(b.getUnit()) + " !~~ " + b ,  a.minus(b).abs().isLessThan(diff));\r
-       }\r
-}\r

diff --git a/test/com/billkuker/rocketry/motorsim/test/ShapeUtilTest.java b/test/com/billkuker/rocketry/motorsim/test/ShapeUtilTest.java
index 7971220fe90f72c23babcf981c0ffbcbbda35958..4ff556702e6c002bc80fedeacbcb7ca98e7d6e20 100644 (file)
--- a/test/com/billkuker/rocketry/motorsim/test/ShapeUtilTest.java
+++ b/test/com/billkuker/rocketry/motorsim/test/ShapeUtilTest.java
@@ -10,7 +10,7 @@ import org.junit.Test;
 import com.billkuker.rocketry.motorsim.grain.util.ShapeUtil;\r
 \r
 \r
-public class ShapeUtilTest extends RocketTest{\r
+public class ShapeUtilTest extends AbstractRocketTest{\r
 \r
        Area tenByTen = new Area(new Rectangle2D.Double(-5, -5, 10, 10));\r
        Area oneByOne = new Area(new Rectangle2D.Double(-.5, -.5, 1, 1));\r