diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2011-11-29 21:00:23 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2011-11-29 21:00:23 +0000 |
| commit | c571385c00031d740b67317cb677cf193300f614 (patch) | |
| tree | c6341b44aca37ddf037354f52ae81350352c8a19 /UnitTesting/GTMSenTestCase.h | |
| parent | 5b52a35992f6bbd427eca4d419721e5354b0262d (diff) | |
[Author: thomasvl]
Move a bunch of tests over onto the GTM test base class.
Fetch some test images from the bundle the test is compiled into instead
of assuming main app.
Change the default iOS logging directory to just be the documents directory
since it should work for all iOS versions.
Add initial support for using SenTestingKit instead of our custom version
to allow the Xcode 4 UI for unittesting.
Add a target for using SenTestingKit.
Add a shell app for the TEST_HOST for SenTestingKit usage (since there are
UI tests, we need to use a real app and not the octest binary).
R=dmaclach
DELTA=517 (482 added, 9 deleted, 26 changed)
Diffstat (limited to 'UnitTesting/GTMSenTestCase.h')
| -rw-r--r-- | UnitTesting/GTMSenTestCase.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/UnitTesting/GTMSenTestCase.h b/UnitTesting/GTMSenTestCase.h index 5f7b03c..08ad162 100644 --- a/UnitTesting/GTMSenTestCase.h +++ b/UnitTesting/GTMSenTestCase.h @@ -53,7 +53,7 @@ #import "GTMDefines.h" -#if (!GTM_IPHONE_SDK) +#if (!GTM_IPHONE_SDK) || (GTM_IPHONE_USE_SENTEST) #import <SenTestingKit/SenTestingKit.h> #else #import <Foundation/Foundation.h> @@ -65,7 +65,7 @@ NSString *STComposeString(NSString *, ...); } #endif -#endif // !GTM_IPHONE_SDK +#endif // !GTM_IPHONE_SDK || GTM_IPHONE_USE_SENTEST // Generates a failure when a1 != noErr // Args: @@ -461,7 +461,8 @@ do { \ } \ } while(0) -#if GTM_IPHONE_SDK +#if GTM_IPHONE_SDK && !GTM_IPHONE_USE_SENTEST +// When not using the Xcode provided version, define everything ourselves. // SENTE_BEGIN /*" Generates a failure when !{ [a1 isEqualTo:a2] } is false @@ -1002,7 +1003,7 @@ GTM_EXTERN NSString *const SenTestFailureException; GTM_EXTERN NSString *const SenTestFilenameKey; GTM_EXTERN NSString *const SenTestLineNumberKey; -#endif // GTM_IPHONE_SDK +#endif // GTM_IPHONE_SDK && !GTM_IPHONE_USE_SENTEST // All unittest cases in GTM should inherit from GTMTestCase. It makes sure // to set up our logging system correctly to verify logging calls. |