Merge pull request kiwi-bdd#171 from eraserhd/improved_have_value_mes…

…sages Improved haveValue:forKey: messages
allending · Nov 23, 2012 · 27d1c4a · 27d1c4a
2 parents d3ca11d + 18cf4ab
commit 27d1c4a
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/Kiwi/KWHaveValueMatcher.m b/Kiwi/KWHaveValueMatcher.m
@@ -70,12 +70,23 @@ - (BOOL)evaluate {
 
 - (NSString *)failureMessageForShould {
     if (self.expectedValue == nil) {
-        return [NSString stringWithFormat:@"expected subject to have a value for key %@", self.expectedKey];
+        return [NSString stringWithFormat:@"expected subject to have a value for key %@",
+                                          [KWFormatter formatObject:self.expectedKey]];
+    }
+    id subjectValue = [self subjectValue];
+    if (subjectValue) {
+        return [NSString stringWithFormat:@"expected subject to have value %@ for key %@, but it had value %@ instead",
+                                          [KWFormatter formatObject:self.expectedValue],
+                                          [KWFormatter formatObject:self.expectedKey],
+                                          [KWFormatter formatObject:subjectValue]];
+    } else {
+        return [NSString stringWithFormat:@"expected subject to have value %@ for key %@, but the key was not present",
+                                          [KWFormatter formatObject:self.expectedValue],
+                                          [KWFormatter formatObject:self.expectedKey]];
     }
-    return [NSString stringWithFormat:@"expected subject to have value %@ for key %@", self.expectedValue, self.expectedKey];
 }
 
-- (id)subjectValue;
+- (id)subjectValue
 {
   id value = nil;