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 /Foundation | |
| 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 'Foundation')
| -rw-r--r-- | Foundation/GTMLoggerTest.m | 3 | ||||
| -rw-r--r-- | Foundation/GTMStackTraceTest.m | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Foundation/GTMLoggerTest.m b/Foundation/GTMLoggerTest.m index c0280e1..2211499 100644 --- a/Foundation/GTMLoggerTest.m +++ b/Foundation/GTMLoggerTest.m @@ -423,8 +423,9 @@ @"[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3} ((otest)|(otest-i386)|(otest-x86_64)|(otest-ppc))\\[[0-9]+/0x[0-9a-f]+\\] \\[lvl=[0-3]\\] \\(unknown\\) "; #else // GTM_MACOS_SDK // E.g. 2008-01-04 09:16:26.906 otest[5567/0xa07d0f60] [lvl=1] (no func) test + // 2011-11-29 12:32:24.129 GTMiPhoneUnitTestingOCUnitTestRig[31540/0xa04dd540] [lvl=1] (unknown) test kFormatBasePattern = - @"[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3} (GTMiPhoneTest)\\[[0-9]+/0x[0-9a-f]+\\] \\[lvl=[0-3]\\] \\(unknown\\) "; + @"[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3} (GTMiPhoneTest|GTMiPhoneUnitTestingOCUnitTestRig)\\[[0-9]+/0x[0-9a-f]+\\] \\[lvl=[0-3]\\] \\(unknown\\) "; #endif // GTM_MACOS_SDK NSString *msg = nil; diff --git a/Foundation/GTMStackTraceTest.m b/Foundation/GTMStackTraceTest.m index 385457a..ab29213 100644 --- a/Foundation/GTMStackTraceTest.m +++ b/Foundation/GTMStackTraceTest.m @@ -38,8 +38,8 @@ STAssertGreaterThan([stacklines count], (NSUInteger)3, @"stack trace must have > 3 lines"); - STAssertLessThan([stacklines count], (NSUInteger)25, - @"stack trace must have < 25 lines"); + STAssertLessThan([stacklines count], (NSUInteger)35, + @"stack trace must have < 35 lines"); NSString *firstFrame = [stacklines objectAtIndex:0]; NSRange range = [firstFrame rangeOfString:@"testStackTraceBasic"]; @@ -103,8 +103,8 @@ STAssertGreaterThan([stacklines count], (NSUInteger)4, @"stack trace must have > 4 lines"); - STAssertLessThan([stacklines count], (NSUInteger)25, - @"stack trace must have < 25 lines"); + STAssertLessThan([stacklines count], (NSUInteger)35, + @"stack trace must have < 35 lines"); STAssertEquals([stacklines count], [[exception callStackReturnAddresses] count], @"stack trace should have the same number of lines as the " |