Unit test and fix for block observer multiplexing. Closes issue BlocksKit#132.

Author: zwaldowski

BlocksKit/NSObject+BlockObservation.m

@@ -57,7 +57,7 @@ static dispatch_queue_t BKObserverMutationQueue() {
 	static dispatch_queue_t queue = nil;
 	static dispatch_once_t token = 0;
 	dispatch_once(&token, ^{
-		queue = dispatch_queue_create("org.blockskit.observers.queue", 0);
+		queue = dispatch_queue_create("us.pandamonia.blockskit.observers", 0);
 	});
 	return queue;
 }
@@ -84,11 +84,7 @@ - (NSString *)addObserverForKeyPaths:(NSArray *)keyPaths options:(NSKeyValueObse
 	return token;
 }
 
-- (void)addObserverForKeyPath:(NSString *)keyPath identifier:(NSString *)identifier options:(NSKeyValueObservingOptions)options task:(BKObservationBlock)task {
-	[self addObserverForKeyPaths: @[keyPath] identifier: identifier options: options task: (id)task];
-}
-
-- (void)addObserverForKeyPaths:(NSArray *)keyPaths identifier:(NSString *)identifier options:(NSKeyValueObservingOptions)options task:(BKMultipleObservationBlock)task {
+- (void)bk_addObserverForKeyPaths:(NSArray *)keyPaths identifier:(NSString *)identifier options:(NSKeyValueObservingOptions)options context:(void *)context task:(id)task {
 	NSParameterAssert(keyPaths.count);
 	NSParameterAssert(identifier.length);
 	NSParameterAssert(task);
@@ -109,12 +105,21 @@ - (void)addObserverForKeyPaths:(NSArray *)keyPaths identifier:(NSString *)identi
 		}];
 	});
 
-	void *context = (options == 0) ? ((keyPaths.count == 1) ? &kBlockObservationNoChangeContext : &kMultipleBlockObservationNoChangeContext) : ((keyPaths.count == 1) ? &kBlockObservationContext : &kMultipleBlockObservationContext);
 	[keyPaths each:^(NSString *keyPath) {
 		[self addObserver:newObserver forKeyPath:keyPath options:options context:context];
 	}];
 }
 
+- (void)addObserverForKeyPath:(NSString *)keyPath identifier:(NSString *)identifier options:(NSKeyValueObservingOptions)options task:(BKObservationBlock)task {
+    void *context = (options == 0) ? &kBlockObservationNoChangeContext : &kBlockObservationContext;
+    [self bk_addObserverForKeyPaths:@[keyPath] identifier:identifier options:options context:context task:task];
+}
+
+- (void)addObserverForKeyPaths:(NSArray *)keyPaths identifier:(NSString *)identifier options:(NSKeyValueObservingOptions)options task:(BKMultipleObservationBlock)task {
+    void *context = (options == 0) ? &kMultipleBlockObservationNoChangeContext : &kMultipleBlockObservationContext;
+    [self bk_addObserverForKeyPaths:keyPaths identifier:identifier options:options context:context task:task];
+}
+
 - (void)removeObserverForKeyPath:(NSString *)keyPath identifier:(NSString *)identifier {
 	NSParameterAssert(keyPath.length);
 	NSParameterAssert(identifier.length);

Tests/NSObjectBlockObservationTest.h

@@ -12,5 +12,8 @@
 - (void)testNSNumberKeyValueObservation;
 - (void)testNSArrayKeyValueObservation;
 - (void)testNSSetKeyValueObservation;
+- (void)testMultipleKeyValueObservation;
+- (void)testMultipleOnlyOneKeyValueObservation;
+
 
 @end

Tests/NSObjectBlockObservationTest.m

@@ -122,5 +122,30 @@ - (void)testNSSetKeyValueObservation {
 	STAssertEqualObjects(_subject.members,target,@"members are %@",_subject.members);
 	STAssertEquals(_total, (NSInteger)2, @"total is %d", _total);
 	[self removeObserverForKeyPath:@"subject.members" identifier:token];
-} 
+}
+
+
+- (void)testMultipleKeyValueObservation {
+    NSString *token = [self addObserverForKeyPaths: @[@"subject.kvc", @"subject.number"] task:^(id obj, NSString *keyPath) {
+        [(NSObjectBlockObservationTest *)obj action];
+    }];
+    NSNumber *number = @1;
+    [self setValue:@NO forKeyPath:@"subject.kvc"];
+    [self setValue:number forKeyPath:@"subject.number"];
+    STAssertFalse(_subject.kvc, @"kvc is NO");
+	STAssertEquals(_subject.number,number,@"number is %@",_subject.number);
+	STAssertEquals(_total, (NSInteger)2, @"total is %d", _total);
+    [self removeObserversWithIdentifier: token];
+}
+
+- (void)testMultipleOnlyOneKeyValueObservation {
+    NSString *token = [self addObserverForKeyPaths: @[@"subject.kvc"] task:^(id obj, NSString *keyPath) {
+        [(NSObjectBlockObservationTest *)obj action];
+    }];
+    [self setValue:@NO forKeyPath:@"subject.kvc"];
+    STAssertFalse(_subject.kvc, @"kvc is NO");
+	STAssertEquals(_total, (NSInteger)1, @"total is %d", _total);
+    [self removeObserversWithIdentifier: token];    
+}
+
 @end