[Merge] lp:~unity-api-team/telephony-service/file-based-infographics into lp:telephony-service

[Gustavo Pichorim Boiko]

Review: Needs Fixing

Can you please remove the workarounds in greeter contacts' tests? Also, can you please merge the latest changes from trunk in this MR?

Thanks.

Diff comments:

> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt	2014-05-29 07:14:15 +0000
> +++ CMakeLists.txt	2014-06-25 10:00:44 +0000
> @@ -77,6 +77,13 @@
>  add_definitions(-std=c++11)
>  
>  set(DATA_DIR "${CMAKE_SOURCE_DIR}/data")
> +
> +# install infographics source hook
> +install(
> +    FILES "${DATA_DIR}/telephony-service.json"
> +    DESTINATION "${CMAKE_INSTALL_DATADIR}/libusermetrics/sources/"
> +    )
> +
>  # install assets
>  set(ASSETS_DIR assets)
>  install(DIRECTORY ${ASSETS_DIR} DESTINATION ${TELEPHONY_SERVICE_DIR})
> 
> === added file 'data/telephony-service.json'
> === modified file 'debian/control'
> --- debian/control	2014-06-12 15:31:41 +0000
> +++ debian/control	2014-06-25 10:00:44 +0000
> @@ -25,7 +25,7 @@
>                 qtdeclarative5-test-plugin (>= 5.0),
>                 qtmultimedia5-dev (>= 5.0),
>                 qtpim5-dev (>= 5),
> -               libusermetricsinput1-dev,
> +               libusermetricsinput1-dev (>= 1.2.0),
>                 telepathy-mission-control-5,
>  Standards-Version: 3.9.4
>  Homepage: https://launchpad.net/telephony-service
> 
> === modified file 'debian/telephony-service.install'
> --- debian/telephony-service.install	2014-03-24 18:53:27 +0000
> +++ debian/telephony-service.install	2014-06-25 10:00:44 +0000
> @@ -14,5 +14,6 @@
>  usr/share/polkit-1/actions/*TelephonyService*.policy
>  usr/share/telepathy/clients/TelephonyService*.client
>  usr/share/telephony-service/assets/*
> +usr/share/libusermetrics
>  var/lib/polkit-1/localauthority/10-vendor.d/*TelephonyService*.pkla
>  upstart/telephony-service-indicator.conf /usr/share/upstart/sessions
> 
> === modified file 'indicator/metrics.cpp'
> --- indicator/metrics.cpp	2013-09-26 18:20:05 +0000
> +++ indicator/metrics.cpp	2014-06-25 10:00:44 +0000
> @@ -36,7 +36,7 @@
>      QObject(parent)
>  {
>      try {
> -        mMetricManager.reset(MetricManager::getInstance());
> +        mMetricManager.reset(MetricManager::getInstance(APP_ID));
>          mMetrics[SentMessages] = mMetricManager->add(MetricParameters(MESSAGES_SENT_STATISTICS_ID).formatString("<b>%1</b> text messages sent today")
>                                                        .emptyDataString("No text messages sent today").textDomain(APP_ID).minimum(0.0));
>          mMetrics[ReceivedMessages] = mMetricManager->add(MetricParameters(MESSAGES_RECEIVED_STATISTICS_ID).formatString("<b>%1</b> text messages received today")
> 
> === modified file 'libtelephonyservice/tests/GreeterContactsTest.cpp'
> --- libtelephonyservice/tests/GreeterContactsTest.cpp	2014-02-27 22:35:40 +0000
> +++ libtelephonyservice/tests/GreeterContactsTest.cpp	2014-06-25 10:00:44 +0000
> @@ -287,5 +287,12 @@
>      QVERIFY(reply.isValid());
>  }
>  
> -QTEST_MAIN(GreeterContactsTest)
> +int main(int argc, char *argv[])
> +{
> +    QCoreApplication::setSetuidAllowed(true);
> +    QCoreApplication app(argc, argv);
> +    app.setAttribute(Qt::AA_Use96Dpi, true);
> +    GreeterContactsTest tc;
> +    return QTest::qExec(&tc, argc, argv);
> +}

This workaround is not needed anymore. Mike Terry has reworked the tests in a different way to fix the problem. Can you remove this piece?

>  #include "GreeterContactsTest.moc"
> 
> === modified file 'libtelephonyservice/tests/GreeterContactsTestServer.cpp'
> --- libtelephonyservice/tests/GreeterContactsTestServer.cpp	2014-02-21 02:16:39 +0000
> +++ libtelephonyservice/tests/GreeterContactsTestServer.cpp	2014-06-25 10:00:44 +0000
> @@ -192,6 +192,7 @@
>  
>  int main(int argc, char *argv[])
>  {
> +    QCoreApplication::setSetuidAllowed(true);

This is not needed anymore either.

>      QCoreApplication a(argc, argv);
>  
>      QDBusConnection connection = QDBusConnection::sessionBus();
> 


-- 
https://code.launchpad.net/~unity-api-team/telephony-service/file-based-infographics/+merge/224105
Your team Ubuntu Phablet Team is subscribed to branch lp:telephony-service.