Skip to content

Commit c36e152

Browse files
creocodercreocoder
committed
Refactored unit tests
1 parent 240c386 commit c36e152

37 files changed

+1412
-1412
lines changed

‎tests/NestedSetsBehaviorTest.php

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

‎tests/NestedSetsQueryBehaviorTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace tests;
99

10-
use tests\models\MultipleRootsTree;
10+
use tests\models\MultipleTree;
1111
use tests\models\Tree;
1212
use Yii;
1313
use yii\db\Connection;
@@ -26,8 +26,8 @@ public function testRoots()
2626
);
2727

2828
$this->assertEquals(
29-
require(__DIR__ . '/data/test-roots-multiple-roots-query.php'),
30-
ArrayHelper::toArray(MultipleRootsTree::find()->roots()->all())
29+
require(__DIR__ . '/data/test-roots-multiple-tree-query.php'),
30+
ArrayHelper::toArray(MultipleTree::find()->roots()->all())
3131
);
3232
}
3333

@@ -39,8 +39,8 @@ public function testLeaves()
3939
);
4040

4141
$this->assertEquals(
42-
require(__DIR__ . '/data/test-leaves-multiple-roots-query.php'),
43-
ArrayHelper::toArray(MultipleRootsTree::find()->leaves()->all())
42+
require(__DIR__ . '/data/test-leaves-multiple-tree-query.php'),
43+
ArrayHelper::toArray(MultipleTree::find()->leaves()->all())
4444
);
4545
}
4646

‎tests/data/clean.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<dataset>
33
<tree/>
4-
<multiple_roots_tree/>
4+
<multiple_tree/>
55
</dataset>

‎tests/data/test-append-to-exists-another-tree.xml

+66-66
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,69 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<dataset>
3-
<multiple_roots_tree id="1" tree="1" lft="1" rgt="30" depth="0" name="Root 1"/>
4-
<multiple_roots_tree id="2" tree="1" lft="2" rgt="15" depth="1" name="Node 1"/>
5-
<multiple_roots_tree id="3" tree="1" lft="3" rgt="8" depth="2" name="Node 1.1"/>
6-
<multiple_roots_tree id="4" tree="1" lft="4" rgt="5" depth="3" name="Node 1.1.1"/>
7-
<multiple_roots_tree id="5" tree="1" lft="6" rgt="7" depth="3" name="Node 1.1.2"/>
8-
<multiple_roots_tree id="6" tree="1" lft="9" rgt="14" depth="2" name="Node 1.2"/>
9-
<multiple_roots_tree id="7" tree="1" lft="10" rgt="11" depth="3" name="Node 1.2.1"/>
10-
<multiple_roots_tree id="8" tree="1" lft="12" rgt="13" depth="3" name="Node 1.2.2"/>
11-
<multiple_roots_tree id="9" tree="45" lft="29" rgt="42" depth="2" name="Updated node 2"/>
12-
<multiple_roots_tree id="10" tree="45" lft="30" rgt="35" depth="3" name="Node 2.1"/>
13-
<multiple_roots_tree id="11" tree="45" lft="31" rgt="32" depth="4" name="Node 2.1.1"/>
14-
<multiple_roots_tree id="12" tree="45" lft="33" rgt="34" depth="4" name="Node 2.1.2"/>
15-
<multiple_roots_tree id="13" tree="45" lft="36" rgt="41" depth="3" name="Node 2.2"/>
16-
<multiple_roots_tree id="14" tree="45" lft="37" rgt="38" depth="4" name="Node 2.2.1"/>
17-
<multiple_roots_tree id="15" tree="45" lft="39" rgt="40" depth="4" name="Node 2.2.2"/>
18-
<multiple_roots_tree id="16" tree="1" lft="16" rgt="29" depth="1" name="Node 3"/>
19-
<multiple_roots_tree id="17" tree="1" lft="17" rgt="22" depth="2" name="Node 3.1"/>
20-
<multiple_roots_tree id="18" tree="1" lft="18" rgt="19" depth="3" name="Node 3.1.1"/>
21-
<multiple_roots_tree id="19" tree="1" lft="20" rgt="21" depth="3" name="Node 3.1.2"/>
22-
<multiple_roots_tree id="20" tree="1" lft="23" rgt="28" depth="2" name="Node 3.2"/>
23-
<multiple_roots_tree id="21" tree="1" lft="24" rgt="25" depth="3" name="Node 3.2.1"/>
24-
<multiple_roots_tree id="22" tree="1" lft="26" rgt="27" depth="3" name="Node 3.2.2"/>
25-
<multiple_roots_tree id="23" tree="23" lft="1" rgt="44" depth="0" name="Root 2"/>
26-
<multiple_roots_tree id="24" tree="23" lft="2" rgt="15" depth="1" name="Node 1"/>
27-
<multiple_roots_tree id="25" tree="23" lft="3" rgt="8" depth="2" name="Node 1.1"/>
28-
<multiple_roots_tree id="26" tree="23" lft="4" rgt="5" depth="3" name="Node 1.1.1"/>
29-
<multiple_roots_tree id="27" tree="23" lft="6" rgt="7" depth="3" name="Node 1.1.2"/>
30-
<multiple_roots_tree id="28" tree="23" lft="9" rgt="14" depth="2" name="Node 1.2"/>
31-
<multiple_roots_tree id="29" tree="23" lft="10" rgt="11" depth="3" name="Node 1.2.1"/>
32-
<multiple_roots_tree id="30" tree="23" lft="12" rgt="13" depth="3" name="Node 1.2.2"/>
33-
<multiple_roots_tree id="31" tree="23" lft="16" rgt="29" depth="1" name="Node 2"/>
34-
<multiple_roots_tree id="32" tree="23" lft="17" rgt="22" depth="2" name="Node 2.1"/>
35-
<multiple_roots_tree id="33" tree="23" lft="18" rgt="19" depth="3" name="Node 2.1.1"/>
36-
<multiple_roots_tree id="34" tree="23" lft="20" rgt="21" depth="3" name="Node 2.1.2"/>
37-
<multiple_roots_tree id="35" tree="23" lft="23" rgt="28" depth="2" name="Node 2.2"/>
38-
<multiple_roots_tree id="36" tree="23" lft="24" rgt="25" depth="3" name="Node 2.2.1"/>
39-
<multiple_roots_tree id="37" tree="23" lft="26" rgt="27" depth="3" name="Node 2.2.2"/>
40-
<multiple_roots_tree id="38" tree="23" lft="30" rgt="43" depth="1" name="Node 3"/>
41-
<multiple_roots_tree id="39" tree="23" lft="31" rgt="36" depth="2" name="Node 3.1"/>
42-
<multiple_roots_tree id="40" tree="23" lft="32" rgt="33" depth="3" name="Node 3.1.1"/>
43-
<multiple_roots_tree id="41" tree="23" lft="34" rgt="35" depth="3" name="Node 3.1.2"/>
44-
<multiple_roots_tree id="42" tree="23" lft="37" rgt="42" depth="2" name="Node 3.2"/>
45-
<multiple_roots_tree id="43" tree="23" lft="38" rgt="39" depth="3" name="Node 3.2.1"/>
46-
<multiple_roots_tree id="44" tree="23" lft="40" rgt="41" depth="3" name="Node 3.2.2"/>
47-
<multiple_roots_tree id="45" tree="45" lft="1" rgt="58" depth="0" name="Root 3"/>
48-
<multiple_roots_tree id="46" tree="45" lft="2" rgt="15" depth="1" name="Node 1"/>
49-
<multiple_roots_tree id="47" tree="45" lft="3" rgt="8" depth="2" name="Node 1.1"/>
50-
<multiple_roots_tree id="48" tree="45" lft="4" rgt="5" depth="3" name="Node 1.1.1"/>
51-
<multiple_roots_tree id="49" tree="45" lft="6" rgt="7" depth="3" name="Node 1.1.2"/>
52-
<multiple_roots_tree id="50" tree="45" lft="9" rgt="14" depth="2" name="Node 1.2"/>
53-
<multiple_roots_tree id="51" tree="45" lft="10" rgt="11" depth="3" name="Node 1.2.1"/>
54-
<multiple_roots_tree id="52" tree="45" lft="12" rgt="13" depth="3" name="Node 1.2.2"/>
55-
<multiple_roots_tree id="53" tree="45" lft="16" rgt="43" depth="1" name="Node 2"/>
56-
<multiple_roots_tree id="54" tree="45" lft="17" rgt="22" depth="2" name="Node 2.1"/>
57-
<multiple_roots_tree id="55" tree="45" lft="18" rgt="19" depth="3" name="Node 2.1.1"/>
58-
<multiple_roots_tree id="56" tree="45" lft="20" rgt="21" depth="3" name="Node 2.1.2"/>
59-
<multiple_roots_tree id="57" tree="45" lft="23" rgt="28" depth="2" name="Node 2.2"/>
60-
<multiple_roots_tree id="58" tree="45" lft="24" rgt="25" depth="3" name="Node 2.2.1"/>
61-
<multiple_roots_tree id="59" tree="45" lft="26" rgt="27" depth="3" name="Node 2.2.2"/>
62-
<multiple_roots_tree id="60" tree="45" lft="44" rgt="57" depth="1" name="Node 3"/>
63-
<multiple_roots_tree id="61" tree="45" lft="45" rgt="50" depth="2" name="Node 3.1"/>
64-
<multiple_roots_tree id="62" tree="45" lft="46" rgt="47" depth="3" name="Node 3.1.1"/>
65-
<multiple_roots_tree id="63" tree="45" lft="48" rgt="49" depth="3" name="Node 3.1.2"/>
66-
<multiple_roots_tree id="64" tree="45" lft="51" rgt="56" depth="2" name="Node 3.2"/>
67-
<multiple_roots_tree id="65" tree="45" lft="52" rgt="53" depth="3" name="Node 3.2.1"/>
68-
<multiple_roots_tree id="66" tree="45" lft="54" rgt="55" depth="3" name="Node 3.2.2"/>
3+
<multiple_tree id="1" tree="1" lft="1" rgt="30" depth="0" name="Root 1"/>
4+
<multiple_tree id="2" tree="1" lft="2" rgt="15" depth="1" name="Node 1"/>
5+
<multiple_tree id="3" tree="1" lft="3" rgt="8" depth="2" name="Node 1.1"/>
6+
<multiple_tree id="4" tree="1" lft="4" rgt="5" depth="3" name="Node 1.1.1"/>
7+
<multiple_tree id="5" tree="1" lft="6" rgt="7" depth="3" name="Node 1.1.2"/>
8+
<multiple_tree id="6" tree="1" lft="9" rgt="14" depth="2" name="Node 1.2"/>
9+
<multiple_tree id="7" tree="1" lft="10" rgt="11" depth="3" name="Node 1.2.1"/>
10+
<multiple_tree id="8" tree="1" lft="12" rgt="13" depth="3" name="Node 1.2.2"/>
11+
<multiple_tree id="9" tree="45" lft="29" rgt="42" depth="2" name="Updated node 2"/>
12+
<multiple_tree id="10" tree="45" lft="30" rgt="35" depth="3" name="Node 2.1"/>
13+
<multiple_tree id="11" tree="45" lft="31" rgt="32" depth="4" name="Node 2.1.1"/>
14+
<multiple_tree id="12" tree="45" lft="33" rgt="34" depth="4" name="Node 2.1.2"/>
15+
<multiple_tree id="13" tree="45" lft="36" rgt="41" depth="3" name="Node 2.2"/>
16+
<multiple_tree id="14" tree="45" lft="37" rgt="38" depth="4" name="Node 2.2.1"/>
17+
<multiple_tree id="15" tree="45" lft="39" rgt="40" depth="4" name="Node 2.2.2"/>
18+
<multiple_tree id="16" tree="1" lft="16" rgt="29" depth="1" name="Node 3"/>
19+
<multiple_tree id="17" tree="1" lft="17" rgt="22" depth="2" name="Node 3.1"/>
20+
<multiple_tree id="18" tree="1" lft="18" rgt="19" depth="3" name="Node 3.1.1"/>
21+
<multiple_tree id="19" tree="1" lft="20" rgt="21" depth="3" name="Node 3.1.2"/>
22+
<multiple_tree id="20" tree="1" lft="23" rgt="28" depth="2" name="Node 3.2"/>
23+
<multiple_tree id="21" tree="1" lft="24" rgt="25" depth="3" name="Node 3.2.1"/>
24+
<multiple_tree id="22" tree="1" lft="26" rgt="27" depth="3" name="Node 3.2.2"/>
25+
<multiple_tree id="23" tree="23" lft="1" rgt="44" depth="0" name="Root 2"/>
26+
<multiple_tree id="24" tree="23" lft="2" rgt="15" depth="1" name="Node 1"/>
27+
<multiple_tree id="25" tree="23" lft="3" rgt="8" depth="2" name="Node 1.1"/>
28+
<multiple_tree id="26" tree="23" lft="4" rgt="5" depth="3" name="Node 1.1.1"/>
29+
<multiple_tree id="27" tree="23" lft="6" rgt="7" depth="3" name="Node 1.1.2"/>
30+
<multiple_tree id="28" tree="23" lft="9" rgt="14" depth="2" name="Node 1.2"/>
31+
<multiple_tree id="29" tree="23" lft="10" rgt="11" depth="3" name="Node 1.2.1"/>
32+
<multiple_tree id="30" tree="23" lft="12" rgt="13" depth="3" name="Node 1.2.2"/>
33+
<multiple_tree id="31" tree="23" lft="16" rgt="29" depth="1" name="Node 2"/>
34+
<multiple_tree id="32" tree="23" lft="17" rgt="22" depth="2" name="Node 2.1"/>
35+
<multiple_tree id="33" tree="23" lft="18" rgt="19" depth="3" name="Node 2.1.1"/>
36+
<multiple_tree id="34" tree="23" lft="20" rgt="21" depth="3" name="Node 2.1.2"/>
37+
<multiple_tree id="35" tree="23" lft="23" rgt="28" depth="2" name="Node 2.2"/>
38+
<multiple_tree id="36" tree="23" lft="24" rgt="25" depth="3" name="Node 2.2.1"/>
39+
<multiple_tree id="37" tree="23" lft="26" rgt="27" depth="3" name="Node 2.2.2"/>
40+
<multiple_tree id="38" tree="23" lft="30" rgt="43" depth="1" name="Node 3"/>
41+
<multiple_tree id="39" tree="23" lft="31" rgt="36" depth="2" name="Node 3.1"/>
42+
<multiple_tree id="40" tree="23" lft="32" rgt="33" depth="3" name="Node 3.1.1"/>
43+
<multiple_tree id="41" tree="23" lft="34" rgt="35" depth="3" name="Node 3.1.2"/>
44+
<multiple_tree id="42" tree="23" lft="37" rgt="42" depth="2" name="Node 3.2"/>
45+
<multiple_tree id="43" tree="23" lft="38" rgt="39" depth="3" name="Node 3.2.1"/>
46+
<multiple_tree id="44" tree="23" lft="40" rgt="41" depth="3" name="Node 3.2.2"/>
47+
<multiple_tree id="45" tree="45" lft="1" rgt="58" depth="0" name="Root 3"/>
48+
<multiple_tree id="46" tree="45" lft="2" rgt="15" depth="1" name="Node 1"/>
49+
<multiple_tree id="47" tree="45" lft="3" rgt="8" depth="2" name="Node 1.1"/>
50+
<multiple_tree id="48" tree="45" lft="4" rgt="5" depth="3" name="Node 1.1.1"/>
51+
<multiple_tree id="49" tree="45" lft="6" rgt="7" depth="3" name="Node 1.1.2"/>
52+
<multiple_tree id="50" tree="45" lft="9" rgt="14" depth="2" name="Node 1.2"/>
53+
<multiple_tree id="51" tree="45" lft="10" rgt="11" depth="3" name="Node 1.2.1"/>
54+
<multiple_tree id="52" tree="45" lft="12" rgt="13" depth="3" name="Node 1.2.2"/>
55+
<multiple_tree id="53" tree="45" lft="16" rgt="43" depth="1" name="Node 2"/>
56+
<multiple_tree id="54" tree="45" lft="17" rgt="22" depth="2" name="Node 2.1"/>
57+
<multiple_tree id="55" tree="45" lft="18" rgt="19" depth="3" name="Node 2.1.1"/>
58+
<multiple_tree id="56" tree="45" lft="20" rgt="21" depth="3" name="Node 2.1.2"/>
59+
<multiple_tree id="57" tree="45" lft="23" rgt="28" depth="2" name="Node 2.2"/>
60+
<multiple_tree id="58" tree="45" lft="24" rgt="25" depth="3" name="Node 2.2.1"/>
61+
<multiple_tree id="59" tree="45" lft="26" rgt="27" depth="3" name="Node 2.2.2"/>
62+
<multiple_tree id="60" tree="45" lft="44" rgt="57" depth="1" name="Node 3"/>
63+
<multiple_tree id="61" tree="45" lft="45" rgt="50" depth="2" name="Node 3.1"/>
64+
<multiple_tree id="62" tree="45" lft="46" rgt="47" depth="3" name="Node 3.1.1"/>
65+
<multiple_tree id="63" tree="45" lft="48" rgt="49" depth="3" name="Node 3.1.2"/>
66+
<multiple_tree id="64" tree="45" lft="51" rgt="56" depth="2" name="Node 3.2"/>
67+
<multiple_tree id="65" tree="45" lft="52" rgt="53" depth="3" name="Node 3.2.1"/>
68+
<multiple_tree id="66" tree="45" lft="54" rgt="55" depth="3" name="Node 3.2.2"/>
6969
</dataset>

0 commit comments

Comments
 (0)