@@ -26,6 +26,7 @@ @import "CPSortDescriptor.j" @import "CPException.j" + /* @ignore */ @implementation _CPArrayEnumerator : CPEnumerator { @@ -520,6 +521,9 @@ */ - (id)objectAtIndex:(int)anIndex { + if (anIndex >= length) + [CPException raise:CPRangeException reason:@"index (" + anIndex + @") beyond bounds (" + length + @")"]; + return self[anIndex]; } Foundation/CPArray.j @@ -115,6 +115,46 @@ equals:2]; } +- (void)testIndexOutOfBounds +{ + try + { + [[] objectAtIndex:0]; + [self assert:false]; + } + catch (anException) + { + [self assert:[anException name] equals:CPRangeException]; + [self assert:[anException reason] equals:@"index (0) beyond bounds (0)"]; + } + + [[0, 1, 2] objectAtIndex:0]; + [[0, 1, 2] objectAtIndex:1]; + [[0, 1, 2] objectAtIndex:2]; + + try + { + [[0, 1, 2] objectAtIndex:3]; + [self assert:false]; + } + catch (anException) + { + [self assert:[anException name] equals:CPRangeException]; + [self assert:[anException reason] equals:@"index (3) beyond bounds (3)"]; + } + + try + { + [[0, 1, 2] objectAtIndex:4]; + [self assert:false]; + } + catch (anException) + { + [self assert:[anException name] equals:CPRangeException]; + [self assert:[anException reason] equals:@"index (4) beyond bounds (3)"]; + } +} + @end @implementation CPArray (reverse) Tests/Foundation/CPArrayTest.j b2f35b61d39ba9233998deae0c16a44c6b23fb34 Francisco Ryan Tolmasky I francisco@280north.com http://github.com/280north/cappuccino/commit/a5a43de26ecda590234341db18f8bb29937eb7fb a5a43de26ecda590234341db18f8bb29937eb7fb 2009-07-08T11:52:47-07:00 2009-07-08T11:52:47-07:00 Fix for objectAtIndex: throwing out of range exceptions. Closes #105. Reviewed by me. 4ca532e57ab3d4235c29e7c50ba1d6b3902f3c7e Francisco Ryan Tolmasky I francisco@280north.com