[Author: thomasvl]

Fix error message to report nil image.
Fix test to use the right bundle, looks like the iOS 5 SDK might have
  changed the behavior here and this was working by chance before.

R=dmaclach
DELTA=9  (6 added, 0 deleted, 3 changed)

2 files changed, 9 insertions, 3 deletions

diff --git a/UnitTesting/GTMNSObject+UnitTesting.m b/UnitTesting/GTMNSObject+UnitTesting.m
index 6bbc2e3..f72ba88 100644
--- a/UnitTesting/GTMNSObject+UnitTesting.m
+++ b/UnitTesting/GTMNSObject+UnitTesting.m
@@ -136,7 +136,11 @@ BOOL GTMIsObjectImageEqualToImageNamed(id object,
       failString = @"systemSettings not valid for taking image";  // COV_NF_LINE
     }
   } else {
-    failString = @"Object does not conform to GTMUnitTestingImaging protocol";
+    if (object == nil) {
+      failString = @"Testing a nil image.";
+    } else {
+      failString = @"Object does not conform to GTMUnitTestingImaging protocol";
+    }
   }
   if (error) {
     *error = failString;
diff --git a/UnitTesting/GTMUIKit+UnitTestingTest.m b/UnitTesting/GTMUIKit+UnitTestingTest.m
index 95bdd5a..4b0387c 100644
--- a/UnitTesting/GTMUIKit+UnitTestingTest.m
+++ b/UnitTesting/GTMUIKit+UnitTestingTest.m
@@ -42,8 +42,10 @@
 
 - (void)testUIImage {
   NSString* name = @"GTMUIViewUnitTestingTest";
-  UIImage* image =
-      [UIImage imageNamed:[name stringByAppendingPathExtension:@"png"]];
+  NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+  NSString *imagePath = [bundle pathForResource:name ofType:@"png"];
+  STAssertNotNil(imagePath, nil);
+  UIImage* image = [UIImage imageWithContentsOfFile:imagePath];
   GTMAssertObjectImageEqualToImageNamed(image, name, nil);
 }