Skip to content

Commit 5399848

Browse files
LANDAISBLANDAISB
authored
Merge pull request #30 from OpenSmock/fix-bloc-update
Change size to extent due to a bloc update
2 parents 5c04ac2 + 3914a11 commit 5399848

3 files changed

Lines changed: 79 additions & 42 deletions

File tree

‎src/Bloc-Serialization-Tests/BlocSerializationChildrenTests.class.st‎

Lines changed: 71 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ BlocSerializationChildrenTests >> testChildren [
1313
e2 := BlElement new.
1414
e3 := BlElement new.
1515

16-
origin addChildren: {
16+
origin addChildren: {
1717
e1.
1818
e2.
1919
e3 }.
2020

21-
self test: origin on: [ :element |
21+
self test: origin on: [ :element |
2222
self assert: element parent equals: nil.
2323
self assert: element children size equals: 3.
24-
self assert: (element childAt: 1) owner equals: element.
24+
self assert: (element childAt: 1) parent equals: element.
2525
self assert: (element childAt: 1) isFirstChild equals: true.
2626
self assert: (element childAt: 1) isLastChild equals: false.
27-
self assert: (element childAt: 2) owner equals: element.
27+
self assert: (element childAt: 2) parent equals: element.
2828
self assert: (element childAt: 2) isFirstChild equals: false.
2929
self assert: (element childAt: 2) isLastChild equals: false.
3030
self assert: (element childAt: 3) owner equals: element.
@@ -36,17 +36,29 @@ BlocSerializationChildrenTests >> testChildren [
3636
BlocSerializationChildrenTests >> testChildren1 [
3737

3838
| origin e1 e2 e3 |
39-
origin := BlElement new size: 300 @ 500; background: Color red; yourself.
40-
e1 := BlElement new size: 200 @ 100; background: Color blue; yourself.
41-
e2 := BlElement new size: 50 @ 10; background: Color green; yourself.
42-
e3 := BlElement new size: 80 @ 600; background: Color yellow; yourself.
39+
origin := BlElement new
40+
extent: 300 @ 500;
41+
background: Color red;
42+
yourself.
43+
e1 := BlElement new
44+
extent: 200 @ 100;
45+
background: Color blue;
46+
yourself.
47+
e2 := BlElement new
48+
size: 50 @ 10;
49+
background: Color green;
50+
yourself.
51+
e3 := BlElement new
52+
size: 80 @ 600;
53+
background: Color yellow;
54+
yourself.
4355

44-
origin addChildren: {
56+
origin addChildren: {
4557
e1.
4658
e2.
4759
e3 }.
4860

49-
self test: origin on: [ :element |
61+
self test: origin on: [ :element |
5062
self assert: element parent equals: nil.
5163
self assert: element children size equals: 3.
5264
self assert: (element childAt: 1) owner equals: element.
@@ -65,11 +77,11 @@ BlocSerializationChildrenTests >> testChildren2 [
6577

6678
| origin e1 e2 e3 |
6779
origin := BlElement new
68-
size: 300 @ 500;
80+
extent: 300 @ 500;
6981
background: Color red;
7082
yourself.
7183
e1 := BlElement new
72-
size: 200 @ 100;
84+
extent: 200 @ 100;
7385
background: Color blue;
7486
yourself.
7587
e2 := BlElement new
@@ -81,32 +93,44 @@ BlocSerializationChildrenTests >> testChildren2 [
8193
background: Color yellow;
8294
yourself.
8395

84-
origin addChildren: {
96+
origin addChildren: {
8597
e1.
8698
e2.
8799
e3 }.
88100

89101
self test: origin on: [ :element |
90102
self assert: element constraints horizontal resizer size equals: 300.
91103
self assert: element constraints vertical resizer size equals: 500.
92-
self assert: (element childAt: 1) constraints horizontal resizer size equals: 200.
93-
self assert: (element childAt: 2) constraints horizontal resizer size equals: 50.
94-
self assert: (element childAt: 3) constraints horizontal resizer size equals: 80.
95-
self assert: (element childAt: 1) constraints vertical resizer size equals: 100.
96-
self assert: (element childAt: 2) constraints vertical resizer size equals: 10.
97-
self assert: (element childAt: 3) constraints vertical resizer size equals: 600. ]
104+
self
105+
assert: (element childAt: 1) constraints horizontal resizer size
106+
equals: 200.
107+
self
108+
assert: (element childAt: 2) constraints horizontal resizer size
109+
equals: 50.
110+
self
111+
assert: (element childAt: 3) constraints horizontal resizer size
112+
equals: 80.
113+
self
114+
assert: (element childAt: 1) constraints vertical resizer size
115+
equals: 100.
116+
self
117+
assert: (element childAt: 2) constraints vertical resizer size
118+
equals: 10.
119+
self
120+
assert: (element childAt: 3) constraints vertical resizer size
121+
equals: 600 ]
98122
]
99123

100124
{ #category : #tests }
101125
BlocSerializationChildrenTests >> testChildren3 [
102126

103127
| origin e1 e2 e3 |
104128
origin := BlElement new
105-
size: 300 @ 500;
129+
extent: 300 @ 500;
106130
background: Color red;
107131
yourself.
108132
e1 := BlElement new
109-
size: 200 @ 100;
133+
extent: 200 @ 100;
110134
background: Color blue;
111135
yourself.
112136
e2 := BlElement new
@@ -118,16 +142,22 @@ BlocSerializationChildrenTests >> testChildren3 [
118142
background: Color yellow;
119143
yourself.
120144

121-
origin addChildren: {
145+
origin addChildren: {
122146
e1.
123147
e2.
124148
e3 }.
125149

126-
self test: origin on: [ :element |
150+
self test: origin on: [ :element |
127151
self assert: element background paint color equals: Color red.
128-
self assert: (element childAt: 1) background paint color equals: Color blue.
129-
self assert: (element childAt: 2) background paint color equals: Color green.
130-
self assert: (element childAt: 3) background paint color equals: Color yellow ]
152+
self
153+
assert: (element childAt: 1) background paint color
154+
equals: Color blue.
155+
self
156+
assert: (element childAt: 2) background paint color
157+
equals: Color green.
158+
self
159+
assert: (element childAt: 3) background paint color
160+
equals: Color yellow ]
131161
]
132162

133163
{ #category : #tests }
@@ -139,18 +169,18 @@ BlocSerializationChildrenTests >> testChildrenBasic1 [
139169
e2 := BlElement new.
140170
e3 := BlElement new.
141171

142-
origin addChildren: {
172+
origin addChildren: {
143173
e1.
144174
e2.
145175
e3 }.
146176

147-
self test: origin on: [ :element |
177+
self test: origin on: [ :element |
148178
self assert: element parent equals: nil.
149179
self assert: element children size equals: 3.
150-
self assert: (element childAt: 1) owner equals: element.
180+
self assert: (element childAt: 1) parent equals: element.
151181
self assert: (element childAt: 1) isFirstChild equals: true.
152182
self assert: (element childAt: 1) isLastChild equals: false.
153-
self assert: (element childAt: 2) owner equals: element.
183+
self assert: (element childAt: 2) parent equals: element.
154184
self assert: (element childAt: 2) isFirstChild equals: false.
155185
self assert: (element childAt: 2) isLastChild equals: false.
156186
self assert: (element childAt: 3) owner equals: element.
@@ -171,19 +201,24 @@ BlocSerializationChildrenTests >> testChildrenBasic2 [
171201
e1 addChild: e2.
172202
e2 addChild: e3.
173203

174-
self test: origin on: [ :element |
204+
self test: origin on: [ :element |
175205
self assert: element parent equals: nil.
176206
self assert: element children size equals: 1.
177207

178-
self assert: (element childAt: 1) owner equals: element.
208+
self assert: (element childAt: 1) parent equals: element.
179209
self assert: (element childAt: 1) children size equals: 1.
180210

181-
self assert: ((element childAt: 1) childAt: 1) children size equals: 1.
182211
self
183-
assert: ((element childAt: 1) childAt: 1) owner
212+
assert: ((element childAt: 1) childAt: 1) children size
213+
equals: 1.
214+
self
215+
assert: ((element childAt: 1) childAt: 1) parent
184216
equals: (element childAt: 1).
185-
186-
self assert: (((element childAt: 1) childAt: 1) childAt: 1) children size equals: 0.
217+
218+
self
219+
assert:
220+
(((element childAt: 1) childAt: 1) childAt: 1) children size
221+
equals: 0.
187222
self
188223
assert: (((element childAt: 1) childAt: 1) childAt: 1) owner
189224
equals: ((element childAt: 1) childAt: 1) ]

‎src/Bloc-Serialization-Tests/BlocSerializationConstraintsTests.class.st‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,10 @@ BlocSerializationConstraintsTests >> testPosition2 [
179179
BlocSerializationConstraintsTests >> testSize [
180180

181181
| origin |
182-
origin := BlElement new size: 10 @ 20; yourself.
183-
self test: origin on: [ :element |
182+
origin := BlElement new
183+
extent: 10 @ 20;
184+
yourself.
185+
self test: origin on: [ :element |
184186
self assert: element constraints horizontal resizer size equals: 10.
185187
self assert: element constraints vertical resizer size equals: 20 ]
186188
]

‎src/Bloc-Serialization-Tests/BlocSerializationLayoutTests.class.st‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ BlocSerializationLayoutTests >> testBlFrameLayoutChildrenTest1 [
2020

2121
| origin |
2222
origin := BlFrameLayoutChildrenTest new
23-
testChildElementWithExactSize100per50.
23+
testChildElementWithExactExtent100per50.
2424
self
2525
test: origin
2626
on: [ :element |
@@ -34,7 +34,7 @@ BlocSerializationLayoutTests >> testBlFrameLayoutChildrenTest2 [
3434

3535
| origin |
3636
origin := BlFrameLayoutChildrenTest new
37-
testParentWithFrameLayoutAndFixedSize.
37+
testParentWithFrameLayoutAndFixedExtent.
3838
self
3939
test: origin
4040
on: [ :element |
@@ -46,7 +46,7 @@ BlocSerializationLayoutTests >> testBlFrameLayoutChildrenTest3 [
4646

4747
| origin |
4848
origin := BlFrameLayoutChildrenTest new
49-
testParentWithFrameLayoutAndFixedSize300per250.
49+
testParentWithFrameLayoutAndFixedExtent300per250.
5050
self
5151
test: origin
5252
on: [ :element |
@@ -64,7 +64,7 @@ BlocSerializationLayoutTests >> testBlFrameLayoutMultipleChildrenTestTest1 [
6464

6565
| origin |
6666
origin := BlFrameLayoutMultipleChildrenTest new
67-
testChildElementWithExactSize140per140.
67+
testChildElementWithExactExtent140per140.
6868
self test: origin on: [ :element |
6969
self assert: element position equals: 0 @ 0.
7070
self assert: element extent equals: 0 @ 0.

0 commit comments

Comments
 (0)