Merge lp:~aacid/qtubuntu-sensors/temporary_open_file into lp:qtubuntu-sensors

[Albert Astals Cid]

Q_ASSERT -> EXPECT_EQ

Since sometimes Q_ASSERT can be compiled out and thus the test would fail

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-trusty-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-sensors-ci/32/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Looking good also on Qt 5.2 with tests enabled:
https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta2/+sourcepub/3845558/+listing-archive-extra

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/test_sensor_api.cpp'
--- tests/test_sensor_api.cpp	2014-01-20 09:13:16 +0000
+++ tests/test_sensor_api.cpp	2014-01-23 14:48:56 +0000
@@ -54,7 +54,8 @@
   protected:
     virtual void SetUp()
     {
-        Q_ASSERT(data_file.open());
+        bool openResult = data_file.open();
+        EXPECT_EQ(openResult, true);
         setenv("UBUNTU_PLATFORM_API_SENSOR_TEST", qPrintable(data_file.fileName()), 1);
         setenv("UBUNTU_PLATFORM_API_BACKEND", "libubuntu_application_api_test.so.1", 1);