Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

UI and unit tests

Browse source
This commit is contained in:
Aleksandrs Proskurins 2022-10-11 17:19:32 +03:00
parent 0af1ac2692
commit 1d1a0eb914
3 changed files with 140 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/MockUserOtherSessionsScreenState.swift
View file

@ -27,6 +27,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
case all case all
case inactiveSessions case inactiveSessions
case unverifiedSessions case unverifiedSessions
case verifiedSessions
/// The associated screen /// The associated screen
var screenType: Any.Type { var screenType: Any.Type {
@ -36,7 +37,7 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
/// A list of screen state definitions /// A list of screen state definitions
static var allCases: [MockUserOtherSessionsScreenState] { static var allCases: [MockUserOtherSessionsScreenState] {
// Each of the presence statuses // Each of the presence statuses
[.all, .inactiveSessions, .unverifiedSessions] [.all, .inactiveSessions, .unverifiedSessions, .verifiedSessions]
} }
/// Generate the view struct for the screen state. /// Generate the view struct for the screen state.
@ -55,6 +56,10 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
viewModel = UserOtherSessionsViewModel(sessionInfos: unverifiedSessions(), viewModel = UserOtherSessionsViewModel(sessionInfos: unverifiedSessions(),
filter: .unverified, filter: .unverified,
title: VectorL10n.userOtherSessionSecurityRecommendationTitle) title: VectorL10n.userOtherSessionSecurityRecommendationTitle)
case .verifiedSessions:
viewModel = UserOtherSessionsViewModel(sessionInfos: verifiedSessions(),
filter: .verified,
title: VectorL10n.userOtherSessionSecurityRecommendationTitle)
} }
// can simulate service and viewModel actions here if needs be. // can simulate service and viewModel actions here if needs be.
@ -167,6 +172,41 @@ enum MockUserOtherSessionsScreenState: MockScreenState, CaseIterable {
isCurrent: false)] isCurrent: false)]
} }
private func verifiedSessions() -> [UserSessionInfo] {
[UserSessionInfo(id: "0",
name: "iOS",
deviceType: .mobile,
isVerified: true,
lastSeenIP: "10.0.0.10",
lastSeenTimestamp: nil,
applicationName: nil,
applicationVersion: nil,
applicationURL: nil,
deviceModel: nil,
deviceOS: nil,
lastSeenIPLocation: nil,
clientName: nil,
clientVersion: nil,
isActive: true,
isCurrent: true),
UserSessionInfo(id: "1",
name: "macOS",
deviceType: .desktop,
isVerified: true,
lastSeenIP: "1.0.0.1",
lastSeenTimestamp: Date().timeIntervalSince1970 - 8_000_000,
applicationName: nil,
applicationVersion: nil,
applicationURL: nil,
deviceModel: nil,
deviceOS: nil,
lastSeenIPLocation: nil,
clientName: nil,
clientVersion: nil,
isActive: true,
isCurrent: false)]
}
private func allSessions() -> [UserSessionInfo] { private func allSessions() -> [UserSessionInfo] {
[UserSessionInfo(id: "0", [UserSessionInfo(id: "0",
name: "iOS", name: "iOS",

7
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift
View file

@ -49,4 +49,11 @@ class UserOtherSessionsUITests: MockScreenTestCase {
XCTAssertTrue(app.staticTexts[VectorL10n.userSessionsOverviewOtherSessionsSectionInfo].exists) XCTAssertTrue(app.staticTexts[VectorL10n.userSessionsOverviewOtherSessionsSectionInfo].exists)
} }
func test_whenOtherSessionsWithVerifiedSessionFilterPresented_correctHeaderDisplayed() {
app.goToScreenWithIdentifier(MockUserOtherSessionsScreenState.verifiedSessions.title)
XCTAssertTrue(app.staticTexts[VectorL10n.userSessionVerifiedShort].exists)
XCTAssertTrue(app.staticTexts[VectorL10n.userOtherSessionVerifiedSessionsHeaderSubtitle].exists)
}
} }

112
RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/Unit/UserOtherSessionsViewModelTests.swift
View file

@ -19,12 +19,27 @@ import XCTest
@testable import RiotSwiftUI @testable import RiotSwiftUI
class UserOtherSessionsViewModelTests: XCTestCase { class UserOtherSessionsViewModelTests: XCTestCase {
private let unverifiedSectionHeader = UserOtherSessionsHeaderViewData(title: VectorL10n.userSessionUnverifiedShort,
subtitle: VectorL10n.userOtherSessionUnverifiedSessionsHeaderSubtitle,
iconName: Asset.Images.userOtherSessionsUnverified.name)
private let inactiveSectionHeader = UserOtherSessionsHeaderViewData(title: VectorL10n.userOtherSessionFilterMenuInactive,
subtitle: VectorL10n.userSessionsOverviewSecurityRecommendationsInactiveInfo,
iconName: Asset.Images.userOtherSessionsInactive.name)
private let allSectionHeader = UserOtherSessionsHeaderViewData(title: nil,
subtitle: VectorL10n.userSessionsOverviewOtherSessionsSectionInfo,
iconName: nil)
private let verifiedSectionHeader = UserOtherSessionsHeaderViewData(title: VectorL10n.userOtherSessionFilterMenuVerified,
subtitle: VectorL10n.userOtherSessionVerifiedSessionsHeaderSubtitle,
iconName: Asset.Images.userOtherSessionsVerified.name)
func test_whenUserOtherSessionSelectedProcessed_completionWithShowUserSessionOverviewCalled() { func test_whenUserOtherSessionSelectedProcessed_completionWithShowUserSessionOverviewCalled() {
let expectedUserSessionInfo = createUserSessionInfo(sessionId: "session 2") let expectedUserSessionInfo = createUserSessionInfo(sessionId: "session 2")
let sut = UserOtherSessionsViewModel(sessionInfos: [createUserSessionInfo(sessionId: "session 1"), let sessionInfos = [createUserSessionInfo(sessionId: "session 1"),
expectedUserSessionInfo], expectedUserSessionInfo]
filter: .inactive, let sut = createSUT(sessionInfos: sessionInfos, filter: .inactive)
title: "Title")
var modelResult: UserOtherSessionsViewModelResult? var modelResult: UserOtherSessionsViewModelResult?
sut.completion = { result in sut.completion = { result in
@ -37,43 +52,100 @@ class UserOtherSessionsViewModelTests: XCTestCase {
func test_whenModelCreated_withInactiveFilter_viewStateIsCorrect() { func test_whenModelCreated_withInactiveFilter_viewStateIsCorrect() {
let sessionInfos = [createUserSessionInfo(sessionId: "session 1", isActive: false), let sessionInfos = [createUserSessionInfo(sessionId: "session 1", isActive: false),
createUserSessionInfo(sessionId: "session 2", isActive: false)] createUserSessionInfo(sessionId: "session 2", isActive: false)]
let sut = UserOtherSessionsViewModel(sessionInfos: sessionInfos, let sut = createSUT(sessionInfos: sessionInfos, filter: .inactive)
filter: .inactive,
title: "Title")
let expectedHeader = UserOtherSessionsHeaderViewData(title: VectorL10n.userOtherSessionFilterMenuInactive,
subtitle: VectorL10n.userSessionsOverviewSecurityRecommendationsInactiveInfo,
iconName: Asset.Images.userOtherSessionsInactive.name)
let expectedItems = sessionInfos.filter { !$0.isActive }.asViewData() let expectedItems = sessionInfos.filter { !$0.isActive }.asViewData()
let expectedState = UserOtherSessionsViewState(bindings: UserOtherSessionsBindings(filter: .inactive), let expectedState = UserOtherSessionsViewState(bindings: UserOtherSessionsBindings(filter: .inactive),
title: "Title", title: "Title",
sections: [.sessionItems(header: expectedHeader, items: expectedItems)]) sections: [.sessionItems(header: inactiveSectionHeader, items: expectedItems)])
XCTAssertEqual(sut.state, expectedState) XCTAssertEqual(sut.state, expectedState)
} }
func test_whenModelCreated_withAllFilter_viewStateIsCorrect() { func test_whenModelCreated_withAllFilter_viewStateIsCorrect() {
let sessionInfos = [createUserSessionInfo(sessionId: "session 1"), createUserSessionInfo(sessionId: "session 2")] let sessionInfos = [createUserSessionInfo(sessionId: "session 1"),
let sut = UserOtherSessionsViewModel(sessionInfos: sessionInfos, createUserSessionInfo(sessionId: "session 2")]
filter: .all, let sut = createSUT(sessionInfos: sessionInfos, filter: .all)
title: "Title")
let expectedHeader = UserOtherSessionsHeaderViewData(title: nil,
subtitle: VectorL10n.userSessionsOverviewOtherSessionsSectionInfo,
iconName: nil)
let expectedItems = sessionInfos.filter { !$0.isCurrent }.asViewData() let expectedItems = sessionInfos.filter { !$0.isCurrent }.asViewData()
let expectedState = UserOtherSessionsViewState(bindings: UserOtherSessionsBindings(filter: .all), let expectedState = UserOtherSessionsViewState(bindings: UserOtherSessionsBindings(filter: .all),
title: "Title", title: "Title",
sections: [.sessionItems(header: expectedHeader, items: expectedItems)]) sections: [.sessionItems(header: allSectionHeader, items: expectedItems)])
XCTAssertEqual(sut.state, expectedState) XCTAssertEqual(sut.state, expectedState)
} }
func test_whenModelCreated_withUnverifiedFilter_viewStateIsCorrect() {
let sessionInfos = [createUserSessionInfo(sessionId: "session 1"),
createUserSessionInfo(sessionId: "session 2")]
let sut = createSUT(sessionInfos: sessionInfos, filter: .unverified)
let expectedItems = sessionInfos.filter { !$0.isCurrent }.asViewData()
let expectedState = UserOtherSessionsViewState(bindings: UserOtherSessionsBindings(filter: .unverified),
title: "Title",
sections: [.sessionItems(header: unverifiedSectionHeader, items: expectedItems)])
XCTAssertEqual(sut.state, expectedState)
}
func test_whenModelCreated_withVerifiedFilter_viewStateIsCorrect() {
let sessionInfos = [createUserSessionInfo(sessionId: "session 1", isVerified: true),
createUserSessionInfo(sessionId: "session 2", isVerified: true)]
let sut = createSUT(sessionInfos: sessionInfos, filter: .verified)
let expectedItems = sessionInfos.filter { !$0.isCurrent }.asViewData()
let expectedState = UserOtherSessionsViewState(bindings: UserOtherSessionsBindings(filter: .verified),
title: "Title",
sections: [.sessionItems(header: verifiedSectionHeader, items: expectedItems)])
XCTAssertEqual(sut.state, expectedState)
}
func test_whenModelCreated_withVerifiedFilterWithNoVerifiedSessions_viewStateIsCorrect() {
let sessionInfos = [createUserSessionInfo(sessionId: "session 1", isVerified: false),
createUserSessionInfo(sessionId: "session 2", isVerified: false)]
let sut = createSUT(sessionInfos: sessionInfos, filter: .verified)
let expectedState = UserOtherSessionsViewState(bindings: UserOtherSessionsBindings(filter: .verified),
title: "Title",
sections: [.emptySessionItems(header: verifiedSectionHeader, title: VectorL10n.userOtherSessionNoVerifiedSessions)])
XCTAssertEqual(sut.state, expectedState)
}
func test_whenModelCreated_withUnverifiedFilterWithNoUnverifiedSessions_viewStateIsCorrect() {
let sessionInfos = [createUserSessionInfo(sessionId: "session 1", isVerified: true),
createUserSessionInfo(sessionId: "session 2", isVerified: true)]
let sut = createSUT(sessionInfos: sessionInfos, filter: .unverified)
let expectedState = UserOtherSessionsViewState(bindings: UserOtherSessionsBindings(filter: .unverified),
title: "Title",
sections: [.emptySessionItems(header: unverifiedSectionHeader, title: VectorL10n.userOtherSessionNoUnverifiedSessions)])
XCTAssertEqual(sut.state, expectedState)
}
func test_whenModelCreated_withInactiveFilterWithNoInactiveSessions_viewStateIsCorrect() {
let sessionInfos = [createUserSessionInfo(sessionId: "session 1", isActive: true),
createUserSessionInfo(sessionId: "session 2", isActive: true)]
let sut = createSUT(sessionInfos: sessionInfos, filter: .inactive)
let expectedState = UserOtherSessionsViewState(bindings: UserOtherSessionsBindings(filter: .inactive),
title: "Title",
sections: [.emptySessionItems(header: inactiveSectionHeader, title: VectorL10n.userOtherSessionNoInactiveSessions)])
XCTAssertEqual(sut.state, expectedState)
}
private func createSUT(sessionInfos: [UserSessionInfo],
filter: OtherUserSessionsFilter,
title: String = "Title") -> UserOtherSessionsViewModel {
UserOtherSessionsViewModel(sessionInfos: sessionInfos,
filter: filter,
title: title)
}
private func createUserSessionInfo(sessionId: String, private func createUserSessionInfo(sessionId: String,
isVerified: Bool = false,
isActive: Bool = true, isActive: Bool = true,
isCurrent: Bool = false) -> UserSessionInfo { isCurrent: Bool = false) -> UserSessionInfo {
UserSessionInfo(id: sessionId, UserSessionInfo(id: sessionId,
name: "iOS", name: "iOS",
deviceType: .mobile, deviceType: .mobile,
isVerified: false, isVerified: isVerified,
lastSeenIP: "10.0.0.10", lastSeenIP: "10.0.0.10",
lastSeenTimestamp: Date().timeIntervalSince1970 - 100, lastSeenTimestamp: Date().timeIntervalSince1970 - 100,
applicationName: nil, applicationName: nil,