adium/adium

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 "ESEditStatusGroupWindowController.h"
#import "AIStatusController.h"
#import <Adium/AIStatusGroup.h>
#import <AIUtilities/AIMenuAdditions.h>
@interface ESEditStatusGroupWindowController ()
- (NSMenu *)groupWithStatusMenu;
@end
@implementation ESEditStatusGroupWindowController
- (id)initWithStatusGroup:(AIStatusGroup *)inStatusGroup notifyingTarget:(id)inTarget
{
if ((self = [super initWithWindowNibName:@"EditStatusGroup"])) {
target = inTarget;
statusGroup = (inStatusGroup ? inStatusGroup : [[AIStatusGroup alloc] init]);
}
return self;
}
- (void)windowDidLoad
{
[popUp_groupWith setMenu:[self groupWithStatusMenu]];
[popUp_groupWith selectItemWithTag:statusGroup.statusType];
NSString *title = [statusGroup title];
[textField_title setStringValue:(title ? title : @"")];
[label_groupWith setAutoresizingMask:NSViewMinXMargin];
[label_title setLocalizedString:AILocalizedString(@"Title:", nil)];
[label_groupWith setAutoresizingMask:NSViewMaxXMargin];
[label_title setAutoresizingMask:NSViewMinXMargin];
[label_groupWith setLocalizedString:AILocalizedString(@"Group with:", "The popup button after this lists status types; it will determine the status type with which a status group will be listed in status menus")];
[label_title setAutoresizingMask:NSViewMaxXMargin];
[button_OK setLocalizedString:AILocalizedString(@"OK", nil)];
[button_cancel setLocalizedString:AILocalizedString(@"Cancel", nil)];
[super windowDidLoad];
}
/*!
* @brief Okay
*
* Save changes, notify our target of the new configuration, and close the editor.
*/
- (IBAction)okay:(id)sender
{
[statusGroup setTitle:[textField_title stringValue]];
[statusGroup setStatusType:(AIStatusType)[[popUp_groupWith selectedItem] tag]];
if (target && [target respondsToSelector:@selector(finishedStatusGroupEdit:)]) {
//Perform on a delay so the sheet can begin closing immediately.
[target performSelector:@selector(finishedStatusGroupEdit:)
withObject:statusGroup
afterDelay:0];
}
[self closeWindow:nil];
}
/*!
* @brief Cancel
*
* Close the editor without saving changes.
*/
- (IBAction)cancel:(id)sender
{
[self closeWindow:nil];
}
- (NSMenu *)groupWithStatusMenu
{
NSMenu *menu = [[NSMenu alloc] init];
NSMenuItem *menuItem;
menuItem = [[NSMenuItem alloc] initWithTitle:[adium.statusController localizedDescriptionForCoreStatusName:STATUS_NAME_AVAILABLE]
target:nil
action:nil
keyEquivalent:@""];
[menuItem setTag:AIAvailableStatusType];
[menuItem setImage:[AIStatusIcons statusIconForStatusName:nil
statusType:AIAvailableStatusType
iconType:AIStatusIconMenu
direction:AIIconNormal]];
[menu addItem:menuItem];
menuItem = [[NSMenuItem alloc] initWithTitle:[adium.statusController localizedDescriptionForCoreStatusName:STATUS_NAME_AWAY]
target:nil
action:nil
keyEquivalent:@""];
[menuItem setTag:AIAwayStatusType];
[menuItem setImage:[AIStatusIcons statusIconForStatusName:nil
statusType:AIAwayStatusType
iconType:AIStatusIconMenu
direction:AIIconNormal]];
[menu addItem:menuItem];
return menu;
}
@end