goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tests broken by piece size change

pull/4/head
Zlatin Balevsky 2019-06-08 13:08:20 +01:00
parent abba4cc6fa
commit 5b313276f4
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/test/groovy/com/muwire/core/files/FileHasherTest.groovy
View File

@ -24,9 +24,9 @@ class FileHasherTest extends GroovyTestCase {
@Test @Test
void testPieceSize() { void testPieceSize() {
assert 18 == FileHasher.getPieceSize(1000000) assert 17 == FileHasher.getPieceSize(1000000)
assert 20 == FileHasher.getPieceSize(100000000) assert 17 == FileHasher.getPieceSize(100000000)
assert 30 == FileHasher.getPieceSize(FileHasher.MAX_SIZE) assert 27 == FileHasher.getPieceSize(FileHasher.MAX_SIZE)
shouldFail IllegalArgumentException, { shouldFail IllegalArgumentException, {
FileHasher.getPieceSize(Long.MAX_VALUE) FileHasher.getPieceSize(Long.MAX_VALUE)
} }
@ -48,7 +48,7 @@ class FileHasherTest extends GroovyTestCase {
fos.write b fos.write b
fos.close() fos.close()
def ih = hasher.hashFile tmp def ih = hasher.hashFile tmp
assert ih.getHashList().length == 32 assert ih.getHashList().length == 64
} }
@Test @Test
@ -58,7 +58,7 @@ class FileHasherTest extends GroovyTestCase {
fos.write b fos.write b
fos.close() fos.close()
def ih = hasher.hashFile tmp def ih = hasher.hashFile tmp
assert ih.getHashList().length == 64 assert ih.getHashList().length == 96
} }
@Test @Test
@ -68,7 +68,7 @@ class FileHasherTest extends GroovyTestCase {
fos.write b fos.write b
fos.close() fos.close()
def ih = hasher.hashFile tmp def ih = hasher.hashFile tmp
assert ih.getHashList().length == 64 assert ih.getHashList().length == 128
} }
@Test @Test
@ -78,6 +78,6 @@ class FileHasherTest extends GroovyTestCase {
fos.write b fos.write b
fos.close() fos.close()
def ih = hasher.hashFile tmp def ih = hasher.hashFile tmp
assert ih.getHashList().length == 32 * 3 assert ih.getHashList().length == 160
} }
} }

6
core/src/test/groovy/com/muwire/core/files/PersisterServiceLoadingTest.groovy
View File

@ -99,7 +99,7 @@ class PersisterServiceLoadingTest {
FileHasher fh = new FileHasher() FileHasher fh = new FileHasher()
InfoHash ih1 = fh.hashFile(sharedFile1) InfoHash ih1 = fh.hashFile(sharedFile1)
assert ih1.getHashList().length == 2 * 32 assert ih1.getHashList().length == 96
def json = [:] def json = [:]
json.file = getSharedFileJsonName(sharedFile1) json.file = getSharedFileJsonName(sharedFile1)
@ -111,7 +111,9 @@ class PersisterServiceLoadingTest {
String hash1 = Base64.encode(tmp) String hash1 = Base64.encode(tmp)
System.arraycopy(ih1.getHashList(), 32, tmp, 0, 32) System.arraycopy(ih1.getHashList(), 32, tmp, 0, 32)
String hash2 = Base64.encode(tmp) 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) json = JsonOutput.toJson(json)