adium/adium

Transition Adium from SenTestingKit to XCTest.

2015-12-14, Matthew Kotila
334dc418b409
Transition Adium from SenTestingKit to XCTest.

In order to build on OS X 10.11, Xcode 7.2, several changes have been made that are outlined:
- Unit tests Target Build Settings modified:
* 'Wrapper Extension' set to 'xctest'
* 'Enable Modules (C and Objective-C)' set to 'Yes'
- UnitTests Target of AutoHyperlink.framework Build Settings modified:
* 'Wrapper Extension' set to 'xctest'
* 'Enable Modules (C and Objective-C)' set to 'Yes'
* 'Other Linker Flags' removed '-framework SenTestingKit'
- 'SenTestingKit.framework' removed from Adium -> Linked Frameworks -> System
- 'SenTestingKit.framework' removed from Adium -> Linked Frameworks -> AutoHyperlinks.framework.xcodeproj -> External Frameworks and Libraries -> Linked Frameworks
- Find and Replace within 'Adium/Unit tests' && 'Adium/Linked Frameworks/Others/AutoHyperlinks.framework.xcodeproj/UnitTests'
* '' to ''
* 'SenTestCase' to 'XCTestCase'
* 'STAssert' to 'XCTAssert'
* 'XCTAssertEquals(' to 'XCTAssertEqual('
* regex '(\[\[\[)([^\]]*\][^\]]*\])(\ autorelease\]);' to '[[$2;'
* regex '(\[)([^\]]*\][^\]]*)(\ autorelease\])' to '$2'
- modified AutoHyperlinks.framework.xcodeproj -> project.pbxproj
* line 331: ’productType = "com.apple.product-type.bundle.ocunit-test";' to 'productType = "com.apple.product-type.bundle.unit-test";'
- AIWebKitMessageViewController.h
* forward declare WebUIDelegate, WebFrameLoadDelegate protocols
* add WebUIDelegate, WebFrameLoadDelegate protocols to 'AIWebKitMessageViewController' class
- AIFacebookXMPPOAuthWebViewWindowController.m lines 107 && 108
* '[[domDoc getElementById:@"email"] setValue:self.autoFillUsername];' to '[domDoc getElementById:@"email"].innerHTML = self.autoFillUsername;'
* '[[domDoc getElementById:@"pass"] setValue:self.autoFillPassword];' to '[domDoc getElementById:@"pass"].innerHTML = self.autoFillPassword;'
- XCTAssertEqual for NSRanges modified to ’XCTAssertTrue(NSEqualRanges(range1, range2)), ...)' in Unit tests
//
// AIOTRSMPSharedSecretWindowController.m
// Adium
//
// Created by Thijs Alkemade on 17-10-12.
// Copyright (c) 2012 The Adium Team. All rights reserved.
//
#import "AIOTRSMPSharedSecretWindowController.h"
#import <AIUtilities/AIImageAdditions.h>
#import <AIUtilities/AIAttributedStringAdditions.h>
@implementation AIOTRSMPSharedSecretWindowController
- (id)initFrom:(AIListContact *)inContact completionHandler:(void(^)(NSData *answer))inHandler isInitiator:(BOOL)inInitiator
{
if (self = [super initWithWindowNibName:@"AIOTRSMPSharedSecretWindowController"]) {
contact = inContact;
handler = inHandler;
isInitiator = inInitiator;
}
return self;
}
- (void)windowDidLoad
{
[super windowDidLoad];
[imageView_lock setImage:[NSImage imageNamed:@"lock-locked" forClass:[adium class]]];
path_file.URL = nil;
if (!isInitiator)
[label_intro setStringValue:[NSString stringWithFormat:AILocalizedString(@"%@ asks you to confirm your identity by giving your shared secret:", nil), contact.UID]];
else
[label_intro setStringValue:[NSString stringWithFormat:AILocalizedString(@"Enter a shared secret you have established with %@:", nil), contact.UID]];
}
- (IBAction)okay:(id)sender
{
NSData *answer;
if ([tab_answer indexOfTabViewItem:[tab_answer selectedTabViewItem]] == 0) {
answer = [[[field_secret textStorage] string] dataUsingEncoding:NSUTF8StringEncoding];
} else {
answer = [NSData dataWithContentsOfURL:path_file.URL];
}
handler(answer);
[self close];
}
- (IBAction)cancel:(id)sender
{
if (!isInitiator) handler(nil);
[self close];
}
- (IBAction)selectFile:(id)sender
{
NSOpenPanel *openPanel = [NSOpenPanel openPanel];
[openPanel setCanChooseFiles:YES];
[openPanel setCanChooseDirectories:NO];
[openPanel setAllowsMultipleSelection:NO];
NSInteger result = [openPanel runModal];
if (result == NSOKButton && [openPanel URLs].count > 0) {
path_file.URL = [[openPanel URLs] objectAtIndex:0];
}
}
@end