Skip to content

Commit 502758b

Browse files
kjkkjk
committed
more renames
1 parent 8610235 commit 502758b

32 files changed

+584
-586
lines changed

‎absolute_position_test.go

+40-40
Large diffs are not rendered by default.

‎align_content_test.go

+38-38
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestAlignContentFlexStart(t *testing.T) {
3737
rootChild4.StyleSetWidth(50)
3838
rootChild4.StyleSetHeight(10)
3939
root.InsertChild(rootChild4, 4)
40-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
40+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
4141

4242
assertFloatEqual(t, 0, root.LayoutGetLeft())
4343
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -69,7 +69,7 @@ func TestAlignContentFlexStart(t *testing.T) {
6969
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
7070
assertFloatEqual(t, 10, rootChild4.LayoutGetHeight())
7171

72-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
72+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
7373

7474
assertFloatEqual(t, 0, root.LayoutGetLeft())
7575
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -132,7 +132,7 @@ func TestAlign_content_flex_start_without_height_on_children(t *testing.T) {
132132
rootChild4 := NewNodeWithConfig(config)
133133
rootChild4.StyleSetWidth(50)
134134
root.InsertChild(rootChild4, 4)
135-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
135+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
136136

137137
assertFloatEqual(t, 0, root.LayoutGetLeft())
138138
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -164,7 +164,7 @@ func TestAlign_content_flex_start_without_height_on_children(t *testing.T) {
164164
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
165165
assertFloatEqual(t, 0, rootChild4.LayoutGetHeight())
166166

167-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
167+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
168168

169169
assertFloatEqual(t, 0, root.LayoutGetLeft())
170170
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -232,7 +232,7 @@ func TestAlign_content_flex_start_with_flex(t *testing.T) {
232232
rootChild4 := NewNodeWithConfig(config)
233233
rootChild4.StyleSetWidth(50)
234234
root.InsertChild(rootChild4, 4)
235-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
235+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
236236

237237
assertFloatEqual(t, 0, root.LayoutGetLeft())
238238
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -264,7 +264,7 @@ func TestAlign_content_flex_start_with_flex(t *testing.T) {
264264
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
265265
assertFloatEqual(t, 0, rootChild4.LayoutGetHeight())
266266

267-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
267+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
268268

269269
assertFloatEqual(t, 0, root.LayoutGetLeft())
270270
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -330,7 +330,7 @@ func TestAlign_content_flex_end(t *testing.T) {
330330
rootChild4.StyleSetWidth(50)
331331
rootChild4.StyleSetHeight(10)
332332
root.InsertChild(rootChild4, 4)
333-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
333+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
334334

335335
assertFloatEqual(t, 0, root.LayoutGetLeft())
336336
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -362,7 +362,7 @@ func TestAlign_content_flex_end(t *testing.T) {
362362
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
363363
assertFloatEqual(t, 10, rootChild4.LayoutGetHeight())
364364

365-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
365+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
366366

367367
assertFloatEqual(t, 0, root.LayoutGetLeft())
368368
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -423,7 +423,7 @@ func TestAlign_content_stretch(t *testing.T) {
423423
rootChild4 := NewNodeWithConfig(config)
424424
rootChild4.StyleSetWidth(50)
425425
root.InsertChild(rootChild4, 4)
426-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
426+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
427427

428428
assertFloatEqual(t, 0, root.LayoutGetLeft())
429429
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -455,7 +455,7 @@ func TestAlign_content_stretch(t *testing.T) {
455455
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
456456
assertFloatEqual(t, 0, rootChild4.LayoutGetHeight())
457457

458-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
458+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
459459

460460
assertFloatEqual(t, 0, root.LayoutGetLeft())
461461
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -522,7 +522,7 @@ func TestAlign_content_spacebetween(t *testing.T) {
522522
rootChild4.StyleSetWidth(50)
523523
rootChild4.StyleSetHeight(10)
524524
root.InsertChild(rootChild4, 4)
525-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
525+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
526526

527527
assertFloatEqual(t, 0, root.LayoutGetLeft())
528528
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -554,7 +554,7 @@ func TestAlign_content_spacebetween(t *testing.T) {
554554
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
555555
assertFloatEqual(t, 10, rootChild4.LayoutGetHeight())
556556

557-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
557+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
558558

559559
assertFloatEqual(t, 0, root.LayoutGetLeft())
560560
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -623,7 +623,7 @@ func TestAlign_content_spacearound(t *testing.T) {
623623
rootChild4.StyleSetWidth(50)
624624
rootChild4.StyleSetHeight(10)
625625
root.InsertChild(rootChild4, 4)
626-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
626+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
627627

628628
assertFloatEqual(t, 0, root.LayoutGetLeft())
629629
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -655,7 +655,7 @@ func TestAlign_content_spacearound(t *testing.T) {
655655
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
656656
assertFloatEqual(t, 10, rootChild4.LayoutGetHeight())
657657

658-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
658+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
659659

660660
assertFloatEqual(t, 0, root.LayoutGetLeft())
661661
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -717,7 +717,7 @@ func TestAlign_content_stretch_row(t *testing.T) {
717717
rootChild4 := NewNodeWithConfig(config)
718718
rootChild4.StyleSetWidth(50)
719719
root.InsertChild(rootChild4, 4)
720-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
720+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
721721

722722
assertFloatEqual(t, 0, root.LayoutGetLeft())
723723
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -749,7 +749,7 @@ func TestAlign_content_stretch_row(t *testing.T) {
749749
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
750750
assertFloatEqual(t, 50, rootChild4.LayoutGetHeight())
751751

752-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
752+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
753753

754754
assertFloatEqual(t, 0, root.LayoutGetLeft())
755755
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -817,7 +817,7 @@ func TestAlign_content_stretch_row_with_children(t *testing.T) {
817817
rootChild4 := NewNodeWithConfig(config)
818818
rootChild4.StyleSetWidth(50)
819819
root.InsertChild(rootChild4, 4)
820-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
820+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
821821

822822
assertFloatEqual(t, 0, root.LayoutGetLeft())
823823
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -854,7 +854,7 @@ func TestAlign_content_stretch_row_with_children(t *testing.T) {
854854
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
855855
assertFloatEqual(t, 50, rootChild4.LayoutGetHeight())
856856

857-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
857+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
858858

859859
assertFloatEqual(t, 0, root.LayoutGetLeft())
860860
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -927,7 +927,7 @@ func TestAlign_content_stretch_row_with_flex(t *testing.T) {
927927
rootChild4 := NewNodeWithConfig(config)
928928
rootChild4.StyleSetWidth(50)
929929
root.InsertChild(rootChild4, 4)
930-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
930+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
931931

932932
assertFloatEqual(t, 0, root.LayoutGetLeft())
933933
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -959,7 +959,7 @@ func TestAlign_content_stretch_row_with_flex(t *testing.T) {
959959
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
960960
assertFloatEqual(t, 100, rootChild4.LayoutGetHeight())
961961

962-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
962+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
963963

964964
assertFloatEqual(t, 0, root.LayoutGetLeft())
965965
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1026,7 +1026,7 @@ func TestAlign_content_stretch_row_with_flex_no_shrink(t *testing.T) {
10261026
rootChild4 := NewNodeWithConfig(config)
10271027
rootChild4.StyleSetWidth(50)
10281028
root.InsertChild(rootChild4, 4)
1029-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
1029+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
10301030

10311031
assertFloatEqual(t, 0, root.LayoutGetLeft())
10321032
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1058,7 +1058,7 @@ func TestAlign_content_stretch_row_with_flex_no_shrink(t *testing.T) {
10581058
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
10591059
assertFloatEqual(t, 100, rootChild4.LayoutGetHeight())
10601060

1061-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
1061+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
10621062

10631063
assertFloatEqual(t, 0, root.LayoutGetLeft())
10641064
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1128,7 +1128,7 @@ func TestAlign_content_stretch_row_with_margin(t *testing.T) {
11281128
rootChild4 := NewNodeWithConfig(config)
11291129
rootChild4.StyleSetWidth(50)
11301130
root.InsertChild(rootChild4, 4)
1131-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
1131+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
11321132

11331133
assertFloatEqual(t, 0, root.LayoutGetLeft())
11341134
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1160,7 +1160,7 @@ func TestAlign_content_stretch_row_with_margin(t *testing.T) {
11601160
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
11611161
assertFloatEqual(t, 20, rootChild4.LayoutGetHeight())
11621162

1163-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
1163+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
11641164

11651165
assertFloatEqual(t, 0, root.LayoutGetLeft())
11661166
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1230,7 +1230,7 @@ func TestAlign_content_stretch_row_with_padding(t *testing.T) {
12301230
rootChild4 := NewNodeWithConfig(config)
12311231
rootChild4.StyleSetWidth(50)
12321232
root.InsertChild(rootChild4, 4)
1233-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
1233+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
12341234

12351235
assertFloatEqual(t, 0, root.LayoutGetLeft())
12361236
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1262,7 +1262,7 @@ func TestAlign_content_stretch_row_with_padding(t *testing.T) {
12621262
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
12631263
assertFloatEqual(t, 50, rootChild4.LayoutGetHeight())
12641264

1265-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
1265+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
12661266

12671267
assertFloatEqual(t, 0, root.LayoutGetLeft())
12681268
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1312,7 +1312,7 @@ func TestAlign_content_stretch_row_with_single_row(t *testing.T) {
13121312
rootChild1 := NewNodeWithConfig(config)
13131313
rootChild1.StyleSetWidth(50)
13141314
root.InsertChild(rootChild1, 1)
1315-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
1315+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
13161316

13171317
assertFloatEqual(t, 0, root.LayoutGetLeft())
13181318
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1329,7 +1329,7 @@ func TestAlign_content_stretch_row_with_single_row(t *testing.T) {
13291329
assertFloatEqual(t, 50, rootChild1.LayoutGetWidth())
13301330
assertFloatEqual(t, 100, rootChild1.LayoutGetHeight())
13311331

1332-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
1332+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
13331333

13341334
assertFloatEqual(t, 0, root.LayoutGetLeft())
13351335
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1377,7 +1377,7 @@ func TestAlign_content_stretch_row_with_fixed_height(t *testing.T) {
13771377
rootChild4 := NewNodeWithConfig(config)
13781378
rootChild4.StyleSetWidth(50)
13791379
root.InsertChild(rootChild4, 4)
1380-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
1380+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
13811381

13821382
assertFloatEqual(t, 0, root.LayoutGetLeft())
13831383
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1409,7 +1409,7 @@ func TestAlign_content_stretch_row_with_fixed_height(t *testing.T) {
14091409
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
14101410
assertFloatEqual(t, 20, rootChild4.LayoutGetHeight())
14111411

1412-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
1412+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
14131413

14141414
assertFloatEqual(t, 0, root.LayoutGetLeft())
14151415
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1472,7 +1472,7 @@ func TestAlign_content_stretch_row_with_max_height(t *testing.T) {
14721472
rootChild4 := NewNodeWithConfig(config)
14731473
rootChild4.StyleSetWidth(50)
14741474
root.InsertChild(rootChild4, 4)
1475-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
1475+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
14761476

14771477
assertFloatEqual(t, 0, root.LayoutGetLeft())
14781478
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1504,7 +1504,7 @@ func TestAlign_content_stretch_row_with_max_height(t *testing.T) {
15041504
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
15051505
assertFloatEqual(t, 50, rootChild4.LayoutGetHeight())
15061506

1507-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
1507+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
15081508

15091509
assertFloatEqual(t, 0, root.LayoutGetLeft())
15101510
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1567,7 +1567,7 @@ func TestAlign_content_stretch_row_with_min_height(t *testing.T) {
15671567
rootChild4 := NewNodeWithConfig(config)
15681568
rootChild4.StyleSetWidth(50)
15691569
root.InsertChild(rootChild4, 4)
1570-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
1570+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
15711571

15721572
assertFloatEqual(t, 0, root.LayoutGetLeft())
15731573
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1599,7 +1599,7 @@ func TestAlign_content_stretch_row_with_min_height(t *testing.T) {
15991599
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
16001600
assertFloatEqual(t, 10, rootChild4.LayoutGetHeight())
16011601

1602-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
1602+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
16031603

16041604
assertFloatEqual(t, 0, root.LayoutGetLeft())
16051605
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1669,7 +1669,7 @@ func TestAlign_content_stretch_column(t *testing.T) {
16691669
rootChild4 := NewNodeWithConfig(config)
16701670
rootChild4.StyleSetHeight(50)
16711671
root.InsertChild(rootChild4, 4)
1672-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
1672+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
16731673

16741674
assertFloatEqual(t, 0, root.LayoutGetLeft())
16751675
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1706,7 +1706,7 @@ func TestAlign_content_stretch_column(t *testing.T) {
17061706
assertFloatEqual(t, 50, rootChild4.LayoutGetWidth())
17071707
assertFloatEqual(t, 50, rootChild4.LayoutGetHeight())
17081708

1709-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
1709+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
17101710

17111711
assertFloatEqual(t, 0, root.LayoutGetLeft())
17121712
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1763,7 +1763,7 @@ func TestAlign_content_stretch_is_not_overriding_align_items(t *testing.T) {
17631763
rootChild0Child0.StyleSetWidth(10)
17641764
rootChild0Child0.StyleSetHeight(10)
17651765
rootChild0.InsertChild(rootChild0Child0, 0)
1766-
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
1766+
CalculateLayout(root, Undefined, Undefined, DirectionLTR)
17671767

17681768
assertFloatEqual(t, 0, root.LayoutGetLeft())
17691769
assertFloatEqual(t, 0, root.LayoutGetTop())
@@ -1780,7 +1780,7 @@ func TestAlign_content_stretch_is_not_overriding_align_items(t *testing.T) {
17801780
assertFloatEqual(t, 10, rootChild0Child0.LayoutGetWidth())
17811781
assertFloatEqual(t, 10, rootChild0Child0.LayoutGetHeight())
17821782

1783-
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
1783+
CalculateLayout(root, Undefined, Undefined, DirectionRTL)
17841784

17851785
assertFloatEqual(t, 0, root.LayoutGetLeft())
17861786
assertFloatEqual(t, 0, root.LayoutGetTop())

0 commit comments

Comments
 (0)