]> Pileus Git - ~andy/gtk/commitdiff
tests: Don't print selection count
authorBenjamin Otte <otte@redhat.com>
Wed, 29 Jun 2011 16:16:23 +0000 (18:16 +0200)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 5 Jul 2011 20:08:56 +0000 (16:08 -0400)
Selection count is tested via assertions and can be inferred from
looking at the number of selected children.

And I'd like to reduce the output of the tests. We're outputting way too
much anyway.

tests/a11y/about.txt
tests/a11y/accessibility-dump.c
tests/a11y/appchooser.txt
tests/a11y/iconview.txt
tests/a11y/notebook.txt
tests/a11y/pickers.txt
tests/a11y/tree.txt

index 58cca1d5c8e5ba7c1fcc7eee49262dfb25320d78..58d39ce38426d52a31d30558789553addf68e0d0 100644 (file)
@@ -86,7 +86,6 @@ window1
         layer: widget
         alpha: 1
         <AtkSelection>
-        selection count: 1
         selected children: unnamed-GailNotebookPage-4
         unnamed-GailNotebookPage-4
           "page tab"
index 38093ca5f959642176b98c0d9286676a315f3a10..09019978f060838d0bcb9f01a6f54589c3cfc99b 100644 (file)
@@ -393,9 +393,9 @@ dump_atk_selection (AtkSelection *atk_selection,
   guint n_selections, n_counted_selections;
   gint i;
 
-  n_selections = atk_selection_get_selection_count (atk_selection);
   g_string_append_printf (string, "%*s<AtkSelection>\n", depth, "");
-  g_string_append_printf (string, "%*sselection count: %d\n", depth, "", n_selections);
+
+  n_selections = atk_selection_get_selection_count (atk_selection);
 
   n_counted_selections = 0;
   for (i = 0; i < atk_object_get_n_accessible_children (ATK_OBJECT (atk_selection)); i++)
@@ -418,6 +418,7 @@ dump_atk_selection (AtkSelection *atk_selection,
     }
   
   g_assert_cmpint (n_selections, ==, n_counted_selections);
+  g_assert_cmpint (n_selections, ==, atk_selection_get_selection_count (atk_selection));
 }
 
 static void
index 8368528c5cfab8ea386ecab09e03bf5cba411004..5750f27a2f8dc64138dcaa6c69f64e147a7834e5 100644 (file)
@@ -101,7 +101,6 @@ window1
               layer: widget
               alpha: 1
               <AtkSelection>
-              selection count: 0
               <AtkTable>
               rows: 1
               columns: 1
index 1061995acffc05796ecc2890ce11578a1ee6a04a..52fd6639c5a5b57ba8a3ca9a44a0caacc0984684 100644 (file)
@@ -16,7 +16,6 @@ window1
     layer: widget
     alpha: 1
     <AtkSelection>
-    selection count: 0
     One
       "icon"
       parent: iv1
index a5176653603f4cc7d7c1b155bddb9561a69dbc34..bf6b116f94df8e769fdce8d41bae0cfec8d9493d 100644 (file)
@@ -16,7 +16,6 @@ window1
     layer: widget
     alpha: 1
     <AtkSelection>
-    selection count: 1
     selected children: Tab 1
     Tab 1
       "page tab"
index eb049375b8e9428a0cd17c658812c2664a355380..4ef41f7cabca9367cc7ac0a1b4c81b6d86b37914 100644 (file)
@@ -82,7 +82,6 @@ window1
         <AtkAction>
         action 0 name: press
         <AtkSelection>
-        selection count: 0
         unnamed-GailMenu-1
           "menu"
           parent: unnamed-GailComboBox-0
@@ -93,7 +92,6 @@ window1
           layer: popup
           alpha: 1
           <AtkSelection>
-          selection count: 0
           unnamed-GailMenuItem-2
             "menu item"
             parent: unnamed-GailMenu-1
@@ -282,7 +280,6 @@ window1
       <AtkAction>
       action 0 name: press
       <AtkSelection>
-      selection count: 0
       unnamed-GailMenu-8
         "menu"
         parent: button1
@@ -293,4 +290,3 @@ window1
         layer: popup
         alpha: 1
         <AtkSelection>
-        selection count: 0
index 0713b5ee75db7d14608b41753928a864254e3695..564ddf72af4e86a8edbb3ca177186c794cfdf810 100644 (file)
@@ -16,7 +16,6 @@ window1
     layer: widget
     alpha: 1
     <AtkSelection>
-    selection count: 2
     selected children: One
                        Two
     <AtkTable>