[Author: aharper]

- Make custom level filters much more flexible (arbitrary level combinations).
- Remove older custom level class to prevent confusion.
- Add a new standard logger that tries to produce a reasonable stdout/stderr
  split for commandline tools.

R=dmaclach
APPROVED=dmaclach

1 files changed, 47 insertions, 20 deletions

diff --git a/Foundation/GTMLoggerTest.m b/Foundation/GTMLoggerTest.m
index fe76194..c0280e1 100644
--- a/Foundation/GTMLoggerTest.m
+++ b/Foundation/GTMLoggerTest.m
@@ -469,30 +469,29 @@
   STAssertTrue([filter filterAllowsMessage:nil level:kGTMLoggerLevelDebug], nil);
 }
 
-- (void)testCustomFilter {
-  // Default level is kGTMLoggerLevelError
-  id<GTMLogFilter> filter = [[[GTMLogCustomLevelFilter alloc] init]
-                                autorelease];
+- (void)testMinimumFilter {
+  id<GTMLogFilter> filter = [[[GTMLogMininumLevelFilter alloc]
+                                initWithMinimumLevel:kGTMLoggerLevelInfo]
+                                    autorelease];
   STAssertNotNil(filter, nil);
   STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelUnknown],
                 nil);
   STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelDebug],
                 nil);
-  STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelInfo],
-                nil);
+  STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelInfo],
+               nil);
   STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelError],
                nil);
   STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelAssert],
                nil);
 
-  // Custom level is possible
-  filter = [[[GTMLogCustomLevelFilter alloc]
-               initWithFilterLevel:kGTMLoggerLevelInfo] autorelease];
+  filter = [[[GTMLogMininumLevelFilter alloc]
+               initWithMinimumLevel:kGTMLoggerLevelDebug] autorelease];
   STAssertNotNil(filter, nil);
   STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelUnknown],
                 nil);
-  STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelDebug],
-                nil);
+  STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelDebug],
+               nil);
   STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelInfo],
                nil);
   STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelError],
@@ -500,23 +499,51 @@
   STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelAssert],
                nil);
 
-  filter = [[[GTMLogCustomLevelFilter alloc]
-               initWithFilterLevel:kGTMLoggerLevelDebug] autorelease];
+  // Cannot exceed min/max levels filter
+  filter = [[[GTMLogMininumLevelFilter alloc]
+               initWithMinimumLevel:kGTMLoggerLevelAssert + 1] autorelease];
+  STAssertNil(filter, nil);
+  filter = [[[GTMLogMininumLevelFilter alloc]
+               initWithMinimumLevel:kGTMLoggerLevelUnknown - 1] autorelease];
+  STAssertNil(filter, nil);
+}
+
+- (void)testMaximumFilter {
+  id<GTMLogFilter> filter = [[[GTMLogMaximumLevelFilter alloc]
+                                initWithMaximumLevel:kGTMLoggerLevelInfo]
+                                    autorelease];
   STAssertNotNil(filter, nil);
-  STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelUnknown],
+  STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelUnknown],
                 nil);
   STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelDebug],
-               nil);
+                nil);
   STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelInfo],
                nil);
-  STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelError],
+  STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelError],
                nil);
-  STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelAssert],
+  STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelAssert],
                nil);
 
-  // Cannot exceed assert level filter
-  filter = [[[GTMLogCustomLevelFilter alloc]
-               initWithFilterLevel:kGTMLoggerLevelAssert + 1] autorelease];
+  filter = [[[GTMLogMaximumLevelFilter alloc]
+               initWithMaximumLevel:kGTMLoggerLevelDebug] autorelease];
+  STAssertNotNil(filter, nil);
+  STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelUnknown],
+                nil);
+  STAssertTrue([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelDebug],
+               nil);
+  STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelInfo],
+               nil);
+  STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelError],
+               nil);
+  STAssertFalse([filter filterAllowsMessage:@"hi" level:kGTMLoggerLevelAssert],
+               nil);
+
+  // Cannot exceed min/max levels filter
+  filter = [[[GTMLogMaximumLevelFilter alloc]
+               initWithMaximumLevel:kGTMLoggerLevelAssert + 1] autorelease];
+  STAssertNil(filter, nil);
+  filter = [[[GTMLogMaximumLevelFilter alloc]
+               initWithMaximumLevel:kGTMLoggerLevelUnknown - 1] autorelease];
   STAssertNil(filter, nil);
 }