chore: add some tests to personal team - WPB-15469 #2446

samwyndham · 2025-01-29T07:28:14Z

WPB-15469 [iOS] Improve personal to team bug fix (WPB-15275)

Issue

This PR adds some tests to the personal to team bug fix (WPB-15275). Unfortunately it in no way covers everything but I have some other priorities right now.

It also fixes some easy to fix warnings that I found randomly.

Testing

Run tests

Checklist

Title contains a reference JIRA issue number like [WPB-XXX].
Description is filled and free of optional paragraphs.
Adds/updates automated tests.

…ingConversations()`

samwyndham · 2025-01-29T07:29:01Z

...rces/WireDomain/Event Processing/ConversationEventProcessor/ConversationEventProcessor.swift

@@ -82,7 +82,7 @@ struct ConversationEventProcessor {
            try await renameEventProcessor.processEvent(event)

        case let .typing(event):
-            try await typingEventProcessor.processEvent(event)


fixes warning

samwyndham · 2025-01-29T07:29:06Z

...rces/WireDomain/Event Processing/UserEventProcessor/UserLegalholdDisableEventProcessor.swift

@@ -23,7 +23,7 @@ struct UserLegalholdDisableEventProcessor: UserLegalholdDisableEventProcessorPro
    let repository: any UserRepositoryProtocol

    func processEvent(_: UserLegalholdDisableEvent) async throws {
-        try await repository.disableUserLegalHold()


fixes warning

samwyndham · 2025-01-29T07:29:12Z

...Domain/Sources/WireDomain/Event Processing/UserEventProcessor/UserUpdateEventProcessor.swift

@@ -23,7 +23,7 @@ struct UserUpdateEventProcessor: UserUpdateEventProcessorProtocol {
    let repository: any UserRepositoryProtocol

    func processEvent(_ event: UserUpdateEvent) async throws {
-        try await repository.updateUser(from: event)


fixes warning

samwyndham · 2025-01-29T07:29:18Z

...Domain/Sources/WireDomain/Repositories/Conversations/Repository/ConversationRepository.swift

@@ -412,7 +412,7 @@ public final class ConversationRepository: ConversationRepositoryProtocol {
        removedUsers: Set<UserID>,
        reason: ConversationMemberLeaveReason
    ) async {
-        var systemMessageType: SystemMessageType = switch reason {


fixes warning

samwyndham · 2025-01-29T07:30:11Z

wire-ios-data-model/Tests/MLS/MLSServiceTests.swift

Changes in this file are just to fix warnings

samwyndham · 2025-01-29T07:30:33Z

wire-ios-request-strategy/Sources/Request Strategies/Assets/AssetV3UploadRequestStrategy.swift

@@ -151,7 +151,7 @@ extension AssetV3UploadRequestStrategy: ZMUpstreamTranscoder {
            "sending request for asset",
            attributes: [.nonce: message.nonce?.safeForLoggingDescription ?? "<nil>"]
        )
-        var request: ZMTransportRequest? = if shouldUseBackgroundSession {


fixes warning

samwyndham · 2025-01-29T07:30:37Z

wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession+Authentication.swift

@@ -121,7 +121,7 @@ extension ZMUserSession {

    func errorFromFailedDeleteResponse(_ response: ZMTransportResponse!) -> NSError {

-        var errorCode: UserSessionErrorCode = switch response.result {


fixes warning

samwyndham · 2025-01-29T07:30:43Z

...es/Authentication/Event Handlers/Pre-Login/AuthenticationEmailLoginUnknownErrorHandler.swift

@@ -39,7 +39,7 @@ final class AuthenticationEmailLoginUnknownErrorHandler: AuthenticationEventHand
        }

        // We try to validate the fields to detect an error
-        var detectedError: NSError = if !ZMUser.isValidEmailAddress(credentials.email) {


fixes warning

samwyndham · 2025-01-29T07:30:47Z

wire-ios/Wire-iOS/Sources/Authentication/Interface/Views/ValidatedTextField.swift

@@ -138,7 +138,7 @@ final class ValidatedTextField: AccessoryTextField, TextContainer {
        self.textFieldValidator = TextFieldValidator()
        self.kind = kind

-        var textFieldAttributes: Attributes = if setNewColors == false {


fixes warning

samwyndham · 2025-01-29T07:30:52Z

wire-ios/Wire-iOS/Sources/UserInterface/Components/Views/LabelIndicator.swift

@@ -77,7 +77,7 @@ final class LabelIndicator: UIView {
    }

    private func setupViews() {
-        var accessibilityString = switch context {


fixes warning

samwyndham · 2025-01-29T07:30:56Z

.../ConfigurationMessageCell/Components/ConversationNewDeviceSystemMessageCellDescription.swift

@@ -155,7 +155,7 @@ final class ConversationNewDeviceSystemMessageCellDescription: ConversationMessa
        )
        let attributedText = attributedSenderNames

-        var linkTarget: View.LinkTarget = if let user = users.first, users.count == 1 {


fixes warning

samwyndham · 2025-01-29T07:31:01Z

...ces/UserInterface/Conversation/Content/ConversationContentViewController+MessageAction.swift

@@ -291,7 +291,7 @@ extension ConversationContentViewController: SignatureObserver {
    }

    private func presentDigitalSignatureErrorAlert(errorType: SignatureStatus.ErrorYpe) {
-        var message: String? = switch errorType {


fixes warning

samwyndham · 2025-01-29T07:31:06Z

.../Wire-iOS/Sources/UserInterface/Conversation/Content/ConversationContentViewController.swift

@@ -343,7 +343,7 @@ final class ConversationContentViewController: UIViewController {
            return nil
        }

-        let message = dataSource.messages[indexPath.section] as? ZMMessage


fixes warning

samwyndham · 2025-01-29T07:31:12Z

...urces/UserInterface/Conversation/InputBar/CameraKeyboard/CameraKeyboardPermissionsCell.swift

@@ -85,7 +85,7 @@ final class CameraKeyboardPermissionsCell: UICollectionViewCell {

    func configure(deniedAuthorization: DeniedAuthorizationType) {
        typealias KeyboardPhotoAccessDeniedLocale = L10n.Localizable.KeyboardPhotosAccess.Denied.Keyboard
-        var title: String = switch deniedAuthorization {


fixes warning

samwyndham · 2025-01-29T07:31:17Z

...ources/UserInterface/MainController/MainCoordinator+ArchivedListViewControllerDelegate.swift

@@ -27,7 +27,7 @@ extension MainCoordinator: ArchivedListViewControllerDelegate where Dependencies
    ) {
        Task { @MainActor in
            await showConversationList(conversationFilter: .none)
-            await showConversation(conversation: conversation, message: nil)


fixes warning

samwyndham · 2025-01-29T07:31:21Z

...rInterface/MainController/MainCoordinator+CreateGroupConversationViewControllerBuilder.swift

@@ -28,7 +28,7 @@ extension MainCoordinator: ConversationCreationControllerDelegate
    ) {
        Task {
            await showConversationList(conversationFilter: .none)
-            await showConversation(conversation: conversation, message: nil)


fixes warning

samwyndham · 2025-01-29T07:31:24Z

...os/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift

@@ -37,7 +37,7 @@ extension ZClientViewController: StartUIDelegate {
                    // If the conversation exists, and is established (in case of mls),
                    // then we open the conversation
                    guard let conversation else { return }
-                    await mainCoordinator.showConversation(conversation: conversation, message: nil)


fixes warning

samwyndham · 2025-01-29T07:31:29Z

...os/Wire-iOS/Sources/UserInterface/MainController/ZClientViewController+StartUIDelegate.swift

@@ -57,7 +57,7 @@ extension ZClientViewController: StartUIDelegate {
    func startUIViewController(_ viewController: StartUIViewController, didSelect conversation: ZMConversation) {
        Task {
            await mainCoordinator.showConversationList(conversationFilter: .none)
-            await mainCoordinator.showConversation(conversation: conversation, message: nil)


fixes warning

github-actions · 2025-01-29T07:57:48Z

Test Results

5 files 6 suites 10m 25s ⏱️
6 954 tests 6 926 ✅ 28 💤 0 ❌
6 964 runs 6 936 ✅ 28 💤 0 ❌

Results for commit 68f5a35.

datadog-wireapp · 2025-01-29T07:59:33Z

Datadog Report

Branch report: chore/personal-team-bug-cleanup-WPB-15469
Commit report: f17cbae
Test service: wire-ios-mono

✅ 0 Failed, 6645 Passed, 28 Skipped, 5m 11.17s Total Time

samwyndham · 2025-01-31T08:52:55Z

netbe changed the title chore: Add some tests to personal team - WPB-15469 chore: add some tests to personal team - WPB-15469 11 hours ago

This whole time I've been capitalizing my PR titles incorrectly 🤦

netbe

left a question before approving

netbe · 2025-02-04T08:09:18Z

wire-ios-data-model/Tests/EntityValidation/ConnectionValidatorTests.swift

+    }
+
+    private func product<T, U>(_ aCollection: [T], _ bCollection: [U]) -> [(T, U)] {
+        aCollection.flatMap { a in


does it require that aCollection and bCollection are same size ?

netbe · 2025-02-04T08:13:10Z

wire-ios-data-model/Tests/EntityValidation/ConnectionValidatorTests.swift

+
+        let conversations = await context.perform { [self] in
+            product(connectionStatuses, conversationTypes).map { status, conversationType in
+                makeConnection(status: status, type: conversationType)


suggestion: makeConversationWithConnection

netbe · 2025-02-04T20:30:18Z

wire-ios-data-model/Tests/MLS/OneOnOneSourceTests.swift

+        _ = try await createConversations([
+            .init(.oneOnOne, .mls, team: nil, users: [selfUser, userA], name: nil), // <- 1:1 MLS with UserA
+            .init(.oneOnOne, .mls, team: nil, users: [selfUser, userA], name: nil), // <- 1:1 MLS with UserA
+            .init(.group, .proteus, team: team, users: [selfUser, userA], name: nil), // <- 1:1 proteus fake with UserA
+            .init(.group, .proteus, team: team, users: [selfUser, userA], name: nil), // <- 1:1 proteus fake with UserA
+            .init(.oneOnOne, .proteus, team: nil, users: [selfUser, userA], name: nil), // <- 1:1 proteus with UserA
+            .init(.oneOnOne, .proteus, team: nil, users: [selfUser, userA], name: nil), // <- 1:1 proteus with UserA
+            .init(.connection, .proteus, team: nil, users: [selfUser, userA], name: nil), // <- 1:1 prot. pending UserA
+            .init(.connection, .proteus, team: nil, users: [selfUser, userA], name: nil) // <- 1:1 prot. pending UserA


question: there are all doubled here? not sure what we're trying to test?

samwyndham added 15 commits January 29, 2025 08:22

Add OneOnOneSourceTests.testFetchOneOnOnes_mls()

f14312c

Test OneOnOneSourceTests.testFetchOneOnOnes_fake()

7fb2e48

Test OneOnOneSourceTests.testFetchOneOnOnes_proteus()

bfbf26c

Test OneOnOneSourceTests.testFetchOneOnOnes_proteusPending()

3899a02

Test OneOnOneSourceTests.testFetchOneOnOnes_allTypes()

eccedff

Test `OneOnOneSourceTests.testFetchOneOnOnesWithCandidate_whenNoMatch…

de31968

…ingConversations()`

Fix some warnings in MLSServiceTests

0909623

Remove was never mutated warnings

fa4a32b

Remove unnecessary try calls

ffdc083

Remove unnecessary await calls

229d891

Remove unnecessary cast

484fa03

Test OneOnOneSource.fetchOneOnOnesWithCandidate(user:types:)

516cb88

Lint & format

b6de647

Add closure based results to MockActionHandler

6aef358

Add ConnectionValidatorTests

68f5a35

github-actions bot assigned samwyndham Jan 29, 2025

samwyndham commented Jan 29, 2025

View reviewed changes

wire-ios-data-model/Tests/MLS/MLSServiceTests.swift Outdated

Copy link

Contributor Author

samwyndham Jan 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes in this file are just to fix warnings

samwyndham commented Jan 29, 2025

View reviewed changes

caldrian changed the base branch from develop to release/cycle-3.117 January 30, 2025 09:39

samwyndham requested review from a team, netbe, caldrian and jullianm and removed request for a team and jullianm January 30, 2025 14:14

netbe changed the title ~~chore: Add some tests to personal team - WPB-15469~~ chore: add some tests to personal team - WPB-15469 Jan 30, 2025

echoes-hq bot added the echoes/initiative: personal-users-to-team-users... label Jan 30, 2025

netbe reviewed Feb 4, 2025

View reviewed changes

netbe changed the base branch from release/cycle-3.117 to develop February 12, 2025 12:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: add some tests to personal team - WPB-15469 #2446

chore: add some tests to personal team - WPB-15469 #2446

samwyndham commented Jan 29, 2025 •

edited by github-actions bot

Loading

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

samwyndham Jan 29, 2025

github-actions bot commented Jan 29, 2025

datadog-wireapp bot commented Jan 29, 2025

samwyndham commented Jan 31, 2025

netbe left a comment

netbe Feb 4, 2025

netbe Feb 4, 2025

netbe Feb 4, 2025

		@@ -121,7 +121,7 @@ extension ZMUserSession {

		func errorFromFailedDeleteResponse(_ response: ZMTransportResponse!) -> NSError {

		var errorCode: UserSessionErrorCode = switch response.result {

chore: add some tests to personal team - WPB-15469 #2446

Are you sure you want to change the base?

chore: add some tests to personal team - WPB-15469 #2446

Conversation

samwyndham commented Jan 29, 2025 • edited by github-actions bot Loading

Issue

Testing

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jan 29, 2025

Test Results

datadog-wireapp bot commented Jan 29, 2025

Datadog Report

samwyndham commented Jan 31, 2025

netbe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

samwyndham commented Jan 29, 2025 •

edited by github-actions bot

Loading