Revision db493e51

View differences:

ChatSecureTests/OTROMEMOTestModule.swift
79 79
    
80 80
    func receiveKeyData(_ keyData: [OMEMOKeyData], iv: Data, fromJID: XMPPJID, senderDeviceId:UInt32, payload: Data?, elementId: String?) {
81 81
        let dummyMessage = XMPPMessage(type: "chat", elementID: "1234")
82
        dummyMessage.addAttribute(withName: "from", stringValue: fromJID.full)
83
        dummyMessage.addAttribute(withName: "to", stringValue: username())
82 84
        self.thisUser.signalOMEMOCoordinator.omemo(self, receivedKeyData: keyData, iv: iv, senderDeviceId: senderDeviceId, from: fromJID, payload: payload, message: dummyMessage)
83 85
    }
84 86
    
ChatSecureTests/OTROmemoStorageTest.swift
9 9
import XCTest
10 10
@testable import ChatSecureCore
11 11

  
12
extension OTROMEMOSignalCoordinator {
13
    convenience init(accountYapKey: String, databaseConnection: YapDatabaseConnection) throws {
14
        let capsStorage = XMPPCapabilitiesCoreDataStorage(inMemoryStore: ())!
15
        let serverCaps = OTRServerCapabilities()
16
        let caps = XMPPCapabilities(capabilitiesStorage: capsStorage)
17
        let file = FileTransferManager(connection: databaseConnection, serverCapabilities: serverCaps, sessionConfiguration: URLSessionConfiguration.ephemeral)
18
        let messageStorage = MessageStorage(connection: databaseConnection, capabilities: caps, fileTransfer: file)
19
        try self.init(accountYapKey: accountYapKey, databaseConnection: databaseConnection, messageStorage: messageStorage)
20
    }
21
}
22

  
12 23
class OTROmemoStorageTest: XCTestCase {
13 24
    
14 25
    var databaseManager:OTRDatabaseManager!
......
45 56
        self.databaseManager.setDatabasePassphrase("help", remember: false, error: nil)
46 57
        self.databaseManager.setupDatabase(withName: name, withMediaStorage: false)
47 58
        self.omemoStorage = OTROMEMOStorageManager(accountKey: accountKey, accountCollection:accountCollection, databaseConnection: databaseManager.readWriteDatabaseConnection!)
59
        
48 60
        self.signalStorage = OTRSignalStorageManager(accountKey: accountKey, databaseConnection: databaseManager.readWriteDatabaseConnection!, delegate: nil)
49 61
        self.signalCoordinator = try! OTROMEMOSignalCoordinator(accountYapKey: accountKey, databaseConnection: databaseManager.readWriteDatabaseConnection!)
50 62
        

Also available in: Unified diff