[gtk+] Fix reftests



commit 339cb1fe6b6a066a4950fab056bed87ee30c8af6
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Oct 27 18:56:05 2015 -0400

    Fix reftests
    
    Multiple reftests were damaged by the element name transition.
    Repair them. The region reftests are no longer needed, since
    we no longer do regions.

 testsuite/reftests/Makefile.am                     |    6 --
 testsuite/reftests/css-match-import-import.css     |    2 +-
 testsuite/reftests/css-match-import.css            |    2 +-
 .../reftests/css-match-inherit-different-state.css |    2 +-
 .../reftests/css-match-region-matches-star.css     |   10 ---
 .../reftests/css-match-region-matches-star.ref.ui  |   32 ---------
 .../reftests/css-match-region-matches-star.ui      |   31 ---------
 testsuite/reftests/css-match-regions.css           |   18 -----
 testsuite/reftests/css-match-regions.ref.ui        |   71 --------------------
 testsuite/reftests/css-match-regions.ui            |   68 -------------------
 testsuite/reftests/css-match-siblings.css          |    6 +-
 testsuite/reftests/entry-progress-coloring.css     |    4 +-
 testsuite/reftests/icon-vfuncs.css                 |    2 +-
 testsuite/reftests/iconview-empty.css              |    2 +-
 testsuite/reftests/label-background.css            |    2 +-
 testsuite/reftests/label-clipping.css              |    2 +-
 testsuite/reftests/label-shadows.css               |    2 +-
 testsuite/reftests/label-sizing.css                |    2 +-
 .../label-text-shadow-changes-modify-clip.css      |    2 +-
 testsuite/reftests/label-text-shadow-clipping.css  |    2 +-
 testsuite/reftests/opacity-initial.css             |    2 +-
 testsuite/reftests/shorthand-entry-border.css      |    4 +-
 testsuite/reftests/sizegroups-basics.css           |    2 +-
 .../reftests/style-context-save-inheritance.css    |    6 +-
 testsuite/reftests/treeview-fixed-height.css       |    2 +-
 25 files changed, 24 insertions(+), 260 deletions(-)
---
diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index bcadea7..584d47e 100644
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -213,12 +213,6 @@ testdata = \
        css-match-name.css \
        css-match-name.ref.ui \
        css-match-name.ui \
-       css-match-region-matches-star.css \
-       css-match-region-matches-star.ui \
-       css-match-region-matches-star.ref.ui \
-       css-match-regions.css \
-       css-match-regions.ref.ui \
-       css-match-regions.ui \
        css-match-siblings.css \
        css-match-siblings.ref.ui \
        css-match-siblings.ui \
diff --git a/testsuite/reftests/css-match-import-import.css b/testsuite/reftests/css-match-import-import.css
index a6239ee..e6e6c9a 100644
--- a/testsuite/reftests/css-match-import-import.css
+++ b/testsuite/reftests/css-match-import-import.css
@@ -1,4 +1,4 @@
-GtkLabel {
+label {
   color: blue;
 }
 
diff --git a/testsuite/reftests/css-match-import.css b/testsuite/reftests/css-match-import.css
index a02915b..6dbdf4b 100644
--- a/testsuite/reftests/css-match-import.css
+++ b/testsuite/reftests/css-match-import.css
@@ -1,6 +1,6 @@
 @import url("css-match-import-import.css");
 
-GtkLabel {
+label {
   color: purple;
 }
 
diff --git a/testsuite/reftests/css-match-inherit-different-state.css 
b/testsuite/reftests/css-match-inherit-different-state.css
index d164300..8cf1f0c 100644
--- a/testsuite/reftests/css-match-inherit-different-state.css
+++ b/testsuite/reftests/css-match-inherit-different-state.css
@@ -7,6 +7,6 @@
   color: red;
 }
 
-GtkLabel:insensitive {
+label:insensitive {
   color: inherit;
 }
diff --git a/testsuite/reftests/css-match-siblings.css b/testsuite/reftests/css-match-siblings.css
index baf2e7d..4c99c61 100644
--- a/testsuite/reftests/css-match-siblings.css
+++ b/testsuite/reftests/css-match-siblings.css
@@ -3,17 +3,17 @@
   color: red
 }
 
-* ~ * ~ GtkLabel,
+* ~ * ~ label,
 #lime {
   color: lime;
 }
 
-* ~ * + GtkLabel ~ *,
+* ~ * + label ~ *,
 #blue {
   color: blue;
 }
 
-* + GtkLabel ~ * ~ GtkLabel + *,
+* + label ~ * ~ label + *,
 #purple {
   color: purple;
 }
diff --git a/testsuite/reftests/entry-progress-coloring.css b/testsuite/reftests/entry-progress-coloring.css
index 607254d..81b312e 100644
--- a/testsuite/reftests/entry-progress-coloring.css
+++ b/testsuite/reftests/entry-progress-coloring.css
@@ -4,11 +4,11 @@
   font: Monospace;
 }
 
-GtkEntry #padded {
+entry #padded {
   padding: 10px;
 }
 
-.progressbar {
+progress {
   background-color: rgba(0,0,0,0);
   background-image: none;
   border-color: rgba(0,0,0,0);
diff --git a/testsuite/reftests/icon-vfuncs.css b/testsuite/reftests/icon-vfuncs.css
index aab3db4..00ce4ed 100644
--- a/testsuite/reftests/icon-vfuncs.css
+++ b/testsuite/reftests/icon-vfuncs.css
@@ -11,6 +11,6 @@
   font-size: 20px;
 }
 
-GtkImage {
+image {
   background: lime;
 }
diff --git a/testsuite/reftests/iconview-empty.css b/testsuite/reftests/iconview-empty.css
index 519b8eb..98b2d5e 100644
--- a/testsuite/reftests/iconview-empty.css
+++ b/testsuite/reftests/iconview-empty.css
@@ -1,5 +1,5 @@
 @import "reset-to-defaults.css";
 
-GtkIconView, GtkImage {
+GtkIconView, image {
   background-color: blue;
 }
diff --git a/testsuite/reftests/label-background.css b/testsuite/reftests/label-background.css
index 82bb5fb..37d4d08 100644
--- a/testsuite/reftests/label-background.css
+++ b/testsuite/reftests/label-background.css
@@ -6,6 +6,6 @@ GtkBox {
   background: red; /* should also never be seen */
 }
 
-GtkLabel {
+label {
   background: green;
 }
diff --git a/testsuite/reftests/label-clipping.css b/testsuite/reftests/label-clipping.css
index b2e2497..2c4fc91 100644
--- a/testsuite/reftests/label-clipping.css
+++ b/testsuite/reftests/label-clipping.css
@@ -1,6 +1,6 @@
 @import "reset-to-defaults.css";
 
-GtkLabel {
+label {
   font-size: 40px;
   font-style: italic;
 }
diff --git a/testsuite/reftests/label-shadows.css b/testsuite/reftests/label-shadows.css
index 5df0f4c..06f92ad 100644
--- a/testsuite/reftests/label-shadows.css
+++ b/testsuite/reftests/label-shadows.css
@@ -1,4 +1,4 @@
-GtkLabel {
+label {
   engine: none;
   text-shadow: 1px 1px red;
 }
diff --git a/testsuite/reftests/label-sizing.css b/testsuite/reftests/label-sizing.css
index 0d356b6..ca06c8f 100644
--- a/testsuite/reftests/label-sizing.css
+++ b/testsuite/reftests/label-sizing.css
@@ -3,6 +3,6 @@
   padding: 0;
 }
 
-GtkPaned GtkLabel {
+GtkPaned label {
   background-color: pink
 }
diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.css 
b/testsuite/reftests/label-text-shadow-changes-modify-clip.css
index bea2d0c..0a53907 100644
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.css
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.css
@@ -5,7 +5,7 @@
   100% { text-shadow: 20px 20px tomato; }
 }
 
-GtkLabel {
+label {
   font-size: 40px;
   animation-name: foo;
   animation-duration: 100s;
diff --git a/testsuite/reftests/label-text-shadow-clipping.css 
b/testsuite/reftests/label-text-shadow-clipping.css
index 9b13b51..a518aa0 100644
--- a/testsuite/reftests/label-text-shadow-clipping.css
+++ b/testsuite/reftests/label-text-shadow-clipping.css
@@ -1,6 +1,6 @@
 @import "reset-to-defaults.css";
 
-GtkLabel {
+label {
   font-size: 40px;
   text-shadow: 20px 20px tomato;
 }
diff --git a/testsuite/reftests/opacity-initial.css b/testsuite/reftests/opacity-initial.css
index 611a8cd..ff6903c 100644
--- a/testsuite/reftests/opacity-initial.css
+++ b/testsuite/reftests/opacity-initial.css
@@ -1,3 +1,3 @@
-GtkLabel {
+label {
   opacity: 0;
 }
diff --git a/testsuite/reftests/shorthand-entry-border.css b/testsuite/reftests/shorthand-entry-border.css
index 0d1d463..93bad6e 100644
--- a/testsuite/reftests/shorthand-entry-border.css
+++ b/testsuite/reftests/shorthand-entry-border.css
@@ -7,11 +7,11 @@ GtkWidget {
   border-right-width: 5px;
 }
 
-GtkEntry {
+entry {
   border-width: 10px 20px;
 }
 
-.entry {
+entry {
   border-left-width: 10px;
   border-right-width: 10px;
 }
diff --git a/testsuite/reftests/sizegroups-basics.css b/testsuite/reftests/sizegroups-basics.css
index 6ae37b9..4eda6b9 100644
--- a/testsuite/reftests/sizegroups-basics.css
+++ b/testsuite/reftests/sizegroups-basics.css
@@ -1,4 +1,4 @@
-GtkLabel {
+label {
   background-image: none;
   background-color: purple;
   color: white;
diff --git a/testsuite/reftests/style-context-save-inheritance.css 
b/testsuite/reftests/style-context-save-inheritance.css
index 3f3630c..5c7957a 100644
--- a/testsuite/reftests/style-context-save-inheritance.css
+++ b/testsuite/reftests/style-context-save-inheritance.css
@@ -4,12 +4,12 @@
   color: red;
 }
 
-GtkLabel {
+label {
   color: green;
 }
 
-GtkLabel:link,
-GtkLabel:visited {
+label:link,
+label:visited {
   color: inherit;
 }
 
diff --git a/testsuite/reftests/treeview-fixed-height.css b/testsuite/reftests/treeview-fixed-height.css
index e203cc6..09160c1 100644
--- a/testsuite/reftests/treeview-fixed-height.css
+++ b/testsuite/reftests/treeview-fixed-height.css
@@ -20,7 +20,7 @@
     background-color: white;
 }
 
-GtkImage, GtkLabel, .menuitem {
+image, label, .menuitem {
     background-color: transparent;
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]