1 files changed, 27 insertions, 33 deletions

diff --git a/Foundation/GTMNSFileManager+CarbonTest.m b/Foundation/GTMNSFileManager+CarbonTest.m
index 95f8814..f42ece4 100644
--- a/Foundation/GTMNSFileManager+CarbonTest.m
+++ b/Foundation/GTMNSFileManager+CarbonTest.m
@@ -6,9 +6,9 @@
 //  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
@@ -18,62 +18,56 @@
 
 #import "GTMSenTestCase.h"
 #import "GTMNSFileManager+Carbon.h"
-#import "GTMUnitTestDevLog.h"
 #import <CoreServices/CoreServices.h>
 
 @interface GTMNSFileManager_CarbonTest : GTMTestCase
 @end
-  
+
 @implementation GTMNSFileManager_CarbonTest
 
 - (void)testAliasPathFSRefConversion {
   NSString *path = NSHomeDirectory();
-  STAssertNotNil(path, nil);
+  XCTAssertNotNil(path);
   NSFileManager *fileManager = [NSFileManager defaultManager];
   FSRef *fsRef = [fileManager gtm_FSRefForPath:path];
-  STAssertNotNULL(fsRef, nil);
+  XCTAssertNotNULL(fsRef);
   AliasHandle alias;
-  STAssertNoErr(FSNewAlias(nil, fsRef, &alias), nil);
-  STAssertNotNULL(alias, nil);
-  NSData *aliasData = [NSData dataWithBytes:*alias 
+  XCTAssertNoErr(FSNewAlias(nil, fsRef, &alias));
+  XCTAssertNotNULL(alias);
+  NSData *aliasData = [NSData dataWithBytes:*alias
                                      length:GetAliasSize(alias)];
-  STAssertNotNil(aliasData, nil);
+  XCTAssertNotNil(aliasData);
   NSString *path2 = [fileManager gtm_pathFromAliasData:aliasData];
-  STAssertEqualObjects(path, path2, nil);
+  XCTAssertEqualObjects(path, path2);
 
   path2 = [fileManager gtm_pathFromAliasData:aliasData
                                      resolve:YES
                                       withUI:NO];
-  STAssertEqualObjects(path, path2, nil);
-  
+  XCTAssertEqualObjects(path, path2);
+
   path2 = [fileManager gtm_pathFromAliasData:aliasData
                                      resolve:NO
                                       withUI:NO];
-  STAssertEqualObjects(path, path2, nil);
+  XCTAssertEqualObjects(path, path2);
 
   NSData *aliasData2 = [fileManager gtm_aliasDataForPath:path2];
-  STAssertNotNil(aliasData2, nil);
+  XCTAssertNotNil(aliasData2);
   NSString *path3 = [fileManager gtm_pathFromAliasData:aliasData2];
-  STAssertEqualObjects(path2, path3, nil);
+  XCTAssertEqualObjects(path2, path3);
   NSString *path4 = [fileManager gtm_pathFromFSRef:fsRef];
-  STAssertEqualObjects(path, path4, nil);
-  
+  XCTAssertEqualObjects(path, path4);
+
   // Failure cases
-  [GTMUnitTestDevLogDebug expectPattern:@"DebugAssert: "
-    @"GoogleToolboxForMac: FSPathMakeRef.*"];
-  STAssertNULL([fileManager gtm_FSRefForPath:@"/ptah/taht/dosent/esixt/"], 
-               nil);
+  XCTAssertNULL([fileManager gtm_FSRefForPath:@"/ptah/taht/dosent/esixt/"]);
+
+  XCTAssertNULL([fileManager gtm_FSRefForPath:@""]);
+  XCTAssertNULL([fileManager gtm_FSRefForPath:nil]);
+  XCTAssertNil([fileManager gtm_pathFromFSRef:nil]);
+  XCTAssertNil([fileManager gtm_pathFromAliasData:nil]);
+  XCTAssertNil([fileManager gtm_pathFromAliasData:[NSData data]]);
 
-  STAssertNULL([fileManager gtm_FSRefForPath:@""], nil);
-  STAssertNULL([fileManager gtm_FSRefForPath:nil], nil);
-  STAssertNil([fileManager gtm_pathFromFSRef:nil], nil);
-  STAssertNil([fileManager gtm_pathFromAliasData:nil], nil);
-  STAssertNil([fileManager gtm_pathFromAliasData:[NSData data]], nil);
-  
-  [GTMUnitTestDevLogDebug expectPattern:@"DebugAssert: "
-   @"GoogleToolboxForMac: FSPathMakeRef.*"];
-  STAssertNil([fileManager gtm_aliasDataForPath:@"/ptah/taht/dosent/esixt/"], nil);
-  STAssertNil([fileManager gtm_aliasDataForPath:@""], nil);
-  STAssertNil([fileManager gtm_aliasDataForPath:nil], nil);
+  XCTAssertNil([fileManager gtm_aliasDataForPath:@"/ptah/taht/dosent/esixt/"]);
+  XCTAssertNil([fileManager gtm_aliasDataForPath:@""]);
+  XCTAssertNil([fileManager gtm_aliasDataForPath:nil]);
 }
 @end