GitHub/BitTorrentSwift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed XCTAssertEqualData macro because XCTAssertEqual now works with data slices

Browse Source
This commit is contained in:
Ben Davis
2017-11-04 18:24:50 +08:00
parent 6c868a9692
commit 939ea1a479
11 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BitTorrent/File Manager/MultFileHandleTests.swift
+8 -8
View File
@@ -43,37 +43,37 @@ class MultFileHandleTests: XCTestCase {
func test_readDataFromFirstFile() {
let data = sut.readData(ofLength: 2)
XCTAssertEqualData(data, Data(bytes: [1,2]))
XCTAssertEqual(data, Data(bytes: [1,2]))
}
func test_scanAndReadData() {
sut.seek(toFileOffset: 4)
let data = sut.readData(ofLength: 3)
XCTAssertEqualData(data, Data(bytes: [5,6,7]))
XCTAssertEqual(data, Data(bytes: [5,6,7]))
}
func test_readDataOverMultipleFiles() {
let data = sut.readData(ofLength: 5)
XCTAssertEqualData(data, Data(bytes: [1,2,3,4,5]))
XCTAssertEqual(data, Data(bytes: [1,2,3,4,5]))
}
func test_writeDataFromFirstFile() {
sut.write(Data(bytes: [11, 12]))
let fileHandle = fileHandles[0]
XCTAssertEqualData(fileHandle.data, Data(bytes: [11,12,3]))
XCTAssertEqual(fileHandle.data, Data(bytes: [11,12,3]))
}
func test_scanAndWriteData() {
sut.seek(toFileOffset: 4)
sut.write(Data(bytes: [15, 16, 17]))
let fileHandle = fileHandles[1]
XCTAssertEqualData(fileHandle.data, Data(bytes: [4, 15, 16, 17, 8]))
XCTAssertEqual(fileHandle.data, Data(bytes: [4, 15, 16, 17, 8]))
}
func test_writeDataOverMultipleFiles() {
sut.write(Data(bytes: [11, 12, 13, 14, 15]))
XCTAssertEqualData(fileHandles[0].data, Data(bytes: [11, 12, 13]))
XCTAssertEqualData(fileHandles[1].data, Data(bytes: [14, 15, 6, 7, 8]))
XCTAssertEqual(fileHandles[0].data, Data(bytes: [11, 12, 13]))
XCTAssertEqual(fileHandles[1].data, Data(bytes: [14, 15, 6, 7, 8]))
}
func test_synchroniseFileAppliesToAllFiles() {
@@ -86,6 +86,6 @@ class MultFileHandleTests: XCTestCase {
func test_canReadLastBytes() {
sut.seek(toFileOffset: 8)
let data = sut.readData(ofLength: 2)
XCTAssertEqualData(data, Data(bytes: [9,10]))
XCTAssertEqual(data, Data(bytes: [9,10]))
}
}
BitTorrent/File Manager/TorrentFileManagerTests.swift
+2 -2
View File
@@ -42,7 +42,7 @@ class TorrentFileManagerTests: XCTestCase {
sut.setPiece(at: 1, data: piece1)
// Then
XCTAssertEqualData(fileHandle.data.correctingIndicies[pieceLength..<pieceLength*2], piece1)
XCTAssertEqual(fileHandle.data.correctingIndicies[pieceLength..<pieceLength*2], piece1)
}
func test_canGetPiece() {
@@ -53,7 +53,7 @@ class TorrentFileManagerTests: XCTestCase {
let result = sut.getPiece(at: 1)
// Then
XCTAssertEqualData(result, piece1)
XCTAssertEqual(result, piece1)
}
// Really slow test (takes ~3.5 seconds)
BitTorrent/Peer Manager/TorrentPeerManagerTests.swift
+1 -1
View File
@@ -363,7 +363,7 @@ class TorrentPeerManagerTests: XCTestCase {
// Then
XCTAssert(delegate.peerRequiresPieceAtIndexCalled)
XCTAssertEqualData(result, data)
XCTAssertEqual(result, data)
if let parameters = delegate.peerRequiresPieceAtIndexParameters {
XCTAssert(parameters.sender === sut)
XCTAssertEqual(parameters.index, 123)
BitTorrent/Peer/Communicator/Message Buffers/TorrentPeerHandshakeMessageBufferTests.swift
+3 -3
View File
@@ -57,8 +57,8 @@ class TorrentPeerHandshakeMessageBufferTests: XCTestCase {
XCTAssert(delegate.gotHandshakeCalled)
XCTAssert(delegate.gotHandshakeParameters?.sender === sut)
XCTAssertEqualData(delegate.gotHandshakeParameters?.peerId, peerId)
XCTAssertEqualData(delegate.gotHandshakeParameters?.remainingBuffer, Data())
XCTAssertEqual(delegate.gotHandshakeParameters?.peerId, peerId)
XCTAssertEqual(delegate.gotHandshakeParameters?.remainingBuffer, Data())
XCTAssertEqual(delegate.gotHandshakeParameters?.onDHT, false)
}
@@ -93,7 +93,7 @@ class TorrentPeerHandshakeMessageBufferTests: XCTestCase {
sut.appendData(data)
XCTAssert(delegate.gotHandshakeCalled)
XCTAssertEqualData(delegate.gotHandshakeParameters?.remainingBuffer, extraBytes)
XCTAssertEqual(delegate.gotHandshakeParameters?.remainingBuffer, extraBytes)
}
func test_canParseOnDHTPeerDiscoveryNetwork() {
BitTorrent/Peer/Communicator/Message Buffers/TorrentPeerMessageBufferTests.swift
+3 -3
View File
@@ -118,7 +118,7 @@ class TorrentPeerMessageBufferTests: XCTestCase {
sut.appendData(data1)
XCTAssert(delegate.gotMessageCalled)
XCTAssert(delegate.gotMessageParameters?.sender === sut)
XCTAssertEqualData(delegate.gotMessageParameters?.message, message1)
XCTAssertEqual(delegate.gotMessageParameters?.message, message1)
delegate.gotMessageCalled = false
delegate.gotMessageParameters = nil
@@ -137,7 +137,7 @@ class TorrentPeerMessageBufferTests: XCTestCase {
sut.appendData(combined)
XCTAssertEqual(delegate.gotMessageCallCount, 2)
XCTAssertEqualData(delegate.previousMessages.first!, message1)
XCTAssertEqualData(delegate.previousMessages.last!, message2)
XCTAssertEqual(delegate.previousMessages.first!, message1)
XCTAssertEqual(delegate.previousMessages.last!, message2)
}
}
BitTorrent/Peer/Communicator/TorrentPeerCommunicatorReadTests.swift
+2 -2
View File
@@ -41,7 +41,7 @@ extension TorrentPeerComminicatorTests {
sut.tcpConnection(tcpConnection, didRead: handshakePayload, withTag: 0)
XCTAssert(delegate.peerSentHandshakeCalled)
XCTAssertEqual(delegate.peerSentHandshakeParameters?.sender, sut)
XCTAssertEqualData(delegate.peerSentHandshakeParameters?.peerId, peerId)
XCTAssertEqual(delegate.peerSentHandshakeParameters?.peerId, peerId)
XCTAssertEqual(delegate.peerSentHandshakeParameters?.onDHT, false)
}
@@ -140,7 +140,7 @@ extension TorrentPeerComminicatorTests {
XCTAssertEqual(delegate.peerSentPieceParameters?.sender, sut)
XCTAssertEqual(delegate.peerSentPieceParameters?.index, index)
XCTAssertEqual(delegate.peerSentPieceParameters?.begin, begin)
XCTAssertEqualData(delegate.peerSentPieceParameters?.block, block)
XCTAssertEqual(delegate.peerSentPieceParameters?.block, block)
}
func test_delegateCalled_whenPeerSendsCancel() {
BitTorrent/Peer/Piece Request info/TorrentUploadPieceRequestTests.swift
+1 -1
View File
@@ -35,7 +35,7 @@ class TorrentUploadPieceRequestTests: XCTestCase {
let expected = Data(bytes: [ 1, 1, 1, 1, 1,
2, 2, 2, 2, 2])
XCTAssertEqualData(result.data, expected)
XCTAssertEqual(result.data, expected)
}
}
BitTorrent/Peer/TorrentPeerUploadingTests.swift
+1 -1
View File
@@ -59,7 +59,7 @@ class TorrentPeerUploadingTests: XCTestCase {
if let sendPieceParameters = communicator.sendPieceParameters {
XCTAssertEqual(sendPieceParameters.index, pieceIndex)
XCTAssertEqual(sendPieceParameters.begin, begin)
XCTAssertEqualData(sendPieceParameters.block, data)
XCTAssertEqual(sendPieceParameters.block, data)
}
}
BitTorrent/Progress Manager/TorrentProgressManagerTests.swift
+1 -1
View File
@@ -105,7 +105,7 @@ class TorrentProgressManagerTests: XCTestCase {
let data = Data(repeating: 1, count: metaInfo.info.length)
sut.setDownloadedPiece(data, pieceIndex: 0)
XCTAssertEqualData(fileHandle.data, data)
XCTAssertEqual(fileHandle.data, data)
}
func test_doesNotReturnUnavailablePieces() {
BitTorrent/Torrent Client/TorrentClientTests.swift
+3 -3
View File
@@ -151,7 +151,7 @@ class TorrentClientTests: XCTestCase {
XCTAssert(progressManager.setDownloadedPieceCalled)
if let setDownloadedPieceParameters = progressManager.setDownloadedPieceParameters {
XCTAssertEqualData(setDownloadedPieceParameters.piece, finalData)
XCTAssertEqual(setDownloadedPieceParameters.piece, finalData)
XCTAssertEqual(setDownloadedPieceParameters.pieceIndex, 123)
}
}
@@ -181,7 +181,7 @@ class TorrentClientTests: XCTestCase {
XCTAssertEqual(progressManager.getNextPieceToDownloadParameter!, bitField)
XCTAssertEqual(result.pieceIndex, expected.pieceIndex)
XCTAssertEqual(result.size, expected.size)
XCTAssertEqualData(result.checksum, expected.checksum)
XCTAssertEqual(result.checksum, expected.checksum)
}
func test_pieceForUploadComesFromFileManager() {
@@ -189,7 +189,7 @@ class TorrentClientTests: XCTestCase {
progressManager.fileHandle.seek(toFileOffset: 0)
progressManager.fileHandle.write(finalData)
let result = sut.torrentPeerManager(peerManager, peerRequiresPieceAtIndex: 0)
XCTAssertEqualData(result, finalData)
XCTAssertEqual(result, finalData)
}
func test_peersConnectingFromServerAreAddedToPeerManager() {
BitTorrentTests/Utilities/BitTorrentTestMacros.swift
-11
View File
@@ -90,14 +90,3 @@ fileprivate func XCTAssertEqualJsonObjects(_ element1: Any?, _ element2: Any?) {
XCTFail()
}
}
// This is a temporary fix as swift 4 has an issue comparing data obtained using the subscript operator
func XCTAssertEqualData(_ lhs: Data?, _ rhs: Data?, file: StaticString = #file, line: UInt = #line) {
guard lhs != nil && rhs != nil else {
if lhs == nil || rhs == nil {
XCTFail("\(String(describing: lhs)) is not equal to \(String(describing: rhs))", file: file, line: line)
}
return
}
XCTAssertEqual(Data(lhs!), Data(rhs!), file: file, line: line)
}