Fix the two test

Author: SullyMLT

src/Pyramid-Bloc/PyramidElementsManipulationHelper.class.st

@@ -28,10 +28,10 @@ PyramidElementsManipulationHelper class >> accumulateParentsOf: aCollectionOfBlE
 	nextCollection := OrderedCollection new.
 
 	onCollection do: [ :each |
-		(each hasParent: elementToTest) ifFalse: [
+		(each allParentsInclude: elementToTest) ifFalse: [
 			nextCollection add: each ].
-		(shouldKeepIt and: [ elementToTest hasParent: each ]) ifTrue: [
-			shouldKeepIt := false ] ].
+		(shouldKeepIt and: [ elementToTest allParentsInclude: each ])
+			ifTrue: [ shouldKeepIt := false ] ].
 	shouldKeepIt ifTrue: [ result add: elementToTest ].
 	self accumulateParentsOf: nextCollection in: result
 ]

src/Pyramid-Tests/PyramidLayoutBlocCommandTest.class.st

@@ -14,26 +14,78 @@ PyramidLayoutBlocCommandTest >> command [
 
 { #category : #'as yet unclassified' }
 PyramidLayoutBlocCommandTest >> targetContainers [
-
+	| flowLayoutVertical basicLayout proportionalLayout  |
+	
+	flowLayoutVertical := BlFlowLayout vertical.
+	basicLayout := BlBasicLayout new.
+	proportionalLayout := BlProportionalLayout new.
+	
 	^ {
 		  (PyramidCommandTestContainer
 			   no: BlElement new
 			   with: (BlElement new
-					    layout: BlFlowLayout vertical;
+					    layout: flowLayoutVertical;
 					    yourself)
-			   prop: BlFlowLayout vertical).
+			   prop: flowLayoutVertical).
 		  (PyramidCommandTestContainer
 			   no: (BlElement new
-					    layout: BlFlowLayout vertical;
+					    layout: flowLayoutVertical;
 					    yourself)
 			   with: (BlElement new
-					    layout: BlBasicLayout new;
+					    layout: basicLayout;
 					    yourself)
-			   prop: BlBasicLayout new).
+			   prop: basicLayout).
 		  (PyramidCommandTestContainer
 			   no: BlElement new
 			   with: (BlElement new
-					    layout: BlProportionalLayout new;
+					    layout: proportionalLayout;
 					    yourself)
-			   prop: BlProportionalLayout new) }
+			   prop: proportionalLayout) }
+]
+
+{ #category : #tests }
+PyramidLayoutBlocCommandTest >> testHistory [
+	"Do once.
+	undo
+	redo
+	undo
+	redo"
+
+	| history commandExecutor targets |
+	targets := self targetsCanBeUsedFor.
+	history := PyramidHistory new.
+	commandExecutor := PyramidHistoryCommandExecutor new
+		                   history: history;
+		                   wrappee: PyramidMainCommandExecutor new;
+		                   yourself.
+
+	"Do once"
+	self argumentsForHistory do: [ :each |
+		commandExecutor use: self command on: targets with: each ].
+
+	"Undo all"
+	self argumentsForHistory reverseDo: [ :argument |
+		targets do: [ :target |
+			self
+				assert: (self command getValueFor: target) class
+				equals: argument class ].
+		history canUndo ifTrue: [ history undo ] ].
+
+	"Redo all"
+	self argumentsForHistory do: [ :argument |
+		history canRedo ifTrue: [ history redo ].
+		targets do: [ :target |
+			self assert: (self command getValueFor: target) class equals: argument class] ].
+
+	"Undo all"
+	self argumentsForHistory reverseDo: [ :argument |
+		targets do: [ :target |
+			self assert: (self command getValueFor: target) class equals: argument class].
+		history canUndo ifTrue: [ history undo ] ].
+
+	"Redo all"
+	self argumentsForHistory do: [ :argument |
+		history canRedo ifTrue: [ history redo ].
+		targets do: [ :target |
+			self assert: (self command getValueFor: target) class equals: argument class ] ]
 ]