Add implementation for the new up- and download protocoll

Remove some old stuff that is not needed anymore
Fix some small bugs

1 files changed, 26 insertions, 9 deletions

diff --git a/src/test/java/org/openslx/imagemaster/AppTest.java b/src/test/java/org/openslx/imagemaster/AppTest.java
index 00be484..7904efc 100644
--- a/src/test/java/org/openslx/imagemaster/AppTest.java
+++ b/src/test/java/org/openslx/imagemaster/AppTest.java
@@ -1,19 +1,14 @@
 package org.openslx.imagemaster;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SignatureException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
+import java.util.UUID;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.openslx.imagemaster.util.AsymMessageVerifier;
+import org.openslx.imagemaster.serverconnection.ImageProcessor;
+import org.openslx.imagemaster.thrift.iface.ImageData;
+import org.openslx.imagemaster.thrift.iface.UploadInfos;
 import org.openslx.imagemaster.util.Sha512Crypt;
 
 /**
@@ -52,4 +47,26 @@ public class AppTest extends TestCase
 	{
 		Sha512Crypt.selfTest();
 	}
+	
+	public void testImageProcessor() {
+		ImageData imageData = new ImageData(UUID.randomUUID().toString(), 1, "windows7.vmdk",
+				System.currentTimeMillis(), System.currentTimeMillis(), "ns202@uni-freiburg.de", "win7",
+				true, false, "Windows 7", "Das ist ein tolles Windows 7", 40*16*1024*1024L);	// exactly 40 blocks
+		
+		UploadInfos uploadInfos = ImageProcessor.getUploadInfos( "asdfasdfasdf", imageData );
+		assertEquals( "Not the right number of blocks", 20, uploadInfos.missingBlocks.size() );
+		for (int i = 0; i < uploadInfos.missingBlocks.size(); i++) {
+			assertEquals(i, uploadInfos.missingBlocks.remove( 0 ).intValue());
+		}
+		
+		String token = uploadInfos.getToken();
+		
+		uploadInfos = ImageProcessor.getUploadInfos( "asdfasdfasdf", imageData );
+		assertEquals( "Not the right number of blocks", 20, uploadInfos.missingBlocks.size() );
+		for (int i = 0; i < uploadInfos.missingBlocks.size(); i++) {
+			assertEquals(i, uploadInfos.missingBlocks.remove( 0 ).intValue());
+		}
+		
+		assertEquals("Wrong token was sent back.", token, uploadInfos.getToken());
+	}
 }