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 "AINewBookmarkWindowController.h"
#import "AINewGroupWindowController.h"
#import <Adium/AIContactControllerProtocol.h>
#import <Adium/AIListGroup.h>
#import <Adium/AIChat.h>
#import <AIUtilities/AIMenuAdditions.h>
#import <AIUtilities/AIStringAdditions.h>
#import <AIUtilities/AIPopUpButtonAdditions.h>
#define ADD_BOOKMARK_NIB @"AddBookmark"
#define DEFAULT_GROUP_NAME AILocalizedString(@"Contacts",nil)
@interface AINewBookmarkWindowController ()
- (id)initWithChat:(AIChat *)inChat notifyingTarget:(id)inTarget;
- (void)buildGroupMenu;
- (void)newGroup:(id)sender;
- (void)newGroupDidEnd:(NSNotification *)inNotification;
@end
@implementation AINewBookmarkWindowController
- (id)initWithChat:(AIChat *)inChat notifyingTarget:(id)inTarget
{
if ((self = [super initWithWindowNibName:ADD_BOOKMARK_NIB])) {
chat = inChat;
target = inTarget;
}
return self;
}
/*!
* @name windowDidLoad
* @brief the sheet finished loading, populate the group menu with contactlist's groups
*/
-(void)windowDidLoad
{
[self buildGroupMenu];
if (chat) {
[textField_name setStringValue:chat.name];
}
[label_name setLocalizedString:AILocalizedString(@"Name:", nil)];
[label_group setLocalizedString:AILocalizedString(@"Group:", nil)];
[button_add setLocalizedString:AILocalizedStringFromTable(@"Add", @"Buttons", nil)];
[button_cancel setLocalizedString:AILocalizedStringFromTable(@"Cancel", @"Buttons", nil)];
}
/*!
* @name add
* @brief User pressed ok on sheet - Calls createBookmarkWithInfo: on the delegate class AIBookmarkController, which creates
* a new bookmark with the entered name & moves it to the entered group.
*/
- (IBAction)add:(id)sender
{
[target createBookmarkForChat:chat
withName:[textField_name stringValue]
inGroup:[[popUp_group selectedItem] representedObject]];
[self closeWindow:nil];
}
/*!
*@brief user pressed cancel on panel -dismisses the sheet
*/
- (IBAction)cancel:(id)sender
{
[self closeWindow:nil];
}
//Add to Group ---------------------------------------------------------------------------------------------------------
#pragma mark Add to Group
/*!
* @brief Build the menu of available destination groups
*/
- (void)buildGroupMenu
{
NSMenu *menu;
//Rebuild the menu
menu = [adium.contactController groupMenuWithTarget:nil];
//Add a default group name to the menu if there are no groups listed
if ([menu numberOfItems] == 0) {
[menu addItemWithTitle:DEFAULT_GROUP_NAME
target:nil
action:nil
keyEquivalent:@""];
}
[menu addItem:[NSMenuItem separatorItem]];
[menu addItemWithTitle:[AILocalizedString(@"New Group",nil) stringByAppendingEllipsis]
target:self
action:@selector(newGroup:)
keyEquivalent:@""];
[popUp_group setMenu:menu];
[popUp_group selectItemAtIndex:0];
}
/*!
* @brief Prompt the user to add a new group immediately
*/
- (void)newGroup:(id)sender
{
AINewGroupWindowController *newGroupWindowController = [[AINewGroupWindowController alloc] init];
//Observe for the New Group window to close
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(newGroupDidEnd:)
name:@"NewGroupWindowControllerDidEnd"
object:[newGroupWindowController window]];
[newGroupWindowController showOnWindow:[self window]];
}
/*!
* @name newGroupDidEnd:
* @brief the New Group sheet has ended, if a new group was created, select it, otherwise
* select the first group.
*/
- (void)newGroupDidEnd:(NSNotification *)inNotification
{
NSWindow *window = [inNotification object];
if ([[window windowController] isKindOfClass:[AINewGroupWindowController class]]) {
AIListGroup *group = [(AINewGroupWindowController *)[window windowController] group];
//Rebuild the group menu
[self buildGroupMenu];
/* Select the new group if it exists; otherwise select the first group (so we don't still have New Group... selected).
* If the user cancelled, group will be nil since the group doesn't exist.
*/
if (![popUp_group selectItemWithRepresentedObject:group]) {
[popUp_group selectItemAtIndex:0];
}
[[self window] performSelector:@selector(makeKeyAndOrderFront:)
withObject:self
afterDelay:0];
}
//Stop observing
[[NSNotificationCenter defaultCenter] removeObserver:self
name:@"NewGroupWindowControllerDidEnd"
object:window];
}
@end