- GTMStackTrace works on 10.5+ (and iPhone) using NSThread to build the call stack.

- Added GTM_EXTERN that makes it easier to mix and match objc and objc++ code.

- Added GTMHotKeysTextField for display and editing of hot key settings.

- Added GTMCarbonEvent for dealing with Carbon Events and HotKeys in a ObjC like way.

- Backported the Atomic Barrier Swap functions for Objective C back to Tiger.

- Added a variety of new functions to GTMUnitTestingUtilities for checking if the screensaver is in the way, waiting on user events, and generating  keystrokes.

- If you are using any Carbon routines that log (DebugStr, AssertMacros.h) and use GTMUnitTestDevLog, the log routines now go through _GTMDevLog so that they can be caught in GTMUnitTestDevLog and verified like any _GTMDevLog calls you may make. For an example of this in action see GTMCarbonEventTest.m.

- Added GTMFileSystemKQueue.  It provides a simple wrapper for kqueuing something in the file system and tracking changes to it.

- RunIPhoneUnitTest.sh now cleans up the user home directory and creates a documents directory within it, used when requesting a NSDocumentDirectory.

- Added GTMNSFileManager+Carbon which contains routines for path <-> Alias conversion and path <-> FSRef conversion.

- Added GTMNSArray+Merge for merging one array into another with or without a custom merging function, returning a new array with the merged contents.

1 files changed, 219 insertions, 0 deletions

diff --git a/Foundation/GTMNSArray+MergeTest.m b/Foundation/GTMNSArray+MergeTest.m
new file mode 100644
index 0000000..0d8eb81
--- /dev/null
+++ b/Foundation/GTMNSArray+MergeTest.m
@@ -0,0 +1,219 @@
+//
+//  GTMNSArray+MergeTest.m
+//
+//  Copyright 2008 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations 
+//  under the License.
+//
+
+#import "GTMSenTestCase.h"
+#import "GTMNSArray+Merge.h"
+
+@interface GTMNSArray_MergeTest : GTMTestCase
+@end
+
+
+@interface NSString (GTMStringMergingTestAdditions)
+
+- (NSString *)mergeString:(NSString *)stringB;
+
+@end
+
+
+@implementation GTMNSArray_MergeTest
+
+- (void)testMergingTwoEmptyArrays {
+  NSArray *emptyArrayA = [NSArray array];
+  NSArray *emptyArrayB = [NSArray array];
+  NSArray *mergedArray = [emptyArrayA gtm_mergeArray:emptyArrayB
+                                       mergeSelector:nil];
+  STAssertNil(mergedArray,
+              @"merge of two empty arrays with no merger should render nil");
+}
+
+- (void)testMergingTwoEmptyArraysWithMerger {
+  NSArray *emptyArrayA = [NSArray array];
+  NSArray *emptyArrayB = [NSArray array];
+  NSArray *mergedArray
+    = [emptyArrayA gtm_mergeArray:emptyArrayB
+                    mergeSelector:@selector(mergeString:)];
+  STAssertNil(mergedArray,
+              @"merge of two empty arrays with merger should render nil");
+}
+
+- (void)testMergingEmptyWithNilArray {
+  NSArray *emptyArrayA = [NSArray array];
+  NSArray *nilArrayB = nil;
+  NSArray *mergedArray = [emptyArrayA gtm_mergeArray:nilArrayB
+                                       mergeSelector:nil];
+  STAssertNil(mergedArray,
+              @"merge of empty with nil array with no merger should render nil");
+}
+
+- (void)testMergingEmptyWithNilArrayWithMerger {
+  NSArray *emptyArrayA = [NSArray array];
+  NSArray *nilArrayB = nil;
+  NSArray *mergedArray
+    = [emptyArrayA gtm_mergeArray:nilArrayB
+                    mergeSelector:@selector(mergeObject:)];
+  STAssertNil(mergedArray,
+              @"merge of empty with nil array with merger should render nil");
+}
+
+- (void)testMergingTwoOneItemArraysThatDontMatch {
+  NSArray *arrayA = [NSArray arrayWithObject:@"abc.def"];
+  NSArray *arrayB = [NSArray arrayWithObject:@"abc.ghi"];
+  NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB
+                                  mergeSelector:nil];
+  STAssertNotNil(mergedArray,
+                 @"merge of two non empty arrays with no merger should render "
+                 @"an array");
+  STAssertEquals([mergedArray count], (NSUInteger)2,
+                 @"merged array should have two items");
+  STAssertEqualObjects([mergedArray objectAtIndex:0], @"abc.def", nil);
+  STAssertEqualObjects([mergedArray objectAtIndex:1], @"abc.ghi", nil);
+}
+
+- (void)testMergingTwoOneItemArraysThatDontMatchWithMerger {
+  NSArray *arrayA = [NSArray arrayWithObject:@"abc.def"];
+  NSArray *arrayB = [NSArray arrayWithObject:@"abc.ghi"];
+  NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB
+                                  mergeSelector:@selector(mergeString:)];
+  STAssertNotNil(mergedArray,
+                 @"merge of two non empty arrays with merger should render "
+                 @"an array");
+  STAssertEquals([mergedArray count], (NSUInteger)2,
+                 @"merged array should have two items");
+  STAssertEqualObjects([mergedArray objectAtIndex:0], @"abc.def", nil);
+  STAssertEqualObjects([mergedArray objectAtIndex:1], @"abc.ghi", nil);
+}
+
+- (void)testMergingTwoOneItemArraysThatMatch {
+  NSArray *arrayA = [NSArray arrayWithObject:@"abc.def"];
+  NSArray *arrayB = [NSArray arrayWithObject:@"abc.def"];
+  NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB
+                                  mergeSelector:nil];
+  STAssertNotNil(mergedArray,
+                 @"merge of two matching arrays with no merger should render "
+                 @"an array");
+  STAssertEquals([mergedArray count], (NSUInteger)2,
+                 @"merged array with no merger should have two items");
+  STAssertEqualObjects([mergedArray objectAtIndex:0], @"abc.def", nil);
+  STAssertEqualObjects([mergedArray objectAtIndex:1], @"abc.def", nil);
+}
+
+- (void)testMergingTwoOneItemArraysThatMatchWithMerger {
+  NSArray *arrayA = [NSArray arrayWithObject:@"abc.def"];
+  NSArray *arrayB = [NSArray arrayWithObject:@"abc.def"];
+  NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB
+                                  mergeSelector:@selector(mergeString:)];
+  STAssertNotNil(mergedArray,
+                 @"merge of two matching arrays with merger should render "
+                 @"an array");
+  STAssertEquals([mergedArray count], (NSUInteger)1,
+                 @"merged array with merger should have one items");
+  STAssertEqualObjects([mergedArray objectAtIndex:0], @"abc.def", nil);
+}
+
+- (void)testMergingMultipleItemArray {
+  NSArray *arrayA = [NSArray arrayWithObjects:
+                     @"Kansas",
+                     @"Arkansas",
+                     @"Wisconson",
+                     @"South Carolina",
+                     nil];
+  NSArray *arrayB = [NSArray arrayWithObjects:
+                     @"South Carolina",
+                     @"Quebec",
+                     @"British Columbia",
+                     @"Arkansas",
+                     @"South Hamptom",
+                     nil];
+  NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB
+                                  mergeSelector:nil];
+  STAssertNotNil(mergedArray,
+                 @"merge of two non empty arrays with no merger should render "
+                 @"an array");
+  STAssertEquals([mergedArray count], (NSUInteger)9,
+                 @"merged array should have 9 items");
+}
+
+- (void)testMergingMultipleItemArrayWithMerger {
+  NSArray *arrayA = [NSArray arrayWithObjects:
+                     @"Kansas",
+                     @"Arkansas",
+                     @"Wisconson",
+                     @"South Carolina",
+                     nil];
+  NSArray *arrayB = [NSArray arrayWithObjects:
+                     @"South Carolina",
+                     @"Quebec",
+                     @"British Columbia",
+                     @"Arkansas",
+                     @"South Hamptom",
+                     nil];
+  NSArray *mergedArray = [arrayA gtm_mergeArray:arrayB
+                                  mergeSelector:@selector(mergeString:)];
+  STAssertNotNil(mergedArray,
+                 @"merge of two non empty arrays with merger should render "
+                 @"an array");
+  STAssertEquals([mergedArray count], (NSUInteger)7,
+                 @"merged array should have 7 items");
+}
+
+- (void)testMergeWithEmptyArrays {
+  NSArray *arrayA = [NSArray arrayWithObjects:@"xyz", @"abc", @"mno", nil];
+  NSArray *arrayB = [NSArray array];
+  NSArray *expected = [NSArray arrayWithObjects:@"abc", @"mno", @"xyz", nil];
+  STAssertNotNil(arrayA, nil);
+  STAssertNotNil(arrayB, nil);
+  STAssertNotNil(expected, nil);
+  NSArray *mergedArray;
+  
+  // no merger
+  mergedArray = [arrayA gtm_mergeArray:arrayB
+                         mergeSelector:nil];
+  STAssertNotNil(mergedArray, nil);
+  STAssertEqualObjects(mergedArray, expected, nil);
+
+  // w/ merger
+  mergedArray = [arrayA gtm_mergeArray:arrayB
+                         mergeSelector:@selector(mergeString:)];
+  STAssertNotNil(mergedArray, nil);
+  STAssertEqualObjects(mergedArray, expected, nil);
+
+  // no merger and array args reversed
+  mergedArray = [arrayB gtm_mergeArray:arrayA
+                         mergeSelector:nil];
+  STAssertNotNil(mergedArray, nil);
+  STAssertEqualObjects(mergedArray, expected, nil);
+  
+  // w/ merger and array args reversed
+  mergedArray = [arrayB gtm_mergeArray:arrayA
+                         mergeSelector:@selector(mergeString:)];
+  STAssertNotNil(mergedArray, nil);
+  STAssertEqualObjects(mergedArray, expected, nil);
+  
+}
+
+@end
+
+
+@implementation NSString (GTMStringMergingTestAdditions)
+
+- (NSString *)mergeString:(NSString *)stringB {
+  return stringB;
+}
+
+@end
+