felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 15:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Unit tests

Browse Source
This commit is contained in:
David Langley
2021-09-20 15:56:53 +01:00
parent f97b8a2b3a
commit 84eb32a1e7
11 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RiotSwiftUI/Modules/Common/Avatar/Model/AvatarInputProtocol.swift
View File

@@ -27,3 +27,5 @@ struct AvatarInput: AvatarInputProtocol {
var matrixItemId: String
let displayName: String?
}
extension AvatarInput: Equatable { }

2
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
View File

@@ -23,4 +23,4 @@ struct TemplateRoomChatBubble {
var items: [TemplateRoomChatBubbleItem]
}
extension TemplateRoomChatBubble: Identifiable { }
extension TemplateRoomChatBubble: Identifiable, Equatable { }

2
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
View File

@@ -20,3 +20,5 @@ import UIKit
struct TemplateRoomChatMessageImageContent {
var image: UIImage
}
extension TemplateRoomChatMessageImageContent: Equatable { }

2
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
View File

@@ -23,6 +23,6 @@ struct TemplateRoomChatBubbleItem {
var content: TemplateRoomChatBubbleItemContent
}
extension TemplateRoomChatBubbleItem: Identifiable { }
extension TemplateRoomChatBubbleItem: Identifiable, Equatable { }

2
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
View File

@@ -19,3 +19,5 @@ import Foundation
enum TemplateRoomChatBubbleItemContent {
case message(TemplateRoomChatMessageContent)
}
extension TemplateRoomChatBubbleItemContent: Equatable { }

2
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
View File

@@ -33,4 +33,4 @@ extension TemplateRoomChatMember: Avatarable {
}
}
extension TemplateRoomChatMember: Identifiable {}
extension TemplateRoomChatMember: Identifiable, Equatable {}

2
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
View File

@@ -21,3 +21,5 @@ enum TemplateRoomChatMessageContent {
case text(TemplateRoomChatMessageTextContent)
case image(TemplateRoomChatMessageImageContent)
}
extension TemplateRoomChatMessageContent: Equatable { }

3
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
View File

@@ -20,3 +20,6 @@ import Foundation
struct TemplateRoomChatMessageTextContent {
var body: String
}
extension TemplateRoomChatMessageTextContent: Equatable { }

46
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Test/Unit/TemplateRoomChatViewModelTests.swift
View File

@@ -21,34 +21,42 @@ import Combine
@available(iOS 14.0, *)
class TemplateRoomChatViewModelTests: XCTestCase {
private enum Constants {
static let presenceInitialValue: TemplateRoomChatPresence = .offline
static let displayName = "Alice"
}
var service: MockTemplateRoomChatService!
var viewModel: TemplateRoomChatViewModel!
var context: TemplateRoomChatViewModel.Context!
var cancellables = Set<AnyCancellable>()
override func setUpWithError() throws {
service = MockTemplateRoomChatService(displayName: Constants.displayName, presence: Constants.presenceInitialValue)
service = MockTemplateRoomChatService()
service.simulateUpdate(initializationStatus: .initialized)
viewModel = TemplateRoomChatViewModel(templateRoomChatService: service)
context = viewModel.context
}
func testInitialState() {
XCTAssertEqual(viewModel.viewState.displayName, Constants.displayName)
XCTAssertEqual(viewModel.viewState.presence, Constants.presenceInitialValue)
XCTAssertEqual(context.viewState.bubbles.count, 3)
XCTAssertEqual(context.viewState.sendButtonEnabled, false)
XCTAssertEqual(context.viewState.roomInitializationStatus, .initialized)
}
func testFirstPresenceReceived() throws {
let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(1).first()
XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue])
}
func testPresenceUpdatesReceived() throws {
let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(3).first()
let newPresenceValue1: TemplateRoomChatPresence = .online
let newPresenceValue2: TemplateRoomChatPresence = .idle
service.simulateUpdate(presence: newPresenceValue1)
service.simulateUpdate(presence: newPresenceValue2)
XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue, newPresenceValue1, newPresenceValue2])
func testSendMessageUpdatesReceived() throws {
let bubblesPublisher: AnyPublisher<[[TemplateRoomChatBubble]], Never> = context.$viewState.map(\.bubbles).removeDuplicates().collect(2).first().eraseToAnyPublisher()
let awaitDeferred = xcAwaitDeferred(bubblesPublisher)
let newMessage: String = "Let's Go"
service.send(textMessage: newMessage)
let result: [[TemplateRoomChatBubble]]? = try awaitDeferred()
// Test that the update to the messages in turn updates the view's
// the last bubble by appending another text item, asserting the body.
guard let item:TemplateRoomChatBubbleItem = result?.last?.last?.items.last,
case TemplateRoomChatBubbleItemContent.message(let message) = item.content,
case let TemplateRoomChatMessageContent.text(text) = message else {
XCTFail()
return
}
XCTAssertEqual(text.body, newMessage)
}
}

4
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
View File

@@ -18,8 +18,8 @@ import Foundation
struct TemplateRoomListRoom {
let id: String
let avatar: AvatarInputProtocol
let avatar: AvatarInput
let displayName: String?
}
extension TemplateRoomListRoom: Identifiable {}
extension TemplateRoomListRoom: Identifiable, Equatable {}

29
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Test/Unit/TemplateRoomListViewModelTests.swift
View File

@@ -22,33 +22,32 @@ import Combine
@available(iOS 14.0, *)
class TemplateRoomListViewModelTests: XCTestCase {
private enum Constants {
static let presenceInitialValue: TemplateRoomListPresence = .offline
static let displayName = "Alice"
}
var service: MockTemplateRoomListService!
var viewModel: TemplateRoomListViewModel!
var context: TemplateRoomListViewModel.Context!
var cancellables = Set<AnyCancellable>()
override func setUpWithError() throws {
service = MockTemplateRoomListService(displayName: Constants.displayName, presence: Constants.presenceInitialValue)
service = MockTemplateRoomListService()
viewModel = TemplateRoomListViewModel(templateRoomListService: service)
context = viewModel.context
}
func testInitialState() {
XCTAssertEqual(viewModel.viewState.displayName, Constants.displayName)
XCTAssertEqual(viewModel.viewState.presence, Constants.presenceInitialValue)
XCTAssertEqual(context.viewState.rooms, MockTemplateRoomListService.mockRooms)
}
func testFirstPresenceReceived() throws {
let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(1).first()
XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue])
func testFirstValueReceived() throws {
let roomsPublisher = context.$viewState.map(\.rooms).removeDuplicates().collect(1).first()
XCTAssertEqual(try xcAwait(roomsPublisher), [MockTemplateRoomListService.mockRooms])
}
func testPresenceUpdatesReceived() throws {
let presencePublisher = viewModel.$viewState.map(\.presence).removeDuplicates().collect(3).first()
let newPresenceValue1: TemplateRoomListPresence = .online
let newPresenceValue2: TemplateRoomListPresence = .idle
service.simulateUpdate(presence: newPresenceValue1)
service.simulateUpdate(presence: newPresenceValue2)
XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue, newPresenceValue1, newPresenceValue2])
func testUpdatesReceived() throws {
let updatedRooms = Array(MockTemplateRoomListService.mockRooms.dropLast())
let roomsPublisher = context.$viewState.map(\.rooms).removeDuplicates().collect(2).first()
let awaitDeferred = xcAwaitDeferred(roomsPublisher)
service.simulateUpdate(rooms: updatedRooms)
XCTAssertEqual(try awaitDeferred(), [MockTemplateRoomListService.mockRooms, updatedRooms])
}
}