I have made the following changes intended for : nemo:devel:mw / qmsystem
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.merproject.org//request/show/77 Thank You, Matti Kosola [This message was auto-generated] --- Request # 77: Messages from BOSS: State: review at 2013-03-21T09:30:20 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:mw : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:mkosola:branches:nemo:devel:mw / qmsystem -> nemo:devel:mw / qmsystem changes files: -------------- --- qmsystem.changes +++ qmsystem.changes @@ -0,0 +1,7 @@ +* Tue Mar 19 2013 Matti Kosola <[email protected]> - 1.4.4 +- Add qmsystem.yaml and qmsystem.changes to rpm directory +- Merge patches from Nemo/Mer OBS to git +- Fix powerontimer test to verify results properly +- Clean up Harmattan hacks from tests.xml +- Clean up time test and try to approximate and set proper system time after test + old: ---- qmsystem-1.0.0-tests-directories.patch qmsystem-1.4.1-meego-1.3-compile-fix.patch qmsystem-1.4.1-no-docs.patch qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch qmsystem-1.4.3-add-missing-lib-for-linking.patch qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch qmsystem-1.4.3.tar.bz2 qmsystem-set-default-usbmode-with-dbus.diff new: ---- qmsystem-1.4.4.tar.bz2 spec files: ----------- --- qmsystem.spec +++ qmsystem.spec @@ -9,20 +9,13 @@ # << macros Summary: QmSystem library -Version: 1.4.3.2 +Version: 1.4.4 Release: 1 Group: System/System Control License: LGPLv2 -URL: http://meego.gitorious.org/meego-middleware/qmsystem -Source0: %{name}-1.4.3.tar.bz2 +URL: http://github.com/nemomobile/qmsystem +Source0: %{name}-1.4.4.tar.bz2 Source100: qmsystem.yaml -Patch0: %{name}-1.0.0-tests-directories.patch -Patch1: qmsystem-set-default-usbmode-with-dbus.diff -Patch2: qmsystem-1.4.1-meego-1.3-compile-fix.patch -Patch3: qmsystem-1.4.1-no-docs.patch -Patch4: qmsystem-1.4.3-add-missing-lib-for-linking.patch -Patch5: qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch -Patch6: qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch Requires: sensorfw >= 0.6.33 Requires: timed >= 2.31 Requires: mce @@ -61,22 +54,8 @@ %prep -%setup -q -n %{name}-1.4.3 +%setup -q -n %{name}-%{version} -# %{name}-1.0.0-tests-directories.patch -%patch0 -p1 -# qmsystem-set-default-usbmode-with-dbus.diff -%patch1 -p1 -# qmsystem-1.4.1-meego-1.3-compile-fix.patch -%patch2 -p1 -# qmsystem-1.4.1-no-docs.patch -%patch3 -p1 -# qmsystem-1.4.3-add-missing-lib-for-linking.patch -%patch4 -p1 -# qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch -%patch5 -p1 -# qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch -%patch6 -p1 # >> setup # << setup other changes: -------------- ++++++ qmsystem-1.4.3.tar.bz2 -> qmsystem-1.4.4.tar.bz2 --- keyd/keyd.pro +++ keyd/keyd.pro @@ -12,6 +12,7 @@ keytranslator.cpp HEADERS += qmkeyd.h \ keytranslator.h +LIBS += -lrt target.path = $$(DESTDIR)/usr/sbin INSTALLS = target --- libqmsystem2.pro +++ libqmsystem2.pro @@ -1,8 +1,6 @@ TEMPLATE = subdirs SUBDIRS = system keyd tests -include( doc/doc.pri ) - PKGCONFIGFILES.files = qmsystem2.pc PKGCONFIGFILES.path = /usr/lib/pkgconfig --- rpm +++ rpm +(directory) --- rpm/qmsystem.changes +++ rpm/qmsystem.changes @@ -0,0 +1,63 @@ +* Tue Mar 19 2013 Matti Kosola <[email protected]> - 1.4.4 +- Add qmsystem.yaml and qmsystem.changes to rpm directory +- Merge patches from Nemo/Mer OBS to git +- Fix powerontimer test to verify results properly +- Clean up Harmattan hacks from tests.xml +- Clean up time test and try to approximate and set proper system time after test + +* Tue Sep 04 2012 Philippe De Swert <[email protected]> - 1.4.3.2 +- Fix bug where ask mode could not be set anymore as default mode +- Update usb test to the new usb functionality + +* Sat Aug 24 2012 Marko Saukko <[email protected]> - 1.4.3.1 +- Fixes NEMO#380: Added mce build dependency back, dropped disable_mce_dependency.patch + +* Thu Aug 23 2012 Marko Saukko <[email protected]> - 1.4.3.1 +- Add .1 to version to make dependency possible without release mess. + See: https://bugs.merproject.org/show_bug.cgi?id=91 + +* Mon Aug 20 2012 Philippe De Swert <[email protected]> - 1.4.3 +- Add patch to make the usb-modes more generic and add mtp + +* Wed Dec 21 2011 Marko Saukko <[email protected]> - 1.4.3 +- Added qmsystem-1.4.3-add-missing-lib-for-linking.patch to fix + linking with newer toolchains. + +* Wed Nov 02 2011 Marko Saukko <[email protected]> - 1.4.3 +- Updated to version 1.4.3. + +* Fri Sep 30 2011 Marko Saukko <[email protected]> - 1.4.1 +- Removed documentation. + +* Fri Sep 16 2011 Marko Saukko <[email protected]> - 1.4.1 +- Updated to version 1.4.1 + +* Sun May 24 2011 Philippe De Swert <[email protected]> - 1.1.6 +- Add qmusbmode patch to work around gconf issue and make usb config applet to work + +* Tue May 24 2011 Miroslav Safr <[email protected]> - 1.1.6 +- BMC#18064 - Remove qmsystem dependency on mce because it is not available anymore +-- removed mce dependecy (added disable_mce_dependency.patch) +-- created .yaml file and regenerated .spec file + +* Fri Apr 08 2011 Miroslav Safr <[email protected]> - 1.1.6 +- BMC#15199 - Update meegotouch framework +- update to 1.1.6 - required by meegotouch-systemui + +* Thu Feb 10 2011 Tapio Rantala <[email protected]> - 1.0.10-1 +- New upstream version (BMC#12784) +- Drop displaystate-default patch, applied upstream + +* Fri Feb 04 2011 Tapio Rantala <[email protected]> - 1.0.8-1 +- New upstream version (BMC#12784) +- Add displaystate-default patch, don't report display off if mce is unavailable + +* Tue Feb 01 2011 Tapio Rantala <[email protected]> - 1.0.7-1 +- New upstream version (BMC#12784) +- Enable mce support + +* Fri Jan 21 2011 Tapio Rantala <[email protected]> - 1.0.6_1-1 +- New upstream version (BMC#12784) + +* Mon Dec 20 2010 Tapio Rantala <[email protected]> - 1.0.0-1 +- Initial meego packaging (FEA#11097) --- rpm/qmsystem.spec +++ rpm/qmsystem.spec @@ -0,0 +1,115 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.25 +# + +Name: qmsystem + +# >> macros +# << macros + +Summary: QmSystem library +Version: 1.4.4 +Release: 1 +Group: System/System Control +License: LGPLv2 +URL: http://github.com/nemomobile/qmsystem +Source0: %{name}-1.4.4.tar.bz2 +Source100: qmsystem.yaml +Requires: sensorfw >= 0.6.33 +Requires: timed >= 2.31 +Requires: mce +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +BuildRequires: pkgconfig(mce) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dsme) +BuildRequires: pkgconfig(dsme_dbus_if) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(libiphb) >= 0.61.29 +BuildRequires: pkgconfig(QtCore) >= 4.5 +BuildRequires: pkgconfig(sensord) >= 0.6.33 +BuildRequires: pkgconfig(timed) >= 2.31 +BuildRequires: fdupes + +%description +This package contains the QmSystem library. + +%package tests +Summary: Unit test cases and xml test description for libqmsystem2 library +Group: Development/System +Requires: %{name} = %{version}-%{release} +Requires: testrunner-lite + +%description tests +%{summary}. + +%package devel +Summary: Development headers for QmSystem library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development headers for compiling applications against the QmSystem library. + + +%prep +%setup -q -n %{name}-%{version} + +# >> setup +# << setup + +%build +# >> build pre +%qmake +make +# << build pre + + + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre + +# >> install post +%make_install +%fdupes %{buildroot}/%{_docdir}/qmsystem2/html/ +# << install post + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +# >> files +%doc debian/copyright +%{_libdir}/libqmsystem2.so.* +%{_sbindir}/qmkeyd2 +# From doc +# %doc debian/changelog debian/copyright +# %{_docdir}/qmsystem2/html/* +# << files + +%files tests +%defattr(-,root,root,-) +# >> files tests +%doc debian/copyright +%{_bindir}/*-test +%{_datadir}/%{name}-tests/tests.xml +# << files tests + +%files devel +%defattr(-,root,root,-) +# >> files devel +%doc debian/copyright +%{_includedir}/qmsystem2/*.h +%{_libdir}/libqmsystem2.so +%{_libdir}/pkgconfig/qmsystem2.pc +%{_datadir}/qt4/mkspecs/features/qmsystem2.prf +# << files devel --- rpm/qmsystem.yaml +++ rpm/qmsystem.yaml @@ -0,0 +1,43 @@ +Name: qmsystem +Summary: QmSystem library +Version: 1.4.4 +Release: 1 +Group: System/System Control +License: LGPLv2 +URL: http://github.com/nemomobile/qmsystem +Sources: + - "%{name}-1.4.4.tar.bz2" +Description: This package contains the QmSystem library. + +Requires: + - sensorfw >= 0.6.33 + - timed >= 2.31 + - mce +PkgBR: + - fdupes +PkgConfigBR: + - mce + - dbus-1 + - dsme + - dsme_dbus_if + - gconf-2.0 + - libiphb >= 0.61.29 + - QtCore >= 4.5 + - sensord >= 0.6.33 + - timed >= 2.31 +Configure: none +Builder: none +SubPackages: + + - Name: tests + Summary: Unit test cases and xml test description for libqmsystem2 library + Group: Development/System + Description: "%{summary}." + Requires: + - testrunner-lite + + - Name: devel + Summary: Development headers for QmSystem library + Group: Development/Libraries + Description: Development headers for compiling applications against the QmSystem library. + --- system/msystemdbus_p.h +++ system/msystemdbus_p.h @@ -79,6 +79,7 @@ #define USB_MODE_STATE_REQUEST "mode_request" #define USB_MODE_STATE_SET "set_mode" + #define USB_MODE_CONFIG_SET "set_config" #define USB_CONNECTED "USB connected" #define USB_DISCONNECTED "USB disconnected" @@ -91,6 +92,9 @@ #define MODE_CHARGING "charging_only" #define MODE_UNDEFINED "undefined" #define MODE_ASK "ask" + #define MODE_WINDOWS_NET "windows_network" + #define MODE_DEVELOPER "developer_mode" + #define MODE_MTP "mtp_mode" #endif /* HAVE_USB_MODED_DEV */ #endif // MSYSTEMDBUS_P_H --- system/qmusbmode.cpp +++ system/qmusbmode.cpp @@ -144,7 +144,7 @@ MEEGO_PRIVATE(QmUSBMode); // The OviSuite, MassStorage, ChargingOnly and SDK modes can be requested - if (!(OviSuite == mode || MassStorage == mode || ChargingOnly == mode || SDK == mode)) { + if (!(OviSuite == mode || MassStorage == mode || ChargingOnly == mode || SDK == mode || Developer == mode || MTP == mode)) { return false; } @@ -164,7 +164,7 @@ MEEGO_PRIVATE(QmUSBMode); // The OviSuite, MassStorage, ChargingOnly and Ask modes can be requested - if (!(OviSuite == mode || MassStorage == mode || ChargingOnly == mode || Ask == mode || SDK == mode)) { + if (!(OviSuite == mode || MassStorage == mode || ChargingOnly == mode || SDK == mode || Developer == mode || MTP == mode || Ask == mode)) { return false; } @@ -172,6 +172,13 @@ if (str.isEmpty()) { return false; } + + // Meego uses different gconf databases for root and user, so sending dbus message to set it + QDBusMessage usbDefaultModeSetCall = QDBusMessage::createMethodCall(USB_MODE_SERVICE, USB_MODE_OBJECT, USB_MODE_INTERFACE, USB_MODE_CONFIG_SET); + usbDefaultModeSetCall << str; + + (void)QDBusConnection::systemBus().call(usbDefaultModeSetCall, QDBus::NoBlock); + gboolean ret = gconf_client_set_string(priv->gcClient, USB_MODE_GCONF, str.toAscii().data(), NULL); if (ret == TRUE) { return true; @@ -258,6 +265,10 @@ return USB_CONNECTED_DIALOG_SHOW; case QmUSBMode::SDK: return MODE_WINDOWS_NET; + case QmUSBMode::MTP: + return MODE_MTP; + case QmUSBMode::Developer: + return MODE_DEVELOPER; default: return ""; } @@ -284,6 +295,10 @@ return QmUSBMode::ModeRequest; } else if (str == MODE_WINDOWS_NET) { return QmUSBMode::SDK; + } else if (str == MODE_MTP) { + return QmUSBMode::MTP; + } else if (str == MODE_DEVELOPER) { + return QmUSBMode::Developer; } else { return QmUSBMode::Undefined; } --- system/qmusbmode.h +++ system/qmusbmode.h @@ -79,7 +79,9 @@ ModeRequest, //!< Signaled as an indication that the USB mode should be set with setMode(QmUSBMode::Mode). Ask, //!< Waiting for the USB mode to be set with setMode(QmUSBMode::Mode). Undefined, //!< Unknown/error. - SDK //!< Windows network mode. Allows USB networking on the device. + SDK, //!< Windows network mode. Allows USB networking on the device. + Developer, //!< Developer mode. Allows USB networking + MTP //!< MTP mode. Allows for generic MTP }; /*! --- system/system.pro +++ system/system.pro @@ -5,7 +5,7 @@ DEFINES += SYSTEM_LIBRARY QT = core network dbus -QMAKE_CXXFLAGS += -Wall -Werror -Wno-psabi +QMAKE_CXXFLAGS += -Wall -Wno-psabi CONFIG += link_pkgconfig PKGCONFIG += dsme dsme_dbus_if gconf-2.0 libiphb sensord timed --- tests/devicemode/devicemode.pro +++ tests/devicemode/devicemode.pro @@ -1,5 +1,6 @@ QT -= gui SOURCES += devicemode.cpp +LIBS += -lQtDBus TARGET = devicemode-test include(../common-install.pri) --- tests/manual_compass/manual_compass.pro +++ tests/manual_compass/manual_compass.pro @@ -3,6 +3,7 @@ CONFIG += link_pkgconfig PKGCONFIG += gconf-2.0 SOURCES += manual_compass.cpp +LIBS += -lgobject-2.0 TARGET = manual-compass-test --- tests/manual_usbmode/manual_usbmode.cpp +++ tests/manual_usbmode/manual_usbmode.cpp @@ -118,6 +118,10 @@ return "SDK"; case QmUSBMode::Undefined: return "Undefined"; + case QmUSBMode::MTP: + return "MTP"; + case QmUSBMode::Developer: + return "Developer"; default: return "An unknown mode!"; } --- tests/manual_usbmode/manual_usbmode.pro +++ tests/manual_usbmode/manual_usbmode.pro @@ -3,5 +3,6 @@ TARGET = manual-usbmode-test SOURCES += manual_usbmode.cpp +LIBS += -lrt include(../common-install.pri) --- tests/powerontime/powerontime.cpp +++ tests/powerontime/powerontime.cpp @@ -48,9 +48,9 @@ // Wait for the power on time to accumulate QTest::qWait(5000); - // cur - prev >= 0 if the timer accumulates as it should + // cur - prev > 0 if the timer accumulates as it should int diff = state.getPowerOnTimeInSeconds() - pot; - QVERIFY(diff >= 0); + QVERIFY(diff > 0); } } }; --- tests/tests.pro +++ tests/tests.pro @@ -47,7 +47,7 @@ } # Test definition installation -testdefinition.files = tests.xml session -testdefinition.path = /usr/share/qmsystem2-api-fast-tests +testdefinition.files = tests.xml +testdefinition.path = /usr/share/qmsystem-tests INSTALLS += testdefinition --- tests/tests.xml +++ tests/tests.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <testdefinition version="0.1"> <!-- Test suite, name mandatory - the same as test package name --> - <suite name="libqmsystem2-tests" domain="System Software"> + <suite name="qmsystem-tests" domain="System Software"> <!-- At least one set per suite, name and description mandatory --> <set name="Qt-API-subsystem-classes" description="Unit test cases for SystemSW APIs" feature="SystemSW Qt API"> @@ -15,23 +15,11 @@ <step>ls -l /var/run/dbus</step> <step>echo "executing ls -l /dev/rtc*"</step> <step>ls -l /dev/rtc*</step> - <step>echo "executing echo A >/var/junk"</step> - <step>echo A >/var/junk</step> - <step>echo "executing echo A >/var/cache/junk"</step> - <step>echo A >/var/cache/junk</step> - <step>echo " executing cat /var/junk"</step> - <step>cat /var/junk</step> - <step>echo "executing cat /var/cache/junk"</step> - <step>cat /var/cache/junk</step> </pre_steps> <case name="activity" level="Component" type="Functional" description="QmActivity" timeout="15" subfeature="QT_APIs" requirement="39927"> <!-- Run test activity application --> <step expected_result="0">/usr/bin/activity-test </step> </case> - <case name="battery" level="Component" type="Functional" description="QmBattery" timeout="120" subfeature="QT_APIs" requirement="39927"> - <!-- Run test cabc application --> - <step expected_result="0">/usr/bin/battery-test </step> - </case> <case name="cabc" level="Component" type="Functional" description="QmCABC" timeout="15" subfeature="QT_APIs" requirement="39927"> <!-- Run test cabc application --> <step expected_result="0">/usr/bin/cabc-test </step> @@ -62,7 +50,7 @@ </case> <case name="thermal" level="Component" type="Functional" description="QmThermal" timeout="240" subfeature="QT_APIs" requirement="39927"> <!-- Run test thermal application --> - <step expected_result="0">/usr/bin/aegis-su -r dsme::DeviceStateControl /sbin/dsmetool -a </step> + <step expected_result="0">/usr/sbin/dsmetool -a </step> <step expected_result="0">/usr/bin/thermal-test </step> </case> <case name="usbmode" level="Component" type="Functional" description="QmUSBMode" timeout="240" subfeature="QT_APIs" requirement="39927"> @@ -72,19 +60,6 @@ <case name="systeminformation" level="Component" type="Functional" description="QmSystemInformation" timeout="5" subfeature="QT_APIs" requirement="39927"> <step expected_result="0">/usr/bin/systeminformation-test</step> </case> - <case name="system-state" level="Component" type="Functional" description="QmSystemState" timeout="30" subfeature="QT_APIs" requirement="39927"> - <step>mkdir -p /tmp/qmsystemstatejail</step> - <step>mkdir -p /tmp/qmsystemstatejail/usr</step> - <step>mkdir -p /tmp/qmsystemstatejail/lib</step> - <step>mkdir -p /tmp/qmsystemstatejail/dev</step> - <step>mkdir -p /tmp/qmsystemstatejail/var/lib/dsme</step> - <step>mount -o bind /usr /tmp/qmsystemstatejail/usr</step> - <step>mount -o bind /lib /tmp/qmsystemstatejail/lib</step> - <step>mount -o bind /dev /tmp/qmsystemstatejail/dev</step> - <step expected_result="0">chroot /tmp/qmsystemstatejail /usr/bin/system-test testGetRunstate</step> - <!-- bootreason uses libsysinfo0, don't attempt to run in a chroot --> - <step expected_result="0">/usr/bin/system-test testGetBootreason</step> - </case> <case name="powerontime" level="Component" type="Functional" description="QmSystemPowerOnTime" timeout="30" subfeature="QT_APIs" requirement="39927"> <step expected_result="0">/usr/bin/powerontime-test</step> </case> @@ -97,16 +72,6 @@ <scratchbox>false</scratchbox> <hardware>true</hardware> </environments> - - <get> - <file>/var/log/syslog</file> - </get> - - <post_steps> - <step>umount /tmp/qmsystemstatejail/usr</step> - <step>umount /tmp/qmsystemstatejail/lib</step> - <step>umount /tmp/qmsystemstatejail/dev</step> - </post_steps> </set> <set name="Sensor-Service-API" description="Unit test cases for com.nokia.SensorService APIs" feature="SystemSW Qt API"> --- tests/time/time.cpp +++ tests/time/time.cpp @@ -30,16 +30,12 @@ #include <QTest> #include <QDebug> -#if !defined(HAVE_QMLOG) - #define log_debug(...) do {} while (0) - #define log_info(...) do {} while (0) - #define log_notice(...) do {} while (0) - #define log_warning(...) do {} while (0) - #define log_error(...) do {} while (0) - #define log_critical(...) do {} while (0) -#else - #include <qmlog> -#endif +#define log_debug(...) do {} while (0) +#define log_info(...) do {} while (0) +#define log_notice(...) do {} while (0) +#define log_warning(...) do {} while (0) +#define log_error(...) do {} while (0) +#define log_critical(...) do {} while (0) using namespace std; using namespace MeeGo; @@ -83,40 +79,17 @@ QDateTime oldTime; QString oldTz; -#if F_TIME_FORMAT - QmTime::TimeFormat oldTimeFormat; -#endif - static struct pre_init_t // do it before main() - { - pre_init_t() { - #if defined(HAVE_QMLOG) - new qmlog::log_file("/var/log/time-test.log") ; - #endif - } - } pre_init ; private slots: void initTestCase() { string name = qApp->arguments().join("\\").toStdString() ; - #if defined(HAVE_QMLOG) - qmlog::process_name(name.c_str()) ; - #endif time = new MeeGo::QmTime(); QVERIFY(time); oldTime = QDateTime::currentDateTime(); QVERIFY(time->getTimezone(oldTz)); -#if F_TIME_FORMAT - oldTimeFormat = time->getTimeFormat(); -#endif QVERIFY(connect(time, SIGNAL(timeOrSettingsChanged(MeeGo::QmTimeWhatChanged)), &signalDump, SLOT(timeOrSettingsChanged(MeeGo::QmTimeWhatChanged)))); - } - - void testGetNetTime() { - bool ret = true; - // TODO : to simulate in case that autosync is not - // enabled and a network time change indication has received) - //ret = time->getNetTime(t, tz); - QVERIFY(ret); + qDebug()<<oldTime; + qDebug()<<oldTz; } void testSetTime() { @@ -159,39 +132,11 @@ waitTwice(500); QVERIFY(signalDump.signalReceived); QVERIFY(signalDump.whatChanged == QmTimeTimeChanged); -#if F_SUPPORT_UNUSED - //QVERIFY(time->getTZName(s)); - //QCOMPARE(s, QString("EET")); -#else + struct tm tm ; QDateTime dt ; QVERIFY(time->remoteTime(s, ::time(NULL), dt, &tm)) ; QCOMPARE((QString)tm.tm_zone, (QString)"EET") ; -#endif - } - - void testSetGetTimeFormat() { - log_notice("Skipping 12/24h test %s", __PRETTY_FUNCTION__) ; -#if 0 - MeeGo::QmTime::TimeFormat tf = time->getTimeFormat(); - QVERIFY((tf == QmTime::format24h) || (tf == QmTime::format12h)); - qDebug() <<"Current format is "<<tf; - - //qDebug() <<"Wait for gconftool to change the time format key"; - //waitTwice(10000); - signalDump.signalReceived = false; - if (tf == QmTime::format12h) { - QVERIFY(time->setTimeFormat(QmTime::format24h)); - } else { - QVERIFY(time->setTimeFormat(QmTime::format12h)); - } - - qDebug() <<"Format is changed to "<<time->getTimeFormat(); - waitTwice(600); - QVERIFY(signalDump.signalReceived); - QVERIFY(signalDump.whatChanged == QmTimeOnlySettingsChanged); - QVERIFY(time->getTimeFormat() != tf); -#endif } int get_utc_offset_now(QmTime *t, const char *location) @@ -210,33 +155,19 @@ QDateTime dateTime(QDate(2000, 1, 1)); QVERIFY(time->setTime(dateTime)); -#if F_SUPPORT_UNUSED - QCOMPARE(time->getUTCOffset(":Europe/Helsinki"), 2*60*60); - QCOMPARE(time->getUTCOffset(":US/Central"), -6*60*60); - QCOMPARE(time->getUTCOffset(":Australia/Melbourne"), 11*60*60); - QCOMPARE(time->getUTCOffset(":America/Sao_Paulo"), -2*60*60); -#else const int hours = 3600 ; QCOMPARE(get_utc_offset_now(time, "Europe/Helsinki"), 2*hours); QCOMPARE(get_utc_offset_now(time, "US/Central"), -6*hours); QCOMPARE(get_utc_offset_now(time, "Australia/Melbourne"), 11*hours); QCOMPARE(get_utc_offset_now(time, "America/Sao_Paulo"), -2*hours); -#endif dateTime.setDate(QDate(2000, 6, 6)); QVERIFY(time->setTime(dateTime)); -#if F_SUPPORT_UNUSED - QCOMPARE(time->getUTCOffset(":Europe/Helsinki"), 3*60*60); - QCOMPARE(time->getUTCOffset(":US/Central"), -5*60*60); - QCOMPARE(time->getUTCOffset(":Australia/Melbourne"), 10*60*60); - QCOMPARE(time->getUTCOffset(":America/Sao_Paulo"), -3*60*60); -#else QCOMPARE(get_utc_offset_now(time, "Europe/Helsinki"), 3*hours); QCOMPARE(get_utc_offset_now(time, "US/Central"), -5*hours); QCOMPARE(get_utc_offset_now(time, "Australia/Melbourne"), 10*hours); QCOMPARE(get_utc_offset_now(time, "America/Sao_Paulo"), -3*hours); -#endif } int get_dst_usage(QmTime *t, time_t at, QString location) @@ -250,14 +181,6 @@ } void testGetDSTUsage() { -#if F_SUPPORT_UNUSED - QCOMPARE(time->getDSTUsage(QDateTime(QDate(2000, 1, 1)), ":Europe/Helsinki"), 0); - QCOMPARE(time->getDSTUsage(QDateTime(QDate(2000, 7, 7)), ":Europe/Helsinki"), 1); - QCOMPARE(time->getDSTUsage(QDateTime(QDate(2000, 1, 1)), ":Australia/Melbourne"), 1); - QCOMPARE(time->getDSTUsage(QDateTime(QDate(2000, 7, 7)), ":Australia/Melbourne"), 0); - QCOMPARE(time->getDSTUsage(QDateTime(QDate(2000, 1, 1)), ":America/Sao_Paulo"), 1); - QCOMPARE(time->getDSTUsage(QDateTime(QDate(2000, 7, 7)), ":America/Sao_Paulo"), 0); -#else time_t jan_2000 = 946722896 ; // Sat Jan 1 12:34:56 EET 2000 time_t jul_2000 = 962444096 ; // Sat Jul 1 12:34:56 EEST 2000 QCOMPARE(get_dst_usage(time, jan_2000, "Europe/Helsinki"), 0); @@ -266,52 +189,32 @@ QCOMPARE(get_dst_usage(time, jul_2000, "Australia/Melbourne"), 0); QCOMPARE(get_dst_usage(time, jan_2000, "America/Sao_Paulo"), 1); QCOMPARE(get_dst_usage(time, jul_2000, "America/Sao_Paulo"), 0); -#endif } void testSetAutosync() { signalDump.signalReceived = false; -#if F_SUPPORT_UNUSED - bool ret = time->setAutosync(true); -#else bool ret1 = time->setAutoSystemTime(MeeGo::QmTime::AutoSystemTimeOn) ; bool ret2 = time->setAutoTimeZone(MeeGo::QmTime::AutoTimeZoneOn) ; bool ret = ret1 and ret2 ; -#endif QVERIFY(ret); -#if F_SUPPORT_UNUSED - ret = time->setAutosync(false); -#else + ret1 = time->setAutoSystemTime(MeeGo::QmTime::AutoSystemTimeOff) ; ret2 = time->setAutoTimeZone(MeeGo::QmTime::AutoTimeZoneOff) ; ret = ret1 and ret2 ; -#endif QVERIFY(ret); + waitTwice(500); QVERIFY(signalDump.signalReceived); } void testGetAutosync() { -#if F_SUPPORT_UNUSED - int ret = time->getAutosync(); - QVERIFY(ret != -1); -#else bool ret1 = time->autoSystemTime() != MeeGo::QmTime::AutoSystemTimeUnknown ; QVERIFY(ret1); bool ret2 = time->autoTimeZone() != MeeGo::QmTime::AutoTimeZoneUnknown ; QVERIFY(ret2); -#endif } void testSetGetAutosync() { -#if F_SUPPORT_UNUSED - QVERIFY(time->setAutosync(true)); - waitTwice(10*1000); - QCOMPARE(time->getAutosync(), 1); - QVERIFY(time->setAutosync(false)); - waitTwice(10*1000); - QCOMPARE(time->getAutosync(), 0); -#else QVERIFY(time->setAutoSystemTime(MeeGo::QmTime::AutoSystemTimeOn)); QVERIFY(time->setAutoTimeZone(MeeGo::QmTime::AutoTimeZoneOn)); waitTwice(1000); @@ -323,17 +226,11 @@ waitTwice(1000); QCOMPARE(time->autoSystemTime(), MeeGo::QmTime::AutoSystemTimeOff); QCOMPARE(time->autoTimeZone(), MeeGo::QmTime::AutoTimeZoneOff); -#endif } void testIsOperatorTimeAccessible() { -#if F_SUPPORT_UNUSED - int ret = time->isOperatorTimeAccessible(); - QVERIFY(ret != -1); -#else bool result, ret = time->isOperatorTimeAccessible(result) ; QVERIFY(ret) ; -#endif } /** The following tests are from old dms-tests. @@ -349,7 +246,6 @@ void testSetTime120010() { QDateTime current = QDateTime::currentDateTime(); QVERIFY(time->setTime(current.addSecs(5))); - //waitTwice(500); QDateTime current2 = QDateTime::currentDateTime(); int secsTo = current.secsTo(current2); QString str = QString("Time difference: %1").arg(secsTo); @@ -368,32 +264,27 @@ } - // TODO: GMT* timezones do not work with libtimed0? void testSetTimezone120020() { QVERIFY(time->setTimezone("UTC")); QDateTime dateTime(QDate(2000, 1, 1)); QVERIFY(time->setTime(dateTime)); - // testTZStruct: { QString tz; QString tzname; int secsTo; QString zone; } - struct testTZStruct tzs[] = { //{"GMT-2GMT-3,0,365", "GMT", 3*60*60}, - //{"GMT+8", "GMT", -8*60*60}, - //{"GMT-10:30", "GMT", 10*60*60 + 30*60}, - {"Africa/Algiers", "CET", 60*60, ""}, - {"Africa/Cairo", "EET", 2*60*60, ""}, - {"Africa/Casablanca", "WET", 0, ""}, - {"Asia/Shanghai", "CST", 8*60*60, ""}, - {"Asia/Tokyo", "JST", 9*60*60, ""}, - {"Australia/Melbourne", "EST", 11*60*60, ""}, // DST on southern summer - {"Canada/Central", "CST", -6*60*60, "America/Winnipeg"}, - {"Europe/Helsinki", "EET", 2*60*60, ""}, - {"Europe/London", "GMT", 0, ""}, - {"Europe/Moscow", "MSK", 3*60*60, ""}, - {"Europe/Paris", "CET", 1*60*60, ""}, - {"Pacific/Honolulu", "HST", -10*60*60, ""}, - {"US/Alaska", "AKST", -9*60*60, "America/Anchorage"}, - {"US/Central", "CST", -6*60*60, "America/Chicago"}, - {"US/Mountain", "MST", -7*60*60, "America/Denver"}, - {"US/Pacific", "PST", -8*60*60, "America/Los_Angeles"}}; + struct testTZStruct tzs[] = {{"Africa/Algiers", "CET", 60*60, ""}, + {"Africa/Cairo", "EET", 2*60*60, ""}, + {"Africa/Casablanca", "WET", 0, ""}, + {"Asia/Shanghai", "CST", 8*60*60, ""}, + {"Asia/Tokyo", "JST", 9*60*60, ""}, + {"Australia/Melbourne", "EST", 11*60*60, ""}, // DST on southern summer + {"Canada/Central", "CST", -6*60*60, "America/Winnipeg"}, + {"Europe/Helsinki", "EET", 2*60*60, ""}, + {"Europe/London", "GMT", 0, ""}, + {"Europe/Moscow", "MSK", 3*60*60, ""}, + {"Europe/Paris", "CET", 1*60*60, ""}, + {"Pacific/Honolulu", "HST", -10*60*60, ""}, + {"US/Alaska", "AKST", -9*60*60, "America/Anchorage"}, + {"US/Central", "CST", -6*60*60, "America/Chicago"}, + {"US/Mountain", "MST", -7*60*60, "America/Denver"}, + {"US/Pacific", "PST", -8*60*60, "America/Los_Angeles"}}; for (unsigned i=0; i < sizeof(tzs)/sizeof(*tzs); i++) { @@ -404,11 +295,8 @@ QCOMPARE(tzs[i].zone.isEmpty() ? tzs[i].tz : tzs[i].zone, tz2); qDebug()<<tz2; -#if F_SUPPORT_UNUSED - //QVERIFY2(time->getTZName(tz2), tzs[i].tz.toAscii().data()); -#else QVERIFY(get_zone_abbreviation_now(time, tz2) == tzs[i].tzname); -#endif + QString abbreviation = get_zone_abbreviation_now(time, tz2) ; log_debug("tsz[%d].tzname='%s' tz2=='%s', abbreviation='%s'", i, tzs[i].tzname.toStdString().c_str(), tz2.toStdString().c_str(), abbreviation.toStdString().c_str()) ; @@ -417,7 +305,6 @@ int diff = dateTime.secsTo(QDateTime::currentDateTime()); QVERIFY2(diff <= tzs[i].secsTo + 5, tzs[i].tz.toAscii()); QVERIFY2(diff >= tzs[i].secsTo - 5, tzs[i].tz.toAscii()); - } } @@ -428,7 +315,6 @@ void testMakeAndCheckTime120030() { - QVERIFY(time->setTimezone("Europe/Helsinki")); waitTwice(500); @@ -454,11 +340,7 @@ QString tz; QVERIFY(time->getTimezone(tz)); -#if F_SUPPORT_UNUSED - QCOMPARE(time->getDSTUsage(current, tz), 1); -#else QCOMPARE(get_dst_usage(time, ::time(NULL), tz.toStdString().c_str()), 1); -#endif } void testCheckRemoteTime120040() { @@ -478,48 +360,27 @@ QVERIFY(time->setTime(dateTime)); QDateTime remoteTime; -#if F_SUPPORT_UNUSED - QVERIFY(time->getRemoteTime(QDateTime::currentDateTime(), ":Europe/Paris", remoteTime)); -#else QVERIFY(time->remoteTime("Europe/Paris", ::time(NULL), remoteTime)); -#endif QCOMPARE(remoteTime.time().hour(), 13); -#if F_SUPPORT_UNUSED - QVERIFY(time->getRemoteTime(QDateTime::currentDateTime(), ":Europe/London", remoteTime)); -#else QVERIFY(time->remoteTime("Europe/London", ::time(NULL), remoteTime)); -#endif QCOMPARE(remoteTime.time().hour(), 12); -#if F_SUPPORT_UNUSED - QDateTime currentDateTime = QDateTime::currentDateTime(); - QVERIFY(time->getRemoteTime(currentDateTime.addSecs(60*60), "Europe/London", remoteTime)); -#else QVERIFY(time->remoteTime("Europe/London", ::time(NULL)+3600, remoteTime)); -#endif QCOMPARE(remoteTime.time().hour(), 13); QString tz; QVERIFY(time->getTimezone(tz)); QCOMPARE(tz, timezone); -#if F_SUPPORT_UNUSED - QCOMPARE(time->getDSTUsage(QDateTime::currentDateTime(), tz), 1); - QCOMPARE(time->getDSTUsage(QDateTime(QDate(2000, 1, 1)), tz), 0); -#else + time_t jan_2000 = 946722896 ; // Sat Jan 1 12:34:56 EET 2000 QCOMPARE(get_dst_usage(time, ::time(NULL), tz), 1); QCOMPARE(get_dst_usage(time, jan_2000, tz), 0); -#endif } void testGetTimeDiff120051() { - time->setTimezone(":Europe/Helsinki"); -#if F_SUPPORT_UNUSED - int diff = time->getTimeDiff(QDateTime::currentDateTime(), ":Europe/Helsinki", ":Europe/London"); -#else + time->setTimezone("Europe/Helsinki"); int diff = time->getTimeDiff(::time(NULL), "Europe/Helsinki", "Europe/London"); -#endif QCOMPARE(diff, 7200); } @@ -536,33 +397,16 @@ tm.tm_isdst = 1; /* daylight savings flag */ QDateTime t = QDateTime::fromTime_t(mktime(&tm)); -#if F_SUPPORT_UNUSED - int diff = time->getTimeDiff(t, ":Europe/Helsinki", ":GMT"); -#else time_t tt = t.toTime_t() ; int diff = time->getTimeDiff(tt, "Europe/Helsinki", "GMT"); -#endif QCOMPARE(diff, 7200); -#if F_SUPPORT_UNUSED - t = t.addDays(30); - diff = time->getTimeDiff(t, ":Europe/Helsinki", ":GMT"); -#else time_t days = 24*60*60 ; diff = time->getTimeDiff(tt+30*days, "Europe/Helsinki", "GMT"); -#endif QCOMPARE(diff, 10800); } void testAutosync120060() { -#if F_SUPPORT_UNUSED - QVERIFY(time->setAutosync(false)); - QCOMPARE(time->getAutosync(), 0); - QVERIFY(time->setAutosync(true)); - QCOMPARE(time->getAutosync(), 1); - QVERIFY(time->setAutosync(false)); - QCOMPARE(time->getAutosync(), 0); -#else QVERIFY (time->setAutoSystemTime(MeeGo::QmTime::AutoSystemTimeOff)); QCOMPARE(time->autoSystemTime(), MeeGo::QmTime::AutoSystemTimeOff); QVERIFY (time->setAutoSystemTime(MeeGo::QmTime::AutoSystemTimeOn )); @@ -576,43 +420,15 @@ QCOMPARE(time->autoTimeZone(), MeeGo::QmTime::AutoTimeZoneOn ); QVERIFY (time->setAutoTimeZone(MeeGo::QmTime::AutoTimeZoneOff)); QCOMPARE(time->autoTimeZone(), MeeGo::QmTime::AutoTimeZoneOff); -#endif } - // XXX: it's a copy of testIsOperatorTimeAccessible void testOperatorTime120070() { -#if F_SUPPORT_UNUSED - int ret = time->isOperatorTimeAccessible(); - QVERIFY(ret == 0 || ret == 1); -#else bool result, ret = time->isOperatorTimeAccessible(result) ; QVERIFY(ret) ; // call not failed -#endif - } - - // There is no libtime time_format_time() in QmTime. - void testTimeFormat120080() { - log_notice("Skipping 12/24h test %s", __PRETTY_FUNCTION__) ; -#if 0 - log_debug("setting to Format_12") ; - QVERIFY(time->setTimeFormat(QmTime::format12h)); - log_debug("checking Format_12") ; - QCOMPARE(time->getTimeFormat(), QmTime::format12h); - log_debug("setting to Format_24") ; - QVERIFY(time->setTimeFormat(QmTime::format24h)); - log_debug("checking Format_24") ; - QCOMPARE(time->getTimeFormat(), QmTime::format24h); - log_debug("setting to Format_12") ; - QVERIFY(time->setTimeFormat(QmTime::format12h)); - log_debug("setting to Format_12") ; - QCOMPARE(time->getTimeFormat(), QmTime::format12h); -#endif } // TESTCASES FROM OLD clocktest.c - // TODO: MT is not in /usr/share/zoneinfo - // TODO: timezone EST+5EDT,M4.1.0/2,M10.5.0/2 is not supported? void test_clocktest_start() { QVERIFY(!time->setTimezone("")); QVERIFY(!time->setTimezone("1")); @@ -620,25 +436,9 @@ QVERIFY(!time->setTimezone("BB-")); QVERIFY(!time->setTimezone("MT-8")); -#if F_SUPPORT_UNUSED - QCOMPARE(time->getTimeDiff(QDateTime::currentDateTime(), ":Europe/Helsinki", ":Europe/London"), 7200); -#else QCOMPARE(time->getTimeDiff(::time(NULL), "Europe/Helsinki", "Europe/London"), 7200) ; -#endif - /* - QCOMPARE(time->getTimeDiff(QDateTime::currentDateTime(), "GMT-2", "MT+2"), 0); - QCOMPARE(time->getTimeDiff(QDateTime::currentDateTime(), "GMT+3", "MT+3"), -6*3600); - */ QVERIFY(time->setTime(QDateTime::fromTime_t(1221472803))); - - /* - QString setTimezone = "EST+5EDT,M4.1.0/2,M10.5.0/2"; - QVERIFY(time->setTimezone(setTimezone)); - QString gotTimezone; - QVERIFY(time->getTimezone(gotTimezone)); - QCOMPARE(setTimezone, gotTimezone); - */ } @@ -665,20 +465,11 @@ for (int i = 0; i < zonecnt; i++) { QDateTime remoteTime; -#if F_SUPPORT_UNUSED - QVERIFY(time->getRemoteTime(currentDateTime, zone[i], remoteTime)); -#else QVERIFY(time->remoteTime(zone[i], ::time(NULL), remoteTime)); -#endif } -#if F_SUPPORT_UNUSED - QVERIFY(time->isOperatorTimeAccessible() == 0 || time->isOperatorTimeAccessible() == 1); -#else bool result, ret = time->isOperatorTimeAccessible(result) ; QVERIFY(ret) ; // call not failed -#endif - currentDateTime = QDateTime::currentDateTime(); qDebug() << "currentDateTime: " << currentDateTime; @@ -686,8 +477,7 @@ qDebug() << "timezone: " << zone[0]; QVERIFY2(time->setTimezone(zone[0]), zone[0]); - // TODO: Without wait here the test will fail. - //waitTwice(500); + currentDateTime = QDateTime::currentDateTime(); qDebug() << "currentDateTime: " << currentDateTime; QVERIFY(currentDateTime.secsTo(QDateTime::currentDateTime()) < 6); @@ -707,14 +497,15 @@ } void cleanupTestCase() { - QVERIFY(time->setTime(oldTime)); + // it takes about 60 sec to run test + QDateTime approxTime = oldTime.addSecs(60); QVERIFY(time->setTimezone(oldTz)); - //QVERIFY(time->setTimeFormat(oldTimeFormat)); + QVERIFY(time->setTime(approxTime)); + qDebug()<<oldTz; + qDebug()<<QDateTime::currentDateTime(); delete time; } }; -TestClass::pre_init_t TestClass::pre_init ; - QTEST_MAIN(TestClass) #include "time.moc" --- tests/usbmode/usbmode.cpp +++ tests/usbmode/usbmode.cpp @@ -78,6 +78,8 @@ setGetDefaultMode(QmUSBMode::ChargingOnly); setGetDefaultMode(QmUSBMode::OviSuite); setGetDefaultMode(QmUSBMode::Ask); + setGetDefaultMode(QmUSBMode::MTP); + setGetDefaultMode(QmUSBMode::Developer); } void testMountStatus() { --- tests/usbmode/usbmode.pro +++ tests/usbmode/usbmode.pro @@ -3,5 +3,6 @@ TARGET = usbmode-test SOURCES += usbmode.cpp +LIBS += -lrt include(../common-install.pri) ++++++ qmsystem.yaml --- qmsystem.yaml +++ qmsystem.yaml @@ -1,20 +1,12 @@ Name: qmsystem Summary: QmSystem library -Version: 1.4.3.2 +Version: 1.4.4 Release: 1 Group: System/System Control License: LGPLv2 -URL: http://meego.gitorious.org/meego-middleware/qmsystem +URL: http://github.com/nemomobile/qmsystem Sources: - - "%{name}-1.4.3.tar.bz2" -Patches: - - "%{name}-1.0.0-tests-directories.patch" - - qmsystem-set-default-usbmode-with-dbus.diff - - qmsystem-1.4.1-meego-1.3-compile-fix.patch - - qmsystem-1.4.1-no-docs.patch - - qmsystem-1.4.3-add-missing-lib-for-linking.patch - - qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch - - qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch + - "%{name}-1.4.4.tar.bz2" Description: This package contains the QmSystem library. Requires: ++++++ deleted files: --- qmsystem-1.0.0-tests-directories.patch --- qmsystem-1.4.1-meego-1.3-compile-fix.patch --- qmsystem-1.4.1-no-docs.patch --- qmsystem-1.4.3-Add-support-for-MTP-and-developer-mode.patch --- qmsystem-1.4.3-add-missing-lib-for-linking.patch --- qmsystem-1.4.3-usb-tests-and-ask-config-bugfix.patch --- qmsystem-set-default-usbmode-with-dbus.diff
