Skip to content

Commit 574433a

Browse files
committed
Fix typos and include unit tests
1 parent 792377b commit 574433a

File tree

7 files changed

+24
-18
lines changed

7 files changed

+24
-18
lines changed

MatrixSDK.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,10 +1739,10 @@
17391739
ECF29BE62641953C0053E6D6 /* MXAssertedIdentityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = ECF29BE42641953C0053E6D6 /* MXAssertedIdentityModel.m */; };
17401740
ED21F68528104DA2002FF83D /* MXMegolmEncryptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED21F68428104DA2002FF83D /* MXMegolmEncryptionTests.swift */; };
17411741
ED21F68628104DA2002FF83D /* MXMegolmEncryptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED21F68428104DA2002FF83D /* MXMegolmEncryptionTests.swift */; };
1742-
ED35652C281150310002BF6A /* MXOlmInboundGroupSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652B281150310002BF6A /* MXOlmInboundGroupSessionTests.swift */; };
1743-
ED35652D281150310002BF6A /* MXOlmInboundGroupSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652B281150310002BF6A /* MXOlmInboundGroupSessionTests.swift */; };
1744-
ED35652F281153480002BF6A /* MXMegolmSessionDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652E281153480002BF6A /* MXMegolmSessionDataTests.swift */; };
1745-
ED356530281153480002BF6A /* MXMegolmSessionDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652E281153480002BF6A /* MXMegolmSessionDataTests.swift */; };
1742+
ED35652C281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652B281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift */; };
1743+
ED35652D281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652B281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift */; };
1744+
ED35652F281153480002BF6A /* MXMegolmSessionDataUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652E281153480002BF6A /* MXMegolmSessionDataUnitTests.swift */; };
1745+
ED356530281153480002BF6A /* MXMegolmSessionDataUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED35652E281153480002BF6A /* MXMegolmSessionDataUnitTests.swift */; };
17461746
ED88999127F2065D00718486 /* MXRoomAliasResolution.h in Headers */ = {isa = PBXBuildFile; fileRef = ED88998F27F2065C00718486 /* MXRoomAliasResolution.h */; settings = {ATTRIBUTES = (Public, ); }; };
17471747
ED88999227F2065D00718486 /* MXRoomAliasResolution.h in Headers */ = {isa = PBXBuildFile; fileRef = ED88998F27F2065C00718486 /* MXRoomAliasResolution.h */; settings = {ATTRIBUTES = (Public, ); }; };
17481748
ED88999327F2065D00718486 /* MXRoomAliasResolution.m in Sources */ = {isa = PBXBuildFile; fileRef = ED88999027F2065D00718486 /* MXRoomAliasResolution.m */; };
@@ -2728,8 +2728,8 @@
27282728
ECF29BE42641953C0053E6D6 /* MXAssertedIdentityModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXAssertedIdentityModel.m; sourceTree = "<group>"; };
27292729
ED21F68428104DA2002FF83D /* MXMegolmEncryptionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXMegolmEncryptionTests.swift; sourceTree = "<group>"; };
27302730
ED2F344856EFFCA383E37B22 /* Pods-SDK-MatrixSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDK-MatrixSDK.release.xcconfig"; path = "Target Support Files/Pods-SDK-MatrixSDK/Pods-SDK-MatrixSDK.release.xcconfig"; sourceTree = "<group>"; };
2731-
ED35652B281150310002BF6A /* MXOlmInboundGroupSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXOlmInboundGroupSessionTests.swift; sourceTree = "<group>"; };
2732-
ED35652E281153480002BF6A /* MXMegolmSessionDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXMegolmSessionDataTests.swift; sourceTree = "<group>"; };
2731+
ED35652B281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXOlmInboundGroupSessionUnitTests.swift; sourceTree = "<group>"; };
2732+
ED35652E281153480002BF6A /* MXMegolmSessionDataUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXMegolmSessionDataUnitTests.swift; sourceTree = "<group>"; };
27332733
ED88998F27F2065C00718486 /* MXRoomAliasResolution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXRoomAliasResolution.h; sourceTree = "<group>"; };
27342734
ED88999027F2065D00718486 /* MXRoomAliasResolution.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXRoomAliasResolution.m; sourceTree = "<group>"; };
27352735
ED8943D327E34762000FC39C /* MXMemoryRoomStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXMemoryRoomStoreTests.swift; sourceTree = "<group>"; };
@@ -4837,8 +4837,8 @@
48374837
ED35652A281150230002BF6A /* Data */ = {
48384838
isa = PBXGroup;
48394839
children = (
4840-
ED35652B281150310002BF6A /* MXOlmInboundGroupSessionTests.swift */,
4841-
ED35652E281153480002BF6A /* MXMegolmSessionDataTests.swift */,
4840+
ED35652B281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift */,
4841+
ED35652E281153480002BF6A /* MXMegolmSessionDataUnitTests.swift */,
48424842
);
48434843
path = Data;
48444844
sourceTree = "<group>";
@@ -6352,7 +6352,7 @@
63526352
32832B5E1BCC048300241108 /* MXStoreNoStoreTests.m in Sources */,
63536353
A816247C25F60C7700A46F05 /* MXDeviceListOperationsPoolUnitTests.swift in Sources */,
63546354
B1660F1C260A20B900C3AA12 /* MXSpaceServiceTest.swift in Sources */,
6355-
ED35652C281150310002BF6A /* MXOlmInboundGroupSessionTests.swift in Sources */,
6355+
ED35652C281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift in Sources */,
63566356
32C9B71823E81A1C00C6F30A /* MXCrossSigningVerificationTests.m in Sources */,
63576357
323C5A081A70E53500FB0549 /* MXToolsUnitTests.m in Sources */,
63586358
3281E89E19E299C000976E1A /* MXErrorUnitTests.m in Sources */,
@@ -6415,7 +6415,7 @@
64156415
EC131B192779D8D500712964 /* MXThreadEventTimelineUnitTests.swift in Sources */,
64166416
B135067427EB201E00BD3276 /* MXLocationServiceTests.swift in Sources */,
64176417
18C26C4F273C0EB300805154 /* MXPollAggregatorTests.swift in Sources */,
6418-
ED35652F281153480002BF6A /* MXMegolmSessionDataTests.swift in Sources */,
6418+
ED35652F281153480002BF6A /* MXMegolmSessionDataUnitTests.swift in Sources */,
64196419
32EEA83F2603CA140041425B /* MXRestClientExtensionsTests.m in Sources */,
64206420
18121F7A273E6E4200B68ADF /* PollBuilder.swift in Sources */,
64216421
18121F7F273E837300B68ADF /* PollModels.swift in Sources */,
@@ -6884,7 +6884,7 @@
68846884
32C9B71923E81A1C00C6F30A /* MXCrossSigningVerificationTests.m in Sources */,
68856885
B1E09A1D2397FCE90057C069 /* MXCryptoKeyVerificationTests.m in Sources */,
68866886
B1E09A472397FD990057C069 /* MXEventScanStoreUnitTests.m in Sources */,
6887-
ED35652D281150310002BF6A /* MXOlmInboundGroupSessionTests.swift in Sources */,
6887+
ED35652D281150310002BF6A /* MXOlmInboundGroupSessionUnitTests.swift in Sources */,
68886888
B1E09A3D2397FD820057C069 /* MXStoreFileStoreTests.m in Sources */,
68896889
32CEEF3E23AD134A0039BA98 /* MXCrossSigningTests.m in Sources */,
68906890
32EEA8402603CA140041425B /* MXRestClientExtensionsTests.m in Sources */,
@@ -6947,7 +6947,7 @@
69476947
EC131B1A2779D8D500712964 /* MXThreadEventTimelineUnitTests.swift in Sources */,
69486948
B135067527EB201E00BD3276 /* MXLocationServiceTests.swift in Sources */,
69496949
18C26C50273C0EB400805154 /* MXPollAggregatorTests.swift in Sources */,
6950-
ED356530281153480002BF6A /* MXMegolmSessionDataTests.swift in Sources */,
6950+
ED356530281153480002BF6A /* MXMegolmSessionDataUnitTests.swift in Sources */,
69516951
32C78BA8256D227D008130B1 /* MXCryptoMigrationTests.m in Sources */,
69526952
18121F7B273E6E4200B68ADF /* PollBuilder.swift in Sources */,
69536953
18121F80273E837400B68ADF /* PollModels.swift in Sources */,

MatrixSDK/Crypto/Data/MXMegolmSessionData.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
/**
5858
Flag indicating whether the history of this room is considered as shared.
5959
60-
This is typically the case if room's `historyVisibility` is set to `world_readable` or `joined`.
60+
This is typically the case if room's `historyVisibility` is set to `world_readable` or `shared`.
6161
In this case the keys are allowed to be shared with other users upon invite.
6262
*/
6363
@property BOOL sharedHistory;

MatrixSDK/Crypto/Data/MXOlmInboundGroupSession.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
/**
7070
Flag indicating whether the history of this room is considered as shared.
7171
72-
This is typically the case if room's `historyVisibility` is set to `world_readable` or `joined`.
72+
This is typically the case if room's `historyVisibility` is set to `world_readable` or `shared`.
7373
In this case the keys are allowed to be shared with other users upon invite.
7474
*/
7575
@property (nonatomic) BOOL sharedHistory;

MatrixSDK/Crypto/MXOlmDevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Determine if an incoming messages is a prekey message matching an existing sessi
230230
@param forwardingCurve25519KeyChain devices which forwarded this session to us (normally empty)
231231
@param keysClaimed Other keys the sender claims.
232232
@param exportFormat YES if the megolm keys are in export format (ie, they lack an ed25519 signature).
233-
@param sharedHistory YES if the session was created whilst room's history was set to visible (i.e. `world_readable` or `joined`
233+
@param sharedHistory YES if the session was created whilst room's history was set to visible (i.e. `world_readable` or `shared`
234234
235235
@return YES if the operation succeeds.
236236
*/

MatrixSDKTests/Crypto/Data/MXMegolmSessionDataTests.swift renamed to MatrixSDKTests/Crypto/Data/MXMegolmSessionDataUnitTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import Foundation
1818
@testable import MatrixSDK
1919

20-
class MXMegolmSessionDataTests: XCTestCase {
20+
class MXMegolmSessionDataUnitTests: XCTestCase {
2121
func testCanInitWithJSONDictionary() {
2222
let jsonDictionary: [String: Any] = [
2323
"sender_key": "A",

MatrixSDKTests/Crypto/Data/MXOlmInboundGroupSessionTests.swift renamed to MatrixSDKTests/Crypto/Data/MXOlmInboundGroupSessionUnitTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import Foundation
1818
@testable import MatrixSDK
1919

20-
class MXOlmInboundGroupSessionTests: XCTestCase {
20+
class MXOlmInboundGroupSessionUnitTests: XCTestCase {
2121
func testExportsCorrectSessionData() {
2222
let session = MXOlmInboundGroupSession()
2323
session.senderKey = "A"

MatrixSDKTests/TestPlans/UnitTests.xctestplan

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"MXAsyncTaskQueueUnitTests",
3636
"MXAuthenticationSessionUnitTests",
3737
"MXBackgroundTaskUnitTests",
38-
"MXBeaconInfoUnitTests",
38+
"MXBeaconInfoUnitTests",
3939
"MXCoreDataRoomListDataManagerUnitTests",
4040
"MXCredentialsUnitTests",
4141
"MXDeviceListOperationsPoolUnitTests",
@@ -47,8 +47,14 @@
4747
"MXHTTPAdditionalHeadersUnitTests",
4848
"MXJSONModelUnitTests",
4949
"MXKeyProviderUnitTests",
50+
"MXLoggerUnitTests\/testDeleteLogFiles",
51+
"MXLoggerUnitTests\/testMXLogger",
5052
"MXMediaScanStoreUnitTests",
5153
"MXMegolmExportEncryptionUnitTests",
54+
"MXMegolmSessionDataUnitTests\/testCanInitWithJSONDictionary()",
55+
"MXMegolmSessionDataUnitTests\/testJsonDictionary()",
56+
"MXOlmInboundGroupSessionUnitTests\/testCanEncodeAndDecodeObject()",
57+
"MXOlmInboundGroupSessionUnitTests\/testExportsCorrectSessionData()",
5258
"MXPushRuleUnitTests",
5359
"MXQRCodeDataUnitTests",
5460
"MXReplyEventParserUnitTests",

0 commit comments

Comments
 (0)