From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Wed, 23 May 2012 14:38:36 +0000 (+0000)
Subject: Minor modification to test case which makes setting breakpoints easier.  No functiona... 
X-Git-Tag: upstream/12.09^2~238
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b48eae1c8a8e2e1ce3d8b42ae8f44ab8ab326553;p=debian%2Fopenrocket

Minor modification to test case which makes setting breakpoints easier.  No functional or assert changes.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@714 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java b/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
index b1444548..285b25a5 100644
--- a/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
+++ b/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
@@ -21,9 +21,11 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		nc.setType( Transition.Shape.CONICAL );
 		nc.setAftRadius(1.0);
 		nc.setMaterial( new Material.Bulk("test",density,true));
-		
+
+		Coordinate cg = nc.getCG();
+
 		System.out.println( nc.getComponentVolume() + "\t" + nc.getMass());
-		System.out.println(nc.getCG());
+		System.out.println( cg );
 		
 		double volume = Math.PI / 3.0;
 		
@@ -33,7 +35,6 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		
 		assertEquals( volume, nc.getComponentVolume(), epsilonPercent * volume);
 		assertEquals( mass, nc.getMass(), epsilonPercent * mass );
-		Coordinate cg = nc.getCG();
 		
 		assertEquals( 0.75, cg.x, epsilonPercent * 0.75 );
 		assertEquals( mass, cg.weight, epsilonPercent * mass);
@@ -55,8 +56,10 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		nc.setAftShoulderThickness(1.0);
 		nc.setMaterial( new Material.Bulk("test",density,true));
 
+		Coordinate cg = nc.getCG();
+
 		System.out.println( nc.getComponentVolume() + "\t" + nc.getMass());
-		System.out.println(nc.getCG());
+		System.out.println( cg );
 
 		double volume = Math.PI / 3.0;
 		volume += Math.PI;
@@ -67,7 +70,6 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 
 		assertEquals( volume, nc.getComponentVolume(), epsilonPercent * volume);
 		assertEquals( mass, nc.getMass(), epsilonPercent * mass );
-		Coordinate cg = nc.getCG();
 		
 		assertEquals( 1.312, cg.x, epsilonPercent * 1.071 );
 		assertEquals( mass, cg.weight, epsilonPercent * mass);
@@ -86,8 +88,10 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		nc.setType( Transition.Shape.CONICAL );
 		nc.setMaterial( new Material.Bulk("test",density,true));
 		
+		Coordinate cg = nc.getCG();
+
 		System.out.println( nc.getComponentVolume() + "\t" + nc.getMass());
-		System.out.println(nc.getCG());
+		System.out.println( cg );
 
 		double volume = Math.PI / 3.0;  // outer volume
 		
@@ -105,7 +109,6 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		
 		assertEquals( volume, nc.getComponentVolume(), epsilonPercent * volume);
 		assertEquals( mass, nc.getMass(), epsilonPercent * mass );
-		Coordinate cg = nc.getCG();
 		
 		assertEquals( 0.7454, cg.x, epsilonPercent * 0.7454 );
 		assertEquals( mass, cg.weight, epsilonPercent * mass);
@@ -127,8 +130,10 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		nc.setAftShoulderThickness(0.5);
 		nc.setMaterial( new Material.Bulk("test",density,true));
 
+		Coordinate cg = nc.getCG();
+
 		System.out.println( nc.getComponentVolume() + "\t" + nc.getMass());
-		System.out.println(nc.getCG());
+		System.out.println( cg );
 
 		double volume = Math.PI / 3.0;  // outer volume
 
@@ -149,7 +154,6 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		
 		assertEquals( volume, nc.getComponentVolume(), epsilonPercent * volume);
 		assertEquals( mass, nc.getMass(), epsilonPercent * mass );
-		Coordinate cg = nc.getCG();
 		
 		assertEquals( 1.2719, cg.x, epsilonPercent * 1.2719 );
 		assertEquals( mass, cg.weight, epsilonPercent * mass);
@@ -169,8 +173,10 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		nc.setAftRadius(2.0);
 		nc.setMaterial( new Material.Bulk("test",density,true));
 		
+		Coordinate cg = nc.getCG();
+
 		System.out.println( nc.getComponentVolume() + "\t" + nc.getMass());
-		System.out.println(nc.getCG());
+		System.out.println( cg );
 
 		double volume = Math.PI / 3.0 * (2.0*2.0 + 2.0 * 1.0 + 1.0 * 1.0) * 4.0;
 		
@@ -180,7 +186,6 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		
 		assertEquals( volume, nc.getComponentVolume(), epsilonPercent * volume);
 		assertEquals( mass, nc.getMass(), epsilonPercent * mass );
-		Coordinate cg = nc.getCG();
 		
 		assertEquals( 2.4285, cg.x, epsilonPercent * 2.4285 );
 		assertEquals( mass, cg.weight, epsilonPercent * mass);
@@ -206,8 +211,10 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		nc.setForeShoulderThickness(1.0);
 		nc.setMaterial( new Material.Bulk("test",density,true));
 		
+		Coordinate cg = nc.getCG();
+
 		System.out.println( nc.getComponentVolume() + "\t" + nc.getMass());
-		System.out.println(nc.getCG());
+		System.out.println( cg );
 
 		double volume = Math.PI / 3.0 * (2.0*2.0 + 2.0 * 1.0 + 1.0 * 1.0) * 4.0;
 		// plus aft shoulder:
@@ -221,7 +228,6 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		
 		assertEquals( volume, nc.getComponentVolume(), epsilonPercent * volume);
 		assertEquals( mass, nc.getMass(), epsilonPercent * mass );
-		Coordinate cg = nc.getCG();
 		
 		assertEquals( 2.8023, cg.x, epsilonPercent * 2.8023 );
 		assertEquals( mass, cg.weight, epsilonPercent * mass);
@@ -241,8 +247,10 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		nc.setThickness(0.5);
 		nc.setMaterial( new Material.Bulk("test",density,true));
 		
+		Coordinate cg = nc.getCG();
+
 		System.out.println( nc.getComponentVolume() + "\t" + nc.getMass());
-		System.out.println(nc.getCG());
+		System.out.println( cg );
 
 		// Volume of filled transition = 
 		double filledVolume = Math.PI /3.0 * ( 1.0*1.0 + 1.0 * 0.5 + 0.5 * 0.5 ) * 1.0;
@@ -267,7 +275,6 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		
 		assertEquals( volume, nc.getComponentVolume(), epsilonPercent * volume);
 		assertEquals( mass, nc.getMass(), epsilonPercent * mass );
-		Coordinate cg = nc.getCG();
 		
 		assertEquals( 0.5884, cg.x, epsilonPercent * 0.5884 );
 		assertEquals( mass, cg.weight, epsilonPercent * mass);
@@ -293,8 +300,10 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		nc.setForeShoulderThickness(0.5);  // note this means fore shoulder is filled.
 		nc.setMaterial( new Material.Bulk("test",density,true));
 		
+		Coordinate cg = nc.getCG();
+
 		System.out.println( nc.getComponentVolume() + "\t" + nc.getMass());
-		System.out.println(nc.getCG());
+		System.out.println( cg );
 
 		// Volume of filled transition = 
 		double filledVolume = Math.PI /3.0 * ( 1.0*1.0 + 1.0 * 0.5 + 0.5 * 0.5 ) * 1.0;
@@ -324,7 +333,6 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		
 		assertEquals( volume, nc.getComponentVolume(), epsilonPercent * volume);
 		assertEquals( mass, nc.getMass(), epsilonPercent * mass );
-		Coordinate cg = nc.getCG();
 		
 		assertEquals( 0.8581, cg.x, epsilonPercent * 0.8581 );
 		assertEquals( mass, cg.weight, epsilonPercent * mass);
@@ -344,8 +352,10 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		nc.setThickness(0.25);
 		nc.setMaterial( new Material.Bulk("test",density,true));
 		
+		Coordinate cg = nc.getCG();
+
 		System.out.println( nc.getComponentVolume() + "\t" + nc.getMass());
-		System.out.println(nc.getCG());
+		System.out.println( cg );
 
 		// Volume of filled transition = 
 		double filledVolume = Math.PI /3.0 * ( 1.0*1.0 + 1.0 * 0.5 + 0.5 * 0.5 ) * 1.0;
@@ -370,7 +380,6 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		
 		assertEquals( volume, nc.getComponentVolume(), epsilonPercent * volume);
 		assertEquals( mass, nc.getMass(), epsilonPercent * mass );
-		Coordinate cg = nc.getCG();
 		
 		assertEquals( 0.56827, cg.x, epsilonPercent * 0.56827 );
 		assertEquals( mass, cg.weight, epsilonPercent * mass);
@@ -397,8 +406,10 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		
 		nc.setMaterial( new Material.Bulk("test",density,true));
 		
+		Coordinate cg = nc.getCG();
+
 		System.out.println( nc.getComponentVolume() + "\t" + nc.getMass());
-		System.out.println(nc.getCG());
+		System.out.println( cg );
 
 		// Volume of filled transition = 
 		double filledVolume = Math.PI /3.0 * ( 1.0*1.0 + 1.0 * 0.5 + 0.5 * 0.5 ) * 1.0;
@@ -429,7 +440,6 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
 		
 		assertEquals( volume, nc.getComponentVolume(), epsilonPercent * volume);
 		assertEquals( mass, nc.getMass(), epsilonPercent * mass );
-		Coordinate cg = nc.getCG();
 		
 		assertEquals( 0.7829, cg.x, epsilonPercent * 0.7829 );
 		assertEquals( mass, cg.weight, epsilonPercent * mass);