aboutsummaryrefslogtreecommitdiff
path: root/UnitTesting
diff options
context:
space:
mode:
authorGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2013-01-23 03:12:46 +0000
committerGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2013-01-23 03:12:46 +0000
commit6af47ca6a866a1bdc045163556030f3e5ebbf11b (patch)
tree12f043e5ac7e81e4579d1892cf9ce9abc879e462 /UnitTesting
parentfa33445a5ad223b7c4f69c1ddee3ab2503716eed (diff)
On second thought, drop the OS X support for now.
DELTA=31 (1 added, 29 deleted, 1 changed)
Diffstat (limited to 'UnitTesting')
-rw-r--r--UnitTesting/GTMSenTestCase.h17
-rw-r--r--UnitTesting/GTMSenTestCase.m9
2 files changed, 4 insertions, 22 deletions
diff --git a/UnitTesting/GTMSenTestCase.h b/UnitTesting/GTMSenTestCase.h
index 55cd813..744550f 100644
--- a/UnitTesting/GTMSenTestCase.h
+++ b/UnitTesting/GTMSenTestCase.h
@@ -60,7 +60,7 @@
#ifdef __cplusplus
extern "C" {
#endif
-
+
#if defined __clang__
// gcc and gcc-llvm do not allow you to use STAssert(blah, nil) with nil
// as a description if you have the NS_FORMAT_FUNCTION on.
@@ -69,7 +69,7 @@ NSString *STComposeString(NSString *, ...) NS_FORMAT_FUNCTION(1, 2);
#else
NSString *STComposeString(NSString *, ...);
#endif // __clang__
-
+
#ifdef __cplusplus
}
#endif
@@ -1081,9 +1081,9 @@ GTM_EXTERN NSString *const SenTestLineNumberKey;
#endif // GTM_IPHONE_SDK && !GTM_IPHONE_USE_SENTEST
#if GTM_IPHONE_SDK
+
@class UIImage;
-#else
-@class NSImage;
+
#endif // GTM_IPHONE_SDK
// All unittest cases in GTM should inherit from GTMTestCase. It makes sure
@@ -1120,15 +1120,6 @@ GTM_EXTERN NSString *const SenTestLineNumberKey;
// This is required as while under test, [UIImage imageNamed:...] does not
// correctly load images from the resources associated with a test class.
- (UIImage *)imageFromResource:(NSString *)resource;
-
-#else
-// Returns the NSImage for the the named |resource|. Asserts that the image is
-// loaded (is non-nil).
-//
-// This is required as while under test, [NSImage imageNamed:...] does not
-// correctly load images from the resources associated with a test class.
-- (NSImage *)imageFromResource:(NSString *)resource;
-
#endif // GTM_IPHONE_SDK
@end
diff --git a/UnitTesting/GTMSenTestCase.m b/UnitTesting/GTMSenTestCase.m
index fbd8659..088514c 100644
--- a/UnitTesting/GTMSenTestCase.m
+++ b/UnitTesting/GTMSenTestCase.m
@@ -29,7 +29,6 @@
#if GTM_IPHONE_SDK
#import <UIKit/UIKit.h>
#else
-#import <AppKit/AppKit.h> // For NSImage
#import "GTMGarbageCollection.h"
#endif // GTM_IPHONE_SDK
@@ -433,14 +432,6 @@ static int MethodSort(id a, id b, void *context) {
STAssertNotNil(image, @"Could not load image from resource: %@", path);
return image;
}
-#else
-- (NSImage *)imageFromResource:(NSString *)resource {
- NSBundle *bundle = [NSBundle bundleForClass:[self class]];
- NSString *path = [bundle pathForResource:resource ofType:nil];
- NSImage *image = [[NSImage alloc] initWithContentsOfFile:path];
- STAssertNotNil(image, @"Could not load image from resource: %@", path);
- return image;
-}
#endif
+ (NSArray *)testInvocations {