Merge pull request #360 from pivotal/xctoolIntegration

Adjust XCTest integration such that xctool finds Cedar specs
cedarbdd · Oct 7, 2015 · 51faf7f · 51faf7f
2 parents e76af34 + e01a43b
commit 51faf7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Source/Headers/Project/XCTest/CDRXCTestSupport.h b/Source/Headers/Project/XCTest/CDRXCTestSupport.h
@@ -18,8 +18,8 @@
 
 // XCTestSuite
 
-- (id)defaultTestSuite;
-- (id)CDR_original_defaultTestSuite;
+- (id)allTests;
+- (id)CDR_original_allTests;
 - (id)initWithName:(NSString *)aName;
 
 // XCTestObservationCenter

diff --git a/Source/XCTest/CDRXCTestFunctions.m b/Source/XCTest/CDRXCTestFunctions.m
@@ -36,18 +36,16 @@ void CDRInjectIntoXCTestRunner() {
         static CDRXCTestObserver *xcTestObserver;
         xcTestObserver = [[CDRXCTestObserver alloc] init];
         [observationCenter addTestObserver:xcTestObserver];
-
-        return;
     }
 
     Class testSuiteMetaClass = object_getClass(testSuiteClass);
-    Method m = class_getClassMethod(testSuiteClass, @selector(defaultTestSuite));
+    Method m = class_getClassMethod(testSuiteClass, @selector(allTests));
 
-    class_addMethod(testSuiteMetaClass, @selector(CDR_original_defaultTestSuite), method_getImplementation(m), method_getTypeEncoding(m));
+    class_addMethod(testSuiteMetaClass, @selector(CDR_original_allTests), method_getImplementation(m), method_getTypeEncoding(m));
     IMP newImp = imp_implementationWithBlock(^id(id self){
-        id defaultSuite = [self CDR_original_defaultTestSuite];
+        id defaultSuite = [self CDR_original_allTests];
         [defaultSuite addTest:CDRCreateXCTestSuite()];
         return defaultSuite;
     });
-    class_replaceMethod(testSuiteMetaClass, @selector(defaultTestSuite), newImp, method_getTypeEncoding(m));
+    class_replaceMethod(testSuiteMetaClass, @selector(allTests), newImp, method_getTypeEncoding(m));
 }