From 04175e02deb0785ab19e5ec3b0655d17b2363c7b Mon Sep 17 00:00:00 2001 From: Nick Forge Date: Wed, 19 Dec 2018 11:58:50 +1100 Subject: [PATCH 1/6] Upgrade project for Xcode 10.1 --- Expecta.xcodeproj/project.pbxproj | 110 +++++++++++++++++- .../xcschemes/Expecta-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Expecta.xcscheme | 2 +- .../xcschemes/libExpecta-iOS.xcscheme | 2 +- .../xcschemes/libExpecta.xcscheme | 2 +- 5 files changed, 110 insertions(+), 8 deletions(-) diff --git a/Expecta.xcodeproj/project.pbxproj b/Expecta.xcodeproj/project.pbxproj index a1aa8a7..a4a56ac 100644 --- a/Expecta.xcodeproj/project.pbxproj +++ b/Expecta.xcodeproj/project.pbxproj @@ -1217,7 +1217,7 @@ attributes = { CLASSPREFIX = EXP; LastTestingUpgradeCheck = 0630; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "Peter Jihoon Kim"; TargetAttributes = { 908379101A8B9660009844DA = { @@ -1686,6 +1686,7 @@ 3A0A59891AD4418C003DA3E4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", @@ -1709,6 +1710,7 @@ 3A0A598A1AD4418C003DA3E4 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", @@ -1732,6 +1734,7 @@ 3A0A598B1AD4418C003DA3E4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", @@ -1755,6 +1758,7 @@ 3A0A59BC1AD441CB003DA3E4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -1779,6 +1783,7 @@ 3A0A59BD1AD441CB003DA3E4 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -1803,6 +1808,7 @@ 3A0A59BE1AD441CB003DA3E4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -1827,6 +1833,8 @@ 908379251A8B9661009844DA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1848,6 +1856,8 @@ 908379261A8B9661009844DA /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1869,6 +1879,8 @@ 908379271A8B9661009844DA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1890,6 +1902,7 @@ 9083798D1A8B972C009844DA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1912,6 +1925,7 @@ 9083798E1A8B972C009844DA /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1934,6 +1948,7 @@ 9083798F1A8B972C009844DA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1956,6 +1971,7 @@ 9C44170917FF3F4A00978F09 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", @@ -1978,6 +1994,7 @@ 9C44170A17FF3F4A00978F09 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", @@ -2001,14 +2018,39 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = ""; - IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; @@ -2021,6 +2063,7 @@ BE5C179F18EDFA93003A13EC /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch"; @@ -2033,6 +2076,7 @@ BE5C17A018EDFA93003A13EC /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch"; INSTALL_PATH = /; @@ -2048,6 +2092,7 @@ BE5C17A218EDFA93003A13EC /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -2070,6 +2115,7 @@ BE5C17A318EDFA93003A13EC /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", @@ -2092,6 +2138,7 @@ E93067EE13B2E6D100EA26FF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch"; INSTALL_PATH = /; @@ -2107,6 +2154,7 @@ E93067EF13B2E6D100EA26FF /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch"; INSTALL_PATH = /; @@ -2122,6 +2170,7 @@ E93067F013B2E6D100EA26FF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -2144,6 +2193,7 @@ E93067F113B2E6D100EA26FF /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -2167,15 +2217,40 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = ""; - IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; @@ -2189,11 +2264,36 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_VERSION = ""; - IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "-ObjC"; SDKROOT = macosx; @@ -2205,6 +2305,7 @@ E9ACDF3013B2DD520010F4D7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch"; @@ -2217,6 +2318,7 @@ E9ACDF3113B2DD520010F4D7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/Expecta/Expecta-Prefix.pch"; diff --git a/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme b/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme index db63587..92f6b24 100644 --- a/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme +++ b/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme @@ -1,6 +1,6 @@ Date: Wed, 19 Dec 2018 12:06:14 +1100 Subject: [PATCH 2/6] Fix no-arg block compiler warnings --- Tests/AsynchronousTestingTest.m | 2 +- Tests/ExpectationTest.m | 2 +- Tests/Matchers/EXPMatchers+equalTest.m | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tests/AsynchronousTestingTest.m b/Tests/AsynchronousTestingTest.m index 5d57b60..ecc2557 100644 --- a/Tests/AsynchronousTestingTest.m +++ b/Tests/AsynchronousTestingTest.m @@ -5,7 +5,7 @@ @interface AsynchronousTestingTest : XCTestCase @implementation AsynchronousTestingTest -- (void)performBlock:(void(^)())block { +- (void)performBlock:(void(^)(void))block { block(); } diff --git a/Tests/ExpectationTest.m b/Tests/ExpectationTest.m index 2aa0fca..aa82f2d 100644 --- a/Tests/ExpectationTest.m +++ b/Tests/ExpectationTest.m @@ -180,7 +180,7 @@ - (void)test_expect_NSUInteger { } - (void)test_expect_block { - void (^b)() = ^{}; + void (^b)(void) = ^{}; void (^b2)(int a) = ^(int a) {}; assertEqualObjects(expect(b).actual, b); assertEqualObjects(expect(b2).actual, b2); diff --git a/Tests/Matchers/EXPMatchers+equalTest.m b/Tests/Matchers/EXPMatchers+equalTest.m index 6ca1cbd..4f2a7f3 100644 --- a/Tests/Matchers/EXPMatchers+equalTest.m +++ b/Tests/Matchers/EXPMatchers+equalTest.m @@ -166,8 +166,8 @@ - (void)test_equal_nullPointer { } - (void)test_equal_block { - void (^block)() = ^{}; - void (^block2)() = ^{}; + void (^block)(void) = ^{}; + void (^block2)(void) = ^{}; assertPass(test_expect(block).equal(block)); assertPass(test_expect(block).toNot.equal(block2)); } From ce54e8113eedc5342d26ae57bfcf5ab21a8595e1 Mon Sep 17 00:00:00 2001 From: Nick Forge Date: Wed, 19 Dec 2018 12:11:52 +1100 Subject: [PATCH 3/6] Fix designated initialiser warning --- Tests/CustomMatcherImplementationsTest.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/CustomMatcherImplementationsTest.m b/Tests/CustomMatcherImplementationsTest.m index 403b87a..2634d87 100644 --- a/Tests/CustomMatcherImplementationsTest.m +++ b/Tests/CustomMatcherImplementationsTest.m @@ -13,6 +13,7 @@ @interface MyCustomMatcherImpl : NSObject { NSString *_expected; } +- (instancetype)init NS_UNAVAILABLE; - (instancetype)initWithExpected:(NSString *)expected NS_DESIGNATED_INITIALIZER; @end From 2c65293c3a4e4ffa4c3f4d9b732eec0b3ee56e6a Mon Sep 17 00:00:00 2001 From: Nick Forge Date: Wed, 19 Dec 2018 12:19:46 +1100 Subject: [PATCH 4/6] Fix 'undeclared selector' warnings --- Tests/ExpectationTest.m | 3 +++ Tests/Matchers/EXPMatchers+equalTest.m | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/Tests/ExpectationTest.m b/Tests/ExpectationTest.m index aa82f2d..b64c84a 100644 --- a/Tests/ExpectationTest.m +++ b/Tests/ExpectationTest.m @@ -16,6 +16,9 @@ + (NSUInteger)instanceCount; @implementation ExpectedObject +// This method is declared to prevent "undeclared selector" compiler warnings +- (void)foo {} + - (instancetype)init { if (self = [super init]) { ++_instanceCount; diff --git a/Tests/Matchers/EXPMatchers+equalTest.m b/Tests/Matchers/EXPMatchers+equalTest.m index 4f2a7f3..14f30ca 100644 --- a/Tests/Matchers/EXPMatchers+equalTest.m +++ b/Tests/Matchers/EXPMatchers+equalTest.m @@ -7,6 +7,11 @@ @interface EXPMatchers_equalTest : XCTestCase @implementation EXPMatchers_equalTest +// These methods are declared to prevent "undeclared selector" compiler warnings +- (void)foo {} +- (void)bar {} +- (void)bar:(id)arg {} + - (void)test_equal_nil { assertPass(test_expect(nil).equal(nil)); assertFail(test_expect(@"foo").equal(nil), @"expected: nil/null, got: foo"); From c41670ea3e51509c40cc14dd8defb0b84dda1894 Mon Sep 17 00:00:00 2001 From: Nick Forge Date: Wed, 19 Dec 2018 12:20:25 +1100 Subject: [PATCH 5/6] Fix null argument warnings --- Tests/Helpers/FakeTestCase.m | 2 +- Tests/Matchers/EXPMatchers+raiseTest.m | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tests/Helpers/FakeTestCase.m b/Tests/Helpers/FakeTestCase.m index fe87fb8..1834c47 100644 --- a/Tests/Helpers/FakeTestCase.m +++ b/Tests/Helpers/FakeTestCase.m @@ -7,7 +7,7 @@ - (void)recordFailureWithDescription:(NSString *)description inFile:(NSString *)filename atLine:(NSUInteger)lineNumber expected:(BOOL)expected { - [NSException raise:description format:nil]; + [NSException raise:description format:@""]; } @end diff --git a/Tests/Matchers/EXPMatchers+raiseTest.m b/Tests/Matchers/EXPMatchers+raiseTest.m index 155e028..96c7f4e 100644 --- a/Tests/Matchers/EXPMatchers+raiseTest.m +++ b/Tests/Matchers/EXPMatchers+raiseTest.m @@ -7,11 +7,11 @@ @implementation EXPMatchers_raiseTest - (void)test_raise { assertPass(test_expect(^{ - [NSException raise:@"TestException" format:nil]; + [NSException raise:@"TestException" format:@""]; }).to.raiseAny()); assertPass(test_expect(^{ - [NSException raise:@"TestException" format:nil]; + [NSException raise:@"TestException" format:@""]; }).to.raise(@"TestException")); assertFail(test_expect(^{ @@ -26,11 +26,11 @@ - (void)test_raise { - (void)test_toNot_raise { assertFail(test_expect(^{ - [NSException raise:@"TestException" format:nil]; + [NSException raise:@"TestException" format:@""]; }).notTo.raiseAny(), @"expected: no exception, got: TestException"); assertFail(test_expect(^{ - [NSException raise:@"TestException" format:nil]; + [NSException raise:@"TestException" format:@""]; }).notTo.raise(@"TestException"), @"expected: not TestException, got: TestException"); assertPass(test_expect(^{ From d9a7dc485efb7e5def30d2c220977435983c005e Mon Sep 17 00:00:00 2001 From: Nick Forge Date: Fri, 21 Dec 2018 10:45:53 +1100 Subject: [PATCH 6/6] Updates .travis.yml to use the most recent macOS/Xcode image (xcode10.1) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index afa2e05..1e8f556 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode611 +osx_image: xcode10.1 script: - rake clean