Respond to CR.

7 years ago · 25239ca608
parent 3935b019f4
commit 25239ca608
16 changed files with 31 additions and 27 deletions
--- a/SignalServiceKit/tests/Contacts/ContactSortingTest.m
+++ b/SignalServiceKit/tests/Contacts/ContactSortingTest.m
@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN

 - (void)setUp
 {
+    [super setUp];
+
    srandom((unsigned int)time(NULL));
 }

--- a/SignalServiceKit/tests/Contacts/TSContactThreadTest.m
+++ b/SignalServiceKit/tests/Contacts/TSContactThreadTest.m
@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN

 - (void)setUp
 {
+    [super setUp];
+
    self.contactThread = [TSContactThread getOrCreateThreadWithContactId:@"fake-contact-id"];
    [OWSRecipientIdentity removeAllObjectsInCollection];
 }
--- a/SignalServiceKit/tests/Devices/OWSProvisioningCipherTest.m
+++ b/SignalServiceKit/tests/Devices/OWSProvisioningCipherTest.m
@ -2,10 +2,10 @@
 //  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //

+#import "SSKBaseTest.h"
 #import <Curve25519Kit/Curve25519.h>
 #import <SignalServiceKit/Cryptography.h>
 #import <SignalServiceKit/OWSProvisioningCipher.h>
-#import <XCTest/XCTest.h>

@interface OWSProvisioningCipher(Testing)

@ -16,7 +16,7 @@

@end

-@interface OWSProvisioningCipherTest : XCTestCase
+@interface OWSProvisioningCipherTest : SSKBaseTest

@end

--- a/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
+++ b/SignalServiceKit/tests/Messages/Interactions/TSMessageTest.m
@ -4,13 +4,13 @@

 #import "TSMessage.h"
 #import "NSDate+OWS.h"
+#import "SSKBaseTest.h"
 #import "TSAttachmentStream.h"
 #import "TSContactThread.h"
-#import <XCTest/XCTest.h>

 NS_ASSUME_NONNULL_BEGIN

-@interface TSMessageTest : XCTestCase
+@interface TSMessageTest : SSKBaseTest

@property TSThread *thread;

--- a/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m
+++ b/SignalServiceKit/tests/Messages/OWSDisappearingMessageFinderTest.m
@ -5,9 +5,9 @@
 #import "NSDate+OWS.h"
 #import "OWSDisappearingMessagesFinder.h"
 #import "OWSPrimaryStorage.h"
+#import "SSKBaseTest.h"
 #import "TSContactThread.h"
 #import "TSMessage.h"
-#import <XCTest/XCTest.h>

 NS_ASSUME_NONNULL_BEGIN

@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
@end


-@interface OWSDisappearingMessageFinderTest : XCTestCase
+@interface OWSDisappearingMessageFinderTest : SSKBaseTest

@property YapDatabaseConnection *dbConnection;
@property OWSDisappearingMessagesFinder *finder;
--- a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
+++ b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
@ -7,9 +7,9 @@
 #import "OWSDisappearingMessagesConfiguration.h"
 #import "OWSDisappearingMessagesFinder.h"
 #import "OWSFakeContactsManager.h"
+#import "SSKBaseTest.h"
 #import "TSContactThread.h"
 #import "TSMessage.h"
-#import <XCTest/XCTest.h>

 NS_ASSUME_NONNULL_BEGIN

@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
                                    contactsManager:(id<ContactsManagerProtocol>)contactsManager;
@end

-@interface OWSDisappearingMessagesJobTest : XCTestCase
+@interface OWSDisappearingMessagesJobTest : SSKBaseTest

@property TSThread *thread;

--- a/SignalServiceKit/tests/Messages/OWSIncomingMessageFinderTest.m
+++ b/SignalServiceKit/tests/Messages/OWSIncomingMessageFinderTest.m
@ -5,9 +5,9 @@
 #import "OWSIncomingMessageFinder.h"
 #import "OWSDevice.h"
 #import "OWSPrimaryStorage.h"
+#import "SSKBaseTest.h"
 #import "TSContactThread.h"
 #import "TSIncomingMessage.h"
-#import <XCTest/XCTest.h>

 NS_ASSUME_NONNULL_BEGIN

@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN

@end

-@interface OWSIncomingMessageFinderTest : XCTestCase
+@interface OWSIncomingMessageFinderTest : SSKBaseTest

@property (nonatomic) NSString *sourceId;
@property (nonatomic) TSThread *thread;
--- a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
+++ b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
@ -11,6 +11,7 @@
 #import "OWSFakeNetworkManager.h"
 #import "OWSPrimaryStorage.h"
 #import "OWSUploadOperation.h"
+#import "SSKBaseTest.h"
 #import "TSAccountManager.h"
 #import "TSContactThread.h"
 #import "TSGroupModel.h"
@ -19,7 +20,6 @@
 #import "TSOutgoingMessage.h"
 #import <AxolotlKit/AxolotlExceptions.h>
 #import <AxolotlKit/SessionBuilder.h>
-#import <XCTest/XCTest.h>

 NS_ASSUME_NONNULL_BEGIN

@ -179,7 +179,7 @@ NS_ASSUME_NONNULL_BEGIN

@end

-@interface OWSMessageSenderTest : XCTestCase
+@interface OWSMessageSenderTest : SSKBaseTest

@property (nonatomic) TSThread *thread;
@property (nonatomic) TSOutgoingMessage *expiringMessage;
--- a/SignalServiceKit/tests/Messages/TSMessagesManagerTest.m
+++ b/SignalServiceKit/tests/Messages/TSMessagesManagerTest.m
@ -15,9 +15,9 @@
 #import "OWSPrimaryStorage.h"
 #import "OWSSignalServiceProtos.pb.h"
 #import "OWSUnitTestEnvironment.h"
+#import "SSKBaseTest.h"
 #import "TSGroupThread.h"
 #import "TSNetworkManager.h"
-#import <XCTest/XCTest.h>

 NS_ASSUME_NONNULL_BEGIN

@ -42,7 +42,7 @@ NS_ASSUME_NONNULL_BEGIN

@end

-@interface TSMessagesManagerTest : XCTestCase
+@interface TSMessagesManagerTest : SSKBaseTest

@end

--- a/SignalServiceKit/tests/Security/OWSFingerprintTest.m
+++ b/SignalServiceKit/tests/Security/OWSFingerprintTest.m
@ -3,11 +3,10 @@
 //

 #import "OWSFingerprint.h"
+#import "SSKBaseTest.h"
 #import <Curve25519Kit/Curve25519.h>
-#import <XCTest/XCTest.h>
-
-@interface OWSFingerprintTest : XCTestCase

+@interface OWSFingerprintTest : SSKBaseTest

@end

--- a/SignalServiceKit/tests/Storage/OWSOrphanedDataCleanerTest.m
+++ b/SignalServiceKit/tests/Storage/OWSOrphanedDataCleanerTest.m
@ -5,12 +5,12 @@
 #import "OWSOrphanedDataCleaner.h"
 #import "OWSDevice.h"
 #import "OWSPrimaryStorage.h"
+#import "SSKBaseTest.h"
 #import "TSAttachmentStream.h"
 #import "TSContactThread.h"
 #import "TSIncomingMessage.h"
-#import <XCTest/XCTest.h>

-@interface OWSOrphanedDataCleanerTest : XCTestCase
+@interface OWSOrphanedDataCleanerTest : SSKBaseTest

@end

--- a/SignalServiceKit/tests/Storage/TSMessageStorageTests.m
+++ b/SignalServiceKit/tests/Storage/TSMessageStorageTests.m
@ -4,15 +4,15 @@

 #import "Cryptography.h"
 #import "OWSPrimaryStorage.h"
+#import "SSKBaseTest.h"
 #import "TSContactThread.h"
 #import "TSGroupThread.h"
 #import "TSIncomingMessage.h"
 #import "TSMessage.h"
 #import "TSOutgoingMessage.h"
 #import "TSThread.h"
-#import <XCTest/XCTest.h>

-@interface TSMessageStorageTests : XCTestCase
+@interface TSMessageStorageTests : SSKBaseTest

@property TSContactThread *thread;

--- a/SignalServiceKit/tests/Storage/TSStorageIdentityKeyStoreTests.m
+++ b/SignalServiceKit/tests/Storage/TSStorageIdentityKeyStoreTests.m
@ -6,12 +6,12 @@
 #import "OWSPrimaryStorage.h"
 #import "OWSRecipientIdentity.h"
 #import "OWSUnitTestEnvironment.h"
+#import "SSKBaseTest.h"
 #import "SSKEnvironment.h"
 #import "SecurityUtils.h"
 #import <Curve25519Kit/Curve25519.h>
-#import <XCTest/XCTest.h>

-@interface TSStorageIdentityKeyStoreTests : XCTestCase
+@interface TSStorageIdentityKeyStoreTests : SSKBaseTest

@end

--- a/SignalServiceKit/tests/Storage/TSStoragePreKeyStoreTests.m
+++ b/SignalServiceKit/tests/Storage/TSStoragePreKeyStoreTests.m
@ -3,9 +3,9 @@
 //

 #import "OWSPrimaryStorage+PreKeyStore.h"
-#import <XCTest/XCTest.h>
+#import "SSKBaseTest.h"

-@interface TSStoragePreKeyStoreTests : XCTestCase
+@interface TSStoragePreKeyStoreTests : SSKBaseTest

@end

--- a/SignalServiceKit/tests/Util/CryptographyTests.m
+++ b/SignalServiceKit/tests/Util/CryptographyTests.m
@ -4,7 +4,7 @@

 #import "Cryptography.h"
 #import "NSData+OWS.h"
-#import <XCTest/XCTest.h>
+#import "SSKBaseTest.h"

 NS_ASSUME_NONNULL_BEGIN

@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN

@end

-@interface CryptographyTests : XCTestCase
+@interface CryptographyTests : SSKBaseTest

@end

--- a/SignalServiceKit/tests/Util/SSKSwiftTests.swift
+++ b/SignalServiceKit/tests/Util/SSKSwiftTests.swift
@ -4,5 +4,6 @@

 import XCTest

+// Just a placeholder.
 class SSKSwiftTests: XCTestCase {
 }