Merge pull request #816 from ApptiveGrid/More-tests-Iterator

Test and fix for iterator: empty #reverseDo:

src/Soil-Core-Tests/SoilIndexIteratorTest.class.st

@@ -578,6 +578,31 @@ SoilIndexIteratorTest >> testNextKeyCloseTo [
 	self assert: (iterator nextKeyCloseTo: 100) equals: 20
 ]
 
+{ #category : #tests }
+SoilIndexIteratorTest >> testNextPage [
+
+	| capacity iterator value expected |
+	iterator := index newIterator.
+
+	"empty case"
+	iterator findPageFor: 1.
+	value := iterator nextPage.
+	self assert: value isNil.
+
+	capacity := index headerPage itemCapacity * 2.
+	1 to: capacity do: [ :n |
+		index at: n put: (n asByteArrayOfSize: 8) ].
+
+	expected := index class == SoilBTree ifTrue: [ 4 ] ifFalse: [ 2 ].
+	value := iterator
+		findPageFor: 222.
+	self assert: iterator nextPage index equals: expected.
+
+	value := iterator
+		findPageFor: capacity + 1.
+	self assert: iterator nextPage isNil
+]
+
 { #category : #tests }
 SoilIndexIteratorTest >> testPrevious [
 
@@ -776,8 +801,12 @@ SoilIndexIteratorTest >> testReverseDo [
 
 	| capacity result |
 
+	"empty case"	
+	result := OrderedCollection new.
+	index newIterator reverseDo: [ :each | result add: each ].
+	self assert: result size equals: 0.
+
 	result := OrderedCollection new.
-
 	capacity := index headerPage itemCapacity * 2.
 	1 to: capacity do: [ :n |
 		index at: n put: (n asByteArrayOfSize: 8) ].

src/Soil-Core/SoilIndexIterator.class.st

@@ -444,7 +444,7 @@ SoilIndexIterator >> restoreItem: anItem [
 { #category : #enumerating }
 SoilIndexIterator >> reverseDo: aBlock [ 
 	| item |
-	aBlock value: self lastAssociation value.
+	self lastAssociation ifNotNil: [ :last |  aBlock value: last value ] ifNil: [ ^self ].
 
 	"We use basicNextAssociation to avoid the creation of intermediate associations of nextAssociation"
 	[ (item := self basicPreviousAssociation ) notNil ] whileTrue: [