Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion FirebaseDatabaseUI/FirebaseArray.m
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,13 @@ - (void)initListeners {
NSUInteger fromIndex = [self indexForKey:snapshot.key];
[self.snapshots removeObjectAtIndex:fromIndex];

NSUInteger toIndex = [self indexForKey:previousChildKey] + 1;
NSUInteger toIndex = 0;
if (previousChildKey != nil) {
NSUInteger prevIndex = [self indexForKey:previousChildKey];
if (prevIndex != NSNotFound) {
toIndex = prevIndex + 1;
}
}
[self.snapshots insertObject:snapshot atIndex:toIndex];

if ([self.delegate respondsToSelector:@selector(array:didMoveObject:fromIndex:toIndex:)]) {
Expand Down
64 changes: 64 additions & 0 deletions FirebaseDatabaseUITests/FirebaseArrayTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -378,4 +378,68 @@ - (void)testFirebaseArrayCanMoveElement {
XCTAssert(expectedParametersWereCorrect, @"unexpected parameter in delegate callback");
}

- (void)testFirebaseArrayCanMoveElementToStart {
[self.observable populateWithCount:10];
self.snap.key = @"8";

// Test delegate
__block BOOL delegateWasCalled = NO;
__block BOOL expectedParametersWereCorrect = NO;
self.arrayDelegate.didMoveObject = ^(FirebaseArray *array, id object, NSUInteger from, NSUInteger to) {
// Xcode complains about retain cycles if an XCTAssert is placed in here.
delegateWasCalled = YES;
expectedParametersWereCorrect = (array == self.firebaseArray &&
object == self.snap &&
from == 8 && to == 0);
};

// Move 8 to the start
[self.observable sendEvent:FIRDataEventTypeChildMoved withObject:self.snap previousKey:@"" error:nil];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a case like this where previous key is nil as well? Other than that this change looks good.


// Array expectation
NSArray *items = self.firebaseArray.items;
NSArray *expected = @[@"8", @"0", @"1", @"2", @"3", @"4", @"5", @"6", @"7", @"9"];
NSMutableArray *result = [NSMutableArray array];
for (FUIFakeSnapshot *snapshot in items) {
[result addObject:snapshot.key];
}
XCTAssert([result isEqual:expected], @"expected firebaseArray contents to equal %@, got %@", expected, [result copy]);

// Delegate expectations
XCTAssert(delegateWasCalled, @"expected delegate to receive callback for deletion");
XCTAssert(expectedParametersWereCorrect, @"unexpected parameter in delegate callback");
}

- (void)testFirebaseArrayMovesElementToStartWithNilPreviousKey {
[self.observable populateWithCount:10];
self.snap.key = @"6";

// Test delegate
__block BOOL delegateWasCalled = NO;
__block BOOL expectedParametersWereCorrect = NO;
self.arrayDelegate.didMoveObject = ^(FirebaseArray *array, id object, NSUInteger from, NSUInteger to) {
// Xcode complains about retain cycles if an XCTAssert is placed in here.
delegateWasCalled = YES;
expectedParametersWereCorrect = (array == self.firebaseArray &&
object == self.snap &&
from == 6 && to == 0);
};

// Move 8 to the start
[self.observable sendEvent:FIRDataEventTypeChildMoved withObject:self.snap previousKey:nil error:nil];

// Array expectation
NSArray *items = self.firebaseArray.items;
NSArray *expected = @[@"6", @"0", @"1", @"2", @"3", @"4", @"5", @"7", @"8", @"9"];
NSMutableArray *result = [NSMutableArray array];
for (FUIFakeSnapshot *snapshot in items) {
[result addObject:snapshot.key];
}
XCTAssert([result isEqual:expected], @"expected firebaseArray contents to equal %@, got %@", expected, [result copy]);

// Delegate expectations
XCTAssert(delegateWasCalled, @"expected delegate to receive callback for deletion");
XCTAssert(expectedParametersWereCorrect, @"unexpected parameter in delegate callback");
}

@end