From c980db4e60639ce7ae9443195a4f9b2b4b449351 Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Tue, 24 Jul 2012 20:30:18 +0000 Subject: [Author: dmaclach] Clean up all of our format string issues amongst some other fun stuff. R=thomasvl DELTA=167 (90 added, 8 deleted, 69 changed) --- AppKit/GTMCarbonEventTest.m | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'AppKit/GTMCarbonEventTest.m') diff --git a/AppKit/GTMCarbonEventTest.m b/AppKit/GTMCarbonEventTest.m index 6a3d007..0c7286b 100644 --- a/AppKit/GTMCarbonEventTest.m +++ b/AppKit/GTMCarbonEventTest.m @@ -155,10 +155,10 @@ static const UInt32 kTestParameterValue = 'bam '; autorelease]; [handler registerForEvents:&types count:1]; OSStatus status = [event_ sendToTarget:handler options:0]; - STAssertErr(status, eventNotHandledErr, @"status: %ld", status); + STAssertErr(status, eventNotHandledErr, @"status: %ld", (long)status); [handler setDelegate:self]; status = [event_ sendToTarget:handler options:0]; - STAssertNoErr(status, @"status: %ld", status); + STAssertNoErr(status, @"status: %ld", (long)status); [handler unregisterForEvents:&types count:1]; } @@ -167,15 +167,15 @@ static const UInt32 kTestParameterValue = 'bam '; [event_ postToMainQueue]; OSStatus status = [event_ postToQueue:eventQueue priority:kEventPriorityStandard]; - STAssertErr(status, eventAlreadyPostedErr, @"status: %ld", status); + STAssertErr(status, eventAlreadyPostedErr, @"status: %ld", (long)status); EventTypeSpec types = { kTestClass, kTestKind }; status = FlushEventsMatchingListFromQueue(eventQueue, 1, &types); - STAssertNoErr(status, @"status: %ld", status); + STAssertNoErr(status, @"status: %ld", (long)status); eventQueue = GetCurrentEventQueue(); [event_ postToCurrentQueue]; status = [event_ postToQueue:eventQueue priority:kEventPriorityStandard]; - STAssertErr(status, eventAlreadyPostedErr, @"status: %ld", status); + STAssertErr(status, eventAlreadyPostedErr, @"status: %ld", (long)status); status = FlushEventsMatchingListFromQueue(eventQueue, 1, &types); STAssertNoErr(status, @"status: %ld", status); } @@ -191,7 +191,8 @@ static const UInt32 kTestParameterValue = 'bam '; - (void)testDescription { NSString *descString - = [NSString stringWithFormat:@"GTMCarbonEvent 'foo ' %d", kTestKind]; + = [NSString stringWithFormat:@"GTMCarbonEvent 'foo ' %lu", + (unsigned long)kTestKind]; STAssertEqualObjects([event_ description], descString, nil); } @end @@ -213,7 +214,8 @@ static const UInt32 kTestParameterValue = 'bam '; - (void)testEventHandler { [GTMUnitTestDevLogDebug expectPattern: @"DebugAssert: GoogleToolboxForMac: event CantUseParams .*"]; - STAssertErr([handler_ handleEvent:nil handler:nil], eventNotHandledErr, nil); + STAssertErr([handler_ handleEvent:nil handler:nil], + (long)eventNotHandledErr, nil); } - (void)testDelegate { -- cgit v1.2.3