Added missing tests

uber · Dec 23, 2015 · 0393c6b · 0393c6b
1 parent 4a22dab
commit 0393c6b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/UberSignals.xcodeproj/xcshareddata/xcschemes/UberSignals OSX.xcscheme b/UberSignals.xcodeproj/xcshareddata/xcschemes/UberSignals OSX.xcscheme
@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/UberSignals.xcodeproj/xcshareddata/xcschemes/UberSignals iOS.xcscheme b/UberSignals.xcodeproj/xcshareddata/xcschemes/UberSignals iOS.xcscheme
@@ -40,7 +40,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/UberSignals/UBSignal.m b/UberSignals/UBSignal.m
@@ -122,12 +122,6 @@ - (instancetype)initWithProtocol:(Protocol *)protocol
     return self;
 }
 
-- (instancetype)init
-{
-    [NSException raise:@"Incorrect initializer" format:@"%@ is unavailable, use %@.", NSStringFromSelector(_cmd), NSStringFromSelector(@selector(initWithProtocol:))];
-    return nil;
-}
-
 #pragma mark - NSObject
 
 - (NSString *)debugDescription
@@ -149,10 +143,13 @@ - (void)setMaxObservers:(NSUInteger)maxObservers
 
 - (UBSignalObserver *)addObserver:(NSObject *)observer callback:(UBSignalCallback)callback
 {
-    NSParameterAssert(observer != nil);
-    NSParameterAssert(callback != nil);
+    if (observer == nil) {
+        NSAssert(NO, @"Observer cannot be nil");
+        return nil;
+    }
 
-    if (observer == nil && callback == nil) {
+    if (callback == nil) {
+        NSAssert(NO, @"Callback cannot be nil");
         return nil;
     }
 

diff --git a/UberSignalsTests/UBSignalTests.m b/UberSignalsTests/UBSignalTests.m
@@ -723,4 +723,20 @@ - (void)testUBSignalHelper
     XCTAssertEqualObjects([emptySignalWithHelper class], [UBSignal class], @"Object created with helper factory method should be a UBSignal");
 }
 
+- (void)testDebugDescription
+{
+    UBSignal<EmptySignal> *signal = (UBSignal<EmptySignal> *)[[UBSignal alloc] initWithProtocol:@protocol(EmptySignal)];
+    [signal addObserver:self callback:^(id self) {}];
+    XCTAssert([[signal debugDescription] containsString:@"<UBSignal: "], @"Should contain string");
+    XCTAssert([[signal debugDescription] containsString:@"NSArray"], @"Should contain string");
+    XCTAssert([[signal debugDescription] containsString:@"<UBSignalObserver: "], @"Should contain string");
+}
+
+- (void)testAddingInvalidObservers
+{
+    UBSignal<EmptySignal> *signal = (UBSignal<EmptySignal> *)[[UBSignal alloc] initWithProtocol:@protocol(EmptySignal)];
+    XCTAssertThrows([signal addObserver:nil callback:^(id self) {}], @"Should have asserted");
+    XCTAssertThrows([signal addObserver:self callback:nil], @"Should have asserted");
+}
+
 @end