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
/*
* Adium is the legal property of its developers, whose names are listed in the copyright file included
* with this source distribution.
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU
* General Public License as published by the Free Software Foundation; either version 2 of the License,
* or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program; if not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#import "ESOTRFingerprintDetailsWindowController.h"
#import "AdiumOTREncryption.h"
#import <Adium/AIAccount.h>
#import <Adium/AIServiceIcons.h>
#import <AIUtilities/AIImageAdditions.h>
/* libotr headers */
@interface ESOTRFingerprintDetailsWindowController ()
- (id)initWithWindowNibName:(NSString *)windowNibName forFingerprintDict:(NSDictionary *)inFingerprintDict;
- (void)setFingerprintDict:(NSDictionary *)inFingerprintDict;
@end
@implementation ESOTRFingerprintDetailsWindowController
static ESOTRFingerprintDetailsWindowController *sharedController = nil;
+ (void)showDetailsForFingerprintDict:(NSDictionary *)inFingerprintDict
{
if (sharedController) {
[sharedController setFingerprintDict:inFingerprintDict];
} else {
sharedController = [[self alloc] initWithWindowNibName:@"OTRFingerprintDetailsWindow"
forFingerprintDict:inFingerprintDict];
}
[sharedController showWindow:nil];
[[sharedController window] makeKeyAndOrderFront:nil];
}
- (id)initWithWindowNibName:(NSString *)windowNibName forFingerprintDict:(NSDictionary *)inFingerprintDict
{
if ((self = [super initWithWindowNibName:windowNibName])) {
[self setFingerprintDict:inFingerprintDict];
}
return self;
}
- (void)configureWindow
{
AIAccount *account = [fingerprintDict objectForKey:@"AIAccount"];
//Ensure the window is loaded
[self window];
[textField_UID setStringValue:[NSString stringWithFormat:AILocalizedString(@"Fingerprint for %@:", "used for OTR, %@ is a name"), [fingerprintDict objectForKey:@"UID"]]];
[textField_fingerprint setStringValue:[fingerprintDict objectForKey:@"FingerprintString"]];
Fingerprint *fingerprint = [[fingerprintDict objectForKey:@"FingerprintValue"] pointerValue];
if (otrl_context_is_fingerprint_trusted(fingerprint)) {
[button_trust selectItemAtIndex:1];
} else {
[button_trust selectItemAtIndex:0];
}
[imageView_service setImage:[AIServiceIcons serviceIconForObject:account
type:AIServiceIconLarge
direction:AIIconNormal]];
}
- (void)setFingerprintDict:(NSDictionary *)inFingerprintDict
{
if (inFingerprintDict != fingerprintDict) {
fingerprintDict = inFingerprintDict;
[self configureWindow];
}
}
- (void)windowDidLoad
{
[imageView_lock setImage:[NSImage imageNamed:@"lock-locked" forClass:[adium class]]];
[[self window] setTitle:AILocalizedString(@"OTR Fingerprint",nil)];
[button_OK setLocalizedString:AILocalizedString(@"OK",nil)];
[super windowDidLoad];
}
- (void)windowWillClose:(id)sender
{
[super windowWillClose:sender];
sharedController = nil;
}
/*!
* @brief Auto-saving window frame key
*
* This is the string used for saving this window's frame. It should be unique to this window.
*/
- (NSString *)adiumFrameAutosaveName
{
return @"OTR Fingerprint Details Window";
}
- (IBAction)okay:(id)sender
{
Fingerprint *fingerprint = [[fingerprintDict objectForKey:@"FingerprintValue"] pointerValue];
if ([button_trust indexOfSelectedItem] == 1 && !otrl_context_is_fingerprint_trusted(fingerprint)) {
otrl_context_set_trust(fingerprint, "verified");
} else if ([button_trust indexOfSelectedItem] == 0 && otrl_context_is_fingerprint_trusted(fingerprint)) {
otrl_context_set_trust(fingerprint, "");
}
otrg_ui_update_fingerprint();
[self closeWindow:sender];
}
- (IBAction)cancel:(id)sender
{
[self closeWindow:sender];
}
@end