Skip to content

Commit cc1552c

Browse files
lpaulsen93lpaulsen93
committed
Corrected CSS import test code to match current behaviour regarding expoding of the 'border' shorthand.
1 parent 083769d commit cc1552c

File tree

1 file changed

+94
-9
lines changed

1 file changed

+94
-9
lines changed

‎_test/cssimport.test.php‎

Lines changed: 94 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,49 @@ public function test_border_shorthand() {
4242
$decl = new css_declaration ('border', '5px solid red;');
4343
$decl->explode ($decls);
4444

45-
$this->assertEquals(count($decls), 3);
45+
$this->assertEquals(count($decls), 19);
4646
$this->assertEquals($decls [0]->getProperty(), 'border-width');
4747
$this->assertEquals($decls [0]->getValue(), '5px');
48-
$this->assertEquals($decls [1]->getProperty(), 'border-style');
49-
$this->assertEquals($decls [1]->getValue(), 'solid');
50-
$this->assertEquals($decls [2]->getProperty(), 'border-color');
51-
$this->assertEquals($decls [2]->getValue(), 'red');
48+
$this->assertEquals($decls [1]->getProperty(), 'border-left-width');
49+
$this->assertEquals($decls [1]->getValue(), '5px');
50+
$this->assertEquals($decls [2]->getProperty(), 'border-right-width');
51+
$this->assertEquals($decls [2]->getValue(), '5px');
52+
$this->assertEquals($decls [3]->getProperty(), 'border-top-width');
53+
$this->assertEquals($decls [3]->getValue(), '5px');
54+
$this->assertEquals($decls [4]->getProperty(), 'border-bottom-width');
55+
$this->assertEquals($decls [4]->getValue(), '5px');
56+
57+
$this->assertEquals($decls [5]->getProperty(), 'border-style');
58+
$this->assertEquals($decls [5]->getValue(), 'solid');
59+
$this->assertEquals($decls [6]->getProperty(), 'border-left-style');
60+
$this->assertEquals($decls [6]->getValue(), 'solid');
61+
$this->assertEquals($decls [7]->getProperty(), 'border-right-style');
62+
$this->assertEquals($decls [7]->getValue(), 'solid');
63+
$this->assertEquals($decls [8]->getProperty(), 'border-top-style');
64+
$this->assertEquals($decls [8]->getValue(), 'solid');
65+
$this->assertEquals($decls [9]->getProperty(), 'border-bottom-style');
66+
$this->assertEquals($decls [9]->getValue(), 'solid');
67+
68+
$this->assertEquals($decls [10]->getProperty(), 'border-color');
69+
$this->assertEquals($decls [10]->getValue(), 'red');
70+
$this->assertEquals($decls [11]->getProperty(), 'border-left-color');
71+
$this->assertEquals($decls [11]->getValue(), 'red');
72+
$this->assertEquals($decls [12]->getProperty(), 'border-right-color');
73+
$this->assertEquals($decls [12]->getValue(), 'red');
74+
$this->assertEquals($decls [13]->getProperty(), 'border-top-color');
75+
$this->assertEquals($decls [13]->getValue(), 'red');
76+
$this->assertEquals($decls [14]->getProperty(), 'border-bottom-color');
77+
$this->assertEquals($decls [14]->getValue(), 'red');
78+
79+
$this->assertEquals($decls [15]->getProperty(), 'border-left');
80+
$this->assertEquals($decls [15]->getValue(), '5px solid red');
81+
$this->assertEquals($decls [16]->getProperty(), 'border-right');
82+
$this->assertEquals($decls [16]->getValue(), '5px solid red');
83+
$this->assertEquals($decls [17]->getProperty(), 'border-top');
84+
$this->assertEquals($decls [17]->getValue(), '5px solid red');
85+
$this->assertEquals($decls [18]->getProperty(), 'border-bottom');
86+
$this->assertEquals($decls [18]->getValue(), '5px solid red');
87+
5288
}
5389

5490
/**
@@ -487,7 +523,8 @@ public function test_media_queries_part1() {
487523
$import->importFromString ($css_code);
488524
$import->getPropertiesForElement ($properties, 'p', NULL);
489525

490-
print ($import->rulesToString());
526+
// Only for debugging.
527+
//print ($import->rulesToString());
491528

492529
$this->assertEquals(count($properties), 1);
493530
$this->assertEquals('blue', $properties ['background-color']);
@@ -593,7 +630,7 @@ public function test_dw_and_wrap_css_part1 () {
593630
//fclose ($handle);
594631

595632
// Check properties
596-
$this->assertEquals(17, count($properties));
633+
$this->assertEquals(33, count($properties));
597634
$this->assertEquals('1em 1em .5em', $properties ['padding']);
598635
$this->assertEquals('1em', $properties ['padding-top']);
599636
$this->assertEquals('1em', $properties ['padding-right']);
@@ -608,9 +645,25 @@ public function test_dw_and_wrap_css_part1 () {
608645
$this->assertEquals('#dcc2ef', $properties ['background-color']);
609646
$this->assertEquals('url(/lib/plugins/wrap/images/note/48/help.png)', $properties ['background-image']);
610647
$this->assertEquals('2px solid #999', $properties ['border']);
648+
$this->assertEquals('2px solid #999', $properties ['border-left']);
649+
$this->assertEquals('2px solid #999', $properties ['border-right']);
650+
$this->assertEquals('2px solid #999', $properties ['border-top']);
651+
$this->assertEquals('2px solid #999', $properties ['border-bottom']);
611652
$this->assertEquals('2px', $properties ['border-width']);
653+
$this->assertEquals('2px', $properties ['border-left-width']);
654+
$this->assertEquals('2px', $properties ['border-right-width']);
655+
$this->assertEquals('2px', $properties ['border-top-width']);
656+
$this->assertEquals('2px', $properties ['border-bottom-width']);
612657
$this->assertEquals('solid', $properties ['border-style']);
658+
$this->assertEquals('solid', $properties ['border-left-style']);
659+
$this->assertEquals('solid', $properties ['border-right-style']);
660+
$this->assertEquals('solid', $properties ['border-top-style']);
661+
$this->assertEquals('solid', $properties ['border-bottom-style']);
613662
$this->assertEquals('#999', $properties ['border-color']);
663+
$this->assertEquals('#999', $properties ['border-left-color']);
664+
$this->assertEquals('#999', $properties ['border-right-color']);
665+
$this->assertEquals('#999', $properties ['border-top-color']);
666+
$this->assertEquals('#999', $properties ['border-bottom-color']);
614667
$this->assertEquals('', $properties ['']);
615668
$this->assertEquals('1.5em', $properties ['margin-bottom']);
616669
}
@@ -633,11 +686,27 @@ public function test_dw_and_wrap_css_part2 () {
633686
//fclose ($handle);
634687

635688
// Check properties
636-
$this->assertEquals(10, count($properties));
689+
$this->assertEquals(26, count($properties));
637690
$this->assertEquals('2px solid #999', $properties ['border']);
691+
$this->assertEquals('2px solid #999', $properties ['border-left']);
692+
$this->assertEquals('2px solid #999', $properties ['border-right']);
693+
$this->assertEquals('2px solid #999', $properties ['border-top']);
694+
$this->assertEquals('2px solid #999', $properties ['border-bottom']);
638695
$this->assertEquals('2px', $properties ['border-width']);
696+
$this->assertEquals('2px', $properties ['border-left-width']);
697+
$this->assertEquals('2px', $properties ['border-right-width']);
698+
$this->assertEquals('2px', $properties ['border-top-width']);
699+
$this->assertEquals('2px', $properties ['border-bottom-width']);
639700
$this->assertEquals('solid', $properties ['border-style']);
701+
$this->assertEquals('solid', $properties ['border-left-style']);
702+
$this->assertEquals('solid', $properties ['border-right-style']);
703+
$this->assertEquals('solid', $properties ['border-top-style']);
704+
$this->assertEquals('solid', $properties ['border-bottom-style']);
640705
$this->assertEquals('#999', $properties ['border-color']);
706+
$this->assertEquals('#999', $properties ['border-left-color']);
707+
$this->assertEquals('#999', $properties ['border-right-color']);
708+
$this->assertEquals('#999', $properties ['border-top-color']);
709+
$this->assertEquals('#999', $properties ['border-bottom-color']);
641710
$this->assertEquals('1em 1em .5em', $properties ['padding']);
642711
$this->assertEquals('1em', $properties ['padding-top']);
643712
$this->assertEquals('1em', $properties ['padding-right']);
@@ -717,11 +786,27 @@ public function test_wrap_css_part2() {
717786
fclose ($handle);
718787

719788
// We shouldn't get any properties
720-
$this->assertEquals(9, count($properties));
789+
$this->assertEquals(25, count($properties));
721790
$this->assertEquals('1px solid #999', $properties ['border']);
791+
$this->assertEquals('1px solid #999', $properties ['border-left']);
792+
$this->assertEquals('1px solid #999', $properties ['border-right']);
793+
$this->assertEquals('1px solid #999', $properties ['border-top']);
794+
$this->assertEquals('1px solid #999', $properties ['border-bottom']);
722795
$this->assertEquals('1px', $properties ['border-width']);
796+
$this->assertEquals('1px', $properties ['border-left-width']);
797+
$this->assertEquals('1px', $properties ['border-right-width']);
798+
$this->assertEquals('1px', $properties ['border-top-width']);
799+
$this->assertEquals('1px', $properties ['border-bottom-width']);
723800
$this->assertEquals('solid', $properties ['border-style']);
801+
$this->assertEquals('solid', $properties ['border-left-style']);
802+
$this->assertEquals('solid', $properties ['border-right-style']);
803+
$this->assertEquals('solid', $properties ['border-top-style']);
804+
$this->assertEquals('solid', $properties ['border-bottom-style']);
724805
$this->assertEquals('#999', $properties ['border-color']);
806+
$this->assertEquals('#999', $properties ['border-left-color']);
807+
$this->assertEquals('#999', $properties ['border-right-color']);
808+
$this->assertEquals('#999', $properties ['border-top-color']);
809+
$this->assertEquals('#999', $properties ['border-bottom-color']);
725810
$this->assertEquals('0 .3em', $properties ['padding']);
726811
$this->assertEquals('0', $properties ['padding-top']);
727812
$this->assertEquals('.3em', $properties ['padding-right']);

0 commit comments

Comments
 (0)