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

Refs #1071. indexOfObject:inSortedRange:options:usingComparator is incorrectly implemented.

Browse Source 
Add more tests to cover more features of the indexOfObject:inSortedRange:options:usingComparator method
This commit is contained in:
Ilya Kulakov authored and Alexander Ljungberg committed 2011-01-04 13:37:06 -03:00
1 parent 95a2b46ae1
commit db6608571a
2 files changed
+67 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Foundation/CPArray/CPArray.j
+4 -4
View File
@@ -440,13 +440,13 @@ CPBinarySearchingInsertionIndex = 1 << 10;
else
{
if (options & CPBinarySearchingFirstEqual)
while (middle++ < count - 1 &&
aComparator(anObject, [self objectAtIndex:middle]) === CPOrderedSame);
while (middle > first && aComparator(anObject, [self objectAtIndex:middle - 1]) === CPOrderedSame)
--middle;
else if (options & CPBinarySearchingLastEqual)
{
while (middle-- > 0 &&
aComparator(anObject, [self objectAtIndex:middle]) === CPOrderedSame);
while (middle < last && aComparator(anObject, [self objectAtIndex:middle + 1]) === CPOrderedSame)
++middle;
if (options & CPBinarySearchingInsertionIndex)
++middle;
Tests/Foundation/CPArrayTest.j
+63 -3
View File
@@ -142,10 +142,70 @@
- (void)testIndexOfObject_inSortedRange_options_usingComparator_
{
var array = [0, 1, 2, 3, 4, 7];
var array = [0, 1, 1, 1, 2, 2, 3, 3, 4, 4, 7];
var numComparator = function(a, b){ return a - b; };
[self assert:[array indexOfObject:3 inSortedRange:nil options:0 usingComparator:function(a, b){ return a - b; }] equals:3];
[self assert:[[array arrayByReversingArray] indexOfObject:3 inSortedRange:nil options:0 usingComparator:function(a, b){ return a - b; }] equals:2];
var index = [array indexOfObject:1
inSortedRange:nil
options:0
usingComparator:numComparator];
[self assertTrue:[[1, 2, 3] containsObject:index]];
[self assert:[array indexOfObject:1
inSortedRange:nil
options:CPBinarySearchingFirstEqual
usingComparator:numComparator]
equals:1];
[self assert:[array indexOfObject:1
inSortedRange:nil
options:CPBinarySearchingLastEqual
usingComparator:numComparator]
equals:3];
index = [array indexOfObject:1
inSortedRange:nil
options:CPBinarySearchingInsertionIndex
usingComparator:numComparator];
[self assertTrue:[[1, 2, 3, 4] containsObject:index]];
[self assert:[array indexOfObject:1
inSortedRange:nil
options:CPBinarySearchingFirstEqual | CPBinarySearchingInsertionIndex
usingComparator:numComparator]
equals:1];
[self assert:[array indexOfObject:1
inSortedRange:nil
options:CPBinarySearchingLastEqual | CPBinarySearchingInsertionIndex
usingComparator:numComparator]
equals:4];
index = [array indexOfObject:2
inSortedRange:CPMakeRange(2, 5) // [ -, -, 1, 1, 2, 2, 3, -, -, -, -]
options:0
usingComparator:numComparator];
[self assertTrue:[[4, 5] containsObject:index]];
[self assert:[array indexOfObject:2
inSortedRange:CPMakeRange(2, 5) // [ -, -, 1, 1, 2, 2, 3, -, -, -, -]
options:CPBinarySearchingFirstEqual
usingComparator:numComparator]
equals:4];
[self assert:[array indexOfObject:2
inSortedRange:CPMakeRange(2, 5) // [ -, -, 1, 1, 2, 2, 3, -, -, -, -]
options:CPBinarySearchingLastEqual
usingComparator:numComparator]
equals:5];
index = [array indexOfObject:2
inSortedRange:CPMakeRange(2, 5) // [ -, -, 1, 1, 2, 2, 3, -, -, -, -]
options:CPBinarySearchingInsertionIndex
usingComparator:numComparator];
[self assertTrue:[[4, 5, 6] containsObject:index]];
[self assert:[array indexOfObject:2
inSortedRange:CPMakeRange(2, 5) // [ -, -, 1, 1, 2, 2, 3, -, -, -, -]
options:CPBinarySearchingFirstEqual | CPBinarySearchingInsertionIndex
usingComparator:numComparator]
equals:4];
[self assert:[array indexOfObject:2
inSortedRange:CPMakeRange(2, 5) // [ -, -, 1, 1, 2, 2, 3, -, -, -, -]
options:CPBinarySearchingLastEqual | CPBinarySearchingInsertionIndex
usingComparator:numComparator]
equals:6];
}
- (void)testIndexOutOfBounds