Fix pharo-vcs#965

- added case for empty detect
guillep · Aug 10, 2018 · 3432004 · 3432004
1 parent ec3f43c
commit 3432004
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/Iceberg-Tests.package/IceTreeTests.class/instance/testDetectFoundElement.st b/Iceberg-Tests.package/IceTreeTests.class/instance/testDetectFoundElement.st
@@ -0,0 +1,7 @@
+tests
+testDetectFoundElement
+
+	| selected |
+	selected := (IceNode value: 2) detect: [ :e | e value even ].
+
+	self assert: selected equals: 2
diff --git a/Iceberg-Tests.package/IceTreeTests.class/instance/testDetectNotFoundElement.st b/Iceberg-Tests.package/IceTreeTests.class/instance/testDetectNotFoundElement.st
@@ -0,0 +1,3 @@
+tests
+testDetectNotFoundElement
+	self should: [ (IceNode value: 1) detect: [ :e | e value even ] ] raise: NotFound
diff --git a/Iceberg.package/IceNode.class/instance/firstNodeSuchThat.ifNone..st b/Iceberg.package/IceNode.class/instance/firstNodeSuchThat.ifNone..st
@@ -9,6 +9,9 @@ firstNodeSuchThat: conditionBlock ifNone: noneBlock
 		ifFound: [ :found | ^ found ].
 
 	^ self parent
-		nextChildNodeStartingFrom: self
-		suchThat: conditionBlock
-		ifNone: noneBlock
+		ifNil: noneBlock
+		ifNotNil: [
+			self parent
+				nextChildNodeStartingFrom: self
+				suchThat: conditionBlock
+				ifNone: noneBlock ]