From 2f744db943a6e1b96e41a1a5f0f2558d95079255 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Wed, 29 Jun 2011 18:16:23 +0200
Subject: [PATCH] tests: Don't print selection count

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            | 1 -
 tests/a11y/accessibility-dump.c | 5 +++--
 tests/a11y/appchooser.txt       | 1 -
 tests/a11y/iconview.txt         | 1 -
 tests/a11y/notebook.txt         | 1 -
 tests/a11y/pickers.txt          | 4 ----
 tests/a11y/tree.txt             | 1 -
 7 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/tests/a11y/about.txt b/tests/a11y/about.txt
index 58cca1d5c8..58d39ce384 100644
--- a/tests/a11y/about.txt
+++ b/tests/a11y/about.txt
@@ -86,7 +86,6 @@ window1
         layer: widget
         alpha: 1
         <AtkSelection>
-        selection count: 1
         selected children: unnamed-GailNotebookPage-4
         unnamed-GailNotebookPage-4
           "page tab"
diff --git a/tests/a11y/accessibility-dump.c b/tests/a11y/accessibility-dump.c
index 38093ca5f9..09019978f0 100644
--- a/tests/a11y/accessibility-dump.c
+++ b/tests/a11y/accessibility-dump.c
@@ -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
diff --git a/tests/a11y/appchooser.txt b/tests/a11y/appchooser.txt
index 8368528c5c..5750f27a2f 100644
--- a/tests/a11y/appchooser.txt
+++ b/tests/a11y/appchooser.txt
@@ -101,7 +101,6 @@ window1
               layer: widget
               alpha: 1
               <AtkSelection>
-              selection count: 0
               <AtkTable>
               rows: 1
               columns: 1
diff --git a/tests/a11y/iconview.txt b/tests/a11y/iconview.txt
index 1061995acf..52fd6639c5 100644
--- a/tests/a11y/iconview.txt
+++ b/tests/a11y/iconview.txt
@@ -16,7 +16,6 @@ window1
     layer: widget
     alpha: 1
     <AtkSelection>
-    selection count: 0
     One
       "icon"
       parent: iv1
diff --git a/tests/a11y/notebook.txt b/tests/a11y/notebook.txt
index a517665360..bf6b116f94 100644
--- a/tests/a11y/notebook.txt
+++ b/tests/a11y/notebook.txt
@@ -16,7 +16,6 @@ window1
     layer: widget
     alpha: 1
     <AtkSelection>
-    selection count: 1
     selected children: Tab 1
     Tab 1
       "page tab"
diff --git a/tests/a11y/pickers.txt b/tests/a11y/pickers.txt
index eb049375b8..4ef41f7cab 100644
--- a/tests/a11y/pickers.txt
+++ b/tests/a11y/pickers.txt
@@ -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
diff --git a/tests/a11y/tree.txt b/tests/a11y/tree.txt
index 0713b5ee75..564ddf72af 100644
--- a/tests/a11y/tree.txt
+++ b/tests/a11y/tree.txt
@@ -16,7 +16,6 @@ window1
     layer: widget
     alpha: 1
     <AtkSelection>
-    selection count: 2
     selected children: One
                        Two
     <AtkTable>