From 01f3dfffbc3cf09c760796ccfae1f39121d3a2d1 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Mon, 27 Dec 2010 22:37:51 +0000 Subject: [PATCH] Fixed OCTest project to use new REQUIRE macro --- Test/Xcode/OCTest/CatchOCTestCase.mm | 8 ++++---- Test/Xcode/OCTest/OCTest.mm | 4 ++-- Test/Xcode/OCTest/OCTest.xcodeproj/project.pbxproj | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Test/Xcode/OCTest/CatchOCTestCase.mm b/Test/Xcode/OCTest/CatchOCTestCase.mm index 8398d1ad..0d0bf42c 100644 --- a/Test/Xcode/OCTest/CatchOCTestCase.mm +++ b/Test/Xcode/OCTest/CatchOCTestCase.mm @@ -24,20 +24,20 @@ OC_TEST_CASE( "OCTest/test1", "This is a test case" ) { - EXPECT( obj.int_val == 0 ); + REQUIRE( obj.int_val == 0 ); obj.int_val = 1; - EXPECT( obj.int_val == 1 ); + REQUIRE( obj.int_val == 1 ); } OC_TEST_CASE( "OCTest/test2", "This is another test case" ) { - EXPECT( obj.int_val == 0 ); + REQUIRE( obj.int_val == 0 ); obj.int_val = 2; - EXPECT( obj.int_val == 2 ); + REQUIRE( obj.int_val == 2 ); } @end diff --git a/Test/Xcode/OCTest/OCTest.mm b/Test/Xcode/OCTest/OCTest.mm index f8da274b..a98cc872 100644 --- a/Test/Xcode/OCTest/OCTest.mm +++ b/Test/Xcode/OCTest/OCTest.mm @@ -15,11 +15,11 @@ TEST_CASE( "OCTest/TestObj", "tests TestObj" ) { TestObj* obj = [[TestObj alloc] init]; - EXPECT( obj.int_val == 0 ); + REQUIRE( obj.int_val == 0 ); obj.int_val = 1; - EXPECT( obj.int_val == 1 ); + REQUIRE( obj.int_val == 1 ); [obj release]; } diff --git a/Test/Xcode/OCTest/OCTest.xcodeproj/project.pbxproj b/Test/Xcode/OCTest/OCTest.xcodeproj/project.pbxproj index 22fded32..bba9255a 100644 --- a/Test/Xcode/OCTest/OCTest.xcodeproj/project.pbxproj +++ b/Test/Xcode/OCTest/OCTest.xcodeproj/project.pbxproj @@ -190,6 +190,7 @@ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES;