From 5b313276f4a3440225353ecde0e4a51e51cd8273 Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Sat, 8 Jun 2019 13:08:20 +0100
Subject: [PATCH] fix tests broken by piece size change

---
 .../com/muwire/core/files/FileHasherTest.groovy    | 14 +++++++-------
 .../core/files/PersisterServiceLoadingTest.groovy  |  6 ++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/src/test/groovy/com/muwire/core/files/FileHasherTest.groovy b/core/src/test/groovy/com/muwire/core/files/FileHasherTest.groovy
index bae3f7ce..d1217d42 100644
--- a/core/src/test/groovy/com/muwire/core/files/FileHasherTest.groovy
+++ b/core/src/test/groovy/com/muwire/core/files/FileHasherTest.groovy
@@ -24,9 +24,9 @@ class FileHasherTest extends GroovyTestCase {
 	
 	@Test
 	void testPieceSize() {
-		assert 18 == FileHasher.getPieceSize(1000000)
-		assert 20 == FileHasher.getPieceSize(100000000)
-		assert 30 == FileHasher.getPieceSize(FileHasher.MAX_SIZE)
+		assert 17 == FileHasher.getPieceSize(1000000)
+		assert 17 == FileHasher.getPieceSize(100000000)
+		assert 27 == FileHasher.getPieceSize(FileHasher.MAX_SIZE)
 		shouldFail IllegalArgumentException, {
 			FileHasher.getPieceSize(Long.MAX_VALUE)
 		}
@@ -48,7 +48,7 @@ class FileHasherTest extends GroovyTestCase {
 		fos.write b
 		fos.close()
 		def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 32
+		assert ih.getHashList().length == 64
 	}
 	
 	@Test
@@ -58,7 +58,7 @@ class FileHasherTest extends GroovyTestCase {
 		fos.write b
 		fos.close()
 		def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 64
+		assert ih.getHashList().length == 96
 	}
 	
 	@Test
@@ -68,7 +68,7 @@ class FileHasherTest extends GroovyTestCase {
 		fos.write b
 		fos.close()
 		def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 64
+		assert ih.getHashList().length == 128
 	}
 	
 	@Test
@@ -78,6 +78,6 @@ class FileHasherTest extends GroovyTestCase {
 		fos.write b
 		fos.close()
 		def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 32 * 3
+		assert ih.getHashList().length == 160
 	}
 }
diff --git a/core/src/test/groovy/com/muwire/core/files/PersisterServiceLoadingTest.groovy b/core/src/test/groovy/com/muwire/core/files/PersisterServiceLoadingTest.groovy
index eecfc426..92f057cb 100644
--- a/core/src/test/groovy/com/muwire/core/files/PersisterServiceLoadingTest.groovy
+++ b/core/src/test/groovy/com/muwire/core/files/PersisterServiceLoadingTest.groovy
@@ -99,7 +99,7 @@ class PersisterServiceLoadingTest {
 		FileHasher fh = new FileHasher()
 		InfoHash ih1 = fh.hashFile(sharedFile1)
 		
-		assert ih1.getHashList().length == 2 * 32
+		assert ih1.getHashList().length == 96
 		
 		def json = [:]
 		json.file = getSharedFileJsonName(sharedFile1)
@@ -111,7 +111,9 @@ class PersisterServiceLoadingTest {
 		String hash1 = Base64.encode(tmp)
 		System.arraycopy(ih1.getHashList(), 32, tmp, 0, 32)
 		String hash2 = Base64.encode(tmp)
-		json.hashList = [hash1, hash2]
+        System.arraycopy(ih1.getHashList(), 64, tmp, 0, 32)
+        String hash3 = Base64.encode(tmp)
+		json.hashList = [hash1, hash2, hash3]
 		
 		json = JsonOutput.toJson(json)