colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-09 16:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into objj2integration

Browse Source
This commit is contained in:
Antoine Mercadal committed 2013-01-15 09:49:25 -08:00
2 parents a7c4802446 5c3d71258d
commit e8ee370499
3 files changed
+10 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Foundation/CPIndexSet.j
+5
View File
@@ -21,6 +21,7 @@
*/
#include "CPRange.h"
#include "Foundation.h"
@import "CPArray.j"
@import "CPObject.j"
@@ -79,6 +80,10 @@
*/
- (id)initWithIndex:(CPInteger)anIndex
{
if (!_IS_NUMERIC(anIndex))
[CPException raise:CPInvalidArgumentException
reason:"Invalid index"];
return [self initWithIndexesInRange:_CPMakeRange(anIndex, 1)];
}
Tests/AppKit/CPApplicationTest.j
+4 -3
View File
@@ -91,10 +91,11 @@ var globalResults = [];
- (void)testRunModalForWindow
{
[app runModalForWindow:aWindow];
var modalWindow = [[CPWindow alloc] init];
[app runModalForWindow:modalWindow];
[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"];
[self assertTrue:[modalWindow isKeyWindow] message:@"A window must be made key when it's run modally"];
[self assertFalse:[modalWindow isMainWindow] message:@"A window must not become the main window when it's run modally"];
[app abortModal];
}
Tests/Foundation/CPIndexSetTest.j
+1
View File
@@ -202,6 +202,7 @@ function descriptionWithoutEntity(aString)
[self assertTrue:[[CPIndexSet indexSetWithIndex:1] containsIndex:1]];
[self assertTrue:[[CPIndexSet indexSetWithIndex:0] containsIndex:0]];
[self assertFalse:[[CPIndexSet indexSetWithIndex:0] containsIndex:1]];
[self assertThrows:function() { [CPIndexSet indexSetWithIndex:NaN] }];
}
- (void)testIndexSetWithIndexesInRange