X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Ftest%2Fnet%2Fsf%2Fopenrocket%2Ffile%2Fmotor%2FTestMotorLoader.java;h=dbc23e7451696571dfefa80d308c1a1b39c8ab4d;hb=e6f50945950584175a65f7ef5dfdff1c7ed24bc7;hp=74391bdc56fea0f6bd453e8fae9c2a022de0442c;hpb=c94b203d12dd1f25ca02ff4ddab6d8e8a5276768;p=debian%2Fopenrocket

diff --git a/core/test/net/sf/openrocket/file/motor/TestMotorLoader.java b/core/test/net/sf/openrocket/file/motor/TestMotorLoader.java
index 74391bdc..dbc23e74 100644
--- a/core/test/net/sf/openrocket/file/motor/TestMotorLoader.java
+++ b/core/test/net/sf/openrocket/file/motor/TestMotorLoader.java
@@ -1,8 +1,6 @@
 package net.sf.openrocket.file.motor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,29 +14,33 @@ 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);
 	}