From d4f39798960feaa6a1e942726cc28b6a5560a1b7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 17 Jan 2020 17:07:46 -0500 Subject: [PATCH] node tests: Update expected output The printing of css nodes has changed and the window is visible now. --- testsuite/css/nodes/box.ltr.nodes | 2 +- testsuite/css/nodes/box.rtl.nodes | 2 +- testsuite/css/nodes/buttons.nodes | 2 +- testsuite/css/nodes/checkbutton.ltr.nodes | 2 +- testsuite/css/nodes/checkbutton.rtl.nodes | 2 +- testsuite/css/nodes/combobox.nodes | 6 +-- testsuite/css/nodes/entries.nodes | 4 +- testsuite/css/nodes/expander.ltr.nodes | 2 +- testsuite/css/nodes/expander.rtl.nodes | 2 +- testsuite/css/nodes/levelbar.ltr.nodes | 54 +++++++++---------- testsuite/css/nodes/levelbar.rtl.nodes | 54 +++++++++---------- testsuite/css/nodes/notebook-arrows.nodes | 6 +-- testsuite/css/nodes/notebook-arrows2.nodes | 6 +-- testsuite/css/nodes/notebook-arrows2.ui | 1 + testsuite/css/nodes/notebook.bottom.ltr.nodes | 2 +- testsuite/css/nodes/notebook.bottom.rtl.nodes | 2 +- testsuite/css/nodes/notebook.left.ltr.nodes | 4 +- testsuite/css/nodes/notebook.left.rtl.nodes | 4 +- testsuite/css/nodes/notebook.right.ltr.nodes | 4 +- testsuite/css/nodes/notebook.right.rtl.nodes | 4 +- testsuite/css/nodes/notebook.top.ltr.nodes | 4 +- testsuite/css/nodes/notebook.top.rtl.nodes | 4 +- testsuite/css/nodes/paned.ltr.nodes | 2 +- testsuite/css/nodes/paned.rtl.nodes | 2 +- testsuite/css/nodes/progressbar.nodes | 2 +- testsuite/css/nodes/scale.nodes | 4 +- 26 files changed, 92 insertions(+), 91 deletions(-) diff --git a/testsuite/css/nodes/box.ltr.nodes b/testsuite/css/nodes/box.ltr.nodes index fae4431022..2c497280d5 100644 --- a/testsuite/css/nodes/box.ltr.nodes +++ b/testsuite/css/nodes/box.ltr.nodes @@ -1,4 +1,4 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) box.horizontal:dir(ltr) label#label1:dir(ltr) diff --git a/testsuite/css/nodes/box.rtl.nodes b/testsuite/css/nodes/box.rtl.nodes index 1179f23dc4..4c29556050 100644 --- a/testsuite/css/nodes/box.rtl.nodes +++ b/testsuite/css/nodes/box.rtl.nodes @@ -1,4 +1,4 @@ -[window.background:dir(rtl)] +window.background:dir(rtl) decoration:dir(rtl) box.horizontal:dir(rtl) label#label1:dir(rtl) diff --git a/testsuite/css/nodes/buttons.nodes b/testsuite/css/nodes/buttons.nodes index a4c768a125..6c94d7265f 100644 --- a/testsuite/css/nodes/buttons.nodes +++ b/testsuite/css/nodes/buttons.nodes @@ -1,4 +1,4 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) grid.horizontal:dir(ltr) button.text-button.toggle:dir(ltr):checked diff --git a/testsuite/css/nodes/checkbutton.ltr.nodes b/testsuite/css/nodes/checkbutton.ltr.nodes index fa59ce21e1..a02c5c57cc 100644 --- a/testsuite/css/nodes/checkbutton.ltr.nodes +++ b/testsuite/css/nodes/checkbutton.ltr.nodes @@ -1,4 +1,4 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) box.vertical:dir(ltr) checkbutton:dir(ltr) diff --git a/testsuite/css/nodes/checkbutton.rtl.nodes b/testsuite/css/nodes/checkbutton.rtl.nodes index 67f2178428..5cd1f470b8 100644 --- a/testsuite/css/nodes/checkbutton.rtl.nodes +++ b/testsuite/css/nodes/checkbutton.rtl.nodes @@ -1,4 +1,4 @@ -[window.background:dir(rtl)] +window.background:dir(rtl) decoration:dir(rtl) box.vertical:dir(rtl) checkbutton:dir(rtl) diff --git a/testsuite/css/nodes/combobox.nodes b/testsuite/css/nodes/combobox.nodes index f0e3bf5ff7..5321d656c3 100644 --- a/testsuite/css/nodes/combobox.nodes +++ b/testsuite/css/nodes/combobox.nodes @@ -1,8 +1,8 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) box.horizontal:dir(ltr) combobox:dir(ltr) - box.linked.horizontal:dir(ltr) + box.horizontal.linked:dir(ltr) button.combo:dir(ltr) box.horizontal:dir(ltr) cellview:dir(ltr) @@ -22,7 +22,7 @@ none.right:dir(ltr) arrow:dir(ltr) combobox:dir(ltr) - box.linked.horizontal:dir(ltr) + box.horizontal.linked:dir(ltr) entry.combo:dir(ltr) text:dir(ltr) undershoot.left:dir(ltr) diff --git a/testsuite/css/nodes/entries.nodes b/testsuite/css/nodes/entries.nodes index 4388e4ba30..5b0580dc72 100644 --- a/testsuite/css/nodes/entries.nodes +++ b/testsuite/css/nodes/entries.nodes @@ -1,4 +1,4 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) box.horizontal:dir(ltr) label:dir(ltr) @@ -25,7 +25,7 @@ text:dir(ltr) undershoot.left:dir(ltr) undershoot.right:dir(ltr) - button.image-button.down:dir(ltr) + button.down.image-button:dir(ltr) image:dir(ltr) button.image-button.up:dir(ltr) image:dir(ltr) diff --git a/testsuite/css/nodes/expander.ltr.nodes b/testsuite/css/nodes/expander.ltr.nodes index efe3ddd2d3..1fb71b5bd6 100644 --- a/testsuite/css/nodes/expander.ltr.nodes +++ b/testsuite/css/nodes/expander.ltr.nodes @@ -1,4 +1,4 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) expander-widget:dir(ltr) box.vertical:dir(ltr) diff --git a/testsuite/css/nodes/expander.rtl.nodes b/testsuite/css/nodes/expander.rtl.nodes index 17b3c7e61d..69df9b9319 100644 --- a/testsuite/css/nodes/expander.rtl.nodes +++ b/testsuite/css/nodes/expander.rtl.nodes @@ -1,4 +1,4 @@ -[window.background:dir(rtl)] +window.background:dir(rtl) decoration:dir(rtl) expander-widget:dir(rtl) box.vertical:dir(rtl) diff --git a/testsuite/css/nodes/levelbar.ltr.nodes b/testsuite/css/nodes/levelbar.ltr.nodes index 2ccfe58738..8f0132348d 100644 --- a/testsuite/css/nodes/levelbar.ltr.nodes +++ b/testsuite/css/nodes/levelbar.ltr.nodes @@ -1,38 +1,38 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) box.vertical:dir(ltr) - levelbar.horizontal.continuous:dir(ltr) + levelbar.continuous.horizontal:dir(ltr) trough:dir(ltr) - block.high.filled:dir(ltr) + block.filled.high:dir(ltr) block.empty:dir(ltr) - levelbar.horizontal.continuous:dir(ltr) + levelbar.continuous.horizontal:dir(ltr) trough:dir(ltr) block.empty:dir(ltr) - block.high.filled:dir(ltr) - levelbar.horizontal.continuous:dir(ltr) + block.filled.high:dir(ltr) + levelbar.continuous.horizontal:dir(ltr) trough:dir(ltr) - block.low.filled:dir(ltr) + block.filled.low:dir(ltr) block.empty:dir(ltr) - levelbar.horizontal.continuous:dir(ltr) + levelbar.continuous.horizontal:dir(ltr) trough:dir(ltr) - block.full.filled:dir(ltr) + block.filled.full:dir(ltr) block.empty:dir(ltr) - levelbar.horizontal.discrete:dir(ltr) + levelbar.discrete.horizontal:dir(ltr) trough:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) block.empty:dir(ltr) block.empty:dir(ltr) block.empty:dir(ltr) block.empty:dir(ltr) block.empty:dir(ltr) - levelbar.horizontal.discrete:dir(ltr) + levelbar.discrete.horizontal:dir(ltr) trough:dir(ltr) - block.low.filled:dir(ltr) - block.low.filled:dir(ltr) + block.filled.low:dir(ltr) + block.filled.low:dir(ltr) block.empty:dir(ltr) block.empty:dir(ltr) block.empty:dir(ltr) @@ -41,15 +41,15 @@ block.empty:dir(ltr) block.empty:dir(ltr) block.empty:dir(ltr) - levelbar.horizontal.discrete:dir(ltr) + levelbar.discrete.horizontal:dir(ltr) trough:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) - block.high.filled:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) + block.filled.high:dir(ltr) block.empty:dir(ltr) block.empty:dir(ltr) diff --git a/testsuite/css/nodes/levelbar.rtl.nodes b/testsuite/css/nodes/levelbar.rtl.nodes index eab776a109..3ec35e6153 100644 --- a/testsuite/css/nodes/levelbar.rtl.nodes +++ b/testsuite/css/nodes/levelbar.rtl.nodes @@ -1,35 +1,35 @@ -[window.background:dir(rtl)] +window.background:dir(rtl) decoration:dir(rtl) box.vertical:dir(rtl) - levelbar.horizontal.continuous:dir(rtl) + levelbar.continuous.horizontal:dir(rtl) trough:dir(rtl) block.empty:dir(rtl) - block.high.filled:dir(rtl) - levelbar.horizontal.continuous:dir(rtl) + block.filled.high:dir(rtl) + levelbar.continuous.horizontal:dir(rtl) trough:dir(rtl) - block.high.filled:dir(rtl) + block.filled.high:dir(rtl) block.empty:dir(rtl) - levelbar.horizontal.continuous:dir(rtl) + levelbar.continuous.horizontal:dir(rtl) trough:dir(rtl) block.empty:dir(rtl) - block.low.filled:dir(rtl) - levelbar.horizontal.continuous:dir(rtl) + block.filled.low:dir(rtl) + levelbar.continuous.horizontal:dir(rtl) trough:dir(rtl) block.empty:dir(rtl) - block.full.filled:dir(rtl) - levelbar.horizontal.discrete:dir(rtl) + block.filled.full:dir(rtl) + levelbar.discrete.horizontal:dir(rtl) trough:dir(rtl) block.empty:dir(rtl) block.empty:dir(rtl) block.empty:dir(rtl) block.empty:dir(rtl) block.empty:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) - levelbar.horizontal.discrete:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) + levelbar.discrete.horizontal:dir(rtl) trough:dir(rtl) block.empty:dir(rtl) block.empty:dir(rtl) @@ -39,17 +39,17 @@ block.empty:dir(rtl) block.empty:dir(rtl) block.empty:dir(rtl) - block.low.filled:dir(rtl) - block.low.filled:dir(rtl) - levelbar.horizontal.discrete:dir(rtl) + block.filled.low:dir(rtl) + block.filled.low:dir(rtl) + levelbar.discrete.horizontal:dir(rtl) trough:dir(rtl) block.empty:dir(rtl) block.empty:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) - block.high.filled:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) + block.filled.high:dir(rtl) diff --git a/testsuite/css/nodes/notebook-arrows.nodes b/testsuite/css/nodes/notebook-arrows.nodes index dcf43c96af..ecd4cfd918 100644 --- a/testsuite/css/nodes/notebook-arrows.nodes +++ b/testsuite/css/nodes/notebook-arrows.nodes @@ -1,9 +1,9 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) notebook.frame:dir(ltr) - header.top.horizontal:dir(ltr) + header.horizontal.top:dir(ltr) tabs:dir(ltr) - arrow.image-button.down:disabled:dir(ltr) + arrow.down.image-button:disabled:dir(ltr) image:disabled:dir(ltr) tab:dir(ltr):checked label#tab1:dir(ltr) diff --git a/testsuite/css/nodes/notebook-arrows2.nodes b/testsuite/css/nodes/notebook-arrows2.nodes index dcf43c96af..ecd4cfd918 100644 --- a/testsuite/css/nodes/notebook-arrows2.nodes +++ b/testsuite/css/nodes/notebook-arrows2.nodes @@ -1,9 +1,9 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) notebook.frame:dir(ltr) - header.top.horizontal:dir(ltr) + header.horizontal.top:dir(ltr) tabs:dir(ltr) - arrow.image-button.down:disabled:dir(ltr) + arrow.down.image-button:disabled:dir(ltr) image:disabled:dir(ltr) tab:dir(ltr):checked label#tab1:dir(ltr) diff --git a/testsuite/css/nodes/notebook-arrows2.ui b/testsuite/css/nodes/notebook-arrows2.ui index 8de9edc0f0..8763e80b68 100644 --- a/testsuite/css/nodes/notebook-arrows2.ui +++ b/testsuite/css/nodes/notebook-arrows2.ui @@ -1,6 +1,7 @@ + popup 1 diff --git a/testsuite/css/nodes/notebook.bottom.ltr.nodes b/testsuite/css/nodes/notebook.bottom.ltr.nodes index c08d819eec..6d8dced2ff 100644 --- a/testsuite/css/nodes/notebook.bottom.ltr.nodes +++ b/testsuite/css/nodes/notebook.bottom.ltr.nodes @@ -1,4 +1,4 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) notebook.frame:dir(ltr) stack:dir(ltr) diff --git a/testsuite/css/nodes/notebook.bottom.rtl.nodes b/testsuite/css/nodes/notebook.bottom.rtl.nodes index b2fb7991ba..67d1234591 100644 --- a/testsuite/css/nodes/notebook.bottom.rtl.nodes +++ b/testsuite/css/nodes/notebook.bottom.rtl.nodes @@ -1,4 +1,4 @@ -[window.background:dir(rtl)] +window.background:dir(rtl) decoration:dir(rtl) notebook.frame:dir(rtl) stack:dir(rtl) diff --git a/testsuite/css/nodes/notebook.left.ltr.nodes b/testsuite/css/nodes/notebook.left.ltr.nodes index 02b33b5cd6..c73bd29170 100644 --- a/testsuite/css/nodes/notebook.left.ltr.nodes +++ b/testsuite/css/nodes/notebook.left.ltr.nodes @@ -1,7 +1,7 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) notebook.frame:dir(ltr) - header.vertical.left:dir(ltr) + header.left.vertical:dir(ltr) button#start.text-button:dir(ltr) label:dir(ltr) tabs:dir(ltr) diff --git a/testsuite/css/nodes/notebook.left.rtl.nodes b/testsuite/css/nodes/notebook.left.rtl.nodes index 8a41237924..0b58742765 100644 --- a/testsuite/css/nodes/notebook.left.rtl.nodes +++ b/testsuite/css/nodes/notebook.left.rtl.nodes @@ -1,4 +1,4 @@ -[window.background:dir(rtl)] +window.background:dir(rtl) decoration:dir(rtl) notebook.frame:dir(rtl) stack:dir(rtl) @@ -6,7 +6,7 @@ label:dir(rtl) button#page2.text-button:dir(rtl) label:dir(rtl) - header.vertical.right:dir(rtl) + header.right.vertical:dir(rtl) button#start.text-button:dir(rtl) label:dir(rtl) tabs:dir(rtl) diff --git a/testsuite/css/nodes/notebook.right.ltr.nodes b/testsuite/css/nodes/notebook.right.ltr.nodes index 54f16c2fca..a3e9551314 100644 --- a/testsuite/css/nodes/notebook.right.ltr.nodes +++ b/testsuite/css/nodes/notebook.right.ltr.nodes @@ -1,4 +1,4 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) notebook.frame:dir(ltr) stack:dir(ltr) @@ -6,7 +6,7 @@ label:dir(ltr) button#page2.text-button:dir(ltr) label:dir(ltr) - header.vertical.right:dir(ltr) + header.right.vertical:dir(ltr) button#start.text-button:dir(ltr) label:dir(ltr) tabs:dir(ltr) diff --git a/testsuite/css/nodes/notebook.right.rtl.nodes b/testsuite/css/nodes/notebook.right.rtl.nodes index f4e18ef07b..d50090f98d 100644 --- a/testsuite/css/nodes/notebook.right.rtl.nodes +++ b/testsuite/css/nodes/notebook.right.rtl.nodes @@ -1,7 +1,7 @@ -[window.background:dir(rtl)] +window.background:dir(rtl) decoration:dir(rtl) notebook.frame:dir(rtl) - header.vertical.left:dir(rtl) + header.left.vertical:dir(rtl) button#start.text-button:dir(rtl) label:dir(rtl) tabs:dir(rtl) diff --git a/testsuite/css/nodes/notebook.top.ltr.nodes b/testsuite/css/nodes/notebook.top.ltr.nodes index b0f27f0b0c..406df9158c 100644 --- a/testsuite/css/nodes/notebook.top.ltr.nodes +++ b/testsuite/css/nodes/notebook.top.ltr.nodes @@ -1,7 +1,7 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) notebook.frame:dir(ltr) - header.top.horizontal:dir(ltr) + header.horizontal.top:dir(ltr) button#start.text-button:dir(ltr) label:dir(ltr) tabs:dir(ltr) diff --git a/testsuite/css/nodes/notebook.top.rtl.nodes b/testsuite/css/nodes/notebook.top.rtl.nodes index 42d60561d3..c9f7f61abd 100644 --- a/testsuite/css/nodes/notebook.top.rtl.nodes +++ b/testsuite/css/nodes/notebook.top.rtl.nodes @@ -1,7 +1,7 @@ -[window.background:dir(rtl)] +window.background:dir(rtl) decoration:dir(rtl) notebook.frame:dir(rtl) - header.top.horizontal:dir(rtl) + header.horizontal.top:dir(rtl) button#start.text-button:dir(rtl) label:dir(rtl) tabs:dir(rtl) diff --git a/testsuite/css/nodes/paned.ltr.nodes b/testsuite/css/nodes/paned.ltr.nodes index bab5f56464..64034c54f3 100644 --- a/testsuite/css/nodes/paned.ltr.nodes +++ b/testsuite/css/nodes/paned.ltr.nodes @@ -1,4 +1,4 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) paned.horizontal:dir(ltr) label#label1:dir(ltr) diff --git a/testsuite/css/nodes/paned.rtl.nodes b/testsuite/css/nodes/paned.rtl.nodes index 7403c1c6a4..cfeac4a518 100644 --- a/testsuite/css/nodes/paned.rtl.nodes +++ b/testsuite/css/nodes/paned.rtl.nodes @@ -1,4 +1,4 @@ -[window.background:dir(rtl)] +window.background:dir(rtl) decoration:dir(rtl) paned.horizontal:dir(rtl) label#label1:dir(rtl) diff --git a/testsuite/css/nodes/progressbar.nodes b/testsuite/css/nodes/progressbar.nodes index bba76f1e88..d34ac6b5f8 100644 --- a/testsuite/css/nodes/progressbar.nodes +++ b/testsuite/css/nodes/progressbar.nodes @@ -1,4 +1,4 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) box#progressbars.vertical:dir(ltr) progressbar.horizontal:dir(ltr) diff --git a/testsuite/css/nodes/scale.nodes b/testsuite/css/nodes/scale.nodes index d78c8a7a85..2d187bcc4e 100644 --- a/testsuite/css/nodes/scale.nodes +++ b/testsuite/css/nodes/scale.nodes @@ -1,4 +1,4 @@ -[window.background:dir(ltr)] +window.background:dir(ltr) decoration:dir(ltr) box#scales.vertical:dir(ltr) scale.horizontal:dir(ltr) @@ -31,7 +31,7 @@ trough:dir(ltr) highlight.top:dir(ltr) slider:dir(ltr) - scale.horizontal.marks-before.marks-after:dir(ltr) + scale.horizontal.marks-after.marks-before:dir(ltr) marks.top:dir(ltr) mark:dir(ltr) label:dir(ltr) -- 2.30.2