From: Bill Kuker <bkuker@billkuker.com>
Date: Sat, 30 Oct 2010 16:59:45 +0000 (+0000)
Subject: Test organization
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=516eb1063b77373cd135b1b3f9024721536707c4;p=sw%2Fmotorsim

Test organization
---

diff --git a/test/UnitTests.java b/test/UnitTests.java
index 05f3801..a3365f1 100644
--- a/test/UnitTests.java
+++ b/test/UnitTests.java
@@ -1,4 +1,18 @@
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
+import com.billkuker.rocketry.motorsim.test.ConvergentDivergentNozzleTest;
+import com.billkuker.rocketry.motorsim.test.CoredCylindricalGrainTest;
+import com.billkuker.rocketry.motorsim.test.CylindricalChamberTest;
+import com.billkuker.rocketry.motorsim.test.KNSUTest;
+import com.billkuker.rocketry.motorsim.test.MotorIOTest;
+import com.billkuker.rocketry.motorsim.test.ShapeUtilTest;
+
+@RunWith(Suite.class)
+@SuiteClasses({ ConvergentDivergentNozzleTest.class,
+		CoredCylindricalGrainTest.class, CylindricalChamberTest.class,
+		KNSUTest.class, MotorIOTest.class, ShapeUtilTest.class })
 public class UnitTests {
 
 }
diff --git a/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java b/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java
new file mode 100644
index 0000000..986ccba
--- /dev/null
+++ b/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java
@@ -0,0 +1,25 @@
+package com.billkuker.rocketry.motorsim.test;
+
+import javax.measure.unit.SI;
+import javax.measure.unit.Unit;
+
+import org.jscience.physics.amount.Amount;
+import org.junit.Assert;
+
+public abstract class AbstractRocketTest {
+	
+	protected static final Unit<javax.measure.quantity.Area> sqMM = SI.MILLIMETER.pow(2).asType(javax.measure.quantity.Area.class);
+	
+	
+	protected static final Unit<javax.measure.quantity.Volume> cubeMM = SI.MILLIMETER.pow(3).asType(javax.measure.quantity.Volume.class);
+
+	@SuppressWarnings("unchecked")
+	protected void assertApproximate(Amount a, Amount b){
+		Assert.assertTrue("" + a.to(b.getUnit()) + " !~ " + b , a.approximates(b));
+	}
+	
+	@SuppressWarnings("unchecked")
+	protected void assertApproximate(Amount a, Amount b, Amount diff){
+		Assert.assertTrue("" + a.to(b.getUnit()) + " !~~ " + b ,  a.minus(b).abs().isLessThan(diff));
+	}
+}
diff --git a/test/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java b/test/com/billkuker/rocketry/motorsim/test/ConvergentDivergentNozzleTest.java
index f9ee4c2..64bc299 100644
--- 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;
 import com.billkuker.rocketry.motorsim.fuel.KNSU;
 
-public class ConvergentDivergentNozzleTest extends RocketTest {
+public class ConvergentDivergentNozzleTest extends AbstractRocketTest {
 	
 	ConvergentDivergentNozzle n = new ConvergentDivergentNozzle();
 	
diff --git a/test/com/billkuker/rocketry/motorsim/test/CoredCylindricalGrainTest.java b/test/com/billkuker/rocketry/motorsim/test/CoredCylindricalGrainTest.java
index b20291e..e461f55 100644
--- 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;
 
 import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain;
 
-public class CoredCylindricalGrainTest extends RocketTest {
+public class CoredCylindricalGrainTest extends AbstractRocketTest {
 
 	@Test
 	public void testSurfaceArea() throws PropertyVetoException {
diff --git a/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java b/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java
index 60600a7..333cdfb 100644
--- 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;
 
 import com.billkuker.rocketry.motorsim.CylindricalChamber;
 
-public class CylindricalChamberTest extends RocketTest {
+public class CylindricalChamberTest extends AbstractRocketTest {
 
 	@Test
 	public void testBurstPressure() {
diff --git a/test/com/billkuker/rocketry/motorsim/test/KNSUTest.java b/test/com/billkuker/rocketry/motorsim/test/KNSUTest.java
index 9845a6f..20448df 100644
--- 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;
 
 import com.billkuker.rocketry.motorsim.fuel.KNSU;
 
-public class KNSUTest extends RocketTest {
+public class KNSUTest extends AbstractRocketTest {
 
 	@Test
 	public void testBurnRate() {
diff --git a/test/com/billkuker/rocketry/motorsim/test/RocketTest.java b/test/com/billkuker/rocketry/motorsim/test/RocketTest.java
deleted file mode 100644
index 149c47e..0000000
--- a/test/com/billkuker/rocketry/motorsim/test/RocketTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.billkuker.rocketry.motorsim.test;
-
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
-
-import org.jscience.physics.amount.Amount;
-import org.junit.Assert;
-
-public class RocketTest {
-	
-	protected static final Unit<javax.measure.quantity.Area> sqMM = SI.MILLIMETER.pow(2).asType(javax.measure.quantity.Area.class);
-	
-	
-	protected static final Unit<javax.measure.quantity.Volume> cubeMM = SI.MILLIMETER.pow(3).asType(javax.measure.quantity.Volume.class);
-
-	@SuppressWarnings("unchecked")
-	protected void assertApproximate(Amount a, Amount b){
-		Assert.assertTrue("" + a.to(b.getUnit()) + " !~ " + b , a.approximates(b));
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected void assertApproximate(Amount a, Amount b, Amount diff){
-		Assert.assertTrue("" + a.to(b.getUnit()) + " !~~ " + b ,  a.minus(b).abs().isLessThan(diff));
-	}
-}
diff --git a/test/com/billkuker/rocketry/motorsim/test/ShapeUtilTest.java b/test/com/billkuker/rocketry/motorsim/test/ShapeUtilTest.java
index 7971220..4ff5567 100644
--- 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;
 
 
-public class ShapeUtilTest extends RocketTest{
+public class ShapeUtilTest extends AbstractRocketTest{
 
 	Area tenByTen = new Area(new Rectangle2D.Double(-5, -5, 10, 10));
 	Area oneByOne = new Area(new Rectangle2D.Double(-.5, -.5, 1, 1));