diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2009-11-11 15:00:55 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2009-11-11 15:00:55 +0000 |
| commit | ee96eba5fd4929f251855009121803b70a48f2d2 (patch) | |
| tree | 0b97a986995483d7f11ecef5fdbe6716c3d4c6a3 /Foundation/GTMLoggerTest.m | |
| parent | dd4c1c15b5f4f178f55942ca6ffa63027fcb20df (diff) | |
[Author: thomasvl]
We still have a bunch that doesn't work on 10.6, but this fixes some things:
Update the logger test to handle the format change on 10.6.
Update the AppleScript test to handle the 10.6 behaviors.
Fix typo in the StackTraceTest.
R=dmaclach
DELTA=26 (18 added, 0 deleted, 8 changed)
Diffstat (limited to 'Foundation/GTMLoggerTest.m')
| -rw-r--r-- | Foundation/GTMLoggerTest.m | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Foundation/GTMLoggerTest.m b/Foundation/GTMLoggerTest.m index 86ced5e..5b354cb 100644 --- a/Foundation/GTMLoggerTest.m +++ b/Foundation/GTMLoggerTest.m @@ -19,6 +19,7 @@ #import "GTMLogger.h" #import "GTMRegex.h" #import "GTMSenTestCase.h" +#import "GTMSystemVersion.h" // A test writer that stores log messages in an array for easy retrieval. @@ -379,9 +380,18 @@ id<GTMLogFormatter> fmtr = [[[GTMLogStandardFormatter alloc] init] autorelease]; STAssertNotNil(fmtr, nil); - // E.g. 2008-01-04 09:16:26.906 otest[5567/0xa07d0f60] [lvl=1] (no func) test - NSString * kFormatBasePattern = - @"[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3} ((otest)|(GTMiPhoneTest))\\[[0-9]+/0x[0-9a-f]+\\] \\[lvl=[0-3]\\] \\(no func\\) "; + NSString * kFormatBasePattern; + if ([GTMSystemVersion isSnowLeopardOrGreater]) { + // E.g. 2009-10-26 22:26:25.086 otest-i386[53200/0xa0438500] [lvl=1] (no func) test + kFormatBasePattern = + @"[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3} ((otest-i386)|(otest-x86_64)|(GTMiPhoneTest))\\[[0-9]+/0x[0-9a-f]+\\] \\[lvl=[0-3]\\] \\(no func\\) "; + } else { + // E.g. 2008-01-04 09:16:26.906 otest[5567/0xa07d0f60] [lvl=1] (no func) test + kFormatBasePattern = + @"[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3} ((otest)|(GTMiPhoneTest))\\[[0-9]+/0x[0-9a-f]+\\] \\[lvl=[0-3]\\] \\(no func\\) "; + } + + NSString *msg = nil; msg = [self stringFromFormatter:fmtr |