Fix tests

[debian/openrocket] / core / test / net / sf / openrocket / file / motor / TestMotorLoader.java

diff --git a/core/test/net/sf/openrocket/file/motor/TestMotorLoader.java b/core/test/net/sf/openrocket/file/motor/TestMotorLoader.java
index 8200310a053db5abf386e105c41fad3488bfe690..dbc23e7451696571dfefa80d308c1a1b39c8ab4d 100644 (file)
--- a/core/test/net/sf/openrocket/file/motor/TestMotorLoader.java
+++ b/core/test/net/sf/openrocket/file/motor/TestMotorLoader.java
@@ -8,36 +8,39 @@ import java.util.Arrays;
 import java.util.List;
 
 import net.sf.openrocket.motor.Motor;
-import net.sf.openrocket.motor.MotorDigest;
 import net.sf.openrocket.motor.ThrustCurveMotor;
 
 import org.junit.Test;
 
 public class TestMotorLoader {
        
+       private static final String DIGEST1 = "e523030bc96d5e63313b5723aaea267d";
+       private static final String DIGEST2 = "6a41f0f10b7283793eb0e6b389753729";
+       
+       
        @Test
        public void testGeneralMotorLoader() throws IOException {
                MotorLoader loader = new GeneralMotorLoader();
                
-               test(loader, "test1.eng", "c056cf25df6751f7bb8a94bc4f64750f");
-               test(loader, "test2.rse", "b2fe203ee319ae28b9ccdad26a8f21de");
-               test(loader, "test.zip", "b2fe203ee319ae28b9ccdad26a8f21de", "c056cf25df6751f7bb8a94bc4f64750f");
+               test(loader, "test1.eng", DIGEST1);
+               test(loader, "test2.rse", DIGEST2);
+               test(loader, "test.zip", DIGEST2, DIGEST1);
                
        }
        
        @Test
        public void testRASPMotorLoader() throws IOException {
-               test(new RASPMotorLoader(), "test1.eng", "c056cf25df6751f7bb8a94bc4f64750f");
+               test(new RASPMotorLoader(), "test1.eng", DIGEST1);
        }
        
        @Test
        public void testRocksimMotorLoader() throws IOException {
-               test(new RockSimMotorLoader(), "test2.rse", "b2fe203ee319ae28b9ccdad26a8f21de");
+               test(new RockSimMotorLoader(), "test2.rse", DIGEST2);
        }
        
        @Test
        public void testZipMotorLoader() throws IOException {
-               test(new ZipFileMotorLoader(), "test.zip", "b2fe203ee319ae28b9ccdad26a8f21de", "c056cf25df6751f7bb8a94bc4f64750f");
+               test(new ZipFileMotorLoader(), "test.zip", DIGEST2, DIGEST1);
        }
        
        
@@ -52,12 +55,12 @@ public class TestMotorLoader {
                
                String[] d = new String[digests.length];
                for (int i = 0; i < motors.size(); i++) {
-                       d[i] = MotorDigest.digestMotor((ThrustCurveMotor) motors.get(i));
+                       d[i] = ((ThrustCurveMotor) motors.get(i)).getDigest();
                }
                
                Arrays.sort(digests);
                Arrays.sort(d);
-               assertTrue(Arrays.equals(d, digests));
+               assertTrue("d = " + Arrays.toString(d) + " digests = " + Arrays.toString(digests), Arrays.equals(d, digests));
        }
        
 }