From 824743a39590d99b508a3de8dfd26b6244334f40 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 5 Apr 2019 00:49:33 +0100
Subject: [PATCH] testsuite/css: Update UI files

Run the UI files through `gtk-builder-tool simplify --3to4` to update
the layout properties.
---
 testsuite/css/nodes/box.ltr.ui             |   7 --
 testsuite/css/nodes/box.rtl.ui             |   7 --
 testsuite/css/nodes/buttons.ui             | 130 +++++++++------------
 testsuite/css/nodes/checkbutton.ltr.ui     |   7 --
 testsuite/css/nodes/checkbutton.rtl.ui     |   7 --
 testsuite/css/nodes/combobox.ui            |   6 +-
 testsuite/css/nodes/entries.ui             |  21 +---
 testsuite/css/nodes/expander.ltr.ui        |   8 +-
 testsuite/css/nodes/expander.rtl.ui        |   8 +-
 testsuite/css/nodes/levelbar.ltr.ui        |  15 +--
 testsuite/css/nodes/levelbar.rtl.ui        |  15 +--
 testsuite/css/nodes/notebook-arrows.ui     |   1 +
 testsuite/css/nodes/notebook-arrows2.ui    |   1 +
 testsuite/css/nodes/notebook.bottom.ltr.ui |   1 +
 testsuite/css/nodes/notebook.bottom.rtl.ui |   1 +
 testsuite/css/nodes/notebook.left.ltr.ui   |   1 +
 testsuite/css/nodes/notebook.left.rtl.ui   |   1 +
 testsuite/css/nodes/notebook.right.ltr.ui  |   1 +
 testsuite/css/nodes/notebook.right.rtl.ui  |   1 +
 testsuite/css/nodes/notebook.top.ltr.ui    |   1 +
 testsuite/css/nodes/notebook.top.rtl.ui    |   1 +
 testsuite/css/nodes/paned.ltr.ui           |   1 +
 testsuite/css/nodes/paned.rtl.ui           |   1 +
 testsuite/css/nodes/progressbar.ui         |  15 +--
 24 files changed, 82 insertions(+), 176 deletions(-)

diff --git a/testsuite/css/nodes/box.ltr.ui b/testsuite/css/nodes/box.ltr.ui
index 7e774e97ca..7454f63236 100644
--- a/testsuite/css/nodes/box.ltr.ui
+++ b/testsuite/css/nodes/box.ltr.ui
@@ -1,28 +1,21 @@
 <?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>
-        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label3</property>
           </object>
         </child>
diff --git a/testsuite/css/nodes/box.rtl.ui b/testsuite/css/nodes/box.rtl.ui
index 7e774e97ca..7454f63236 100644
--- a/testsuite/css/nodes/box.rtl.ui
+++ b/testsuite/css/nodes/box.rtl.ui
@@ -1,28 +1,21 @@
 <?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>
-        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="name">label3</property>
           </object>
         </child>
diff --git a/testsuite/css/nodes/buttons.ui b/testsuite/css/nodes/buttons.ui
index 826f840769..60e429dd2d 100644
--- a/testsuite/css/nodes/buttons.ui
+++ b/testsuite/css/nodes/buttons.ui
@@ -1,134 +1,118 @@
 <?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="GtkGrid" id="grid1">
-        <property name="visible">True</property>
         <child>
           <object class="GtkToggleButton" id="button1">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="active">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkCheckButton" id="button2">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="button3">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkRadioButton" id="button4">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="visible">True</property>
-            <property name="active">True</property>
+            <property name="active">1</property>
             <property name="group">button3</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">3</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">3</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSwitch" id="button5">
-            <property name="visible">True</property>
-            <property name="active">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="active">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
+            <layout>
+              <property name="left_attach">4</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">4</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSwitch" id="button6">
-            <property name="visible">True</property>
-            <property name="active">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="button6-accessible">
                 <property name="accessible-name">Test switch</property>
               </object>
             </child>
+            <layout>
+              <property name="left_attach">5</property>
+              <property name="top_attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">5</property>
-            <property name="top_attach">0</property>
-          </packing>
         </child>
-
         <child>
           <object class="GtkButton" id="button7">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="label">Text Button</property>
+            <layout>
+              <property name="left_attach">0</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button8">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="icon-name">edit-find-replace</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
+            <layout>
+              <property name="left_attach">1</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="button9">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
             <property name="icon-name">window-close-symbolic</property>
+            <layout>
+              <property name="left_attach">2</property>
+              <property name="top_attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/testsuite/css/nodes/checkbutton.ltr.ui b/testsuite/css/nodes/checkbutton.ltr.ui
index 5482265ac6..98cd73b52f 100644
--- a/testsuite/css/nodes/checkbutton.ltr.ui
+++ b/testsuite/css/nodes/checkbutton.ltr.ui
@@ -1,19 +1,14 @@
 <?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>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkCheckButton">
-            <property name="visible">True</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">label</property>
               </object>
             </child>
@@ -21,10 +16,8 @@
         </child>
         <child>
           <object class="GtkRadioButton">
-            <property name="visible">True</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">label</property>
               </object>
             </child>
diff --git a/testsuite/css/nodes/checkbutton.rtl.ui b/testsuite/css/nodes/checkbutton.rtl.ui
index 5482265ac6..98cd73b52f 100644
--- a/testsuite/css/nodes/checkbutton.rtl.ui
+++ b/testsuite/css/nodes/checkbutton.rtl.ui
@@ -1,19 +1,14 @@
 <?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>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkCheckButton">
-            <property name="visible">True</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">label</property>
               </object>
             </child>
@@ -21,10 +16,8 @@
         </child>
         <child>
           <object class="GtkRadioButton">
-            <property name="visible">True</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="label">label</property>
               </object>
             </child>
diff --git a/testsuite/css/nodes/combobox.ui b/testsuite/css/nodes/combobox.ui
index a6be038c41..c899a71823 100644
--- a/testsuite/css/nodes/combobox.ui
+++ b/testsuite/css/nodes/combobox.ui
@@ -1,14 +1,11 @@
 <?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" id="box1">
         <child>
           <object class="GtkComboBoxText" id="combo1">
-            <property name="visible">True</property>
             <items>
               <item id="one">One</item>
               <item id="two">Two</item>
@@ -18,8 +15,7 @@
         </child>
         <child>
           <object class="GtkComboBoxText" id="combo2">
-            <property name="visible">True</property>
-            <property name="has-entry">True</property>
+            <property name="has-entry">1</property>
             <items>
               <item id="one">One</item>
               <item id="two">Two</item>
diff --git a/testsuite/css/nodes/entries.ui b/testsuite/css/nodes/entries.ui
index c6fa1e8d16..5d75aa4407 100644
--- a/testsuite/css/nodes/entries.ui
+++ b/testsuite/css/nodes/entries.ui
@@ -1,63 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">0.5</property>
     <property name="upper">99.5</property>
-    <property name="page-size">0</property>
     <property name="value">45.5</property>
     <property name="step-increment">0.5</property>
     <property name="page-increment">5.0</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
           <object class="GtkLabel" id="label1">
             <property name="label">_entry:</property>
-            <property name="visible">True</property>
-            <property name="use-underline">True</property>
+            <property name="use-underline">1</property>
             <property name="mnemonic-widget">entry1</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
             <property name="label">_password entry:</property>
-            <property name="visible">True</property>
-            <property name="use-underline">True</property>
+            <property name="use-underline">1</property>
             <property name="mnemonic-widget">entry2</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="label3">
             <property name="label">_spinbutton:</property>
-            <property name="visible">True</property>
-            <property name="use-underline">True</property>
+            <property name="use-underline">1</property>
             <property name="mnemonic-widget">spinbutton1</property>
           </object>
         </child>
         <child>
           <object class="GtkEntry" id="entry1">
             <property name="text" translatable="yes">text</property>
-            <property name="visible">True</property>
             <property name="progress-fraction">0.3</property>
           </object>
         </child>
         <child>
           <object class="GtkEntry" id="entry2">
             <property name="text" translatable="yes">password text</property>
-            <property name="visible">True</property>
-            <property name="visibility">False</property>
-            <property name="invisible_char">*</property>
-            <property name="invisible_char_set">True</property>
+            <property name="visibility">0</property>
+            <property name="invisible_char_set">1</property>
           </object>
         </child>
         <child>
           <object class="GtkEntry" id="entry3">
             <property name="text" translatable="yes">icons</property>
-            <property name="visible">True</property>
             <property name="primary-icon-name">edit-copy</property>
             <property name="secondary-icon-name">edit-paste</property>
           </object>
@@ -65,7 +55,6 @@
         <child>
           <object class="GtkSpinButton" id="spinbutton1">
             <property name="adjustment">adjustment1</property>
-            <property name="visible">True</property>
           </object>
         </child>
       </object>
diff --git a/testsuite/css/nodes/expander.ltr.ui b/testsuite/css/nodes/expander.ltr.ui
index db90ffd577..f0185db2b7 100644
--- a/testsuite/css/nodes/expander.ltr.ui
+++ b/testsuite/css/nodes/expander.ltr.ui
@@ -1,22 +1,16 @@
 <?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="GtkExpander">
-        <property name="visible">True</property>
         <child type="label">
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="label">label</property>
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-          </object>
+          <object class="GtkBox"/>
         </child>
       </object>
     </child>
diff --git a/testsuite/css/nodes/expander.rtl.ui b/testsuite/css/nodes/expander.rtl.ui
index db90ffd577..f0185db2b7 100644
--- a/testsuite/css/nodes/expander.rtl.ui
+++ b/testsuite/css/nodes/expander.rtl.ui
@@ -1,22 +1,16 @@
 <?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="GtkExpander">
-        <property name="visible">True</property>
         <child type="label">
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <property name="label">label</property>
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-          </object>
+          <object class="GtkBox"/>
         </child>
       </object>
     </child>
diff --git a/testsuite/css/nodes/levelbar.ltr.ui b/testsuite/css/nodes/levelbar.ltr.ui
index a74784fff1..4ff7b23a09 100644
--- a/testsuite/css/nodes/levelbar.ltr.ui
+++ b/testsuite/css/nodes/levelbar.ltr.ui
@@ -1,42 +1,33 @@
 <?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>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.5</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="inverted">True</property>
+            <property name="inverted">1</property>
             <property name="value">0.5</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.2</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.8</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">5</property>
             <property name="mode">discrete</property>
@@ -49,8 +40,6 @@
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">2</property>
             <property name="mode">discrete</property>
@@ -63,8 +52,6 @@
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">8</property>
             <property name="mode">discrete</property>
diff --git a/testsuite/css/nodes/levelbar.rtl.ui b/testsuite/css/nodes/levelbar.rtl.ui
index a74784fff1..4ff7b23a09 100644
--- a/testsuite/css/nodes/levelbar.rtl.ui
+++ b/testsuite/css/nodes/levelbar.rtl.ui
@@ -1,42 +1,33 @@
 <?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>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.5</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="inverted">True</property>
+            <property name="inverted">1</property>
             <property name="value">0.5</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.2</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
             <property name="value">0.8</property>
           </object>
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">5</property>
             <property name="mode">discrete</property>
@@ -49,8 +40,6 @@
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">2</property>
             <property name="mode">discrete</property>
@@ -63,8 +52,6 @@
         </child>
         <child>
           <object class="GtkLevelBar">
-            <property name="visible">True</property>
-            <property name="min-value">0</property>
             <property name="max-value">10</property>
             <property name="value">8</property>
             <property name="mode">discrete</property>
diff --git a/testsuite/css/nodes/notebook-arrows.ui b/testsuite/css/nodes/notebook-arrows.ui
index 4b3bd70fab..8763e80b68 100644
--- a/testsuite/css/nodes/notebook-arrows.ui
+++ b/testsuite/css/nodes/notebook-arrows.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook-arrows2.ui b/testsuite/css/nodes/notebook-arrows2.ui
index bd563af34a..8de9edc0f0 100644
--- a/testsuite/css/nodes/notebook-arrows2.ui
+++ b/testsuite/css/nodes/notebook-arrows2.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <child>
diff --git a/testsuite/css/nodes/notebook.bottom.ltr.ui b/testsuite/css/nodes/notebook.bottom.ltr.ui
index 927ec1f252..4c8774de39 100644
--- a/testsuite/css/nodes/notebook.bottom.ltr.ui
+++ b/testsuite/css/nodes/notebook.bottom.ltr.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.bottom.rtl.ui b/testsuite/css/nodes/notebook.bottom.rtl.ui
index 927ec1f252..4c8774de39 100644
--- a/testsuite/css/nodes/notebook.bottom.rtl.ui
+++ b/testsuite/css/nodes/notebook.bottom.rtl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.left.ltr.ui b/testsuite/css/nodes/notebook.left.ltr.ui
index 3b654a680b..e1678785bd 100644
--- a/testsuite/css/nodes/notebook.left.ltr.ui
+++ b/testsuite/css/nodes/notebook.left.ltr.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.left.rtl.ui b/testsuite/css/nodes/notebook.left.rtl.ui
index 3b654a680b..e1678785bd 100644
--- a/testsuite/css/nodes/notebook.left.rtl.ui
+++ b/testsuite/css/nodes/notebook.left.rtl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.right.ltr.ui b/testsuite/css/nodes/notebook.right.ltr.ui
index 26877095d7..2a4592e356 100644
--- a/testsuite/css/nodes/notebook.right.ltr.ui
+++ b/testsuite/css/nodes/notebook.right.ltr.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.right.rtl.ui b/testsuite/css/nodes/notebook.right.rtl.ui
index 26877095d7..2a4592e356 100644
--- a/testsuite/css/nodes/notebook.right.rtl.ui
+++ b/testsuite/css/nodes/notebook.right.rtl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.top.ltr.ui b/testsuite/css/nodes/notebook.top.ltr.ui
index a51b936a42..05cff7f79f 100644
--- a/testsuite/css/nodes/notebook.top.ltr.ui
+++ b/testsuite/css/nodes/notebook.top.ltr.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/notebook.top.rtl.ui b/testsuite/css/nodes/notebook.top.rtl.ui
index a51b936a42..05cff7f79f 100644
--- a/testsuite/css/nodes/notebook.top.rtl.ui
+++ b/testsuite/css/nodes/notebook.top.rtl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/paned.ltr.ui b/testsuite/css/nodes/paned.ltr.ui
index 69b08b672d..be2e3936fc 100644
--- a/testsuite/css/nodes/paned.ltr.ui
+++ b/testsuite/css/nodes/paned.ltr.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/paned.rtl.ui b/testsuite/css/nodes/paned.rtl.ui
index 69b08b672d..be2e3936fc 100644
--- a/testsuite/css/nodes/paned.rtl.ui
+++ b/testsuite/css/nodes/paned.rtl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
diff --git a/testsuite/css/nodes/progressbar.ui b/testsuite/css/nodes/progressbar.ui
index 83badd4348..18510402fd 100644
--- a/testsuite/css/nodes/progressbar.ui
+++ b/testsuite/css/nodes/progressbar.ui
@@ -1,44 +1,35 @@
 <?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>
         <property name="name">progressbars</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkProgressBar">
-            <property name="visible">True</property>
-            <property name="show-text">True</property>
-            <property name="fraction">0</property>
+            <property name="show-text">1</property>
           </object>
         </child>
         <child>
           <object class="GtkProgressBar">
-            <property name="visible">True</property>
             <property name="fraction">1</property>
           </object>
         </child>
         <child>
           <object class="GtkProgressBar">
-            <property name="visible">True</property>
-            <property name="show-text">True</property>
+            <property name="show-text">1</property>
             <property name="fraction">0.4</property>
           </object>
         </child>
         <child>
           <object class="GtkProgressBar">
-            <property name="visible">True</property>
-            <property name="inverted">True</property>
+            <property name="inverted">1</property>
             <property name="fraction">0.4</property>
           </object>
         </child>
         <child>
           <object class="GtkProgressBar">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="fraction">0.4</property>
           </object>