Skip to content

Commit 9d1169d

Browse files
committed
Adds unit tests.
Switches from cursor() to iterator() for toString(), hashCode() and equals().
1 parent 3677581 commit 9d1169d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/main/java/org/javimmutable/collections/btree_list/JImmutableBtreeList.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
import org.javimmutable.collections.SplitableIterator;
4545
import org.javimmutable.collections.common.ListAdaptor;
4646
import org.javimmutable.collections.common.StreamConstants;
47-
import org.javimmutable.collections.cursors.Cursors;
4847
import org.javimmutable.collections.indexed.IndexedList;
48+
import org.javimmutable.collections.iterators.IteratorHelper;
4949
import org.javimmutable.collections.serialization.JImmutableRandomAccessListProxy;
5050

5151
import javax.annotation.Nonnull;
@@ -457,19 +457,19 @@ public void checkInvariants()
457457
@Override
458458
public boolean equals(Object o)
459459
{
460-
return (o == this) || ((o instanceof JImmutableList) && Cursors.areEqual(cursor(), ((JImmutableList)o).cursor()));
460+
return (o == this) || ((o instanceof JImmutableList) && IteratorHelper.iteratorEquals(iterator(), ((JImmutableList)o).iterator()));
461461
}
462462

463463
@Override
464464
public int hashCode()
465465
{
466-
return Cursors.computeHashCode(cursor());
466+
return IteratorHelper.iteratorHashCode(iterator());
467467
}
468468

469469
@Override
470470
public String toString()
471471
{
472-
return Cursors.makeString(cursor());
472+
return IteratorHelper.iteratorToString(iterator());
473473
}
474474

475475
private Object writeReplace()

src/test/java/org/javimmutable/collections/btree_list/JImmutableBtreeListTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ public void test()
9191
list.checkInvariants();
9292
StandardCursorTest.indexedCursorTest(list, list.size(), list.cursor());
9393
StandardCursorTest.indexedIteratorTest(list, list.size(), list.iterator());
94+
assertEquals("[100,200]", list.toString());
95+
assertEquals(3300, list.hashCode());
9496

9597
JImmutableBtreeList<Integer> saved = list;
9698

0 commit comments

Comments
 (0)