Refactor PrimitiveArrayPropertyTests a little to reduce the compiled …

…size The compiled object was so large that the CI machines ran out of ram building it.
noxchen · Apr 1, 2020 · 5a5d027 · 5a5d027
1 parent 9961381
commit 5a5d027
Show file tree

Hide file tree

Showing 5 changed files with 271 additions and 1,530 deletions.
diff --git a/Realm/TestUtils/TestUtils.mm b/Realm/TestUtils/TestUtils.mm
@@ -113,6 +113,18 @@ static void assertThrows(XCTestCase *self, dispatch_block_t block, NSString *mes
     }
 }
 
+void (RLMAssertExceptionReason)(XCTestCase *self,
+                                NSException *exception, NSString *expected, NSString *expression,
+                                NSString *fileName, NSUInteger lineNumber) {
+    if (!exception) {
+        return;
+    }
+    if ([exception.reason rangeOfString:(expected)].location == NSNotFound) {
+        NSString *desc = [NSString stringWithFormat:@"The expression %@ threw an exception with reason '%@', but expected to contain '%@'", expression, exception.reason ?: @"<nil>", expected];
+        [self recordFailureWithDescription:desc inFile:fileName atLine:lineNumber expected:NO];
+    }
+}
+
 bool RLMHasCachedRealmForPath(NSString *path) {
     return RLMGetAnyCachedRealmForPath(path.UTF8String);
 }
diff --git a/Realm/TestUtils/include/RLMAssertions.h b/Realm/TestUtils/include/RLMAssertions.h
@@ -47,6 +47,11 @@ void RLMAssertThrowsWithReason(XCTestCase *self,
                                NSString *regexString, NSString *message,
                                NSString *fileName, NSUInteger lineNumber);
 
+FOUNDATION_EXTERN
+void RLMAssertExceptionReason(XCTestCase *self,
+                              NSException *exception, NSString *expected, NSString *expression,
+                              NSString *fileName, NSUInteger lineNumber);
+
 FOUNDATION_EXTERN bool RLMHasCachedRealmForPath(NSString *path);
 
 #define RLMAssertThrows(expression, ...) \
@@ -88,17 +93,10 @@ FOUNDATION_EXTERN bool RLMHasCachedRealmForPath(NSString *path);
     exception; \
 })
 
-#define RLMAssertThrowsWithReason(expression, expected, ...) \
+#define RLMAssertThrowsWithReason(expression, expected) \
 ({ \
     NSException *exception = RLMAssertThrows(expression); \
-    if (exception) { \
-        if ([exception.reason rangeOfString:(expected)].location == NSNotFound) { \
-            _XCTRegisterFailure(self, \
-                                [_XCTFailureDescription(_XCTAssertion_True, 0, @#expression " (EXPR_STRING) contains " #expected) \
-                                 stringByReplacingOccurrencesOfString:@"EXPR_STRING" \
-                                                           withString:exception.reason ?: @"<nil>"]); \
-        } \
-    } \
+    RLMAssertExceptionReason(self, exception, expected, @#expression, @"" __FILE__, __LINE__); \
     exception; \
 })