From 675956f79295e1d16ea46e4cb9cfb30ac1398db3 Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Thu, 17 Jul 2014 01:14:12 +0200 Subject: [PATCH] Goodbye OCTest, Hello XCTest Some tests are still failing after the new key datastore transition. --- Signal.xcodeproj/project.pbxproj | 62 ++++++++++++++----- Signal/src/AppDelegate.m | 1 + Signal/test/TestUtil.h | 5 +- Signal/test/async/AsyncUtilTest.h | 4 +- Signal/test/async/FutureSourceTest.h | 4 +- Signal/test/async/ObservableTest.h | 4 +- Signal/test/audio/AudioFrameTest.h | 4 +- Signal/test/audio/AudioRemoteIOTest.h | 4 +- Signal/test/audio/AudioStretcherTest.h | 4 +- Signal/test/audio/JitterQueueTest.h | 4 +- Signal/test/audio/SpeexCodecTest.h | 4 +- Signal/test/contact/ContactManagerTest.m | 4 +- Signal/test/network/IpAddressTest.h | 4 +- Signal/test/network/IpEndPointTest.h | 4 +- Signal/test/network/dns/DnsManagerTest.h | 4 +- .../network/http/HttpRequestResponseTest.h | 4 +- Signal/test/network/rtp/RtpPacketTests.h | 4 +- .../test/network/rtp/srtp/SecureStreamTest.h | 4 +- .../network/rtp/srtp/SequenceCounterTest.h | 4 +- .../network/rtp/srtp/SequenceCounterTest.m | 2 +- Signal/test/network/rtp/zrtp/DH3KAgreerTest.h | 4 +- Signal/test/network/rtp/zrtp/EC25AgreerTest.m | 4 +- .../network/rtp/zrtp/HandshakePacketTest.h | 4 +- Signal/test/network/rtp/zrtp/HashChainTest.h | 4 +- .../test/network/rtp/zrtp/MasterSecretTest.h | 4 +- .../ShortAuthenticationStringGeneratorTest.h | 4 +- Signal/test/network/rtp/zrtp/ZrtpTest.h | 4 +- .../network/tcp/LowLatencyConnectorTest.h | 4 +- .../test/network/tcp/tls/NetworkStreamTest.h | 4 +- .../test/network/tcp/tls/SecureEndPointTest.h | 4 +- Signal/test/network/udp/UdpSocketTest.h | 4 +- Signal/test/phone/PhoneNumberTest.h | 4 +- .../phone/signaling/SessionDescriptorTest.h | 4 +- .../profiling/DecayingSampleEstimatorTest.h | 4 +- Signal/test/profiling/EventWindowTest.h | 4 +- Signal/test/util/BloomFilterTest.h | 4 +- Signal/test/util/CancelTokenTest.h | 4 +- Signal/test/util/ConversionsTest.h | 4 +- Signal/test/util/Crc32Test.h | 4 +- Signal/test/util/CryptoUtilTest.h | 4 +- Signal/test/util/CyclicalBufferTest.h | 4 +- Signal/test/util/ExceptionsTest.h | 4 +- Signal/test/util/ExceptionsTest.m | 8 +-- Signal/test/util/FunctionalUtilTest.h | 4 +- Signal/test/util/PriorityQueueTest.h | 4 +- Signal/test/util/QueueTest.h | 4 +- Signal/test/util/UtilTest.h | 4 +- Signal/test/util/UtilTest.m | 4 +- 48 files changed, 142 insertions(+), 108 deletions(-) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 1aad5ba4b..e2314d1f8 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -382,6 +382,7 @@ AA0C8E498E2046B0B81EEE6E /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8313AE91B4954215858A5662 /* libPods.a */; }; B62686301964AE3D00D2D697 /* LogSubmit.m in Sources */ = {isa = PBXBuildFile; fileRef = B626862F1964AE3D00D2D697 /* LogSubmit.m */; }; B67EBF5D19194AC60084CCFD /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B67EBF5C19194AC60084CCFD /* Settings.bundle */; }; + B69CD25119773E79005CE69A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B69CD25019773E79005CE69A /* XCTest.framework */; }; B6B1013C196D213F007E3930 /* SGNKeychainUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B1013B196D213F007E3930 /* SGNKeychainUtil.m */; }; B6B6C3C71919440C00C0B76B /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6B6C3C51919440C00C0B76B /* Localizable.strings */; }; B90418E6183E9DD40038554A /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; }; @@ -421,7 +422,6 @@ D221A090169C9E5E00537ABF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D221A08F169C9E5E00537ABF /* Foundation.framework */; }; D221A092169C9E5E00537ABF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D221A091169C9E5E00537ABF /* CoreGraphics.framework */; }; D221A09A169C9E5E00537ABF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D221A099169C9E5E00537ABF /* main.m */; }; - D221A0AC169C9E5F00537ABF /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D221A0AB169C9E5F00537ABF /* SenTestingKit.framework */; }; D221A0AD169C9E5F00537ABF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D221A08D169C9E5E00537ABF /* UIKit.framework */; }; D221A0AE169C9E5F00537ABF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D221A08F169C9E5E00537ABF /* Foundation.framework */; }; D221A0E8169DFFC500537ABF /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D221A0E7169DFFC500537ABF /* AVFoundation.framework */; }; @@ -622,6 +622,20 @@ remoteGlobalIDString = A1FDCBF916DBC57D00868894; remoteInfo = speex; }; + B6913FF419773C5000AE2BF5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D221A080169C9E5E00537ABF /* Project object */; + proxyType = 1; + remoteGlobalIDString = D221A088169C9E5E00537ABF; + remoteInfo = Signal; + }; + B6913FF619773C5100AE2BF5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D221A080169C9E5E00537ABF /* Project object */; + proxyType = 1; + remoteGlobalIDString = D221A088169C9E5E00537ABF; + remoteInfo = Signal; + }; D221A0AF169C9E5F00537ABF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D221A080169C9E5E00537ABF /* Project object */; @@ -1093,6 +1107,7 @@ B626862F1964AE3D00D2D697 /* LogSubmit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogSubmit.m; sourceTree = ""; }; B657DDC91911A40500F45B0C /* Signal.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Signal.entitlements; sourceTree = ""; }; B67EBF5C19194AC60084CCFD /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = SettingsBundle/Settings.bundle; sourceTree = SOURCE_ROOT; }; + B69CD25019773E79005CE69A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; B6B1013A196D213F007E3930 /* SGNKeychainUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SGNKeychainUtil.h; sourceTree = ""; }; B6B1013B196D213F007E3930 /* SGNKeychainUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SGNKeychainUtil.m; sourceTree = ""; }; B6B6C3C61919440C00C0B76B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; @@ -1139,8 +1154,7 @@ D221A095169C9E5E00537ABF /* Signal-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Signal-Info.plist"; sourceTree = ""; }; D221A099169C9E5E00537ABF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; D221A09B169C9E5E00537ABF /* Signal-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Signal-Prefix.pch"; sourceTree = ""; }; - D221A0AA169C9E5F00537ABF /* SignalTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SignalTests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; - D221A0AB169C9E5F00537ABF /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; + D221A0AA169C9E5F00537ABF /* SignalTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SignalTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; D221A0E7169DFFC500537ABF /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = ../../../../../../System/Library/Frameworks/AVFoundation.framework; sourceTree = ""; }; D24B5BD4169F568C00681372 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = ../../../../../../System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; D2AEACDB16C426DA00C364C0 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; @@ -1340,6 +1354,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B69CD25119773E79005CE69A /* XCTest.framework in Frameworks */, E1368CBE18A1C36B00109378 /* MessageUI.framework in Frameworks */, A10FDF79184FB4BB007FF963 /* MediaPlayer.framework in Frameworks */, A1A018531805C60D00A052A6 /* CoreGraphics.framework in Frameworks */, @@ -1351,7 +1366,6 @@ D202868316DBE0FC009068E9 /* CoreTelephony.framework in Frameworks */, D202868216DBE0F4009068E9 /* SystemConfiguration.framework in Frameworks */, D202868116DBE0E7009068E9 /* CFNetwork.framework in Frameworks */, - D221A0AC169C9E5F00537ABF /* SenTestingKit.framework in Frameworks */, D221A0AD169C9E5F00537ABF /* UIKit.framework in Frameworks */, D221A0AE169C9E5F00537ABF /* Foundation.framework in Frameworks */, AA0C8E498E2046B0B81EEE6E /* libPods.a in Frameworks */, @@ -2460,7 +2474,7 @@ isa = PBXGroup; children = ( D221A089169C9E5E00537ABF /* Signal.app */, - D221A0AA169C9E5F00537ABF /* SignalTests.octest */, + D221A0AA169C9E5F00537ABF /* SignalTests.xctest */, ); name = Products; sourceTree = ""; @@ -2468,6 +2482,7 @@ D221A08C169C9E5E00537ABF /* Frameworks */ = { isa = PBXGroup; children = ( + B69CD25019773E79005CE69A /* XCTest.framework */, 70377AAA1918450100CAF501 /* MobileCoreServices.framework */, B9EB5ABC1884C002007CBB57 /* MessageUI.framework */, A1C32D4D17A0652C000A904E /* AddressBook.framework */, @@ -2486,7 +2501,6 @@ D221A08D169C9E5E00537ABF /* UIKit.framework */, D221A08F169C9E5E00537ABF /* Foundation.framework */, D221A091169C9E5E00537ABF /* CoreGraphics.framework */, - D221A0AB169C9E5F00537ABF /* SenTestingKit.framework */, 8313AE91B4954215858A5662 /* libPods.a */, ); name = Frameworks; @@ -2659,11 +2673,13 @@ ); dependencies = ( D221A0B0169C9E5F00537ABF /* PBXTargetDependency */, + B6913FF519773C5000AE2BF5 /* PBXTargetDependency */, + B6913FF719773C5100AE2BF5 /* PBXTargetDependency */, ); name = SignalTests; productName = RedPhoneTests; - productReference = D221A0AA169C9E5F00537ABF /* SignalTests.octest */; - productType = "com.apple.product-type.bundle"; + productReference = D221A0AA169C9E5F00537ABF /* SignalTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -2671,7 +2687,7 @@ D221A080169C9E5E00537ABF /* Project object */ = { isa = PBXProject; attributes = { - LastTestingUpgradeCheck = 0510; + LastTestingUpgradeCheck = 0600; LastUpgradeCheck = 0500; ORGANIZATIONNAME = "Open Whisper Systems"; TargetAttributes = { @@ -2686,6 +2702,9 @@ }; }; }; + D221A0A9169C9E5F00537ABF = { + TestTargetID = D221A088169C9E5E00537ABF; + }; }; }; buildConfigurationList = D221A083169C9E5E00537ABF /* Build configuration list for PBXProject "Signal" */; @@ -3411,6 +3430,16 @@ name = speex; targetProxy = 70B800AD190C54870042E3F0 /* PBXContainerItemProxy */; }; + B6913FF519773C5000AE2BF5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D221A088169C9E5E00537ABF /* Signal */; + targetProxy = B6913FF419773C5000AE2BF5 /* PBXContainerItemProxy */; + }; + B6913FF719773C5100AE2BF5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D221A088169C9E5E00537ABF /* Signal */; + targetProxy = B6913FF619773C5100AE2BF5 /* PBXContainerItemProxy */; + }; D221A0B0169C9E5F00537ABF /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D221A088169C9E5E00537ABF /* Signal */; @@ -3568,6 +3597,8 @@ FRAMEWORK_SEARCH_PATHS = ( "\"$(SDKROOT)/Developer/Library/Frameworks\"", "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", ); GCC_GENERATE_TEST_COVERAGE_FILES = NO; GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; @@ -3601,8 +3632,7 @@ ); PRODUCT_NAME = SignalTests; TEST_HOST = "$(BUNDLE_LOADER)"; - VALID_ARCHS = "arm64 armv7s armv7 i386"; - WRAPPER_EXTENSION = octest; + VALID_ARCHS = "arm64 armv7s armv7 i386 x86_64"; }; name = "Ad-Hoc Distribution"; }; @@ -3851,6 +3881,8 @@ FRAMEWORK_SEARCH_PATHS = ( "\"$(SDKROOT)/Developer/Library/Frameworks\"", "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", ); GCC_GENERATE_TEST_COVERAGE_FILES = NO; GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; @@ -3884,8 +3916,7 @@ ); PRODUCT_NAME = SignalTests; TEST_HOST = "$(BUNDLE_LOADER)"; - VALID_ARCHS = "arm64 armv7s armv7 i386"; - WRAPPER_EXTENSION = octest; + VALID_ARCHS = "arm64 armv7s armv7 i386 x86_64"; }; name = Debug; }; @@ -3897,6 +3928,8 @@ FRAMEWORK_SEARCH_PATHS = ( "\"$(SDKROOT)/Developer/Library/Frameworks\"", "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", ); GCC_GENERATE_TEST_COVERAGE_FILES = NO; GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; @@ -3930,8 +3963,7 @@ ); PRODUCT_NAME = SignalTests; TEST_HOST = "$(BUNDLE_LOADER)"; - VALID_ARCHS = "arm64 armv7s armv7 i386"; - WRAPPER_EXTENSION = octest; + VALID_ARCHS = "arm64 armv7s armv7 i386 x86_64"; }; name = "App Store Release"; }; diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 1b18f0cd5..0ff27b48b 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -44,6 +44,7 @@ if (!previousVersion) { DDLogError(@"No previous version found. Possibly first launch since install."); + [Environment setCurrent:[Release releaseEnvironmentWithLogging:nil]]; [Environment resetAppData]; // We clean previous keychain entries in case their are some entries remaining. } else if ([currentVersion compare:previousVersion options:NSNumericSearch] == NSOrderedDescending) { // The application was updated diff --git a/Signal/test/TestUtil.h b/Signal/test/TestUtil.h index bab17b387..118e66e9b 100644 --- a/Signal/test/TestUtil.h +++ b/Signal/test/TestUtil.h @@ -2,14 +2,15 @@ #import "DiscardingLog.h" #import "Release.h" + NSObject* churnLock(void); bool _testChurnHelper(int (^condition)(), NSTimeInterval delay); #define testPhoneNumber1 [PhoneNumber phoneNumberFromE164:@"+19027777777"] #define testPhoneNumber2 [PhoneNumber phoneNumberFromE164:@"+19028888888"] -#define test(expressionExpectedToBeTrue) STAssertTrue(expressionExpectedToBeTrue, @"") -#define testThrows(expressionExpectedToThrow) STAssertThrows(expressionExpectedToThrow, @"") +#define test(expressionExpectedToBeTrue) XCTAssert(expressionExpectedToBeTrue, @"") +#define testThrows(expressionExpectedToThrow) XCTAssertThrows(expressionExpectedToThrow, @"") #define testDoesNotThrow(expressionExpectedToNotThrow) expressionExpectedToNotThrow #define testEnv [Release unitTestEnvironment:@[]] #define testEnvWith(options) [Release unitTestEnvironment:(@[options])] diff --git a/Signal/test/async/AsyncUtilTest.h b/Signal/test/async/AsyncUtilTest.h index deafebb00..e368891b5 100644 --- a/Signal/test/async/AsyncUtilTest.h +++ b/Signal/test/async/AsyncUtilTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface AsyncUtilTest : SenTestCase +@interface AsyncUtilTest : XCTestCase @end diff --git a/Signal/test/async/FutureSourceTest.h b/Signal/test/async/FutureSourceTest.h index 6b0fa12e9..0843ed791 100644 --- a/Signal/test/async/FutureSourceTest.h +++ b/Signal/test/async/FutureSourceTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface FutureSourceTest : SenTestCase +@interface FutureSourceTest : XCTestCase @end diff --git a/Signal/test/async/ObservableTest.h b/Signal/test/async/ObservableTest.h index 241cb9b04..6690477fc 100644 --- a/Signal/test/async/ObservableTest.h +++ b/Signal/test/async/ObservableTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface ObservableTest : SenTestCase +@interface ObservableTest : XCTestCase @end diff --git a/Signal/test/audio/AudioFrameTest.h b/Signal/test/audio/AudioFrameTest.h index 93c9f6874..90d6c9b70 100644 --- a/Signal/test/audio/AudioFrameTest.h +++ b/Signal/test/audio/AudioFrameTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface AudioFrameTest : SenTestCase +@interface AudioFrameTest : XCTestCase @end diff --git a/Signal/test/audio/AudioRemoteIOTest.h b/Signal/test/audio/AudioRemoteIOTest.h index 761893a79..e032f3943 100644 --- a/Signal/test/audio/AudioRemoteIOTest.h +++ b/Signal/test/audio/AudioRemoteIOTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface AudioRemoteIOTest : SenTestCase +@interface AudioRemoteIOTest : XCTestCase @end diff --git a/Signal/test/audio/AudioStretcherTest.h b/Signal/test/audio/AudioStretcherTest.h index b6ae29274..9be2d7731 100644 --- a/Signal/test/audio/AudioStretcherTest.h +++ b/Signal/test/audio/AudioStretcherTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface AudioStretcherTest : SenTestCase +@interface AudioStretcherTest : XCTestCase @end diff --git a/Signal/test/audio/JitterQueueTest.h b/Signal/test/audio/JitterQueueTest.h index 53a1fea54..d749245f5 100644 --- a/Signal/test/audio/JitterQueueTest.h +++ b/Signal/test/audio/JitterQueueTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface JitterQueueTest : SenTestCase +@interface JitterQueueTest : XCTestCase @end diff --git a/Signal/test/audio/SpeexCodecTest.h b/Signal/test/audio/SpeexCodecTest.h index b865bd046..a56692ca9 100644 --- a/Signal/test/audio/SpeexCodecTest.h +++ b/Signal/test/audio/SpeexCodecTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface SpeexCodecTest : SenTestCase +@interface SpeexCodecTest : XCTestCase @end diff --git a/Signal/test/contact/ContactManagerTest.m b/Signal/test/contact/ContactManagerTest.m index bdfe03d9a..c7740f248 100644 --- a/Signal/test/contact/ContactManagerTest.m +++ b/Signal/test/contact/ContactManagerTest.m @@ -1,8 +1,8 @@ -#import +#import #import "TestUtil.h" #import "ContactsManager.h" -@interface ContactManagerTest : SenTestCase +@interface ContactManagerTest : XCTestCase @end diff --git a/Signal/test/network/IpAddressTest.h b/Signal/test/network/IpAddressTest.h index 4a1225573..a42286d42 100644 --- a/Signal/test/network/IpAddressTest.h +++ b/Signal/test/network/IpAddressTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface IpAddressTest : SenTestCase +@interface IpAddressTest : XCTestCase @end diff --git a/Signal/test/network/IpEndPointTest.h b/Signal/test/network/IpEndPointTest.h index 0f13701b4..9acbbad8c 100644 --- a/Signal/test/network/IpEndPointTest.h +++ b/Signal/test/network/IpEndPointTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface IpEndPointTest : SenTestCase +@interface IpEndPointTest : XCTestCase @end diff --git a/Signal/test/network/dns/DnsManagerTest.h b/Signal/test/network/dns/DnsManagerTest.h index 69c1ae25b..70049edc6 100644 --- a/Signal/test/network/dns/DnsManagerTest.h +++ b/Signal/test/network/dns/DnsManagerTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface DnsManagerTest : SenTestCase +@interface DnsManagerTest : XCTestCase @end diff --git a/Signal/test/network/http/HttpRequestResponseTest.h b/Signal/test/network/http/HttpRequestResponseTest.h index bd41b424d..670754747 100644 --- a/Signal/test/network/http/HttpRequestResponseTest.h +++ b/Signal/test/network/http/HttpRequestResponseTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface HttpRequestResponseTest : SenTestCase +@interface HttpRequestResponseTest : XCTestCase @end diff --git a/Signal/test/network/rtp/RtpPacketTests.h b/Signal/test/network/rtp/RtpPacketTests.h index 97d7dcb2b..23cbca2bc 100644 --- a/Signal/test/network/rtp/RtpPacketTests.h +++ b/Signal/test/network/rtp/RtpPacketTests.h @@ -1,6 +1,6 @@ -#import +#import #import "RtpPacket.h" -@interface RtpPacketTests : SenTestCase +@interface RtpPacketTests : XCTestCase @end diff --git a/Signal/test/network/rtp/srtp/SecureStreamTest.h b/Signal/test/network/rtp/srtp/SecureStreamTest.h index d58307002..43d03a50d 100644 --- a/Signal/test/network/rtp/srtp/SecureStreamTest.h +++ b/Signal/test/network/rtp/srtp/SecureStreamTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface SecureStreamTest : SenTestCase +@interface SecureStreamTest : XCTestCase @end diff --git a/Signal/test/network/rtp/srtp/SequenceCounterTest.h b/Signal/test/network/rtp/srtp/SequenceCounterTest.h index 813fc9ebd..c162853fe 100644 --- a/Signal/test/network/rtp/srtp/SequenceCounterTest.h +++ b/Signal/test/network/rtp/srtp/SequenceCounterTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface SequenceCounterTest : SenTestCase +@interface SequenceCounterTest : XCTestCase @end diff --git a/Signal/test/network/rtp/srtp/SequenceCounterTest.m b/Signal/test/network/rtp/srtp/SequenceCounterTest.m index dfe29aaf9..2d1f461c1 100644 --- a/Signal/test/network/rtp/srtp/SequenceCounterTest.m +++ b/Signal/test/network/rtp/srtp/SequenceCounterTest.m @@ -38,7 +38,7 @@ uint16_t nextShortId = (uint16_t)(nextLongId & 0xFFFF); int64_t actualNextLongId = [s convertNext:nextShortId]; if (nextLongId != actualNextLongId) { - STFail(@"Bad transition: %lld, %lld + %lld -> %lld, %lld != %lld", (long long)prevShortId, (long long)prevLongId, (long long)delta, (long long)nextShortId, (long long)actualNextLongId, (long long)nextLongId); + XCTFail(@"Bad transition: %lld, %lld + %lld -> %lld, %lld != %lld", (long long)prevShortId, (long long)prevLongId, (long long)delta, (long long)nextShortId, (long long)actualNextLongId, (long long)nextLongId); return; } prevLongId = nextLongId; diff --git a/Signal/test/network/rtp/zrtp/DH3KAgreerTest.h b/Signal/test/network/rtp/zrtp/DH3KAgreerTest.h index 8a2de03ac..72362b180 100644 --- a/Signal/test/network/rtp/zrtp/DH3KAgreerTest.h +++ b/Signal/test/network/rtp/zrtp/DH3KAgreerTest.h @@ -6,8 +6,8 @@ // Copyright (c) 2013 Twisted Oak Studios. All rights reserved. // -#import +#import -@interface DH3KAgreerTest : SenTestCase +@interface DH3KAgreerTest : XCTestCase @end diff --git a/Signal/test/network/rtp/zrtp/EC25AgreerTest.m b/Signal/test/network/rtp/zrtp/EC25AgreerTest.m index 7696ba4c0..c6d71dcbb 100644 --- a/Signal/test/network/rtp/zrtp/EC25AgreerTest.m +++ b/Signal/test/network/rtp/zrtp/EC25AgreerTest.m @@ -1,9 +1,9 @@ -#import +#import #import "TestUtil.h" #import "EC25KeyAgreementParticipant.h" #import "EC25KeyAgreementProtocol.h" -@interface EC25AgreerTest : SenTestCase{ +@interface EC25AgreerTest : XCTestCase{ } diff --git a/Signal/test/network/rtp/zrtp/HandshakePacketTest.h b/Signal/test/network/rtp/zrtp/HandshakePacketTest.h index dd5b8b91b..a605b31f9 100644 --- a/Signal/test/network/rtp/zrtp/HandshakePacketTest.h +++ b/Signal/test/network/rtp/zrtp/HandshakePacketTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface HandshakePacketTest : SenTestCase +@interface HandshakePacketTest : XCTestCase @end diff --git a/Signal/test/network/rtp/zrtp/HashChainTest.h b/Signal/test/network/rtp/zrtp/HashChainTest.h index 188717f02..9eecdc0bb 100644 --- a/Signal/test/network/rtp/zrtp/HashChainTest.h +++ b/Signal/test/network/rtp/zrtp/HashChainTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface HashChainTest : SenTestCase +@interface HashChainTest : XCTestCase @end diff --git a/Signal/test/network/rtp/zrtp/MasterSecretTest.h b/Signal/test/network/rtp/zrtp/MasterSecretTest.h index 30c25223c..889231ebc 100644 --- a/Signal/test/network/rtp/zrtp/MasterSecretTest.h +++ b/Signal/test/network/rtp/zrtp/MasterSecretTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface MasterSecretTest : SenTestCase +@interface MasterSecretTest : XCTestCase @end diff --git a/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.h b/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.h index f73eb5a81..05ccee8a8 100644 --- a/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.h +++ b/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface ShortAuthenticationStringGeneratorTest : SenTestCase +@interface ShortAuthenticationStringGeneratorTest : XCTestCase @end diff --git a/Signal/test/network/rtp/zrtp/ZrtpTest.h b/Signal/test/network/rtp/zrtp/ZrtpTest.h index fbb1bbbcc..1e81e2fc3 100644 --- a/Signal/test/network/rtp/zrtp/ZrtpTest.h +++ b/Signal/test/network/rtp/zrtp/ZrtpTest.h @@ -1,4 +1,4 @@ -#import +#import #import "ZrtpManager.h" #import "HelloPacket.h" #import "ConfirmPacket.h" @@ -12,6 +12,6 @@ #import "ZrtpResponder.h" #import "ZrtpInitiator.h" -@interface ZrtpTest : SenTestCase +@interface ZrtpTest : XCTestCase @end diff --git a/Signal/test/network/tcp/LowLatencyConnectorTest.h b/Signal/test/network/tcp/LowLatencyConnectorTest.h index df5c79797..3353f7c01 100644 --- a/Signal/test/network/tcp/LowLatencyConnectorTest.h +++ b/Signal/test/network/tcp/LowLatencyConnectorTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface LowLatencyConnectorTest : SenTestCase +@interface LowLatencyConnectorTest : XCTestCase @end diff --git a/Signal/test/network/tcp/tls/NetworkStreamTest.h b/Signal/test/network/tcp/tls/NetworkStreamTest.h index 8a4b4c912..3e3abf749 100644 --- a/Signal/test/network/tcp/tls/NetworkStreamTest.h +++ b/Signal/test/network/tcp/tls/NetworkStreamTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface NetworkStreamTest : SenTestCase +@interface NetworkStreamTest : XCTestCase @end diff --git a/Signal/test/network/tcp/tls/SecureEndPointTest.h b/Signal/test/network/tcp/tls/SecureEndPointTest.h index 3d584d1f4..cd0606d5f 100644 --- a/Signal/test/network/tcp/tls/SecureEndPointTest.h +++ b/Signal/test/network/tcp/tls/SecureEndPointTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface SecureEndPointTest : SenTestCase +@interface SecureEndPointTest : XCTestCase @end diff --git a/Signal/test/network/udp/UdpSocketTest.h b/Signal/test/network/udp/UdpSocketTest.h index 8c207e456..8e7f2fea8 100644 --- a/Signal/test/network/udp/UdpSocketTest.h +++ b/Signal/test/network/udp/UdpSocketTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface UdpSocketTest : SenTestCase +@interface UdpSocketTest : XCTestCase @end diff --git a/Signal/test/phone/PhoneNumberTest.h b/Signal/test/phone/PhoneNumberTest.h index d76202e96..a37777c94 100644 --- a/Signal/test/phone/PhoneNumberTest.h +++ b/Signal/test/phone/PhoneNumberTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface PhoneNumberTest : SenTestCase +@interface PhoneNumberTest : XCTestCase @end diff --git a/Signal/test/phone/signaling/SessionDescriptorTest.h b/Signal/test/phone/signaling/SessionDescriptorTest.h index 22825a760..904b1d9da 100644 --- a/Signal/test/phone/signaling/SessionDescriptorTest.h +++ b/Signal/test/phone/signaling/SessionDescriptorTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface SessionDescriptorTest : SenTestCase +@interface SessionDescriptorTest : XCTestCase @end diff --git a/Signal/test/profiling/DecayingSampleEstimatorTest.h b/Signal/test/profiling/DecayingSampleEstimatorTest.h index c9fbecb39..a19dcc45e 100644 --- a/Signal/test/profiling/DecayingSampleEstimatorTest.h +++ b/Signal/test/profiling/DecayingSampleEstimatorTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface DecayingSampleEstimatorTest : SenTestCase +@interface DecayingSampleEstimatorTest : XCTestCase @end diff --git a/Signal/test/profiling/EventWindowTest.h b/Signal/test/profiling/EventWindowTest.h index e9b45a765..4f49c1f40 100644 --- a/Signal/test/profiling/EventWindowTest.h +++ b/Signal/test/profiling/EventWindowTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface EventWindowTest : SenTestCase +@interface EventWindowTest : XCTestCase @end diff --git a/Signal/test/util/BloomFilterTest.h b/Signal/test/util/BloomFilterTest.h index 1b8bc6b1a..19e2cddfa 100644 --- a/Signal/test/util/BloomFilterTest.h +++ b/Signal/test/util/BloomFilterTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface BloomFilterTest : SenTestCase +@interface BloomFilterTest : XCTestCase @end diff --git a/Signal/test/util/CancelTokenTest.h b/Signal/test/util/CancelTokenTest.h index 6a6453995..fb49a5899 100644 --- a/Signal/test/util/CancelTokenTest.h +++ b/Signal/test/util/CancelTokenTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface CancelTokenTest : SenTestCase +@interface CancelTokenTest : XCTestCase @end diff --git a/Signal/test/util/ConversionsTest.h b/Signal/test/util/ConversionsTest.h index f1544d4f1..c2eff2b7a 100644 --- a/Signal/test/util/ConversionsTest.h +++ b/Signal/test/util/ConversionsTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface ConversionsTest : SenTestCase +@interface ConversionsTest : XCTestCase @end diff --git a/Signal/test/util/Crc32Test.h b/Signal/test/util/Crc32Test.h index 98106e588..eec4461b4 100644 --- a/Signal/test/util/Crc32Test.h +++ b/Signal/test/util/Crc32Test.h @@ -1,5 +1,5 @@ -#import +#import -@interface Crc32Test : SenTestCase +@interface Crc32Test : XCTestCase @end diff --git a/Signal/test/util/CryptoUtilTest.h b/Signal/test/util/CryptoUtilTest.h index 2e162054c..cc4b080b2 100644 --- a/Signal/test/util/CryptoUtilTest.h +++ b/Signal/test/util/CryptoUtilTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface CryptoUtilTest : SenTestCase +@interface CryptoUtilTest : XCTestCase @end diff --git a/Signal/test/util/CyclicalBufferTest.h b/Signal/test/util/CyclicalBufferTest.h index c85c68bcf..76ec15b4d 100644 --- a/Signal/test/util/CyclicalBufferTest.h +++ b/Signal/test/util/CyclicalBufferTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface CyclicalBufferTest : SenTestCase +@interface CyclicalBufferTest : XCTestCase @end diff --git a/Signal/test/util/ExceptionsTest.h b/Signal/test/util/ExceptionsTest.h index a0c6ac115..7b1e4c581 100644 --- a/Signal/test/util/ExceptionsTest.h +++ b/Signal/test/util/ExceptionsTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface ExceptionsTest : SenTestCase +@interface ExceptionsTest : XCTestCase @end diff --git a/Signal/test/util/ExceptionsTest.m b/Signal/test/util/ExceptionsTest.m index 77128eba6..da692e036 100644 --- a/Signal/test/util/ExceptionsTest.m +++ b/Signal/test/util/ExceptionsTest.m @@ -7,7 +7,7 @@ require(1 + 1 == 2); @try { require(1 + 1 == 3); - STFail(@""); + XCTFail(@""); } @catch (BadArgument* ex) { test([[ex reason] hasPrefix:@"require 1 + 1 == 3"]); } @@ -15,7 +15,7 @@ requireState(1 + 1 == 2); @try { requireState(1 + 1 == 3); - STFail(@""); + XCTFail(@""); } @catch (BadState* ex) { test([[ex reason] hasPrefix:@"required state: 1 + 1 == 3"]); } @@ -23,7 +23,7 @@ checkOperationDescribe(1 + 1 == 2, @"addition."); @try { checkOperationDescribe(1 + 1 == 3, @"addition."); - STFail(@""); + XCTFail(@""); } @catch (OperationFailed* ex) { test([[ex reason] hasPrefix:@"Operation failed: addition. Expected: 1 + 1 == 3"]); } @@ -31,7 +31,7 @@ checkOperation(1 + 1 == 2); @try { checkOperation(1 + 1 == 3); - STFail(@""); + XCTFail(@""); } @catch (OperationFailed* ex) { test([[ex reason] hasPrefix:@"Operation failed. Expected: 1 + 1 == 3"]); } diff --git a/Signal/test/util/FunctionalUtilTest.h b/Signal/test/util/FunctionalUtilTest.h index 512b891ea..29fe5f829 100644 --- a/Signal/test/util/FunctionalUtilTest.h +++ b/Signal/test/util/FunctionalUtilTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface FunctionalUtilTest : SenTestCase +@interface FunctionalUtilTest : XCTestCase @end diff --git a/Signal/test/util/PriorityQueueTest.h b/Signal/test/util/PriorityQueueTest.h index 15198a1c1..e2d3f61e5 100644 --- a/Signal/test/util/PriorityQueueTest.h +++ b/Signal/test/util/PriorityQueueTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface PriorityQueueTest : SenTestCase +@interface PriorityQueueTest : XCTestCase @end diff --git a/Signal/test/util/QueueTest.h b/Signal/test/util/QueueTest.h index a152d768c..55ddd69d8 100644 --- a/Signal/test/util/QueueTest.h +++ b/Signal/test/util/QueueTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface QueueTest : SenTestCase +@interface QueueTest : XCTestCase @end diff --git a/Signal/test/util/UtilTest.h b/Signal/test/util/UtilTest.h index 2b543438a..3252acaa8 100644 --- a/Signal/test/util/UtilTest.h +++ b/Signal/test/util/UtilTest.h @@ -1,5 +1,5 @@ -#import +#import -@interface UtilTest : SenTestCase +@interface UtilTest : XCTestCase @end diff --git a/Signal/test/util/UtilTest.m b/Signal/test/util/UtilTest.m index 822521239..311607c08 100644 --- a/Signal/test/util/UtilTest.m +++ b/Signal/test/util/UtilTest.m @@ -276,8 +276,8 @@ NSString* b = [d encodedAsBase64]; NSData* d2 = [b decodedAsBase64Data]; if (![d isEqualToData:d2]) { - STFail([d description]); - } + XCTFail(@"%@",[d description]); + } } } -(void) testToRegex {