Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[css-multicol] Adding assert statements to tests #13616

Merged
merged 8 commits into from
Oct 22, 2018
Merged

[css-multicol] Adding assert statements to tests #13616

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e28b31f
tidying up rule shorthand test, adding assert
rachelandrew Jul 4, 2018
a823191
merging upstream
rachelandrew Jul 5, 2018
d608ce3
Merge branch 'master' of https://github.com/rachelandrew/web-platform…
rachelandrew Oct 17, 2018
0cdae28
Merge branch 'master' of https://github.com/rachelandrew/web-platform…
rachelandrew Oct 18, 2018
29a831e
[css-multicol] Adding assert statements to a bunch of tests.
rachelandrew Oct 19, 2018
ed322df
Update css/css-multicol/multicol-rule-000.xht
mstensho Oct 19, 2018
659a97e
Update css/css-multicol/multicol-under-vertical-rl-scroll.html
mstensho Oct 19, 2018
2e263df
Update css/css-multicol/multicol-span-all-002.xht
Ms2ger Oct 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions css/css-multicol/multicol-gap-fraction-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
<link rel="match" href="multicol-gap-fraction-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Test checks that increasing column gaps display consistently" />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-gap-large-002.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1 'column-gap" />
<link rel="match" href="multicol-gap-large-002-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that a large column-gap is supported. We should have two 3.5em columns with a 4em gap between them." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-gap-negative-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gap" title="4.1. 'column-gap'" />
<link rel="match" href="multicol-gap-002-ref.xht" />
<meta name="flags" content="ahem invalid" />
<meta name="asset" content="Test checks that a negative value is not allowed for column-gap" />
<style type="text/css"><![CDATA[
div
{
Expand Down
2 changes: 1 addition & 1 deletion css/css-multicol/multicol-inherit-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>CSS Multi-column Layout Test: multicolumn and inheritance</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-08 -->
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm" title="3.4 Pseudo-algorithm" />
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns" />
<link rel="match" href="multicol-inherit-001-ref.xht" />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion css/css-multicol/multicol-margin-child-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-multi-column-model" title="2. The multi-column model" />
<link rel="match" href="multicol-margin-child-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="This test checks that the margin-bottom of a block child in a multi-column element will collapse with the margin-top of a following block child of that same multi-colum element if those children are vertically adjacent and if no line boxes, no clearance, no padding and no border separate them." />
<meta name="assert" content="This test checks that the margin-bottom of a block child in a multi-column element will collapse with the margin-top of a following block child of that same multi-column element if those children are vertically adjacent and if no line boxes, no clearance, no padding and no border separate them." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-000.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-rule-000-ref.xht" />
<meta name="assert" content="THis test checks that the shorthand column-rule property draws the rule correctly." />
rachelandrew marked this conversation as resolved.
Show resolved Hide resolved
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
div
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-003.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-14 -->
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules" title="4. Column gaps and rules" />
<link rel="match" href="multicol-rule-003-ref.xht" />
<meta name="assert" content="Tests that the three column-rule-* longhand properties are correctly applied." />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
div
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-color-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-rule-color-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Basic test that the column-rule-color property is applied." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-dashed-000.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-rule-dashed-000-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Tests that the dashed value of column-rule-style is correctly rendered when used in the shorthand column-rule property." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-dotted-000.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-27 -->
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-rule-dotted-000-ref.xht" />
<meta name="assert" content="Tests that the dotted value of column-rule-style is correctly rendered when used in the shorthand column-rule property." />
<meta name="flags" content="ahem" />
<style type="text/css"><![CDATA[
div
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-double-000.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-rule-double-000-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Tests that the double value of column-rule-style is correctly rendered when used in the shorthand column-rule property." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-fraction-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
<link rel="match" href="multicol-rule-fraction-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Basic test for the column-rule-width property, checking that values above 0 but below 1 are allowed." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-groove-000.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-rule-groove-000-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Test checks that the value of 'groove' for 'column-rule-style' is drawn correctly." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-hidden-000.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-rule-hidden-000-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Test checks that a column-rule-width value of hidden results in no rule being drawn." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-none-000.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-rule-hidden-000-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Test checks that a column-rule-width value of none results in no rule being drawn." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-px-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-rule-ref.xht"/>
<meta name="flags" content="ahem"/>
<meta name="assert" content="Test checks that a column-rule-width value set in pixels is rendered correctly. The width of the rule should be 16px." />
<style type="text/css"><![CDATA[
body {
margin: 0;
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-ridge-000.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-rule-ridge-000-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Test checks that the value of 'ridge' for 'column-rule-style' is drawn correctly." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-samelength-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
<link rel="match" href="multicol-rule-samelength-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Test that a gap of 5em and a column-rule-width of 5em both take up the same space." />
<style type="text/css"><![CDATA[
body {margin: 8px;}

Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-shorthand-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#crw" title="4.4. 'column-rule-width'" />
<link rel="match" href="multicol-rule-samelength-001-ref.xht" />
<meta name="flags" content="ahem invalid" />
<meta name="assert" content="Tests that column rules are not displayed for invalid properties and values."/>
<style type="text/css"><![CDATA[
body {margin: 8px;}

Expand Down
2 changes: 1 addition & 1 deletion css/css-multicol/multicol-rule-shorthand-2.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="help" href=""/>
<link rel="match" href="multicol-rule-shorthand-2-ref.xht"/>
<meta name="assert" content="Tests that column rules are not displayed for invalid properties and values."/>
<meta name="flags" content="invalid"/>
<meta name="flags" content="ahem invalid"/>
<style type="text/css"><![CDATA[
body {
margin: 1em;
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-rule-solid-000.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-rule-solid-000-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Test checks that a column-rule-style value set as 'solid' is rendered correctly." />
<style type="text/css"><![CDATA[
div
{
Expand Down
3 changes: 1 addition & 2 deletions css/css-multicol/multicol-rule-stacking-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-rule-stacking-ref.xht"/>
<meta name="flags" content="ahem"/>
<meta name="assert" content="The test checks that the span element, which has a higher 'z-index' stacks on top of the other elements in the multicol container." />
<style type="text/css"><![CDATA[
body {
margin: 0;
Expand All @@ -20,8 +21,6 @@ body>div {
margin: 1em;
border: 1em solid gray;
width: 14em;
orphans: 1;
widows: 1;

column-count: 4;
column-gap: 1em;
Expand Down
5 changes: 3 additions & 2 deletions css/css-multicol/multicol-shorthand-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
<link rel="match" href="multicol-rule-ref.xht"/>
<meta name="flags" content="ahem invalid"/>
<meta name="assert" content="Testing that invalid property names used as a shorthand do not result in column-rules being displayed." />
<style type="text/css"><![CDATA[
body {
margin: 0;
Expand All @@ -26,8 +27,8 @@ body>div {
column-count: 4;
column-gap: 1em;
column-rule: solid blue 1em;
column: normal red 1em;
columns: normal red 1em;
column: normal red 1em; /* column is not a valid property */
columns: normal red 1em; /* columns is a shorthand for colun-width and column-count */
}
span {
background: blue;
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-span-000.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-rule" title="4.5 'column-rule'" />
<link rel="match" href="multicol-span-000-ref.xht" />
<meta name="flags" content="ahem image" />
<meta name="assert" content="Tests that the element with an id of 'column-span' spans across all columns." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-span-all-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
<link rel="match" href="multicol-span-all-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Tests that the h4 set to 'column-span: all' spans across all columns resulting in a black bar across the multicol container." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-span-all-002.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
<link rel="match" href="multicol-span-all-002-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="Test of the situation where there is not sufficient space for the spanning element, UA may treat the element as 'column-span: none'; in which case, 'overflow: hidden' will take care of overflowed content out of multi-column box."
rachelandrew marked this conversation as resolved.
Show resolved Hide resolved
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-span-all-block-sibling-003.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#spanning-columns"/>
<link rel="match" href="multicol-span-all-block-sibling-3-ref.xht"/>
<meta name="flags" content="ahem"/>
<meta name="assert" content="Test that a block element which is a sibling of content in the multicol element acts correctly as a spanner." />
<style type="text/css"><![CDATA[
body>div {
font-family: Ahem;
Expand Down
2 changes: 1 addition & 1 deletion css/css-multicol/multicol-span-all-margin-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Multi-column Layout Test: 'column-span: all' element and width exceeding available multi-colum width (complex)</title>
<title>CSS Multi-column Layout Test: 'column-span: all' element and width exceeding available multi-column width (complex)</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 2013-08-18 -->
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-span-all-margin-002.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
<link rel="match" href="multicol-span-all-margin-002-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="The spanning element extends only to the width of the multicol element, despite an item in the fourth column extending into the overflow area." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-span-all-margin-bottom-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-span" title="6.1. 'column-span'" />
<link rel="match" href="multicol-span-all-margin-bottom-001-ref.xht" />
<meta name="flags" content="ahem" />
<meta name="assert" content="In this test, the glyphs 'or' are painted into 1st column box, the glyphs 'ang' extend outside the box, and should not be clipped. In this test they are overwritten by spans so are not visible." />
<style type="text/css"><![CDATA[
div
{
Expand Down
1 change: 1 addition & 0 deletions css/css-multicol/multicol-table-cell-vertical-align-001.xht
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-multi-column-model"/>
<link rel="match" href="multicol-table-cell-vertical-align-ref.xht"/>
<meta name="flags" content="ahem"/>
<meta name="assert" content="This test checks that 'column-count' applies to elements with 'display' set to 'table-cell' which also use 'vertical-align: middle'. The 'vertical-align' property should still apply." />
<style type="text/css"><![CDATA[
div {
font-family: Ahem;
Expand Down
3 changes: 2 additions & 1 deletion css/css-multicol/multicol-under-vertical-rl-scroll.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
<title>Multicol under vertical-rl scrolling container</title>
<link rel="match" href="multicol-under-vertical-rl-scroll-ref.html">
<link rel="help" href="https://drafts.csswg.org/css-multicol">
<meta name="assert" content="Test that multicol works as expected when overflow is scrolling in vertical-rl" />
<p>Passes if there are two green squares</p>
<div style="width: 200px; height: 200px; overflow: scroll; writing-mode: vertical-rl; border: 1px solid black">
<div style="columns: 2; column-gap: 20px; width: 80px; height: 180px">
<div style="width: 160px; background: green"></div>
</div>
<div style="width: 500px; height: 500px"></div>
</div>
</div>
rachelandrew marked this conversation as resolved.
Show resolved Hide resolved