diff --git a/core/src/test/groovy/com/muwire/core/download/DownloadSessionTest.groovy b/core/src/test/groovy/com/muwire/core/download/DownloadSessionTest.groovy index 12ed6ef7..9480658b 100644 --- a/core/src/test/groovy/com/muwire/core/download/DownloadSessionTest.groovy +++ b/core/src/test/groovy/com/muwire/core/download/DownloadSessionTest.groovy @@ -15,7 +15,7 @@ class DownloadSessionTest { private File source, target private InfoHash infoHash private Endpoint endpoint - private Pieces pieces, claimed + private Pieces pieces private String rootBase64 private DownloadSession session @@ -48,8 +48,7 @@ class DownloadSessionTest { else nPieces = size / pieceSize + 1 pieces = new Pieces(nPieces) - claimed = new Pieces(nPieces) - claimedPieces.each {claimed.markDownloaded(it)} + claimedPieces.each {pieces.claimed.set(it)} fromDownloader = new PipedInputStream() fromUploader = new PipedInputStream() @@ -57,7 +56,7 @@ class DownloadSessionTest { toUploader = new PipedOutputStream(fromDownloader) endpoint = new Endpoint(null, fromUploader, toUploader, null) - session = new DownloadSession("",pieces, claimed, infoHash, endpoint, target, pieceSize, size) + session = new DownloadSession("",pieces, infoHash, endpoint, target, pieceSize, size) downloadThread = new Thread( { session.request() } as Runnable) downloadThread.setDaemon(true) downloadThread.start() @@ -154,7 +153,7 @@ class DownloadSessionTest { int pieceSize = FileHasher.getPieceSize(1) int size = (1 << pieceSize) * 10 initSession(size, [1,2,3,4,5,6,7,8,9]) - assert !claimed.isMarked(0) + assert !pieces.claimed.get(0) assert "GET $rootBase64" == readTillRN(fromDownloader) String range = readTillRN(fromDownloader) @@ -162,7 +161,7 @@ class DownloadSessionTest { int start = Integer.parseInt(matcher[0][1]) int end = Integer.parseInt(matcher[0][2]) - assert claimed.isMarked(0) + assert pieces.claimed.get(0) assert start == 0 && end == (1 << pieceSize) - 1 } } diff --git a/core/src/test/groovy/com/muwire/core/download/PiecesTest.groovy b/core/src/test/groovy/com/muwire/core/download/PiecesTest.groovy index e5568983..09082103 100644 --- a/core/src/test/groovy/com/muwire/core/download/PiecesTest.groovy +++ b/core/src/test/groovy/com/muwire/core/download/PiecesTest.groovy @@ -16,7 +16,7 @@ class PiecesTest { public void testSinglePiece() { pieces = new Pieces(1) assert !pieces.isComplete() - assert pieces.getRandomPiece() == 0 + assert pieces.claim() == 0 pieces.markDownloaded(0) assert pieces.isComplete() } @@ -25,11 +25,11 @@ class PiecesTest { public void testTwoPieces() { pieces = new Pieces(2) assert !pieces.isComplete() - int piece = pieces.getRandomPiece() + int piece = pieces.claim() assert piece == 0 || piece == 1 pieces.markDownloaded(piece) assert !pieces.isComplete() - int piece2 = pieces.getRandomPiece() + int piece2 = pieces.claim() assert piece != piece2 pieces.markDownloaded(piece2) assert pieces.isComplete() 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 d1217d42..ab60a0e2 100644 --- a/core/src/test/groovy/com/muwire/core/files/FileHasherTest.groovy +++ b/core/src/test/groovy/com/muwire/core/files/FileHasherTest.groovy @@ -26,7 +26,7 @@ class FileHasherTest extends GroovyTestCase { void testPieceSize() { assert 17 == FileHasher.getPieceSize(1000000) assert 17 == FileHasher.getPieceSize(100000000) - assert 27 == FileHasher.getPieceSize(FileHasher.MAX_SIZE) + assert 24 == FileHasher.getPieceSize(FileHasher.MAX_SIZE) shouldFail IllegalArgumentException, { FileHasher.getPieceSize(Long.MAX_VALUE) } diff --git a/core/src/test/groovy/com/muwire/core/files/HasherServiceTest.groovy b/core/src/test/groovy/com/muwire/core/files/HasherServiceTest.groovy index 667baf51..1f6e5597 100644 --- a/core/src/test/groovy/com/muwire/core/files/HasherServiceTest.groovy +++ b/core/src/test/groovy/com/muwire/core/files/HasherServiceTest.groovy @@ -27,6 +27,7 @@ class HasherServiceTest { hasher = new FileHasher() service = new HasherService(hasher, eventBus, new FileManager(eventBus, new MuWireSettings())) eventBus.register(FileHashedEvent.class, listener) + eventBus.register(FileSharedEvent.class, service) service.start() } 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 92f057cb..7d4b45a5 100644 --- a/core/src/test/groovy/com/muwire/core/files/PersisterServiceLoadingTest.groovy +++ b/core/src/test/groovy/com/muwire/core/files/PersisterServiceLoadingTest.groovy @@ -78,7 +78,7 @@ class PersisterServiceLoadingTest { persisted.write json PersisterService ps = new PersisterService(persisted, eventBus, 100, null) - ps.start() + ps.onUILoadedEvent(null) Thread.sleep(2000) assert listener.publishedFiles.size() == 1 @@ -121,7 +121,7 @@ class PersisterServiceLoadingTest { persisted.write json PersisterService ps = new PersisterService(persisted, eventBus, 100, null) - ps.start() + ps.onUILoadedEvent(null) Thread.sleep(2000) assert listener.publishedFiles.size() == 1 @@ -163,7 +163,7 @@ class PersisterServiceLoadingTest { persisted.append "$json2\n" PersisterService ps = new PersisterService(persisted, eventBus, 100, null) - ps.start() + ps.onUILoadedEvent(null) Thread.sleep(2000) assert listener.publishedFiles.size() == 2 @@ -195,7 +195,7 @@ class PersisterServiceLoadingTest { persisted.write json1 PersisterService ps = new PersisterService(persisted, eventBus, 100, null) - ps.start() + ps.onUILoadedEvent(null) Thread.sleep(2000) assert listener.publishedFiles.size() == 1 diff --git a/core/src/test/groovy/com/muwire/core/files/PersisterServiceSavingTest.groovy b/core/src/test/groovy/com/muwire/core/files/PersisterServiceSavingTest.groovy index 232a6c7b..08d5737e 100644 --- a/core/src/test/groovy/com/muwire/core/files/PersisterServiceSavingTest.groovy +++ b/core/src/test/groovy/com/muwire/core/files/PersisterServiceSavingTest.groovy @@ -58,7 +58,7 @@ class PersisterServiceSavingTest { sf = new SharedFile(f, ih, 0) ps = new PersisterService(persisted, eventBus, 100, fileSource) - ps.start() + ps.onUILoadedEvent(null) Thread.sleep(1500) JsonSlurper jsonSlurper = new JsonSlurper() @@ -77,7 +77,7 @@ class PersisterServiceSavingTest { sf = new DownloadedFile(f, ih, 0, new HashSet([dests.dest1, dests.dest2])) ps = new PersisterService(persisted, eventBus, 100, fileSource) - ps.start() + ps.onUILoadedEvent(null) Thread.sleep(1500) JsonSlurper jsonSlurper = new JsonSlurper() diff --git a/core/src/test/groovy/com/muwire/core/upload/RequestParsingTest.groovy b/core/src/test/groovy/com/muwire/core/upload/RequestParsingTest.groovy index 1194b0cf..7bd87ca1 100644 --- a/core/src/test/groovy/com/muwire/core/upload/RequestParsingTest.groovy +++ b/core/src/test/groovy/com/muwire/core/upload/RequestParsingTest.groovy @@ -9,18 +9,18 @@ import com.muwire.core.InfoHash class RequestParsingTest { - Request request + ContentRequest request private void fromString(String requestString) { def is = new ByteArrayInputStream(requestString.getBytes(StandardCharsets.US_ASCII)) - request = Request.parse(new InfoHash(new byte[InfoHash.SIZE]), is) + request = Request.parseContentRequest(new InfoHash(new byte[InfoHash.SIZE]), is) } private static void failed(String requestString) { try { def is = new ByteArrayInputStream(requestString.getBytes(StandardCharsets.US_ASCII)) - Request.parse(new InfoHash(new byte[InfoHash.SIZE]), is) + Request.parseContentRequest(new InfoHash(new byte[InfoHash.SIZE]), is) assert false } catch (IOException expected) {} } diff --git a/core/src/test/groovy/com/muwire/core/upload/UploaderTest.groovy b/core/src/test/groovy/com/muwire/core/upload/UploaderTest.groovy index 4cf56cf0..2e0bf31b 100644 --- a/core/src/test/groovy/com/muwire/core/upload/UploaderTest.groovy +++ b/core/src/test/groovy/com/muwire/core/upload/UploaderTest.groovy @@ -19,7 +19,7 @@ class UploaderTest { InputStream is OutputStream os - Request request + ContentRequest request Uploader uploader byte[] inFile @@ -52,7 +52,7 @@ class UploaderTest { } private void startUpload() { - uploader = new Uploader(file, request, endpoint) + uploader = new ContentUploader(file, request, endpoint) uploadThread = new Thread(uploader.respond() as Runnable) uploadThread.setDaemon(true) uploadThread.start() @@ -77,7 +77,7 @@ class UploaderTest { @Test public void testSmallFile() { fillFile(20) - request = new Request(range : new Range(0,19)) + request = new ContentRequest(range : new Range(0,19)) startUpload() assert "200 OK" == readUntilRN() assert "Content-Range: 0-19" == readUntilRN() @@ -92,7 +92,7 @@ class UploaderTest { @Test public void testRequestMiddle() { fillFile(20) - request = new Request(range : new Range(5,15)) + request = new ContentRequest(range : new Range(5,15)) startUpload() assert "200 OK" == readUntilRN() assert "Content-Range: 5-15" == readUntilRN() @@ -108,7 +108,7 @@ class UploaderTest { @Test public void testOutOfRange() { fillFile(20) - request = new Request(range : new Range(0,20)) + request = new ContentRequest(range : new Range(0,20)) startUpload() assert "416 Range Not Satisfiable" == readUntilRN() assert "" == readUntilRN() @@ -118,7 +118,7 @@ class UploaderTest { public void testLargeFile() { final int length = 0x1 << 14 fillFile(length) - request = new Request(range : new Range(0, length - 1)) + request = new ContentRequest(range : new Range(0, length - 1)) startUpload() readUntilRN() readUntilRN()