Merge lp:~allanlesage/autopilot-gtk/null-check-stringification into lp:autopilot-gtk

[Allan LeSage]

Worked through this with charles; we were crashing on failure to find a match, this branch checks for.

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

This now seems to work for string properties, but not for other property types. For example, when launching gedit, this query should return things:

"//GeditWindow[can_focus=0]"

But it doesn't...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:37
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~allanlesage/autopilot-gtk/null-check-stringification/+merge/162444/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-gtk-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-raring-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-raring-armhf-ci/12

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

review: Needs Fixing (continuous-integration)

[Allan LeSage (allanlesage)]

Try "//GtkWindow[accept-focus=TRUE]" ; would '1' be more correct? It appears the string-expression of bools is as in the code proper.

[Allan LeSage (allanlesage)]

Approving after consulting with Thomi.

review: Approve

[Allan LeSage (allanlesage)]

Thomi believes that there's a pattern for transforming values like 1, TRUE, "on" in autopilot-qt--Thomi do give me a reference to that code if you think of it and we'll implement it in autopilot-gtk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~allanlesage/autopilot-gtk/null-check-stringification/+merge/162444/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Martin Pitt (pitti)]

This is also fixed as a side-effect of refactoring the MatchProperty() function, see https://code.launchpad.net/~pitti/autopilot-gtk/enum-flags-properties/+merge/171713 . So this is superseded.

Unmerged revisions

37. By Allan LeSage on 2013-05-03

Null check prevents failure of otherwise correct stringification.

=== modified file 'lib/GtkNode.cpp'
--- lib/GtkNode.cpp	2013-05-02 19:24:57 +0000
+++ lib/GtkNode.cpp	2013-05-03 19:03:30 +0000
@@ -17,6 +17,7 @@
  * Authored by: Allan LeSage <[e-mail]>
  */
 
+#include <cstdio>
 #include <string>
 #include <gdk/gdk.h>
 
@@ -191,12 +192,15 @@
     // if we found the property and it can be expressed as a string
     if (pspec && g_value_type_transformable(pspec->value_type,
                                             G_TYPE_STRING)) {
+      const char * str;
       GValue dest_value = G_VALUE_INIT;
       g_value_init(&dest_value, G_TYPE_STRING);
       g_object_get_property(object_, name.c_str(), &dest_value);
-      std::string dest_string = g_value_get_string(&dest_value);
+      str = g_value_get_string (&dest_value);
+      // a null check prevents crash if match isn't found
+      bool match = str && value == str;
       g_value_unset(&dest_value);
-      return dest_string == value;
+      return match;
     }
     return false;
   }