[Fix] - unite test all passing

OpenSmock · Jun 28, 2023 · dc36ca5 · dc36ca5
1 parent d208a09
commit dc36ca5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 22 deletions.
diff --git a/src/Pyramid-Bloc/PyramidBlocCommand.class.st b/src/Pyramid-Bloc/PyramidBlocCommand.class.st
@@ -24,7 +24,7 @@ PyramidBlocCommand class >> addElementOnCollection [
 		  set: [ :state :target | target addAll: state arguments ]
 		  get: [ :state :source |
 			  state source: source.
-			  state arguments: source elements asArray ]
+			  state arguments: source collection asArray ]
 		  isExecutableBlock: [ :obj :state| obj isCollection ]
 ]
 
@@ -152,7 +152,7 @@ PyramidBlocCommand class >> removeElementOnCollection [
 		  set: [ :state :target | target removeAll: state arguments ]
 		  get: [ :state :source |
 			  state source: source.
-			  state arguments: source elements asArray ]
+			  state arguments: source collection asArray ]
 		  isExecutableBlock: [ :obj :state| obj isCollection ]
 ]
 

diff --git a/src/Pyramid-Tests/PyramidBlocCommandTest.class.st b/src/Pyramid-Tests/PyramidBlocCommandTest.class.st
@@ -55,7 +55,7 @@ PyramidBlocCommandTest >> testAddElementOnCollection [
 	| e1 e2 e3 b1 b2 b3 state |
 	state := PyramidCommandState new.
 
-	e1 := PyramidObservableElementCollection new.
+	e1 := PyramidCollectionWithCallbacks new.
 	e2 := BlElement new.
 	e3 := BlElement new.
 	e1 addAll: {
@@ -70,7 +70,7 @@ PyramidBlocCommandTest >> testAddElementOnCollection [
 
 
 
-	b1 := PyramidObservableElementCollection new.
+	b1 := PyramidCollectionWithCallbacks new.
 	b2 := BlElement new.
 	b3 := BlElement new.
 
@@ -79,9 +79,9 @@ PyramidBlocCommandTest >> testAddElementOnCollection [
 					 b2.
 					 b3 })
 		on: b1.
-	self assert: b1 elements size equals: 2.
-	b1 elements indexOf: b2 ifAbsent: [ self fail ].
-	b1 elements indexOf: b3 ifAbsent: [ self fail ]
+	self assert: b1 collection size equals: 2.
+	b1 collection indexOf: b2 ifAbsent: [ self fail ].
+	b1 collection indexOf: b3 ifAbsent: [ self fail ]
 ]
 
 { #category : #tests }
@@ -202,7 +202,7 @@ PyramidBlocCommandTest >> testRemoveElementOnCollection [
 	| e1 e2 e3 b1 b2 b3 state |
 	state := PyramidCommandState new.
 
-	e1 := PyramidObservableElementCollection new.
+	e1 := PyramidCollectionWithCallbacks new.
 	e2 := BlElement new.
 	e3 := BlElement new.
 	e1 addAll: {
@@ -215,7 +215,7 @@ PyramidBlocCommandTest >> testRemoveElementOnCollection [
 	self assert: state arguments first equals: e2.
 	self assert: state arguments last equals: e3.
 
-	b1 := PyramidObservableElementCollection new.
+	b1 := PyramidCollectionWithCallbacks new.
 	b2 := BlElement new.
 	b3 := BlElement new.
 	b1 addAll: {
@@ -225,9 +225,9 @@ PyramidBlocCommandTest >> testRemoveElementOnCollection [
 	PyramidBlocCommand removeElementOnCollection
 		setState: (PyramidCommandState new arguments: { b2 })
 		on: b1.
-	self assert: b1 elements size equals: 1.
-	self assert: (b1 elements indexOf: b2) equals: 0.
-	b1 elements indexOf: b3 ifAbsent: [ self fail ]
+	self assert: b1 collection size equals: 1.
+	self assert: (b1 collection indexOf: b2) equals: 0.
+	b1 collection indexOf: b3 ifAbsent: [ self fail ]
 ]
 
 { #category : #tests }

diff --git a/src/Pyramid-Tests/PyramidProjectModelTest.class.st b/src/Pyramid-Tests/PyramidProjectModelTest.class.st
diff --git a/src/Pyramid-Tests/PyramidPropertiesTestDummy.class.st b/src/Pyramid-Tests/PyramidPropertiesTestDummy.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #PyramidPropertiesTestDummy,
-	#superclass : #Object,
+	#superclass : #BlElement,
 	#instVars : [
 		'isToto',
 		'string'

diff --git a/src/Pyramid-Tests/PyramidPropertiesViewTest.class.st b/src/Pyramid-Tests/PyramidPropertiesViewTest.class.st
@@ -81,7 +81,7 @@ PyramidPropertiesViewTest >> testUpdatePropertyViews [
 	Verify <A> <B> targetModel is not empty, <C> targetModel is empty."
 
 	| propertyA propertyB propertyC view activeProject |
-	activeProject := PyramidActiveProjectModel new.
+	activeProject := PyramidProjectModel new.
 
 	propertyA := PyramidProperty new
 		             command: self alwaysTrueCommand;

diff --git a/src/Pyramid-Tests/PyramidPropertyInputModelBuilderTest.class.st b/src/Pyramid-Tests/PyramidPropertyInputModelBuilderTest.class.st
@@ -61,7 +61,7 @@ PyramidPropertyInputModelBuilderTest >> testEmptyModel [
 
 	self assert: property inputsModel elementInputsModel size equals: 0.
 	self assert: property inputsModel stateInputsModel size equals: 0.
-	self assert: property inputsModel applyToAllInput text equals: '# no values'
+	self deny: property inputsModel shouldDisplay
 ]
 
 { #category : #tests }

diff --git a/src/Pyramid/PyramidProperty.class.st b/src/Pyramid/PyramidProperty.class.st
@@ -29,8 +29,8 @@ PyramidProperty class >> fromCommand: aPyramidCommand inputBuilder: aPyramidProp
 { #category : #sorting }
 PyramidProperty class >> sortBlElements: a and: b [
 
-	a parent
-	=  b parent ifTrue: [
+	(a parent
+	=  b parent and: [ a parent isNotNil ]) ifTrue: [
 		^ (a parent childIndexOf: a)
 		  <= (a parent childIndexOf:
 				   b) ].