- GTM_INLINE will make sure a function gets inlined, and provides a consistent

  way for all GTM code to do it.

- Added GTMDebugThreadValidation to allow you to enforce the fact that your
  code must run in the main thread in DEBUG builds.

- Updated some internals of the iPhone unittesting so it doesn't double print
  the test descriptions, file names, or lines numbers of a test failure line.
  Also includes the test names in the error output.

- Changed the xcconfigs so that know it's easier to set different settings at
  the different levels and not accidentally overwrite settings set at lower
  levels in the "settings collapse". Also tightened up warnings significantly.

- Changed how gtm_unitTestExposedBindingsTestValues works. If you have an
  implementation of gtm_unitTestExposedBindingsTestValues in your own code
  you will need to update to the new way of calling. See implementations in
  GTMNSObject+BindingUnitTesting.m for details.

- Added support for grabbing the build number for a particular OS in
  GTMSystemVersion and easily comparing it to known build numbers, and switched 
  some types from in GTMSystemVersion from "int" to SInt32 to make 64 bit work 
  better.
   
- Added support for SnowLeopard (10A96). We build cleanly with the 10.6 SDKs and
  all radar checks were updated accordingly. Build All script was also updated
  to build on SnowLeopard if you have the SDK available.
  
- Turned off building ppc64 GTM because the SnowLeopard SDK currently
  doesn't have ppc64 support, so SenTestCase isn't defined. This makes it
  impossible to build the ppc64 10.5 config on SnowLeopard. We have left the
  setting in the xcconfig for those of you who need it, but have disabled
  it in the GTM project settings.
  
- Turned on stack smashing protection on the debug builds for all Leopard 
  and above.

- Added ability to easily do leak checking by defining the GTM_ENABLE_LEAKS
  environment variable. It isn't on by default because several of Apple's
  frameworks leak. You can work around these false positives by using the
  GTM_LEAKS_SYMBOLS_TO_IGNORE environment variable. Also if you turn on leaks
  make sure to turn off zombies by defining the GTM_DISABLE_ZOMBIES variable,
  otherwise every memory allocation you do will look like a leak.

1 files changed, 43 insertions, 11 deletions

diff --git a/Foundation/GTMObjC2RuntimeTest.m b/Foundation/GTMObjC2RuntimeTest.m
index 6fb5bdf..1bc0ee3 100644
--- a/Foundation/GTMObjC2RuntimeTest.m
+++ b/Foundation/GTMObjC2RuntimeTest.m
@@ -18,6 +18,10 @@
 
 #import "GTMObjC2Runtime.h"
 #import "GTMSenTestCase.h"
+#import "GTMSystemVersion.h"
+
+
+
 #import <string.h>
 
 @protocol GTMObjC2Runtime_TestProtocol
@@ -270,11 +274,6 @@ AT_REQUIRED
 }
 
 - (void)test_method_setImplementation {
-  // Nil Checks
-  // This case intentionally not tested. Passing nil to method_setImplementation
-  // on Leopard crashes. It does on Tiger as well.
-  // STAssertNULL(method_setImplementation(nil, nil), nil);
-
   // Standard use check
   GTMObjC2Runtime_TestClass *test = [[GTMObjC2Runtime_TestClass alloc] init];
   Method *list = class_copyMethodList(cls_, nil);
@@ -297,12 +296,45 @@ AT_REQUIRED
   STAssertNotEquals(oldImp, newImp, nil);
 
   // test nils
-  oldImp = method_setImplementation(list[0], nil);
-  STAssertNotNULL(oldImp, nil);
-
-  newImp = method_setImplementation(list[0], oldImp);
-  STAssertNULL(newImp, nil);
-
+  // Apparently it was a bug that we could call setImplementation with a nil
+  // so we now test to make sure that setting to nil works as expected on
+  // all systems.
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+  // Built for less then leopard gives us the behaviors we defined...
+  // (doesn't take nil)
+  IMP nullImp = method_setImplementation(list[0], nil);
+  STAssertNULL(nullImp, nil);
+  IMP testImp = method_setImplementation(list[0], newImp);
+  STAssertEquals(testImp, oldImp, nil);
+#else  
+  // Built for leopard or later means we get the os runtime behavior...
+  if ([GTMSystemVersion isLeopard]) {
+    // (takes nil)
+    oldImp = method_setImplementation(list[0], nil);
+    STAssertNotNULL(oldImp, nil);
+    newImp = method_setImplementation(list[0], oldImp);
+    STAssertNULL(newImp, nil);
+  } else {
+    // (doesn't take nil)
+    IMP nullImp = method_setImplementation(list[0], nil);
+    STAssertNULL(nullImp, nil);
+    IMP testImp = method_setImplementation(list[0], newImp);
+    STAssertEquals(testImp, oldImp, nil);
+  }
+#endif
+  
+  // This case intentionally not tested. Passing nil to method_setImplementation
+  // on Leopard crashes. It does on Tiger as well. Half works on SnowLeopard.
+  // We made our Tiger implementation the same as the SnowLeopard 
+  // implementation.
+  // Logged as radar 5572981.
+  if (![GTMSystemVersion isLeopard]) {
+    STAssertNULL(method_setImplementation(nil, nil), nil);
+  }
+  if ([GTMSystemVersion isBuildGreaterThan:kGTMSystemBuild10_6_0_WWDC]) {
+    STAssertNULL(method_setImplementation(nil, newImp), nil);
+  }
+  
   [test release];
   free(list);
 }