SpecHelper -> CDRSpecHelper

- SpecHelper.h is retained for compatibility with a deprecation warning,
  as it is likely to be imported at the top of users' spec files.

OCUnitAppLogicTests/OCUnitAppLogicTests.mm

@@ -1,4 +1,4 @@
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #import "DummyModel.h" // should be included in OCUnitAppLogicTests target
 
 using namespace Cedar::Matchers;

OCUnitAppTests/OCUnitApplicationTests.mm

@@ -1,4 +1,4 @@
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #import "OCUnitAppAppDelegate.h" // should NOT be included in OCUnitAppTests target
 
 using namespace Cedar::Matchers;

Source/CDRExample.m

@@ -1,6 +1,6 @@
 #import "CDRExample.h"
 #import "CDRSpecFailure.h"
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #import "CDRReportDispatcher.h"
 
 const CDRSpecBlock PENDING = nil;

Source/CDRExampleBase.m

@@ -1,5 +1,5 @@
 #import "CDRExampleBase.h"
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #import "CDRReportDispatcher.h"
 
 @implementation CDRExampleBase
@@ -34,7 +34,7 @@ - (void)runWithDispatcher:(CDRReportDispatcher *)dispatcher {
 }
 
 - (BOOL)shouldRun {
-    BOOL shouldOnlyRunFocused = [SpecHelper specHelper].shouldOnlyRunFocused;
+    BOOL shouldOnlyRunFocused = [CDRSpecHelper specHelper].shouldOnlyRunFocused;
     return !shouldOnlyRunFocused || (shouldOnlyRunFocused && (self.isFocused || parent_.shouldRun));
 }
 

Source/CDRFunctions.m

@@ -4,7 +4,7 @@
 #import "CDRExampleGroup.h"
 #import "CDRExampleReporter.h"
 #import "CDRDefaultReporter.h"
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #import "CDRFunctions.h"
 #import "CDRReportDispatcher.h"
 #import "CDROTestNamer.h"
@@ -65,11 +65,11 @@ BOOL CDRClassHasClassMethod(Class class, SEL selector) {
 }
 
 void CDRDefineGlobalBeforeAndAfterEachBlocks() {
-    [SpecHelper specHelper].globalBeforeEachClasses = CDRSelectClasses(^BOOL(Class class) {
+    [CDRSpecHelper specHelper].globalBeforeEachClasses = CDRSelectClasses(^BOOL(Class class) {
         return CDRClassHasClassMethod(class, @selector(beforeEach));
     });
 
-    [SpecHelper specHelper].globalAfterEachClasses = CDRSelectClasses(^BOOL(Class class) {
+    [CDRSpecHelper specHelper].globalAfterEachClasses = CDRSelectClasses(^BOOL(Class class) {
         return CDRClassHasClassMethod(class, @selector(afterEach));
     });
 }
@@ -156,7 +156,7 @@ void CDRMarkFocusedExamplesInSpecs(NSArray *specs) {
     }
 
     for (CDRSpec *spec in specs) {
-        SpecHelper.specHelper.shouldOnlyRunFocused |= spec.rootGroup.hasFocusedExamples;
+        CDRSpecHelper.specHelper.shouldOnlyRunFocused |= spec.rootGroup.hasFocusedExamples;
     }
 }
 
@@ -220,7 +220,7 @@ void CDRMarkXcodeFocusedExamplesInSpecs(NSArray *specs, NSArray *arguments) {
     [testNamer release];
 
     for (CDRSpec *spec in specs) {
-        SpecHelper.specHelper.shouldOnlyRunFocused |= spec.rootGroup.hasFocusedExamples;
+        CDRSpecHelper.specHelper.shouldOnlyRunFocused |= spec.rootGroup.hasFocusedExamples;
     }
 }
 

Source/CDRSharedExampleGroupPool.m

@@ -1,21 +1,21 @@
 #import "CDRSharedExampleGroupPool.h"
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #import "CDRSpec.h"
 #import "CDRExampleGroup.h"
 #import "CDRSpecFailure.h"
 
 extern CDRSpec *currentSpec;
 
-@interface SpecHelper (CDRSharedExampleGroupPoolFriend)
+@interface CDRSpecHelper (CDRSharedExampleGroupPoolFriend)
 @property (nonatomic, retain, readonly) NSMutableDictionary *sharedExampleGroups;
 @end
 
 void sharedExamplesFor(NSString *groupName, CDRSharedExampleGroupBlock block) {
-    [[[SpecHelper specHelper] sharedExampleGroups] setObject:[[block copy] autorelease] forKey:groupName];
+    [[[CDRSpecHelper specHelper] sharedExampleGroups] setObject:[[block copy] autorelease] forKey:groupName];
 }
 
 void itShouldBehaveLike(NSString *groupName) {
-    CDRSharedExampleGroupBlock sharedExampleGroupBlock = [[[SpecHelper specHelper] sharedExampleGroups] objectForKey:groupName];
+    CDRSharedExampleGroupBlock sharedExampleGroupBlock = [[[CDRSpecHelper specHelper] sharedExampleGroups] objectForKey:groupName];
     if (!sharedExampleGroupBlock) {
         NSString *message = [NSString stringWithFormat:@"Unknown shared example group with description: '%@'", groupName];
         [[NSException exceptionWithName:NSInternalInconsistencyException reason:message userInfo:nil] raise];
@@ -25,7 +25,7 @@ void itShouldBehaveLike(NSString *groupName) {
     currentSpec.currentGroup = [CDRExampleGroup groupWithText:[NSString stringWithFormat:@"(as %@)", groupName]];
     [parentGroup add:currentSpec.currentGroup];
 
-    sharedExampleGroupBlock([SpecHelper specHelper].sharedExampleContext);
+    sharedExampleGroupBlock([CDRSpecHelper specHelper].sharedExampleContext);
     currentSpec.currentGroup = parentGroup;
 }
 

Source/CDRSpec.m

@@ -2,7 +2,7 @@
 #import "CDRExample.h"
 #import "CDRExampleGroup.h"
 #import "CDRSpecFailure.h"
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #import "CDRSymbolicator.h"
 
 CDRSpec *currentSpec;
@@ -98,7 +98,7 @@ @implementation CDRSpec
 - (id)init {
     if (self = [super init]) {
         self.rootGroup = [[[CDRExampleGroup alloc] initWithText:[[self class] description] isRoot:YES] autorelease];
-        self.rootGroup.parent = [SpecHelper specHelper];
+        self.rootGroup.parent = [CDRSpecHelper specHelper];
         self.currentGroup = self.rootGroup;
         self.symbolicator = [[[CDRSymbolicator alloc] init] autorelease];
     }

Source/SpecHelper.m → Source/CDRSpecHelper.m

@@ -1,12 +1,12 @@
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 
-static SpecHelper *specHelper__;
+static CDRSpecHelper *specHelper__;
 
-@interface SpecHelper ()
+@interface CDRSpecHelper ()
 @property (nonatomic, retain, readwrite) NSMutableDictionary *sharedExampleGroups, *sharedExampleContext;
 @end
 
-@implementation SpecHelper
+@implementation CDRSpecHelper
 
 @synthesize
     sharedExampleGroups = sharedExampleGroups_,
@@ -17,7 +17,7 @@ @implementation SpecHelper
 
 + (id)specHelper {
     if (!specHelper__) {
-        specHelper__ = [[SpecHelper alloc] init];
+        specHelper__ = [[CDRSpecHelper alloc] init];
     }
     return specHelper__;
 }

Source/Headers/CDRSpec.h

@@ -2,7 +2,7 @@
 #import "CDRExampleBase.h"
 
 @protocol CDRExampleReporter;
-@class CDRExampleGroup, CDRExample, SpecHelper, CDRSymbolicator;
+@class CDRExampleGroup, CDRExample, CDRSpecHelper, CDRSymbolicator;
 
 @protocol CDRSpec
 @end

Source/Headers/CDRSpecHelper.h

@@ -0,0 +1,21 @@
+#import "CDRSpec.h"
+#import "CDRHooks.h"
+#import "CDRSharedExampleGroupPool.h"
+#import "CDRExampleParent.h"
+
+@interface CDRSpecHelper : NSObject <CDRExampleParent> {
+    NSMutableDictionary *sharedExampleContext_, *sharedExampleGroups_;
+    NSArray *globalBeforeEachClasses_, *globalAfterEachClasses_;
+    BOOL shouldOnlyRunFocused_;
+}
+
+@property (nonatomic, retain, readonly) NSMutableDictionary *sharedExampleContext;
+@property (nonatomic, retain) NSArray *globalBeforeEachClasses, *globalAfterEachClasses;
+
+@property (nonatomic, assign) BOOL shouldOnlyRunFocused;
+
++ (CDRSpecHelper *)specHelper;
+
+@end
+
+@compatibility_alias SpecHelper CDRSpecHelper;

Source/Headers/Cedar.h

@@ -1,2 +1,2 @@
 #import "CDRFunctions.h"
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"

Source/Headers/SpecHelper.h

@@ -1,19 +1,3 @@
-#import "CDRSpec.h"
-#import "CDRHooks.h"
-#import "CDRSharedExampleGroupPool.h"
-#import "CDRExampleParent.h"
+#import "CDRSpecHelper.h"
 
-@interface SpecHelper : NSObject <CDRExampleParent> {
-    NSMutableDictionary *sharedExampleContext_, *sharedExampleGroups_;
-    NSArray *globalBeforeEachClasses_, *globalAfterEachClasses_;
-    BOOL shouldOnlyRunFocused_;
-}
-
-@property (nonatomic, retain, readonly) NSMutableDictionary *sharedExampleContext;
-@property (nonatomic, retain) NSArray *globalBeforeEachClasses, *globalAfterEachClasses;
-
-@property (nonatomic, assign) BOOL shouldOnlyRunFocused;
-
-+ (SpecHelper *)specHelper;
-
-@end
+#warning SpecHelper is deprecated. Please import Cedar.h or Cedar-iOS.h and use CDRSpecHelper instead.

Source/Reporters/CDRDefaultReporter.m

@@ -2,7 +2,7 @@
 #import "CDRExample.h"
 #import "CDRExampleGroup.h"
 #import "CDRSymbolicator.h"
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #import "CDRSlowTestStatistics.h"
 
 @interface CDRDefaultReporter (private)
@@ -60,7 +60,7 @@ - (void)runDidComplete {
 }
 
 - (int)result {
-    if ([SpecHelper specHelper].shouldOnlyRunFocused || [failureMessages_ count]) {
+    if ([CDRSpecHelper specHelper].shouldOnlyRunFocused || [failureMessages_ count]) {
         return 1;
     } else {
         return 0;

Source/Reporters/CDROTestReporter.m

@@ -2,7 +2,7 @@
 #import "CDRFunctions.h"
 #import "CDRExample.h"
 #import "CDRExampleGroup.h"
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #import "CDRSpec.h"
 #import "CDROTestNamer.h"
 
@@ -120,7 +120,7 @@ - (void)logMessage:(NSString *)message {
 #pragma mark - Private
 
 - (BOOL)isFocused {
-    return [SpecHelper specHelper].shouldOnlyRunFocused;
+    return [CDRSpecHelper specHelper].shouldOnlyRunFocused;
 }
 
 - (NSString *)rootSuiteName {

Spec/CDRExampleGroupSpec.mm

@@ -2,9 +2,9 @@
 // Normally you would include this file out of the framework.  However, we're
 // testing the framework here, so including the file from the framework will
 // conflict with the compiler attempting to include the file from the project.
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #else
-#import <Cedar/SpecHelper.h>
+#import <Cedar/CDRSpecHelper.h>
 #endif
 
 #import "CDRExampleBase.h"

Spec/CDRExampleSpec.mm

@@ -2,9 +2,9 @@
 // Normally you would include this file out of the framework.  However, we're
 // testing the framework here, so including the file from the framework will
 // conflict with the compiler attempting to include the file from the project.
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #else
-#import <Cedar/SpecHelper.h>
+#import <Cedar/CDRSpecHelper.h>
 #endif
 
 #import "CDRExample.h"
@@ -19,12 +19,12 @@
 using namespace Cedar::Doubles;
 
 void (^runInFocusedSpecsMode)(CDRExampleBase *, CDRReportDispatcher *) = ^(CDRExampleBase *example, CDRReportDispatcher *dispatcher) {
-    BOOL before = [SpecHelper specHelper].shouldOnlyRunFocused;
-    [SpecHelper specHelper].shouldOnlyRunFocused = YES;
+    BOOL before = [CDRSpecHelper specHelper].shouldOnlyRunFocused;
+    [CDRSpecHelper specHelper].shouldOnlyRunFocused = YES;
     @try {
         [example runWithDispatcher:dispatcher];
     } @finally {
-        [SpecHelper specHelper].shouldOnlyRunFocused = before;
+        [CDRSpecHelper specHelper].shouldOnlyRunFocused = before;
     }
 };
 
@@ -140,13 +140,13 @@
         example = [[[CDRExample alloc] initWithText:exampleText andBlock:^{}] autorelease];
 
         // if you focus any of these specs, they will fail without this
-        beforeFocused = [SpecHelper specHelper].shouldOnlyRunFocused;
-        [SpecHelper specHelper].shouldOnlyRunFocused = NO;
+        beforeFocused = [CDRSpecHelper specHelper].shouldOnlyRunFocused;
+        [CDRSpecHelper specHelper].shouldOnlyRunFocused = NO;
         // end
     });
 
     afterEach(^{
-        [SpecHelper specHelper].shouldOnlyRunFocused = beforeFocused;
+        [CDRSpecHelper specHelper].shouldOnlyRunFocused = beforeFocused;
     });
 
     describe(@"runWithDispatcher:", ^{

Spec/CDRSpecFailureSpec.mm

@@ -2,9 +2,9 @@
 // Normally you would include this file out of the framework.  However, we're
 // testing the framework here, so including the file from the framework will
 // conflict with the compiler attempting to include the file from the project.
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #else
-#import <Cedar/SpecHelper.h>
+#import <Cedar/CDRSpecHelper.h>
 #endif
 
 #import "CDRSpecFailure.h"

Spec/CDRSpecSpec.mm

@@ -2,9 +2,9 @@
 // Normally you would include this file out of the framework.  However, we're
 // testing the framework here, so including the file from the framework will
 // conflict with the compiler attempting to include the file from the project.
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #else
-#import <Cedar/SpecHelper.h>
+#import <Cedar/CDRSpecHelper.h>
 #endif
 
 #import "CDRSpec.h"

Spec/CDRSymbolicatorSpec.mm

@@ -1,4 +1,4 @@
-#import "SpecHelper.h"
+#import "CDRSpecHelper.h"
 #import "CDRExample.h"
 #import "CDRExampleGroup.h"
 #import "CDRSymbolicator.h"

Spec/CDRTypeUtilitiesSpec.mm

@@ -1,4 +1,4 @@
-#import <Cedar/SpecHelper.h>
+#import <Cedar/CDRSpecHelper.h>
 #import "CDRTypeUtilities.h"
 
 using namespace Cedar::Matchers;

Spec/Doubles/CDRClassFakeSpec.mm

@@ -1,4 +1,4 @@
-#import <Cedar/SpecHelper.h>
+#import <Cedar/CDRSpecHelper.h>
 #import "SimpleIncrementer.h"
 #import "ObjectWithForwardingTarget.h"
 #import "ObjectWithWeakDelegate.h"
@@ -78,7 +78,7 @@
         beforeEach(^{
             fake = fake_for([SimpleIncrementer class]);
 
-            [[SpecHelper specHelper].sharedExampleContext setObject:fake forKey:@"double"];
+            [[CDRSpecHelper specHelper].sharedExampleContext setObject:fake forKey:@"double"];
         });
 
         itShouldBehaveLike(@"a Cedar double");
@@ -99,7 +99,7 @@
         beforeEach(^{
             niceFake = nice_fake_for([SimpleIncrementer class]);
 
-            [[SpecHelper specHelper].sharedExampleContext setObject:niceFake forKey:@"double"];
+            [[CDRSpecHelper specHelper].sharedExampleContext setObject:niceFake forKey:@"double"];
         });
 
         itShouldBehaveLike(@"a Cedar double");