Skip to content

Commit 18bca82

Browse files
martinmitrevskimartinmitrevski
committed
updated formatting and linting issues
1 parent 1a5e83b commit 18bca82

16 files changed

+97
-122
lines changed

‎StreamChatSwiftUITests/Infrastructure/Mocks/ImageLoader_Mock.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
//
44

55
import Foundation
6-
import UIKit
76
@testable import StreamChat
87
import StreamChatSwiftUI
8+
import UIKit
99

1010
class ImageLoader_Mock: ImageLoading {
1111

@@ -16,8 +16,9 @@ class ImageLoader_Mock: ImageLoading {
1616
imageCDN: ImageCDN,
1717
resize: Bool,
1818
preferredSize: CGSize?,
19-
completion: @escaping ((Result<UIImage, Error>) -> Void)) {
20-
completion(.success(Self.defaultLoadedImage))
19+
completion: @escaping ((Result<UIImage, Error>) -> Void)
20+
) {
21+
completion(.success(Self.defaultLoadedImage))
2122
}
2223

2324
func loadImages(
@@ -33,5 +34,4 @@ class ImageLoader_Mock: ImageLoading {
3334
}
3435
completion(result)
3536
}
36-
3737
}

‎StreamChatSwiftUITests/Infrastructure/Mocks/StreamChatUtilsMocks.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ class VideoPreviewLoader_Mock: VideoPreviewLoader {
1212

1313
func loadPreviewForVideo(at url: URL, completion: @escaping (Result<UIImage, Error>) -> Void) {
1414
loadPreviewVideoCalled = true
15-
}
16-
15+
}
1716
}
1817

1918
/// Mock implementation of `ImageLoading`.
@@ -30,5 +29,4 @@ class ImageLoaderUtils_Mock: ImageLoading {
3029
) {
3130
loadImageCalled = true
3231
}
33-
3432
}

‎StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelTestHelpers.swift‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Copyright © 2021 Stream.io Inc. All rights reserved.
33
//
44

5-
import XCTest
6-
@testable import StreamChatSwiftUI
75
@testable import StreamChat
6+
@testable import StreamChatSwiftUI
7+
import XCTest
88

99
class ChatChannelTestHelpers {
1010

@@ -98,11 +98,11 @@ class ChatChannelTestHelpers {
9898
id: .unique,
9999
type: .video,
100100
payload: VideoAttachmentPayload(
101-
title: "test",
102-
videoRemoteURL: testURL,
103-
file: attachmentFile,
104-
extraData: nil
105-
),
101+
title: "test",
102+
videoRemoteURL: testURL,
103+
file: attachmentFile,
104+
extraData: nil
105+
),
106106
uploadingState: uploadingState
107107
)
108108
.asAnyAttachment
@@ -151,18 +151,17 @@ class ChatChannelTestHelpers {
151151
id: .unique,
152152
type: .file,
153153
payload:
154-
FileAttachmentPayload(
155-
title: "test",
156-
assetRemoteURL: testURL,
157-
file: attachmentFile,
158-
extraData: nil
159-
),
154+
FileAttachmentPayload(
155+
title: "test",
156+
assetRemoteURL: testURL,
157+
file: attachmentFile,
158+
extraData: nil
159+
),
160160
uploadingState: uploadingState
161161
)
162162
.asAnyAttachment
163163
]
164164

165165
return fileAttachments
166166
}()
167-
168167
}

‎StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelViewModel_Tests.swift‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Copyright © 2021 Stream.io Inc. All rights reserved.
33
//
44

5-
import XCTest
6-
@testable import StreamChatSwiftUI
75
@testable import StreamChat
6+
@testable import StreamChatSwiftUI
7+
import XCTest
88

99
class ChatChannelViewModel_Tests: XCTestCase {
1010

@@ -160,15 +160,14 @@ class ChatChannelViewModel_Tests: XCTestCase {
160160
XCTAssert(initialListId == newListId)
161161
}
162162

163-
//MARK: - private
163+
// MARK: - private
164164

165165
private func makeChannelController(
166166
messages: [ChatMessage] = []
167167
) -> ChatChannelController_Mock {
168-
return ChatChannelTestHelpers.makeChannelController(
168+
ChatChannelTestHelpers.makeChannelController(
169169
chatClient: chatClient,
170170
messages: messages
171171
)
172172
}
173-
174173
}

‎StreamChatSwiftUITests/Tests/ChatChannel/ChatMessageIDs_Tests.swift‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Copyright © 2021 Stream.io Inc. All rights reserved.
33
//
44

5-
import XCTest
6-
@testable import StreamChatSwiftUI
75
@testable import StreamChat
6+
@testable import StreamChatSwiftUI
7+
import XCTest
88

99
class ChatMessageIDs_Tests: XCTestCase {
1010

@@ -93,5 +93,4 @@ class ChatMessageIDs_Tests: XCTestCase {
9393
// Then
9494
XCTAssert(messageId == expectedId)
9595
}
96-
9796
}

‎StreamChatSwiftUITests/Tests/ChatChannel/MessageActionsViewModel_Tests.swift‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
// Copyright © 2021 Stream.io Inc. All rights reserved.
33
//
44

5-
import XCTest
6-
@testable import StreamChatSwiftUI
75
@testable import StreamChat
8-
6+
@testable import StreamChatSwiftUI
97
import XCTest
108

119
class MessageActionsViewModel_Tests: XCTestCase {
@@ -46,5 +44,4 @@ class MessageActionsViewModel_Tests: XCTestCase {
4644
XCTAssert(action.confirmationPopup != nil)
4745
XCTAssert(viewModel.alertShown == true)
4846
}
49-
5047
}

‎StreamChatSwiftUITests/Tests/ChatChannel/MessageComposerViewModel_Tests.swift‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Copyright © 2021 Stream.io Inc. All rights reserved.
33
//
44

5-
import XCTest
6-
@testable import StreamChatSwiftUI
75
@testable import StreamChat
6+
@testable import StreamChatSwiftUI
7+
import XCTest
88

99
class MessageComposerViewModel_Tests: XCTestCase {
1010

@@ -16,15 +16,15 @@ class MessageComposerViewModel_Tests: XCTestCase {
1616
url: testURL,
1717
type: .image
1818
)
19-
19+
2020
private var chatClient: ChatClient = {
2121
let client = ChatClient.mock()
2222
client.currentUserId = .unique
2323
return client
2424
}()
2525

2626
private var streamChat: StreamChat?
27-
27+
2828
override func setUp() {
2929
super.setUp()
3030
streamChat = StreamChat(chatClient: chatClient)
@@ -157,7 +157,7 @@ class MessageComposerViewModel_Tests: XCTestCase {
157157
viewModel.imageTapped(defaultAsset) // removed from the attachments list
158158

159159
// Then
160-
XCTAssert(viewModel.addedAssets.count == 0)
160+
XCTAssert(viewModel.addedAssets.isEmpty)
161161
}
162162

163163
func test_messageComposerVM_removeFileAttachment() {
@@ -169,7 +169,7 @@ class MessageComposerViewModel_Tests: XCTestCase {
169169
viewModel.removeAttachment(with: testURL.absoluteString)
170170

171171
// Then
172-
XCTAssert(viewModel.addedFileURLs.count == 0)
172+
XCTAssert(viewModel.addedFileURLs.isEmpty)
173173
}
174174

175175
func test_messageComposerVM_removeImageAttachment() {
@@ -181,7 +181,7 @@ class MessageComposerViewModel_Tests: XCTestCase {
181181
viewModel.removeAttachment(with: defaultAsset.id)
182182

183183
// Then
184-
XCTAssert(viewModel.addedAssets.count == 0)
184+
XCTAssert(viewModel.addedAssets.isEmpty)
185185
}
186186

187187
func test_messageComposerVM_cameraImageAdded() {
@@ -245,7 +245,7 @@ class MessageComposerViewModel_Tests: XCTestCase {
245245

246246
// Then
247247
XCTAssert(isSelected == false)
248-
XCTAssert(viewModel.addedCustomAttachments.count == 0)
248+
XCTAssert(viewModel.addedCustomAttachments.isEmpty)
249249
}
250250

251251
func test_messageComposerVM_cameraPickerShown() {
@@ -311,7 +311,7 @@ class MessageComposerViewModel_Tests: XCTestCase {
311311
}
312312
}
313313

314-
//MARK: - private
314+
// MARK: - private
315315

316316
private func makeComposerViewModel() -> MessageComposerViewModel {
317317
let channelController = makeChannelController()
@@ -322,12 +322,11 @@ class MessageComposerViewModel_Tests: XCTestCase {
322322
private func makeChannelController(
323323
messages: [ChatMessage] = []
324324
) -> ChatChannelController_Mock {
325-
return ChatChannelTestHelpers.makeChannelController(
325+
ChatChannelTestHelpers.makeChannelController(
326326
chatClient: chatClient,
327327
messages: messages
328328
)
329329
}
330-
331330
}
332331

333332
extension PickerTypeState: Equatable {
@@ -343,10 +342,5 @@ extension PickerTypeState: Equatable {
343342
}
344343

345344
return false
346-
347345
}
348-
349-
350-
351-
352346
}

‎StreamChatSwiftUITests/Tests/ChatChannel/MessageTypeResolver_Tests.swift‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
// Copyright © 2021 Stream.io Inc. All rights reserved.
33
//
44

5-
import XCTest
6-
@testable import StreamChatSwiftUI
75
@testable import StreamChat
8-
6+
@testable import StreamChatSwiftUI
97
import XCTest
108

119
class MessageTypeResolver_Tests: XCTestCase {
@@ -148,5 +146,4 @@ class MessageTypeResolver_Tests: XCTestCase {
148146
// Then
149147
XCTAssert(hasFileAttachments == true)
150148
}
151-
152149
}

‎StreamChatSwiftUITests/Tests/ChatChannelList/ChannelHeaderLoader_Tests.swift‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// Copyright © 2021 Stream.io Inc. All rights reserved.
33
//
44

5-
import XCTest
6-
@testable import StreamChatSwiftUI
75
@testable import StreamChat
6+
@testable import StreamChatSwiftUI
7+
import XCTest
88

99
class ChannelHeaderLoader_Tests: XCTestCase {
10-
10+
1111
@Injected(\.images) var images
1212

1313
private let testURL = URL(string: "https://example.com")!
@@ -19,7 +19,7 @@ class ChannelHeaderLoader_Tests: XCTestCase {
1919
}()
2020

2121
private var streamChat: StreamChat?
22-
22+
2323
override func setUp() {
2424
super.setUp()
2525
let imageLoader = ImageLoader_Mock()
@@ -30,7 +30,7 @@ class ChannelHeaderLoader_Tests: XCTestCase {
3030
func test_channelHeaderLoader_channelImageURL() {
3131
// Given
3232
let channel = ChatChannel.mockDMChannel(imageURL: testURL)
33-
33+
3434
// Then
3535
loadImagesAndAssert(
3636
for: channel,
@@ -66,7 +66,7 @@ class ChannelHeaderLoader_Tests: XCTestCase {
6666
expectedLoadedImage: images.userAvatarPlaceholder4
6767
)
6868
}
69-
69+
7070
func test_channelHeaderLoader_group_activeMembersEmpty() {
7171
// Given
7272
let channel = ChatChannel.mockNonDMChannel()
@@ -107,7 +107,7 @@ class ChannelHeaderLoader_Tests: XCTestCase {
107107
)
108108
}
109109

110-
//MARK: - private
110+
// MARK: - private
111111

112112
private func loadImagesAndAssert(
113113
for channel: ChatChannel,
@@ -138,5 +138,4 @@ class ChannelHeaderLoader_Tests: XCTestCase {
138138
XCTAssert(firstImage != secondImage)
139139
}
140140
}
141-
142141
}

‎StreamChatSwiftUITests/Tests/ChatChannelList/ChatChannelListTestHelpers.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Copyright © 2021 Stream.io Inc. All rights reserved.
33
//
44

5-
@testable import StreamChatSwiftUI
65
@testable import StreamChat
6+
@testable import StreamChatSwiftUI
77

88
extension ChannelAlertType: Equatable {
99

@@ -31,5 +31,4 @@ extension ChannelPopupType: Equatable {
3131

3232
return false
3333
}
34-
3534
}

0 commit comments

Comments
 (0)