Merge remote-tracking branch 'origin/ApplyKeyValueChangeDictionaryFix'

jspahrsummers · Apr 13, 2012 · c7e8b8c · c7e8b8c
2 parents 42af47e + c2f500f
commit c7e8b8c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Proton/NSObject+KeyValueCodingAdditions.m b/Proton/NSObject+KeyValueCodingAdditions.m
@@ -57,7 +57,7 @@ - (void)applyKeyValueChangeDictionary:(NSDictionary *)changes toKeyPath:(NSStrin
             }];
         }
 
-        if (convertToSet) {
+        if (convertToSet && ![newCollection isKindOfClass:[NSSet class]]) {
             return [NSSet setWithArray:newCollection];
         } else {
             return newCollection;

diff --git a/ProtonTests/PRONSObjectAdditionsTests.m b/ProtonTests/PRONSObjectAdditionsTests.m
@@ -568,6 +568,21 @@ @interface ErrorTestClass : NSObject
                 [object applyKeyValueChangeDictionary:changes toKeyPath:keyPath mappingNewObjectsUsingBlock:mappingBlock];
             });
 
+            it(@"should apply 'insertion' change with mapping using a set", ^{
+                NSSet *insertedObjects = [NSSet setWithObjects:@"quux", [NSNull null], nil];
+
+                NSDictionary *changes = [NSDictionary dictionaryWithObjectsAndKeys:
+                    [NSNumber numberWithUnsignedInteger:NSKeyValueChangeInsertion], NSKeyValueChangeKindKey,
+                    insertedObjects, NSKeyValueChangeNewKey,
+                    nil
+                ];
+
+                expectedSet = [set mutableCopy];
+                [expectedSet unionSet:[insertedObjects mapUsingBlock:mappingBlock]];
+
+                [object applyKeyValueChangeDictionary:changes toKeyPath:keyPath mappingNewObjectsUsingBlock:mappingBlock];
+            });
+
             it(@"should apply 'removal' change with mapping", ^{
                 NSSet *removedObjects = [NSSet setWithObjects:@"foo", @"fizz", [NSNull null], nil];