Merge lp:~canonical-platform-qa/autopilot-qt/wily_fix-unittests into lp:autopilot-qt

[Christopher Lee]

Update unittest to reflect 2 new objects that appear in the object tree.

Update test to reflect 2 new objects that appear in the object tree.

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2014-08-19 23:59:15 +0000
+++ debian/control	2015-08-25 00:30:42 +0000
@@ -69,8 +69,7 @@
 Package: qttestability-autopilot
 Section: libs
 Architecture: any
-Depends: libxpathselect1.4,
-         python3-autopilot (>= 1.4),
+Depends: python3-autopilot (>= 1.4),
          autopilot-qt5 | autopilot-qt4
          ${misc:Depends},
          ${shlibs:Depends}

=== modified file 'tests/unittests/tst_introspection.cpp'
--- tests/unittests/tst_introspection.cpp	2014-07-21 02:04:52 +0000
+++ tests/unittests/tst_introspection.cpp	2015-08-25 00:30:42 +0000
@@ -107,11 +107,13 @@
                     QStringList()
                         << "QMainWindow"
                         << "QWidgetWindow"
+                        << "QWidgetWindow"
+                        << "QWidgetWindow"
                     )
             );
 
-    QTest::newRow("//QWidget[id=6]")
-        << "//QWidget[id=6]"
+    QTest::newRow("//QWidget[id=8]")
+        << "//QWidget[id=8]"
         << 1
         << "/tst_introspection/QMainWindow/QWidget"
         << "objectName"
@@ -121,8 +123,8 @@
                 << "centralTestWidget"
             );
 
-    QTest::newRow("//QPushButton[id=9]")
-        << "//QPushButton[id=9]"
+    QTest::newRow("//QPushButton[id=11]")
+        << "//QPushButton[id=11]"
         << 1
         << "/tst_introspection/QMainWindow/QWidget/QPushButton"
         << "objectName"