testsuite: Update buildertool tests

gtk-builder-tool simplify --3to4 now produces a <requires lib="gtk" version="4.0"/>. Adapt for that, and also add some tests that check that we actually verify the requires, and accept 3.99 and 4.0, but not 5.x.
2024-11-10 10:50:10 +00:00 · 2020-11-10 19:20:51 -05:00 · 2020-11-10 19:20:51 -05:00 · d6a0948182
commit d6a0948182
parent 7215c74933
34 changed files with 32 additions and 18 deletions
--- a/testsuite/tools/simplify-data-3to4/actionbar.expected
+++ b/testsuite/tools/simplify-data-3to4/actionbar.expected
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="3.0"/>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkActionBar">
    <property name="visible">0</property>
    <child type="start">
--- a/testsuite/tools/simplify-data-3to4/actionbar.ui
+++ b/testsuite/tools/simplify-data-3to4/actionbar.ui
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
  <object class="GtkActionBar">
    <child>
      <object class="GtkButton" id="button">
--- a/testsuite/tools/simplify-data-3to4/assistant.expected
+++ b/testsuite/tools/simplify-data-3to4/assistant.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkAssistant" id="window1">
    <child>
      <object class="GtkAssistantPage">
--- a/testsuite/tools/simplify-data-3to4/assistant.ui
+++ b/testsuite/tools/simplify-data-3to4/assistant.ui
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
  <object class="GtkAssistant" id="window1">
    <child>
      <object class="GtkButton" id="button1">
--- a/testsuite/tools/simplify-data-3to4/bin.expected
+++ b/testsuite/tools/simplify-data-3to4/bin.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkFrame">
    <property name="visible">0</property>
    <property name="label">bla</property>
--- a/testsuite/tools/simplify-data-3to4/box.expected
+++ b/testsuite/tools/simplify-data-3to4/box.expected
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="3.0"/>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkWindow">
    <property name="child">
      <object class="GtkBox">
--- a/testsuite/tools/simplify-data-3to4/box.ui
+++ b/testsuite/tools/simplify-data-3to4/box.ui
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
 <interface>
-  <requires lib="gtk+" version="3.0"/>
  <object class="GtkWindow">
    <child>
      <object class="GtkBox">
--- a/testsuite/tools/simplify-data-3to4/dialog.expected
+++ b/testsuite/tools/simplify-data-3to4/dialog.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <object class="GtkDialog">
+  <requires lib="gtk" version="4.0"/>
  <child internal-child="content_area">
    <object class="GtkBox">
      <property name="visible">0</property>
--- a/testsuite/tools/simplify-data-3to4/fixed.expected
+++ b/testsuite/tools/simplify-data-3to4/fixed.expected
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="3.0"/>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkFixed">
    <child>
      <object class="GtkButton" id="button">
--- a/testsuite/tools/simplify-data-3to4/fixed.ui
+++ b/testsuite/tools/simplify-data-3to4/fixed.ui
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
 <interface>
-  <requires lib="gtk+" version="3.0"/>
  <object class="GtkFixed">
    <property name="visible">True</property>
    <child>
--- a/testsuite/tools/simplify-data-3to4/grid.expected
+++ b/testsuite/tools/simplify-data-3to4/grid.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkWindow" id="window1">
    <property name="child">
      <object class="GtkGrid" id="grid1">
--- a/testsuite/tools/simplify-data-3to4/grid.ui
+++ b/testsuite/tools/simplify-data-3to4/grid.ui
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
  <object class="GtkWindow" id="window1">
    <child>
      <object class="GtkGrid" id="grid1">
--- a/testsuite/tools/simplify-data-3to4/gtkfilechooserdialog.expected
+++ b/testsuite/tools/simplify-data-3to4/gtkfilechooserdialog.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk30">
+  <requires lib="gtk" version="4.0"/>
  <template class="GtkFileChooserDialog" parent="GtkDialog">
    <property name="role">GtkFileChooserDialog</property>
    <property name="type-hint">dialog</property>
--- a/testsuite/tools/simplify-data-3to4/gtkfilechooserdialog.ui
+++ b/testsuite/tools/simplify-data-3to4/gtkfilechooserdialog.ui
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk30">
-  <!-- interface-requires gtk+ 3.10 -->
  <template class="GtkFileChooserDialog" parent="GtkDialog">
    <property name="role">GtkFileChooserDialog</property>
    <property name="type-hint">dialog</property>
--- a/testsuite/tools/simplify-data-3to4/headerbar.expected
+++ b/testsuite/tools/simplify-data-3to4/headerbar.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkWindow" id="window1">
    <child type="titlebar">
      <object class="GtkHeaderBar" id="headerbar1">
--- a/testsuite/tools/simplify-data-3to4/headerbar.ui
+++ b/testsuite/tools/simplify-data-3to4/headerbar.ui
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
  <object class="GtkWindow" id="window1">
    <child type="titlebar">
      <object class="GtkHeaderBar" id="headerbar1">
--- a/testsuite/tools/simplify-data-3to4/nm-crash.expected
+++ b/testsuite/tools/simplify-data-3to4/nm-crash.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="nm-applet">
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkAssistant">
    <child>
      <object class="GtkAssistantPage">
--- a/testsuite/tools/simplify-data-3to4/notebook.expected
+++ b/testsuite/tools/simplify-data-3to4/notebook.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkWindow" id="window1">
    <property name="child">
      <object class="GtkNotebook" id="notebook1">
--- a/testsuite/tools/simplify-data-3to4/notebook.ui
+++ b/testsuite/tools/simplify-data-3to4/notebook.ui
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
  <object class="GtkWindow" id="window1">
    <child>
      <object class="GtkNotebook" id="notebook1">
--- a/testsuite/tools/simplify-data-3to4/office-runner.expected
+++ b/testsuite/tools/simplify-data-3to4/office-runner.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkWindow" id="window1">
    <property name="border_width">12</property>
    <property name="title" translatable="yes">Office Runner</property>
--- a/testsuite/tools/simplify-data-3to4/office-runner.ui
+++ b/testsuite/tools/simplify-data-3to4/office-runner.ui
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
  <object class="GtkWindow" id="window1">
    <property name="border_width">12</property>
    <property name="title" translatable="yes">Office Runner</property>
--- a/testsuite/tools/simplify-data-3to4/overlay.expected
+++ b/testsuite/tools/simplify-data-3to4/overlay.expected
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="3.0"/>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkOverlay">
    <child type="overlay">
      <object class="GtkButton" id="button">
--- a/testsuite/tools/simplify-data-3to4/paned.expected
+++ b/testsuite/tools/simplify-data-3to4/paned.expected
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="3.0"/>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkPaned">
    <property name="resize-end-child">0</property>
    <property name="shrink-start-child">0</property>
--- a/testsuite/tools/simplify-data-3to4/popover.expected
+++ b/testsuite/tools/simplify-data-3to4/popover.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkPopover" id="popover">
    <property name="autohide">0</property>
  </object>
--- a/testsuite/tools/simplify-data-3to4/scale.expected
+++ b/testsuite/tools/simplify-data-3to4/scale.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkScale">
    <property name="draw-value">1</property>
    <property name="visible">0</property>
--- a/testsuite/tools/simplify-data-3to4/stack.expected
+++ b/testsuite/tools/simplify-data-3to4/stack.expected
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkWindow" id="window1">
    <property name="child">
      <object class="GtkBox" id="box1">
--- a/testsuite/tools/simplify-data-3to4/stack.ui
+++ b/testsuite/tools/simplify-data-3to4/stack.ui
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
  <object class="GtkWindow" id="window1">
    <child>
      <object class="GtkBox" id="box1">
--- a/testsuite/tools/simplify-data-3to4/toolbar.expected
+++ b/testsuite/tools/simplify-data-3to4/toolbar.expected
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk" version="3.0"/>
+  <requires lib="gtk" version="4.0"/>
  <object class="GtkBox">
    <style>
      <class name="toolbar"/>
--- a/testsuite/tools/validate-data/invalid5.expected
+++ b/testsuite/tools/validate-data/invalid5.expected
@ -0,0 +1 @@
+invalid5.ui:3:1 Required GTK version 5.10, current version is 3.99
--- a/testsuite/tools/validate-data/invalid5.ui
+++ b/testsuite/tools/validate-data/invalid5.ui
@ -0,0 +1,3 @@
+<interface>
+  <requires lib="gtk" version="5.10"/>
+</interface>
--- a/testsuite/tools/validate-data/valid3.expected
+++ b/testsuite/tools/validate-data/valid3.expected
--- a/testsuite/tools/validate-data/valid3.ui
+++ b/testsuite/tools/validate-data/valid3.ui
@ -0,0 +1,5 @@
+<interface>
+  <requires lib="gtk" version="3.99"/>
+  <object class="GtkWindow">
+  </object>
+</interface>
--- a/testsuite/tools/validate-data/valid4.expected
+++ b/testsuite/tools/validate-data/valid4.expected
--- a/testsuite/tools/validate-data/valid4.ui
+++ b/testsuite/tools/validate-data/valid4.ui
@ -0,0 +1,5 @@
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkWindow">
+  </object>
+</interface>
				`@ -0,0 +1 @@`
				`invalid5.ui:3:1 Required GTK version 5.10, current version is 3.99`