summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorWolfgang Beck <wolfgang.beck@nokia.com>2011-09-28 13:03:07 +1000
committerLincoln Ramsay <lincoln.ramsay@nokia.com>2011-10-10 09:25:31 +1000
commit93be0e5c0fd1694b0868187ed3daa006dfa4bd79 (patch)
tree299d135cc77f61d91bfa0ec52798718b49a1c743 /tests/auto
parentfe9a92ef71d5ab183672d0aeb94ca88e03854c7b (diff)
MTMW-357 Codereview changes for ProximitySensor QML Element
Change-Id: I5ded985ad4ea99fa7691c6b06bd233acdc517332 Reviewed-on: http://codereview.qt-project.org/5661 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp
index c9ec4d0b..33de1e70 100644
--- a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp
+++ b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp
@@ -82,12 +82,12 @@ void tst_Sensors2QMLAPI::initTestCase()
void tst_Sensors2QMLAPI::testProximity()
{
QSensor2Proximity prox;
- QSignalSpy spy(&prox, SIGNAL(runningChanged()));
- prox.setProperty("running", QVariant(true));
+ QSignalSpy spy(&prox, SIGNAL(enabledChanged()));
+ prox.setProperty("enabled", QVariant(true));
QCOMPARE(spy.count() , 1);
spy.clear();
- prox.setProperty("running", QVariant(true));
+ prox.setProperty("enabled", QVariant(true));
QCOMPARE(spy.count() , 0);
TestSensorPlugin plugin;
@@ -95,20 +95,20 @@ void tst_Sensors2QMLAPI::testProximity()
proxi->test(true);
bool expected = true;
- bool actual = prox.property("close").toBool();
+ bool actual = prox.property("near").toBool();
QCOMPARE(expected, actual);
- QSignalSpy spy1(&prox, SIGNAL(closeChanged()));
+ QSignalSpy spy1(&prox, SIGNAL(nearChanged()));
proxi->test(false);
QCOMPARE(spy1.count() , 1);
expected = false;
- actual = prox.property("close").toBool();
+ actual = prox.property("near").toBool();
QCOMPARE(expected, actual);
spy1.clear();
proxi->test(false);
QCOMPARE(spy1.count() , 0);
- prox.setProperty("running", QVariant(false));
+ prox.setProperty("enabled", QVariant(false));
}
void tst_Sensors2QMLAPI::testAmbientLight()