mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-20 05:29:23 +00:00
Merge branch 'master' of git://github.com/280north/cappuccino
This commit is contained in:
commit
24ab9f9fdf
4 files changed
+277
-4
No files matched your search
@@ -203,6 +203,9 @@
|
||||
*/
|
||||
- (void)setContent:(CPArray)anArray
|
||||
{
|
||||
// reset the _selectionIndexes
|
||||
[self setSelectionIndexes:[CPIndexSet indexSet]];
|
||||
|
||||
_content = anArray;
|
||||
|
||||
[self reloadContent];
|
||||
|
||||
@@ -225,7 +225,7 @@ CPTableColumnUserResizingMask = 1 << 1;
|
||||
}
|
||||
|
||||
/*!
|
||||
This method set's the "prototype" view which will be used to create all table cells in this column.
|
||||
This method sets the "prototype" view which will be used to create all table cells in this column.
|
||||
|
||||
It creates a snapshot of aView, using keyed archiving, which is then copied over and over for each
|
||||
individual cell that is shown. As a result, changes made after calling this method won't be reflected.
|
||||
|
||||
@@ -1,24 +1,257 @@
|
||||
@import <AppKit/CPApplication.j>
|
||||
@import <AppKit/CPWindow.j>
|
||||
|
||||
globalResults = [];
|
||||
|
||||
@implementation MyAppDelegate : CPObject
|
||||
{
|
||||
}
|
||||
|
||||
- (void)delegateMethod
|
||||
{
|
||||
globalResults.push(@"delegateMethod called");
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation CPApplication(TestMethods)
|
||||
{
|
||||
}
|
||||
|
||||
- (void)someTestMethod:(id)someArg
|
||||
{
|
||||
globalResults.push(@"someTestMethod called with: " + someArg);
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation TestMainWindow : CPWindow
|
||||
{
|
||||
}
|
||||
|
||||
- (void)onlyOnMain
|
||||
{
|
||||
globalResults.push(@"onlyOnMain called");
|
||||
}
|
||||
|
||||
- (void)onBoth
|
||||
{
|
||||
globalResults.push(@"onBoth called on main");
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation TestKeyWindow : CPWindow
|
||||
{
|
||||
}
|
||||
|
||||
- (void)onlyOnKey
|
||||
{
|
||||
globalResults.push(@"onlyOnKey called");
|
||||
}
|
||||
|
||||
- (void)onBoth
|
||||
{
|
||||
globalResults.push(@"onBoth called on key");
|
||||
}
|
||||
@end
|
||||
|
||||
|
||||
@implementation CPApplicationTest : OJTestCase
|
||||
{
|
||||
CPApplication app;
|
||||
CPWindow aWindow;
|
||||
}
|
||||
|
||||
- (void)setUp
|
||||
{
|
||||
// This sets up the CPApp convenience variable, the unit tests fails
|
||||
// if this is not done, because the framework internally uses CPApp.
|
||||
[CPApplication sharedApplication]
|
||||
app = [CPApplication sharedApplication];
|
||||
|
||||
// fake the window.location.hash
|
||||
app.window = {location: {hash: "#var1=1/var2=2"}};
|
||||
[app setDelegate:[[MyAppDelegate alloc] init]];
|
||||
|
||||
aWindow = [[CPWindow alloc] init];
|
||||
aWindow._isVisible = YES;
|
||||
[aWindow setTitle:@"My Great Window"];
|
||||
|
||||
globalResults = []
|
||||
}
|
||||
|
||||
- (void)receiveNotification:(CPNotification)aNote
|
||||
{
|
||||
globalResults.push(aNote);
|
||||
}
|
||||
|
||||
- (void)testRunModalForWindow
|
||||
{
|
||||
var aWindow = [[CPWindow alloc] init];
|
||||
[[CPApplication sharedApplication] runModalForWindow:aWindow];
|
||||
[app runModalForWindow:aWindow];
|
||||
|
||||
[self assertTrue:[aWindow isKeyWindow] message:@"A window must be made key when it's run modally"];
|
||||
[self assertFalse:[aWindow isMainWindow] message:@"A window must not become the main window when it's run modally"];
|
||||
|
||||
[app abortModal];
|
||||
}
|
||||
|
||||
@end
|
||||
- (void)testModalWindow
|
||||
{
|
||||
var modalWindow = [[CPWindow alloc] init];
|
||||
[modalWindow setTitle:@"I am so modal!"];
|
||||
[self assert:nil equals:[app modalWindow]];
|
||||
[app runModalForWindow:modalWindow];
|
||||
[self assert:@"I am so modal!" equals:[[app modalWindow] title]];
|
||||
[app abortModal];
|
||||
}
|
||||
|
||||
- (void)testAbortModal
|
||||
{
|
||||
var modalWindow = [[CPWindow alloc] init];
|
||||
[modalWindow setTitle:@"I am so modal!"];
|
||||
[self assert:nil equals:[app modalWindow]];
|
||||
[app runModalForWindow:modalWindow];
|
||||
[self assert:@"I am so modal!" equals:[[app modalWindow] title]];
|
||||
[app abortModal];
|
||||
|
||||
[self assert:nil equals:[app modalWindow]];
|
||||
}
|
||||
|
||||
- (void)testStopModal
|
||||
{
|
||||
var modalWindow = [[CPWindow alloc] init];
|
||||
[modalWindow setTitle:@"I am so modal!"];
|
||||
[self assert:nil equals:[app modalWindow]];
|
||||
[app runModalForWindow:modalWindow];
|
||||
[self assert:@"I am so modal!" equals:[[app modalWindow] title]];
|
||||
[app stopModal];
|
||||
|
||||
[self assert:nil equals:[app modalWindow]];
|
||||
}
|
||||
|
||||
- (void)testArguments
|
||||
{
|
||||
[self assert:["var1=1", "var2=2"] equals:[app arguments]];
|
||||
}
|
||||
|
||||
- (void)testSetArguments
|
||||
{
|
||||
[app setArguments:["a", "b"]];
|
||||
[self assert:["a", "b"] equals:[app arguments]];
|
||||
|
||||
[app setArguments:@"c/d"];
|
||||
[self assert:["c/d"] equals:[app arguments]];
|
||||
}
|
||||
|
||||
- (void)testDelegate
|
||||
{
|
||||
[self assert:[[app delegate] class] equals:MyAppDelegate];
|
||||
}
|
||||
|
||||
- (void)testDoCommandBySelector
|
||||
{
|
||||
[app doCommandBySelector:@selector(delegateMethod)];
|
||||
[self assert:@"delegateMethod called" equals:globalResults[0]];
|
||||
}
|
||||
|
||||
- (void)testActivateIgnoringOtherApps
|
||||
{
|
||||
[app activateIgnoringOtherApps:YES];
|
||||
[self assertTrue:[app isActive]];
|
||||
}
|
||||
|
||||
- (void)testDeactivate
|
||||
{
|
||||
[app deactivate];
|
||||
[self assertFalse:[app isActive]];
|
||||
}
|
||||
|
||||
- (void)testMainWindow
|
||||
{
|
||||
[self assertTrue:[aWindow canBecomeMainWindow]];
|
||||
[aWindow makeMainWindow];
|
||||
[self assert:@"My Great Window" equals:[[app mainWindow] title]];
|
||||
}
|
||||
|
||||
- (void)testKeyWindow
|
||||
{
|
||||
[self assert:nil equals:[app keyWindow]];
|
||||
[aWindow becomeKeyWindow];
|
||||
[self assert:@"My Great Window" equals:[[app keyWindow] title]];
|
||||
[aWindow resignKeyWindow];
|
||||
[self assert:nil equals:[app keyWindow]];
|
||||
}
|
||||
|
||||
- (void)testWindows
|
||||
{
|
||||
[self assert:@"My Great Window" equals:[[[app windows] objectAtIndex:1] title]];
|
||||
}
|
||||
|
||||
- (void)testWindowWithWindowNumber
|
||||
{
|
||||
[self assert:@"My Great Window" equals:[[app windowWithWindowNumber:1] title]];
|
||||
}
|
||||
|
||||
- (void)testReplyToApplicationShouldTerminate
|
||||
{
|
||||
[[CPNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(receiveNotification:)
|
||||
name:CPApplicationWillTerminateNotification
|
||||
object:nil];
|
||||
|
||||
[app replyToApplicationShouldTerminate:CPTerminateNow];
|
||||
[self assert:CPApplicationWillTerminateNotification equals:[globalResults[0] name]];
|
||||
|
||||
[[CPNotificationCenter defaultCenter] removeObserver:self];
|
||||
}
|
||||
|
||||
- (void)testTryToPerformWith
|
||||
{
|
||||
//first on self
|
||||
var success = [app tryToPerform:@selector(someTestMethod:) with:@"Sweet!"];
|
||||
[self assertTrue:success];
|
||||
[self assert:@"someTestMethod called with: Sweet!" equals:globalResults[0]];
|
||||
|
||||
//if the method isn't found on self, it should be called on the delegate
|
||||
globalResults = []
|
||||
var success = [app tryToPerform:@selector(delegateMethod) with:nil];
|
||||
[self assertTrue:success];
|
||||
[self assert:@"delegateMethod called" equals:globalResults[0]];
|
||||
|
||||
//method isn't defined anywhere
|
||||
var success = [app tryToPerform:@selector(someMethodThatDoesNotExist:) with:@"Sweet!"];
|
||||
[self assertFalse:success];
|
||||
}
|
||||
|
||||
- (void)testTargetForAction
|
||||
{
|
||||
var mainWin = [[TestMainWindow alloc] init];
|
||||
var keyWin = [[TestKeyWindow alloc] init];
|
||||
mainWin._isVisible = YES;
|
||||
keyWin._isVisible = YES;
|
||||
[mainWin makeMainWindow];
|
||||
[keyWin becomeKeyWindow];
|
||||
|
||||
//key should be first
|
||||
[self assert:keyWin equals:[app targetForAction:@selector(onBoth)]];
|
||||
[self assert:keyWin equals:[app targetForAction:@selector(onlyOnKey)]];
|
||||
|
||||
//then main
|
||||
[self assert:mainWin equals:[app targetForAction:@selector(onlyOnMain)]];
|
||||
[keyWin resignKeyWindow];
|
||||
[self assert:mainWin equals:[app targetForAction:@selector(onBoth)]];
|
||||
|
||||
//then self
|
||||
[self assert:app equals:[app targetForAction:@selector(someTestMethod:)]];
|
||||
|
||||
//then the delegate
|
||||
[self assert:MyAppDelegate equals:[[app targetForAction:@selector(delegateMethod)] class]];
|
||||
}
|
||||
|
||||
- (void)testTargetForActionToFrom
|
||||
{
|
||||
[self assert:@"some object" equals:[app targetForAction:@selector(anything) to:@"some object" from:nil]];
|
||||
|
||||
// when no target is given, targetForAction is called
|
||||
[self assert:app equals:[app targetForAction:@selector(someTestMethod:) to:nil from:nil]];
|
||||
|
||||
}
|
||||
@end
|
||||
@@ -4,11 +4,19 @@
|
||||
@implementation CPCollectionViewTest : OJTestCase
|
||||
{
|
||||
CPCollectionView _collectionView;
|
||||
id _globalResults;
|
||||
}
|
||||
|
||||
- (void)setUp
|
||||
{
|
||||
_collectionView = [[CPCollectionView alloc] initWithFrame:CGRectMakeZero()];
|
||||
_globalResults = nil;
|
||||
}
|
||||
|
||||
// delegate method
|
||||
- (void)collectionViewDidChangeSelection:(CPCollectionView)aCollectionView
|
||||
{
|
||||
_globalResults = "selection changed: " + [[aCollectionView selectionIndexes] count];
|
||||
}
|
||||
|
||||
- (void)testItemPrototypeActuallyReturnsTheItemPrototype
|
||||
@@ -49,6 +57,35 @@
|
||||
[self assert:[collectionView reloadContentCallCount] equals:reloadContentCount+1 message:@"subsequent calls to setContent should have called reloadContent once"];
|
||||
}
|
||||
|
||||
- (void)testCallCollectionViewDidChangeSelectionDelegateMethod
|
||||
{
|
||||
var content1 = ["a", "b", "c"],
|
||||
content2 = ["d", "e", "f"];
|
||||
|
||||
[_collectionView setSelectable:YES];
|
||||
[_collectionView setDelegate:self];
|
||||
[_collectionView setContent:content1];
|
||||
[_collectionView setSelectionIndexes:[CPIndexSet indexSetWithIndex:0]];
|
||||
// the first time the delegate does get called
|
||||
[self assert:"selection changed: 1" equals:_globalResults];
|
||||
_globalResults = nil;
|
||||
|
||||
// setting the same content again should still trigger the delegate but with no selection
|
||||
[_collectionView setContent:content1];
|
||||
[self assert:"selection changed: 0" equals:_globalResults];
|
||||
_globalResults = nil;
|
||||
|
||||
// now lets change the contents
|
||||
[_collectionView setContent:content2];
|
||||
// we set the selection to 0 again, but on the NEW content
|
||||
[_collectionView setSelectionIndexes:[CPIndexSet indexSetWithIndex:0]];
|
||||
[self assert:"selection changed: 1" equals:_globalResults];
|
||||
|
||||
_globalResults = nil;
|
||||
[_collectionView setSelectionIndexes:[CPIndexSet indexSetWithIndex:1]];
|
||||
[self assert:"selection changed: 1" equals:_globalResults];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@implementation _CPCollectionViewWithHooks : CPCollectionView
|
||||
|
||||
Reference in new issue
Block a user