Merge lp:~pitti/autopilot-gtk/gtktextbuffer into lp:autopilot-gtk

[Martin Pitt]

Support GtkTextBuffer properties, to introspect GtkTextView contents.

This adds support for GtkTextBuffer property types, most importantly to
introspect GtkTextView.buffer properties.

[lp:~pitti/autopilot-gtk/gtktextbuffer]

51. By Martin Pitt on 2013-06-27

fix memory leak in previous commit

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/autopilot-gtk-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-saucy-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-saucy-armhf-ci/22

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-gtk-ci/60/rebuild

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

Revied and tested. All looks good. Confirmed that test case failed without lib update.

review: Approve

=== modified file 'lib/GtkNode.cpp'
--- lib/GtkNode.cpp	2013-06-27 07:16:45 +0000
+++ lib/GtkNode.cpp	2013-06-27 09:47:28 +0000
@@ -65,6 +65,25 @@
       g_value_init(value, G_TYPE_UINT);
       g_value_set_uint(value, flags);
   }
+
+  if (pspec->value_type == GTK_TYPE_TEXT_BUFFER) {
+    GtkTextBuffer *buf = GTK_TEXT_BUFFER(g_value_get_object(value));
+    if (buf != NULL) {
+      //g_debug("attribute %s of type %s holds GtkTextBuffer", g_param_spec_get_name(pspec),
+      //        g_type_name(pspec->value_type));
+      GtkTextIter start, end;
+      gtk_text_buffer_get_start_iter(buf, &start);
+      gtk_text_buffer_get_end_iter(buf, &end);
+      gchar* text = gtk_text_iter_get_text(&start, &end);
+
+      g_value_unset(value);
+      *value = G_VALUE_INIT;
+      g_value_init(value, G_TYPE_STRING);
+      g_value_set_string(value, (text != NULL) ? text : "");
+
+      g_free(text);
+    }
+  }
 }
 
 GVariant* GtkNode::Introspect() const

=== modified file 'tests/autopilot/tests/test_properties.py'
--- tests/autopilot/tests/test_properties.py	2013-06-27 06:07:01 +0000
+++ tests/autopilot/tests/test_properties.py	2013-06-27 09:47:28 +0000
@@ -121,3 +121,18 @@
 
         res = self.app.select_many('GtkButton', events=btn_greet.events)
         self.assertGreater(len(res), 0)
+
+    def test_textview_properties(self):
+        """GtkTextView properties"""
+
+        t = self.app.select_single(BuilderName='textview_demo')
+        self.assertNotEqual(t, None)
+        self.assertEqual(t.editable, True)
+        self.assertEqual(t.overwrite, False)
+        # the buffer property points to a GtkTextBuffer object, which we want
+        # to translate to a plain string
+        self.assertEqual(t.buffer, 'This is a test application.')
+
+        # select by buffer contents
+        w = self.app.select_single(buffer='This is a test application.')
+        self.assertEqual(w.BuilderName, 'textview_demo')

=== modified file 'tests/hello_color.ui'
--- tests/hello_color.ui	2013-06-25 10:39:16 +0000
+++ tests/hello_color.ui	2013-06-27 09:47:28 +0000
@@ -10,8 +10,29 @@
     <property name="authors">Martin Pitt</property>
     <property name="license_type">gpl-3-0</property>
   </object>
+  <object class="GtkWindow" id="window_textview">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">TextView Demo</property>
+    <child>
+      <object class="GtkScrolledWindow" id="scrolledwindow1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkTextView" id="textview_demo">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="buffer">textbuffer_demo</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkTextBuffer" id="textbuffer_demo">
+    <property name="text">This is a test application.</property>
+  </object>
   <object class="GtkWindow" id="window_app">
     <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Hello Color</property>
     <signal name="destroy" handler="on_quit" swapped="no"/>
     <child>
       <object class="GtkBox" id="box1">