Fix Position getter for table cells

diff --git a/atk-adaptor/adaptors/table-cell-adaptor.c b/atk-adaptor/adaptors/table-cell-adaptor.c
index 3418f4cd36a14062736bf3ec6e5161c50722cc71..330c6330aa6ba8281750595352ef54ffa19b42f8 100644 (file)
--- a/atk-adaptor/adaptors/table-cell-adaptor.c
+++ b/atk-adaptor/adaptors/table-cell-adaptor.c
@@ -114,8 +114,8 @@ impl_get_Position (DBusMessageIter * iter, void *user_data)
 
   d_row = row;
   d_column = column;
-  dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, "(ii)", &iter_variant);
-  dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_STRUCT, NULL, &iter_struct);
+  dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "(ii)", &iter_variant);
+  dbus_message_iter_open_container (&iter_variant, DBUS_TYPE_STRUCT, NULL, &iter_struct);
   dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &row);
   dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &column);
   dbus_message_iter_close_container (&iter_variant, &iter_struct);

diff --git a/tests/atk_test_table_cell.c b/tests/atk_test_table_cell.c
index 082ce1d10f744b28513a0fcfdf328eb8311ca8ce..6b629b8a77abb2a05ddf6d26d857b52ac62921f0 100644 (file)
--- a/tests/atk_test_table_cell.c
+++ b/tests/atk_test_table_cell.c
@@ -139,6 +139,28 @@ atk_test_table_cell_get_row_column_span (gpointer fixture, gconstpointer user_da
   g_assert_cmpint (column_span, ==, 1);
 }
 
+static void
+atk_test_table_cell_get_position (gpointer fixture, gconstpointer user_data)
+{
+  AtspiAccessible *_obj = get_root_obj (DATA_FILE);
+  g_assert (_obj);
+  AtspiAccessible *child = atspi_accessible_get_child_at_index (_obj, 0, NULL);
+  g_assert (child);
+
+  AtspiAccessible *cell = atspi_accessible_get_child_at_index (child, 9, NULL);
+  AtspiTableCell *obj = atspi_accessible_get_table_cell (cell);
+  g_assert (cell);
+
+  gint row = 10;
+  gint column = 10;
+
+  atspi_table_cell_get_position (obj, &row, &column, NULL);
+
+  /* TODO: not a very good test for the app to return (-1, -1) */
+  g_assert_cmpint (row, ==, -1);
+  g_assert_cmpint (column, ==, -1);
+}
+
 static void
 atk_test_table_cell_get_table (gpointer fixture, gconstpointer user_data)
 {
@@ -181,6 +203,8 @@ atk_test_table_cell (void)
   */
   g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_row_column_span",
                      0, NULL, NULL, atk_test_table_cell_get_row_column_span, teardown_table_cell_test);
+  g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_position",
+                     0, NULL, NULL, atk_test_table_cell_get_position, teardown_table_cell_test);
   g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_table",
                      0, NULL, NULL, atk_test_table_cell_get_table, teardown_table_cell_test);
 

diff --git a/tests/dummyatk/my-atk-table-cell.c b/tests/dummyatk/my-atk-table-cell.c
index 2d1c5688342a9bd01d34c1b038ce31c2b38920a2..b22eaf5b13529da20163b37251463ea84c1a2ff7 100644 (file)
--- a/tests/dummyatk/my-atk-table-cell.c
+++ b/tests/dummyatk/my-atk-table-cell.c
@@ -134,7 +134,7 @@ my_atk_tablecell_get_position (AtkTableCell *obj, gint *row , gint *column)
   *row = self->xy[0];
   *column = self->xy[1];
 
-  return FALSE;
+  return TRUE;
 }
 
 static GPtrArray *