2003-01-15 Padraig O'Briain <padraig.obriain@sun.com

	* test/test-simple.c: Update to take account of fact that GailButton
	now implements AtkText.
	(create_text_window): Set name on AtkObject for GtkEntry.
	(validate_accessible): Check accessible name before calling test_text().

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@395 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index d4a574d..15a2b18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-01-15  Padraig O'Briain <padraig.obriain@sun.com
 
+       * test/test-simple.c: Update to take account of fact that GailButton 
+       now implements AtkText.
+       (create_text_window): Set name on AtkObject for GtkEntry.
+       (validate_accessible): Check accessible name before calling test_text().
+
        * libspi/Makefile.am: Fix problem with building outside of source
        directory. Bug #98120.
 

diff --git a/test/test-simple.c b/test/test-simple.c
index 2d13812..c832ee9 100644 (file)
--- a/test/test-simple.c
+++ b/test/test-simple.c
@@ -41,6 +41,7 @@ static void validate_accessible (Accessible *accessible,
 
 #define WINDOW_MAGIC 0x123456a
 #define TEST_STRING_A "A test string"
+#define TEST_STRING_A_OBJECT "A_test_string_object"
 #define TEST_STRING_B "Another test string"
 
 static int      print_tree_depth = 0;
@@ -105,6 +106,7 @@ create_test_window (void)
 {
        TestWindow *win = g_new0 (TestWindow, 1);
        GtkWidget  *widget, *vbox;
+       AtkObject *obj;
 
        win->magic  = WINDOW_MAGIC;
        win->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -117,6 +119,9 @@ create_test_window (void)
 
        widget = gtk_entry_new ();
        gtk_entry_set_text (GTK_ENTRY (widget), TEST_STRING_A);
+       obj = gtk_widget_get_accessible (widget);
+       atk_object_set_name (obj, TEST_STRING_A_OBJECT);
+
        test_window_add_and_show (GTK_CONTAINER (vbox), widget);
 
        widget = gtk_button_new_with_label ("_Foobar");
@@ -600,8 +605,10 @@ validate_accessible (Accessible *accessible,
                g_assert (tmp != NULL);
                if (print_tree)
                        fprintf (stderr, "Te");
-               else
-                       test_text (tmp);
+               else {
+                       if (strcmp (name, TEST_STRING_A_OBJECT) == 0)   
+                               test_text (tmp);
+               }
                AccessibleText_unref (tmp);
        }