Use OCHamcrest's throwsException matcher

jonreid · Dec 24, 2015 · 848f226 · 848f226
1 parent 9f7d763
commit 848f226
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 28 deletions.
diff --git a/Sample/MockUIAlertControllerSample.xcodeproj/project.pbxproj b/Sample/MockUIAlertControllerSample.xcodeproj/project.pbxproj
@@ -405,6 +405,7 @@
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.qualitycoding.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = MockUIAlertControllerSampleTests;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MockUIAlertControllerSample.app/MockUIAlertControllerSample";
@@ -421,6 +422,7 @@
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.qualitycoding.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = MockUIAlertControllerSampleTests;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MockUIAlertControllerSample.app/MockUIAlertControllerSample";

diff --git a/Sample/Tests/QCOMockAlertVerifierTests.m b/Sample/Tests/QCOMockAlertVerifierTests.m
@@ -2,10 +2,8 @@
 
 #import "ViewController.h"
 
-@import XCTest;
-
-#define HC_SHORTHAND
 #import <OCHamcrestIOS/OCHamcrestIOS.h>
+@import XCTest;
 
 
 @interface QCOMockAlertVerifierTests : XCTestCase
@@ -28,26 +26,18 @@ - (void)testShowAlert_TryingToGetStyleForNonexistentButton_ShouldThrowInternalIn
 {
     QCOMockAlertVerifier *alertVerifier = [[QCOMockAlertVerifier alloc] init];
     [sut showAlert:nil];
-
-    XCTAssertThrowsSpecificNamed(
-            [alertVerifier styleForButtonWithTitle:@"NO SUCH BUTTON"],
-            NSException,
-            NSInternalInconsistencyException);
+
+    assertThat(^{ [alertVerifier styleForButtonWithTitle:@"NO SUCH BUTTON"]; },
+            throwsException(hasProperty(@"name", NSInternalInconsistencyException)));
 }
 
 - (void)testShowAlert_TryingToGetStyleForNonexistentButton_ShouldThrowExceptionWithReason
 {
     QCOMockAlertVerifier *alertVerifier = [[QCOMockAlertVerifier alloc] init];
     [sut showAlert:nil];
 
-    @try
-    {
-        [alertVerifier styleForButtonWithTitle:@"NO SUCH BUTTON"];
-    }
-    @catch (NSException *exception)
-    {
-        assertThat(exception.reason, is(@"Button not found"));
-    }
+    assertThat(^{ [alertVerifier styleForButtonWithTitle:@"NO SUCH BUTTON"]; },
+            throwsException(hasProperty(@"reason", @"Button not found")));
 }
 
 - (void)testShowAlert_TryingToExecuteActionForNonexistentButton_ShouldThrowInternalInconsistency
@@ -56,25 +46,17 @@ - (void)testShowAlert_TryingToExecuteActionForNonexistentButton_ShouldThrowInter
 
     [sut showAlert:nil];
 
-    XCTAssertThrowsSpecificNamed(
-            [alertVerifier executeActionForButtonWithTitle:@"NO SUCH BUTTON"],
-            NSException,
-            NSInternalInconsistencyException);
+    assertThat(^{ [alertVerifier executeActionForButtonWithTitle:@"NO SUCH BUTTON"]; },
+            throwsException(hasProperty(@"name", NSInternalInconsistencyException)));
 }
 
 - (void)testShowAlert_TryingToExecuteActionForNonexistentButton_ShouldThrowExceptionWithReason
 {
     QCOMockAlertVerifier *alertVerifier = [[QCOMockAlertVerifier alloc] init];
     [sut showAlert:nil];
 
-    @try
-    {
-        [alertVerifier executeActionForButtonWithTitle:@"NO SUCH BUTTON"];
-    }
-    @catch (NSException *exception)
-    {
-        assertThat(exception.reason, is(@"Button not found"));
-    }
+    assertThat(^{ [alertVerifier executeActionForButtonWithTitle:@"NO SUCH BUTTON"]; },
+            throwsException(hasProperty(@"reason", @"Button not found")));
 }
 
 @end