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 "GBQuestionHandlerPlugin.h"
#import <Adium/AIInterfaceControllerProtocol.h>
#import "ESTextAndButtonsWindowController.h"
typedef enum
{
ALERT_TYPE_ERROR,
ALERT_TYPE_QUESTION
} AlertType;
@interface GBQuestionHandlerPlugin (privateFunctions)
- (BOOL)displayNextAlert;
@end
@implementation GBQuestionHandlerPlugin
static GBQuestionHandlerPlugin *instance;
- (id)init
{
if( (self = [super init]) != nil)
{
questionQueue = [[NSMutableArray alloc] init];
errorQueue = [[NSMutableArray alloc] init];
}
return self;
}
- (void)installPlugin
{
instance = self;
}
- (void)uninstallPlugin
{
}
- (void)handleType:(AlertType)type userInfo:(NSDictionary *)userInfo
{
NSDictionary *infoCopy = [userInfo copy];
switch(type)
{
case ALERT_TYPE_QUESTION:
[questionQueue addObject:infoCopy];
break;
case ALERT_TYPE_ERROR:
[errorQueue addObject:infoCopy];
break;
}
if(currentAlert == nil)
[self displayNextAlert];
}
+ (void)handleQuestion:(NSDictionary *)questionDict;
{
[instance handleType:ALERT_TYPE_QUESTION userInfo:questionDict];
}
- (BOOL)textAndButtonsWindowDidEnd:(NSWindow *)window returnCode:(AITextAndButtonsReturnCode)returnCode suppression:(BOOL)suppression userInfo:(id)userInfo
{
void (^handler)(AITextAndButtonsReturnCode ret, BOOL suppressed, id userInfo) = [userInfo objectForKey:@"Handler"];
BOOL ret = YES;
if (handler)
handler(returnCode, suppression, [userInfo objectForKey:@"Userinfo"]);
if ([self displayNextAlert]) {
//More alerts so don't hide window
ret = NO;
}
else
{
dispatch_async(dispatch_get_main_queue(), ^{
[currentAlert close];
currentAlert = nil;
});
}
return ret;
}
- (BOOL)displayNextAlert
{
BOOL ret = NO;
if([errorQueue count] != 0)
{
NSDictionary *info = [errorQueue objectAtIndex:0];
if(currentAlert == nil)
currentAlert = [[ESTextAndButtonsWindowController alloc] init];
[currentAlert changeWindowToTitle:[info objectForKey:@"Window Title"]
defaultButton:AILocalizedString(@"Next", @"Next Button")
alternateButton:AILocalizedString(@"Dismiss All", @"Dismiss All Button")
otherButton:nil
suppression:nil
withMessageHeader:[info objectForKey:@"Title"]
andMessage:[info objectForKey:@"Description"]
image:nil
target:self
userInfo:info];
[currentAlert show];
if ([[info objectForKey:@"Make Key"] boolValue]) {
[currentAlert showWindow:nil];
}
[errorQueue removeObjectAtIndex:0];
ret = YES;
}
else if ([questionQueue count] != 0)
{
NSDictionary *info = [questionQueue objectAtIndex:0];
if(currentAlert == nil)
currentAlert = [[ESTextAndButtonsWindowController alloc] init];
[currentAlert changeWindowToTitle:[info objectForKey:@"Window Title"]
defaultButton:[info objectForKey:@"Default Button"]
alternateButton:[info objectForKey:@"Alternate Button"]
otherButton:[info objectForKey:@"Other Button"]
suppression:[info objectForKey:@"Suppression Checkbox"]
withMessageHeader:[info objectForKey:@"Title"]
andMessage:[info objectForKey:@"Description"]
image:nil
target:self
userInfo:info];
[currentAlert show];
if ([[info objectForKey:@"Make Key"] boolValue]) {
[currentAlert showWindow:nil];
}
[questionQueue removeObjectAtIndex:0];
ret = YES;
}
return ret;
}
@end