[gtk/matthiasc/css-change-tracking-4: 11/11] testsuite: Update expected test output

[Matthias Clasen <matthiasc src gnome org>]

commit 7c9f469202f5cd4ccecb0ce0c3b60c26a7dcfe6a
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 17 00:16:44 2020 -0500

    testsuite: Update expected test output
    
    Several of the just added change flag tests were
    using nonexisting or impossible ancestor names,
    and thus are affected by the change to superset
    matching.

 testsuite/css/change/test1.css   |  13 ++
 testsuite/css/change/test1.nodes |   5 +
 testsuite/css/change/test1.ui    |  26 +++
 testsuite/css/change/test2.css   |  48 ++---
 testsuite/css/change/test2.nodes | 428 ++++++++++++++++++++++++++++++++++++++-
 testsuite/css/change/test2.ui    |   2 +
 testsuite/css/change/test4.css   |   6 +-
 testsuite/css/change/test5.css   |   2 +-
 8 files changed, 501 insertions(+), 29 deletions(-)
---
diff --git a/testsuite/css/change/test1.css b/testsuite/css/change/test1.css
new file mode 100644
index 0000000000..9ffd3c7551
--- /dev/null
+++ b/testsuite/css/change/test1.css
@@ -0,0 +1,13 @@
+/* Just a basic test of the machinery */
+
+box {
+  color: red;
+}
+
+label {
+  color: green;
+}
+
+label.test2 {
+  color: blue;
+}
diff --git a/testsuite/css/change/test1.nodes b/testsuite/css/change/test1.nodes
new file mode 100644
index 0000000000..4cf52ec676
--- /dev/null
+++ b/testsuite/css/change/test1.nodes
@@ -0,0 +1,5 @@
+[window.background:dir(ltr)]    
+  decoration:dir(ltr)    
+  box.horizontal:dir(ltr)    name
+    label:dir(ltr)    name
+    label.test:dir(ltr)    name
diff --git a/testsuite/css/change/test1.ui b/testsuite/css/change/test1.ui
new file mode 100644
index 0000000000..b5ddb9c1cf
--- /dev/null
+++ b/testsuite/css/change/test1.ui
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Hello World!</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">Hello World!</property>
+            <style><class name="test"/></style>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/css/change/test2.css b/testsuite/css/change/test2.css
index 8fa68e444a..228f9537d2 100644
--- a/testsuite/css/change/test2.css
+++ b/testsuite/css/change/test2.css
@@ -1,7 +1,7 @@
 /* trigger all change flags at least once */
 
 box {
-  color: red;
+  color: green;
 }
 
 label {
@@ -92,95 +92,95 @@ label:nth-last-child(2n+5) ~ label.t {
   color: blue;
 }
 
-label label.u {
+box label.u {
   color: blue;
 }
 
-#label label.u1 {
+#box label.u1 {
   color: blue;
 }
 
-label.test label.v {
+box.test label.v {
   color: blue;
 }
 
-label:focus label.w {
+box:focus label.w {
   color: blue;
 }
 
-label:hover label.x {
+box:hover label.x {
   color: blue;
 }
 
-label:disabled label.y {
+box:disabled label.y {
   color: blue;
 }
 
-label:backdrop label.z {
+box:backdrop label.z {
   color: blue;
 }
 
-label:selected label.aa {
+box:selected label.aa {
   color: blue;
 }
 
-label:first-child label.bb {
+box:first-child label.bb {
   color: blue;
 }
 
-label:last-child label.cc {
+box:last-child label.cc {
   color: blue;
 }
 
-label:nth-child(3) label.dd {
+box:nth-child(3) label.dd {
   color: blue;
 }
 
-label:nth-last-child(3) label.ee {
+box:nth-last-child(3) label.ee {
   color: blue;
 }
 
-label~label label.ff {
+box~box label.ff {
   color: blue;
 }
 
-#label~label label.gg {
+#box1~box label.gg {
   color: blue;
 }
 
-label.test~label label.hh {
+box.test~box label.hh {
   color: blue;
 }
 
-label:focus~label label.ii {
+box:focus~box label.ii {
   color: blue;
 }
 
-label:hover~label label.jj {
+box:hover~box label.jj {
   color: blue;
 }
 
-label:backdrop~label label.kk {
+box:backdrop~box label.kk {
   color: blue;
 }
 
-label:selected~label label.ll {
+box:selected~box label.ll {
   color: blue;
 }
 
-label:first-child~label label.mm {
+box:first-child~box label.mm {
   color: blue;
 }
 
-label:last-child~label label.nn {
+box:last-child~box label.nn {
   color: blue;
 }
 
-label:nth-child(2)~label label.oo {
+box:nth-child(2)~box label.oo {
   color: blue;
 }
 
-label:nth-last-child(2)~label label.pp {
+box:nth-last-child(2)~box label.pp {
   color: blue;
 }
 
diff --git a/testsuite/css/change/test2.nodes b/testsuite/css/change/test2.nodes
index ae80d2a6ca..28775de173 100644
--- a/testsuite/css/change/test2.nodes
+++ b/testsuite/css/change/test2.nodes
@@ -1,6 +1,432 @@
+Change for [window.background:dir(ltr)]
+ from 0 rules
+Total: 
+Change for [window.background:dir(ltr)]
+ from 1 rules
+  from *: 
+Total: 
+Change for decoration:dir(ltr)
+ from 0 rules
+Total: 
+Change for decoration:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for box#box.horizontal.test:dir(ltr)
+ from 1 rules
+  from box: name
+Total: name
+Change for box#box.horizontal.test:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label:dir(ltr)
+ from 1 rules
+  from label: name
+Total: name
+Change for label:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.a:dir(ltr)
+ from 2 rules
+  from :disabled.alabel: class|name|disabled
+  from label: name
+Total: class|name|disabled
+Change for label.a:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.b:dir(ltr)
+ from 2 rules
+  from :selected.blabel: class|name|selected
+  from label: name
+Total: class|name|selected
+Change for label.b:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.c:dir(ltr)
+ from 2 rules
+  from :backdrop.clabel: class|name|backdrop
+  from label: name
+Total: class|name|backdrop
+Change for label.c:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.d:dir(ltr)
+ from 2 rules
+  from :focus.dlabel: class|name|state
+  from label: name
+Total: class|name|state
+Change for label.d:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.e:dir(ltr)
+ from 2 rules
+  from :first-child.elabel: class|name|first-child
+  from label: name
+Total: class|name|first-child
+Change for label.e:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.f:dir(ltr)
+ from 2 rules
+  from :last-child.flabel: class|name|last-child
+  from label: name
+Total: class|name|last-child
+Change for label.f:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.g:dir(ltr)
+ from 2 rules
+  from :nth-child(2).glabel: class|name|nth-child
+  from label: name
+Total: class|name|nth-child
+Change for label.g:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.h:dir(ltr)
+ from 2 rules
+  from :nth-last-child(2).hlabel: class|name|nth-last-child
+  from label: name
+Total: class|name|nth-last-child
+Change for label.h:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.i:dir(ltr)
+ from 2 rules
+  from :hover.ilabel: class|name|hover
+  from label: name
+Total: class|name|hover
+Change for label.i:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.j:dir(ltr)
+ from 2 rules
+  from label ~ .jlabel: class|name|sibling-name
+  from label: name
+Total: class|name|sibling-name
+Change for label.j:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.j1:dir(ltr)
+ from 2 rules
+  from #label ~ .j1label: class|name|sibling-id
+  from label: name
+Total: class|name|sibling-id
+Change for label.j1:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.k:dir(ltr)
+ from 2 rules
+  from label.test ~ .klabel: class|name|sibling-class|sibling-name
+  from label: name
+Total: class|name|sibling-class|sibling-name
+Change for label.k:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.l:dir(ltr)
+ from 2 rules
+  from :hoverlabel ~ .llabel: class|name|sibling-name|sibling-hover
+  from label: name
+Total: class|name|sibling-name|sibling-hover
+Change for label.l:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.m:dir(ltr)
+ from 2 rules
+  from :disabledlabel ~ .mlabel: class|name|sibling-name|sibling-disabled
+  from label: name
+Total: class|name|sibling-name|sibling-disabled
+Change for label.m:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.n:dir(ltr)
+ from 2 rules
+  from :backdroplabel ~ .nlabel: class|name|sibling-name|sibling-backdrop
+  from label: name
+Total: class|name|sibling-name|sibling-backdrop
+Change for label.n:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.o:dir(ltr)
+ from 2 rules
+  from :selectedlabel ~ .olabel: class|name|sibling-name|sibling-selected
+  from label: name
+Total: class|name|sibling-name|sibling-selected
+Change for label.o:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.p:dir(ltr)
+ from 2 rules
+  from :focuslabel ~ .plabel: class|name|sibling-name|sibling-state
+  from label: name
+Total: class|name|sibling-name|sibling-state
+Change for label.p:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.q:dir(ltr)
+ from 2 rules
+  from :first-childlabel ~ .qlabel: class|name|sibling-name|sibling-first-child
+  from label: name
+Total: class|name|sibling-name|sibling-first-child
+Change for label.q:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.r:dir(ltr)
+ from 2 rules
+  from :last-childlabel ~ .rlabel: class|name|sibling-name|sibling-last-child
+  from label: name
+Total: class|name|sibling-name|sibling-last-child
+Change for label.r:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.s:dir(ltr)
+ from 2 rules
+  from :nth-child(2n+5)label ~ .slabel: class|name|nth-child|sibling-name|sibling-nth-child
+  from label: name
+Total: class|name|nth-child|sibling-name|sibling-nth-child
+Change for label.s:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.t:dir(ltr)
+ from 2 rules
+  from :nth-last-child(2n+5)label ~ .tlabel: class|name|nth-last-child|sibling-name|sibling-nth-last-child
+  from label: name
+Total: class|name|nth-last-child|sibling-name|sibling-nth-last-child
+Change for label.t:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.u:dir(ltr)
+ from 2 rules
+  from box .ulabel: class|name|parent-name
+  from label: name
+Total: class|name|parent-name
+Change for label.u:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.u1:dir(ltr)
+ from 2 rules
+  from #box .u1label: class|name|parent-id
+  from label: name
+Total: class|name|parent-id
+Change for label.u1:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.v:dir(ltr)
+ from 2 rules
+  from box.test .vlabel: class|name|parent-class|parent-name
+  from label: name
+Total: class|name|parent-class|parent-name
+Change for label.v:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.w:dir(ltr)
+ from 2 rules
+  from :focusbox .wlabel: class|name|parent-name|parent-state
+  from label: name
+Total: class|name|parent-name|parent-state
+Change for label.w:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.x:dir(ltr)
+ from 2 rules
+  from :hoverbox .xlabel: class|name|parent-name|parent-hover
+  from label: name
+Total: class|name|parent-name|parent-hover
+Change for label.x:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.y:dir(ltr)
+ from 2 rules
+  from :disabledbox .ylabel: class|name|parent-name|parent-disabled
+  from label: name
+Total: class|name|parent-name|parent-disabled
+Change for label.y:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.z:dir(ltr)
+ from 2 rules
+  from :backdropbox .zlabel: class|name|parent-name|parent-backdrop
+  from label: name
+Total: class|name|parent-name|parent-backdrop
+Change for label.z:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.aa:dir(ltr)
+ from 2 rules
+  from :selectedbox .aalabel: class|name|parent-name|parent-selected
+  from label: name
+Total: class|name|parent-name|parent-selected
+Change for label.aa:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.bb:dir(ltr)
+ from 2 rules
+  from :first-childbox .bblabel: class|name|parent-name|parent-first-child
+  from label: name
+Total: class|name|parent-name|parent-first-child
+Change for label.bb:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.cc:dir(ltr)
+ from 2 rules
+  from :last-childbox .cclabel: class|name|parent-name|parent-last-child
+  from label: name
+Total: class|name|parent-name|parent-last-child
+Change for label.cc:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.dd:dir(ltr)
+ from 2 rules
+  from :nth-child(3)box .ddlabel: class|name|parent-name|parent-nth-child
+  from label: name
+Total: class|name|parent-name|parent-nth-child
+Change for label.dd:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.ee:dir(ltr)
+ from 2 rules
+  from :nth-last-child(3)box .eelabel: class|name|parent-name|parent-nth-last-child
+  from label: name
+Total: class|name|parent-name|parent-nth-last-child
+Change for label.ee:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.ff:dir(ltr)
+ from 2 rules
+  from box ~ box .fflabel: class|name|parent-name|parent-sibling-name
+  from label: name
+Total: class|name|parent-name|parent-sibling-name
+Change for label.ff:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.gg:dir(ltr)
+ from 2 rules
+  from #box1 ~ box .gglabel: class|name|parent-name|parent-sibling-id
+  from label: name
+Total: class|name|parent-name|parent-sibling-id
+Change for label.gg:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.hh:dir(ltr)
+ from 2 rules
+  from box.test ~ box .hhlabel: class|name|parent-name|parent-sibling-class|parent-sibling-name
+  from label: name
+Total: class|name|parent-name|parent-sibling-class|parent-sibling-name
+Change for label.hh:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.ii:dir(ltr)
+ from 2 rules
+  from :focusbox ~ box .iilabel: class|name|parent-name|parent-sibling-name|parent-sibling-state
+  from label: name
+Total: class|name|parent-name|parent-sibling-name|parent-sibling-state
+Change for label.ii:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.jj:dir(ltr)
+ from 2 rules
+  from :hoverbox ~ box .jjlabel: class|name|parent-name|parent-sibling-name|parent-sibling-hover
+  from label: name
+Total: class|name|parent-name|parent-sibling-name|parent-sibling-hover
+Change for label.jj:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.kk:dir(ltr)
+ from 2 rules
+  from :backdropbox ~ box .kklabel: class|name|parent-name|parent-sibling-name|parent-sibling-backdrop
+  from label: name
+Total: class|name|parent-name|parent-sibling-name|parent-sibling-backdrop
+Change for label.kk:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.ll:dir(ltr)
+ from 2 rules
+  from :selectedbox ~ box .lllabel: class|name|parent-name|parent-sibling-name|parent-sibling-selected
+  from label: name
+Total: class|name|parent-name|parent-sibling-name|parent-sibling-selected
+Change for label.ll:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.mm:dir(ltr)
+ from 2 rules
+  from :first-childbox ~ box .mmlabel: class|name|parent-name|parent-sibling-name|parent-sibling-first-child
+  from label: name
+Total: class|name|parent-name|parent-sibling-name|parent-sibling-first-child
+Change for label.mm:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.nn:dir(ltr)
+ from 2 rules
+  from :last-childbox ~ box .nnlabel: class|name|parent-name|parent-sibling-name|parent-sibling-last-child
+  from label: name
+Total: class|name|parent-name|parent-sibling-name|parent-sibling-last-child
+Change for label.nn:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.oo:dir(ltr)
+ from 2 rules
+  from :nth-child(2)box ~ box .oolabel: 
class|name|parent-name|parent-nth-child|parent-sibling-name|parent-sibling-nth-child
+  from label: name
+Total: class|name|parent-name|parent-nth-child|parent-sibling-name|parent-sibling-nth-child
+Change for label.oo:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
+Change for label.pp:dir(ltr)
+ from 2 rules
+  from :nth-last-child(2)box ~ box .pplabel: 
class|name|parent-name|parent-nth-last-child|parent-sibling-name|parent-sibling-nth-last-child
+  from label: name
+Total: class|name|parent-name|parent-nth-last-child|parent-sibling-name|parent-sibling-nth-last-child
+Change for label.pp:dir(ltr)
+ from 1 rules
+  from *: 
+Total: 
 [window.background:dir(ltr)]    
   decoration:dir(ltr)    
-  box.horizontal:dir(ltr)    name
+  box#box.horizontal.test:dir(ltr)    name
     label:dir(ltr)    name
     label.a:dir(ltr)    class|name|disabled
     label.b:dir(ltr)    class|name|selected
diff --git a/testsuite/css/change/test2.ui b/testsuite/css/change/test2.ui
index 5407cef3e1..f679c5ac5d 100644
--- a/testsuite/css/change/test2.ui
+++ b/testsuite/css/change/test2.ui
@@ -5,6 +5,8 @@
     <property name="type">popup</property>
     <child>
       <object class="GtkBox">
+        <property name="name">box</property>
+        <style><class name="test"/></style>
         <child>
           <object class="GtkLabel">
           </object>
diff --git a/testsuite/css/change/test4.css b/testsuite/css/change/test4.css
index 7a6367dacb..425600637a 100644
--- a/testsuite/css/change/test4.css
+++ b/testsuite/css/change/test4.css
@@ -12,14 +12,14 @@ label.b:not(:hover):backdrop {
   color: green;
 }
 
-label:not(:hover) label.c {
+box:not(:hover) label.c {
   color: green;
 }
 
-label:not(:hover):backdrop label.d {
+box:not(:hover):backdrop label.d {
   color: green;
 }
 
-label:not(:hover):backdrop label.e:not(.f) {
+box:not(:hover):backdrop label.e:not(.f) {
   color: green;
 }
diff --git a/testsuite/css/change/test5.css b/testsuite/css/change/test5.css
index 432f7dc128..a4aa9002a4 100644
--- a/testsuite/css/change/test5.css
+++ b/testsuite/css/change/test5.css
@@ -4,7 +4,7 @@ box {
   color: red;
 }
 
-g:hover label {
+box:hover label {
   color: red;
 }