unity-scopes-api

Merge lp:~michihenning/unity-scopes-api/gtest-fixes into lp:unity-scopes-api/devel

  1. gtest-fixes
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 701
Merged at revision: 694
Proposed branch: lp:~michihenning/unity-scopes-api/gtest-fixes
Merge into: lp:unity-scopes-api/devel
Diff against target: 3454 lines (+639/-368)
113 files modified
HACKING (+4/-4)
debian/changelog (+6/-0)
debian/control (+4/-118)
debian/control.in (+2/-0)
include/unity/scopes/testing/MockObject.h (+3/-0)
include/unity/scopes/testing/MockPreviewReply.h (+3/-0)
include/unity/scopes/testing/MockQueryCtrl.h (+3/-0)
include/unity/scopes/testing/MockRegistry.h (+3/-0)
include/unity/scopes/testing/MockScope.h (+3/-0)
include/unity/scopes/testing/MockSearchReply.h (+3/-0)
include/unity/scopes/testing/TypedScopeFixture.h (+3/-0)
src/scopes/internal/Utils.cpp (+14/-1)
test/gtest/CMakeLists.txt (+1/-18)
test/gtest/scopes/Activation/Activation_test.cpp (+5/-1)
test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp (+6/-2)
test/gtest/scopes/Aggregation/ChildScopes_test.cpp (+13/-9)
test/gtest/scopes/Aggregation/Keywords_test.cpp (+10/-6)
test/gtest/scopes/Aggregation/LoopDetection_test.cpp (+21/-18)
test/gtest/scopes/Annotation/Annotation_test.cpp (+4/-0)
test/gtest/scopes/CannedQuery/CannedQuery_test.cpp (+5/-1)
test/gtest/scopes/CategorisedResult/CategorisedResult_test.cpp (+4/-0)
test/gtest/scopes/Category/Category_test.cpp (+3/-0)
test/gtest/scopes/CategoryRenderer/CategoryRenderer_test.cpp (+4/-0)
test/gtest/scopes/ColumnLayout/ColumnLayout_test.cpp (+4/-0)
test/gtest/scopes/DateTimePickerFilter/DateTimePickerFilter_test.cpp (+4/-0)
test/gtest/scopes/Department/Department_test.cpp (+4/-0)
test/gtest/scopes/Filters/Filters_test.cpp (+5/-1)
test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp (+4/-0)
test/gtest/scopes/Invocation/Invocation_test.cpp (+3/-0)
test/gtest/scopes/Location/Location_test.cpp (+5/-1)
test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp (+8/-4)
test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp (+5/-0)
test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp (+4/-0)
test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp (+5/-1)
test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp (+4/-0)
test/gtest/scopes/RangeInputFilter/RangeInputFilter_test.cpp (+4/-0)
test/gtest/scopes/RatingFilter/RatingFilter_test.cpp (+5/-0)
test/gtest/scopes/Registry/Registry_test.cpp (+19/-15)
test/gtest/scopes/ReplyReaper/NoReplyScope.cpp (+3/-0)
test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp (+4/-0)
test/gtest/scopes/ResultCache/ResultCache_test.cpp (+39/-34)
test/gtest/scopes/Runtime/PusherScope.cpp (+3/-0)
test/gtest/scopes/Runtime/Runtime_test.cpp (+5/-2)
test/gtest/scopes/Runtime/SlowCreateScope.cpp (+3/-0)
test/gtest/scopes/Runtime/TestScope.cpp (+4/-0)
test/gtest/scopes/ScopeBase/ScopeBase_test.cpp (+3/-0)
test/gtest/scopes/ScopeExceptions/ScopeExceptions_test.cpp (+3/-0)
test/gtest/scopes/StandAloneScope/StandAloneScope_test.cpp (+3/-0)
test/gtest/scopes/StripLocation/StripLocation_test.cpp (+3/-0)
test/gtest/scopes/SwitchFilter/SwitchFilter_test.cpp (+4/-0)
test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp (+12/-9)
test/gtest/scopes/ThrowingScope/ThrowingScope_test.cpp (+14/-11)
test/gtest/scopes/ValueSliderFilter/ValueSliderFilter_test.cpp (+6/-2)
test/gtest/scopes/Variant/Variant_test.cpp (+5/-2)
test/gtest/scopes/VariantBuilder/VariantBuilder_test.cpp (+5/-1)
test/gtest/scopes/Version/Version_test.cpp (+3/-0)
test/gtest/scopes/internal/CategoryRegistry/CategoryRegistry_test.cpp (+3/-0)
test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp (+3/-0)
test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp (+3/-0)
test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp (+9/-6)
test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp (+4/-0)
test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp (+7/-4)
test/gtest/scopes/internal/Logger/Logger_test.cpp (+5/-0)
test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp (+3/-0)
test/gtest/scopes/internal/Reaper/Reaper_test.cpp (+17/-14)
test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp (+3/-0)
test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp (+3/-1)
test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp (+4/-0)
test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp (+3/-0)
test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp (+4/-0)
test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp (+9/-6)
test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp (+3/-0)
test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp (+5/-2)
test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp (+25/-21)
test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp (+4/-0)
test/gtest/scopes/internal/ThreadSafeQueue/ThreadSafeQueue_test.cpp (+3/-0)
test/gtest/scopes/internal/UniqueID/UniqueID_test.cpp (+3/-0)
test/gtest/scopes/internal/Utils/Utils_test.cpp (+21/-5)
test/gtest/scopes/internal/gobj_ptr/gobj_ptr_test.cpp (+12/-8)
test/gtest/scopes/internal/safe_strerror/safe_strerror_test.cpp (+4/-0)
test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp (+4/-0)
test/gtest/scopes/internal/smartscopes/SSConfig/SSConfig_test.cpp (+3/-0)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+24/-20)
test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp (+11/-7)
test/gtest/scopes/internal/zmq_middleware/ConnectionPool/ConnectionPool_test.cpp (+3/-0)
test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp (+4/-0)
test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp (+4/-0)
test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp (+4/-1)
test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp (+3/-0)
test/gtest/scopes/internal/zmq_middleware/StopPublisher/StopPublisher_test.cpp (+3/-0)
test/gtest/scopes/internal/zmq_middleware/Util/Util_test.cpp (+4/-0)
test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp (+5/-1)
test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp (+3/-0)
test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp (+5/-1)
test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp (+3/-0)
test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp (+3/-0)
test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp (+4/-1)
test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp (+3/-0)
test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp (+5/-2)
test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp (+4/-1)
test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp (+3/-1)
test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp (+3/-0)
test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp (+3/-1)
test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp (+4/-0)
test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp (+3/-0)
test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp (+3/-1)
test/gtest/scopes/qt/qt-bindings/QUtils_test.cpp (+4/-1)
test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp (+3/-0)
test/gtest/scopes/stress/scopes-stress.cpp (+6/-2)
test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp (+3/-0)
test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp (+3/-0)
test/gtest/scopes/testing/Statistics/Statistics_test.cpp (+3/-0)
test/gtest/scopes/utility/BufferedResultForwarder/BufferedResultForwarder_test.cpp (+4/-0)
To merge this branch: bzr merge lp:~michihenning/unity-scopes-api/gtest-fixes
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+311790@code.launchpad.net

Commit message

Changed tests to use cmake-extras for gtest/gmock 1.8.
Fixed tons of warnings caused by new gtest for private ctors.
Fixed tons of warnings about signed/unsigned comparison.
Fixed segfault in the Utils test.
Fixed test failure in the SettingsDB test.
Fixed lots of places where gtest macros had their arguments in the wrong order.
Added missing dependency for language-pack-tr to control.in.
Replaced debian/control with a minimal dummy so people don't endlessly edit the wrong file (control instead of control.in) by mistake.

Description of the change

Changed tests to use cmake-extras for gtest/gmock 1.8.
Fixed tons of warnings caused by new gtest for private ctors.
Fixed tons of warnings about signed/unsigned comparison.
Fixed segfault in the Utils test.
Fixed test failure in the SettingsDB test.
Fixed lots of places where gtest macros had their arguments in the wrong order.
Added missing dependency for language-pack-tr to control.in.
Replaced debian/control with a minimal dummy so people don't endlessly edit the wrong file (control instead of control.in) by mistake.

To post a comment you must log in.
Revision history for this message
Michi Henning (michihenning) wrote :

I set this to "work in progress" because we need to wait for the cmake-extras changes to land before this will pass its tests.

Revision history for this message
Michi Henning (michihenning) wrote :

I've upgraded the chroots on the slaves, so zesty builds should work with gtest 1.8 now.

lp:~michihenning/unity-scopes-api/gtest-fixes updated
694. By Michi Henning

Added missing dependency on language-pack-tr to control.in.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:693
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/53/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1175/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1182
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/968/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/968/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/968/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/968/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/968/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/968/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/53/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:694
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/54/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1178/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1185
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/971/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/971/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/971/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/971/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/971/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/971/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/54/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:694
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/55/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1179/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1186
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/972/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/972/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/972/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/972/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/972/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/972/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/55/rebuild

review: Needs Fixing (continuous-integration)
lp:~michihenning/unity-scopes-api/gtest-fixes updated
695. By Michi Henning

Merged devel.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:695
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/56/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1180/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1187
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/973/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/973/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/973/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/973/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/973/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/973/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/56/rebuild

review: Needs Fixing (continuous-integration)
lp:~michihenning/unity-scopes-api/gtest-fixes updated
696. By Michi Henning

Addedd missing cmake-extras to control.in.

697. By Michi Henning

Replaced debian/control with a minimully dummy, so people don't
endlessly edit control instead of control.in by mistake.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:696
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/60/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1184/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1191
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/977
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/977
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/977/artifact/output/*zip*/output.zip
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/977/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/977/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/977
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/977/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/977
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/977/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/60/rebuild

review: Needs Fixing (continuous-integration)
lp:~michihenning/unity-scopes-api/gtest-fixes updated
698. By Michi Henning

Updated HACKING.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:697
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/61/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1185
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1192
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/978/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/978
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/978/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/61/rebuild

review: Approve (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:698
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/62/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1186
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1193
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/979/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/979/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/979/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/979/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/979/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/979
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/979/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/62/rebuild

review: Approve (continuous-integration)
lp:~michihenning/unity-scopes-api/gtest-fixes updated
699. By Michi Henning

Relaxed cmake-extras version requirement. 0.4 is good enough.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:699
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/63/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1187
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1194
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/980/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/980
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/980/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/63/rebuild

review: Approve (continuous-integration)
lp:~michihenning/unity-scopes-api/gtest-fixes updated
700. By Michi Henning

Unset LC_ALL after test if it wasn't set initially.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:700
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/64/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1192
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1199
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/985/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/985/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/985/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/985/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/985/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/985
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/985/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/64/rebuild

review: Approve (continuous-integration)
lp:~michihenning/unity-scopes-api/gtest-fixes updated
701. By Michi Henning

Fix typo.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:701
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/65/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1194
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1201
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/987/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/987/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/987/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/987/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/987/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/987
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/987/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-api-ci/65/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Looks good Michi, thanks!

P.S. On the topic of whether cppcheck finds anything the compiler doesn't, here's the sort of stuff cppcheck complains about for this project: http://pastebin.ubuntu.com/23552147/ (nothing serious really, but different nonetheless)

review: Approve
Revision history for this message
Michi Henning (michihenning) wrote :

Thanks for that. Interesting. Last time I ran cppcheck (quite some time ago), we didn't get any of that (or we certainly didn't get most of it). Looks like cppcheck is more thorough now. Might run it over some of our other stuff then, too.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING'
2--- HACKING 2016-09-09 06:57:47 +0000
3+++ HACKING 2016-11-28 10:48:16 +0000
4@@ -205,13 +205,13 @@
5
6 - QT-VERSION
7
8- The full version number parts for libunity-scopes-qt.
9+ The full version number for libunity-scopes-qt.
10
11 - *If* the soname changes, you need to add the outdated
12 versions to the "Replaces:" and "Conflicts:" entries
13- in control and control.in. (You need an extra
14- entry for each Vivid and Wily/Xenial andlater. See
15- bileto_pre_release_hook for the sed scripts that append a
16+ in control.in. (You need an extra entry for each Vivid and
17+ Wily/Xenial and later.)
18+ See bileto_pre_release_hook for the sed scripts that append a
19 line to the stanza if the soname is changed. This also may apply
20 if the soname of the Qt library changes, in which case
21 bileto_pre_release_hook needs a corresponding update.
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2016-09-21 03:51:32 +0000
25+++ debian/changelog 2016-11-28 10:48:16 +0000
26@@ -1,3 +1,9 @@
27+unity-scopes-api (1.0.7+17.04.20161115-0ubuntu1) zesty; urgency=medium
28+
29+ * Be stricter on user-configurable idle timeout (1s to 5min).
30+
31+ -- Marcus Tomlinson <marcus.tomlinson@canonical.com> Tue, 15 Nov 2016 06:09:04 +0000
32+
33 unity-scopes-api (1.0.7+16.10.20160921-0ubuntu1) yakkety; urgency=medium
34
35 [ Marcus Tomlinson ]
36
37=== modified file 'debian/control'
38--- debian/control 2016-10-07 15:42:53 +0000
39+++ debian/control 2016-11-28 10:48:16 +0000
40@@ -4,124 +4,10 @@
41 # This file is regenerated automatically by bileto.
42 #
43 Source: unity-scopes-api
44-Priority: optional
45-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
46-Build-Depends: abigail-tools <!nocheck> | libabigail-tools <!nocheck>,
47- binutils:native,
48- capnproto,
49- click-dev (>= 0.2.2),
50- cmake,
51- dbus-test-runner,
52- debhelper (>= 9),
53- devscripts,
54- doxygen,
55- exuberant-ctags,
56- google-mock,
57- graphviz,
58- language-pack-tr,
59- libaccounts-glib-dev,
60- libapparmor-dev,
61- libboost-filesystem-dev,
62- libboost-regex-dev,
63- libboost-serialization-dev,
64- libboost-thread-dev,
65- libcapnp-dev (>= 0.4.0),
66- libdbustest1-dev,
67- libjson-glib-dev,
68- liblttng-ust-dev,
69- libnet-cpp-dev (>= 1.2.0),
70- libprocess-cpp-dev (>= 1.0.1),
71- libsignon-glib-dev,
72- libunity-api-dev (>= 7.80.7~),
73- libzmq3-dev,
74- libzmqpp-dev,
75- lsb-release,
76- lttng-tools,
77- pkg-config,
78- python3 <!nocheck>,
79- python3-dbusmock <!nocheck>,
80- python-tornado <!nocheck>,
81- valgrind,
82-Standards-Version: 3.9.6
83-XS-Testsuite: autopkgtest
84-Section: libs
85-Homepage: https://launchpad.net/unity-scopes-api
86-# if you don't have have commit access to this branch but would like to upload
87-# directly to Ubuntu, don't worry: your changes will be merged back into the
88-# upstream branch
89-Vcs-Bzr: lp:unity-scopes-api
90-Vcs-Browser: https://code.launchpad.net/unity-scopes-api
91+
92+# DO NOT EDIT THIS FILE. WE REALLY MEAN IT!
93
94 Package: libunity-scopes1.0
95 Architecture: any
96-Multi-Arch: same
97-Pre-Depends: ${misc:Pre-Depends},
98-Depends: ${misc:Depends},
99- ${shlibs:Depends},
100-Replaces: libunity-scopes0,
101- libunity-scopes3,
102- libunity-scopes1,
103- libunity-scopes2,
104-Conflicts: libunity-scopes0,
105- libunity-scopes3,
106- libunity-scopes1,
107- libunity-scopes2,
108-Description: API for Unity scopes integration
109- Library to integrate scopes with the Unity shell
110-
111-Package: libunity-scopes-dev
112-Section: libdevel
113-Architecture: any
114-Multi-Arch: same
115-Depends: libproperties-cpp-dev,
116- libunity-api-dev,
117- libunity-scopes1.0 (= ${binary:Version}),
118- ${misc:Depends},
119-Description: Header files for Unity scopes API
120- Library to integrate scopes with the Unity shell (dev files)
121-
122-Package: libunity-scopes-cli
123-Section: devel
124-Architecture: any
125-Multi-Arch: foreign
126-Depends: libunity-scopes1.0 (= ${binary:Version}),
127- ${misc:Depends},
128- ${shlibs:Depends},
129-Description: Client utility for Unity scopes API
130- Commandline client utility for querying Unity scopes, useful for testing.
131-
132-Package: libunity-scopes-doc
133-Section: doc
134-Architecture: all
135-Multi-Arch: foreign
136-Depends: ${misc:Depends},
137-Description: Documentation for Unity scopes API
138- Library to integrate scopes with the Unity shell (documentation)
139-
140-Package: libunity-scopes-qt0.2
141-Architecture: any
142-Multi-Arch: same
143-Pre-Depends: ${misc:Pre-Depends},
144-Depends: ${misc:Depends},
145- ${shlibs:Depends},
146-Description: Qt library for Unity scopes API
147- Library that integrates classes based on Qt for convenience
148-
149-Package: libunity-scopes-qt-dev
150-Section: libdevel
151-Architecture: any
152-Multi-Arch: same
153-Depends: libunity-scopes-dev (= ${binary:Version}),
154- libunity-scopes-qt0.2 (= ${binary:Version}),
155- libnet-cpp-dev (>=1.2.0),
156- ${misc:Depends},
157-Description: Header files for Qt library for Unity scopes API
158- Library that integrates classes based on Qt for convenience (dev files)
159-
160-Package: libunity-scopes-qt-doc
161-Section: doc
162-Architecture: all
163-Multi-Arch: foreign
164-Depends: ${misc:Depends},
165-Description: Documentation for Unity Qt library
166- Library that integrates classes based on Qt for convenience (documentation)
167+Description: DO NOT EDIT THIS FILE, IT IS GENERATED FROM control.in
168+ DO NOT EDIT THIS FILE
169
170=== modified file 'debian/control.in'
171--- debian/control.in 2016-07-25 05:35:44 +0000
172+++ debian/control.in 2016-11-28 10:48:16 +0000
173@@ -6,6 +6,7 @@
174 capnproto,
175 click-dev (>= 0.2.2),
176 cmake,
177+ cmake-extras (>= 0.4),
178 dbus-test-runner,
179 debhelper (>= 9),
180 devscripts,
181@@ -13,6 +14,7 @@
182 exuberant-ctags,
183 google-mock,
184 graphviz,
185+ language-pack-tr,
186 libaccounts-glib-dev,
187 libapparmor-dev,
188 libboost-filesystem-dev,
189
190=== modified file 'include/unity/scopes/testing/MockObject.h'
191--- include/unity/scopes/testing/MockObject.h 2015-04-01 11:28:32 +0000
192+++ include/unity/scopes/testing/MockObject.h 2016-11-28 10:48:16 +0000
193@@ -20,7 +20,10 @@
194
195 #include <unity/scopes/Object.h>
196
197+#pragma GCC diagnostic push
198+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
199 #include <gmock/gmock.h>
200+#pragma GCC diagnostic pop
201
202 namespace unity
203 {
204
205=== modified file 'include/unity/scopes/testing/MockPreviewReply.h'
206--- include/unity/scopes/testing/MockPreviewReply.h 2015-04-10 10:10:06 +0000
207+++ include/unity/scopes/testing/MockPreviewReply.h 2016-11-28 10:48:16 +0000
208@@ -22,7 +22,10 @@
209
210 #include <unity/scopes/testing/MockObject.h>
211
212+#pragma GCC diagnostic push
213+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
214 #include <gmock/gmock.h>
215+#pragma GCC diagnostic pop
216
217 namespace unity
218 {
219
220=== modified file 'include/unity/scopes/testing/MockQueryCtrl.h'
221--- include/unity/scopes/testing/MockQueryCtrl.h 2014-11-03 05:31:30 +0000
222+++ include/unity/scopes/testing/MockQueryCtrl.h 2016-11-28 10:48:16 +0000
223@@ -22,7 +22,10 @@
224
225 #include <unity/scopes/testing/MockObject.h>
226
227+#pragma GCC diagnostic push
228+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
229 #include <gmock/gmock.h>
230+#pragma GCC diagnostic pop
231
232 namespace unity
233 {
234
235=== modified file 'include/unity/scopes/testing/MockRegistry.h'
236--- include/unity/scopes/testing/MockRegistry.h 2015-02-06 00:25:05 +0000
237+++ include/unity/scopes/testing/MockRegistry.h 2016-11-28 10:48:16 +0000
238@@ -21,7 +21,10 @@
239 #include <unity/scopes/Registry.h>
240 #include <unity/scopes/testing/MockObject.h>
241
242+#pragma GCC diagnostic push
243+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
244 #include <gmock/gmock.h>
245+#pragma GCC diagnostic pop
246
247 namespace unity
248 {
249
250=== modified file 'include/unity/scopes/testing/MockScope.h'
251--- include/unity/scopes/testing/MockScope.h 2016-09-08 08:22:37 +0000
252+++ include/unity/scopes/testing/MockScope.h 2016-11-28 10:48:16 +0000
253@@ -24,7 +24,10 @@
254
255 #include <unity/scopes/testing/MockObject.h>
256
257+#pragma GCC diagnostic push
258+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
259 #include <gmock/gmock.h>
260+#pragma GCC diagnostic pop
261
262 namespace unity
263 {
264
265=== modified file 'include/unity/scopes/testing/MockSearchReply.h'
266--- include/unity/scopes/testing/MockSearchReply.h 2016-06-14 14:19:25 +0000
267+++ include/unity/scopes/testing/MockSearchReply.h 2016-11-28 10:48:16 +0000
268@@ -24,7 +24,10 @@
269
270 #include <unity/scopes/testing/MockObject.h>
271
272+#pragma GCC diagnostic push
273+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
274 #include <gmock/gmock.h>
275+#pragma GCC diagnostic pop
276
277 namespace unity
278 {
279
280=== modified file 'include/unity/scopes/testing/TypedScopeFixture.h'
281--- include/unity/scopes/testing/TypedScopeFixture.h 2016-03-09 04:01:35 +0000
282+++ include/unity/scopes/testing/TypedScopeFixture.h 2016-11-28 10:48:16 +0000
283@@ -22,7 +22,10 @@
284
285 #include <unity/scopes/testing/MockRegistry.h>
286
287+#pragma GCC diagnostic push
288+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
289 #include <gtest/gtest.h>
290+#pragma GCC diagnostic pop
291
292 #include <memory>
293
294
295=== modified file 'src/scopes/internal/Utils.cpp'
296--- src/scopes/internal/Utils.cpp 2016-10-07 15:42:53 +0000
297+++ src/scopes/internal/Utils.cpp 2016-11-28 10:48:16 +0000
298@@ -266,7 +266,20 @@
299 }
300 else
301 {
302- result += custom_exec_arg + " ";
303+ // The path provided is already absolute. Ensure that the SNAP env var is honored.
304+
305+ char const* sroot = getenv("SNAP");
306+ std::string snap_root;
307+ if (sroot)
308+ {
309+ snap_root = sroot;
310+ if (!snap_root.empty() && snap_root[snap_root.size() - 1] != '/')
311+ {
312+ snap_root += '/';
313+ }
314+ }
315+
316+ result += snap_root + custom_exec_arg + " ";
317 }
318 }
319 result.resize(result.size() - 1);
320
321=== modified file 'test/gtest/CMakeLists.txt'
322--- test/gtest/CMakeLists.txt 2014-12-02 02:00:57 +0000
323+++ test/gtest/CMakeLists.txt 2016-11-28 10:48:16 +0000
324@@ -1,21 +1,4 @@
325-if (NOT DEFINED GMOCK_ROOT)
326- set(GMOCK_ROOT /usr/src/gmock)
327-endif()
328-
329-add_subdirectory(${GMOCK_ROOT} gmock)
330-
331-# Selectively switch off warnings about missing field initializers when building gmock and gtest
332-set_property(TARGET gmock APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-missing-field-initializers -Wno-old-style-cast")
333-set_property(TARGET gmock_main APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-missing-field-initializers -Wno-old-style-cast")
334-set_property(TARGET gtest APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-missing-field-initializers -Wno-old-style-cast")
335-
336-# Make sure we always build gtest/gmock with debug info, otherwise we don't
337-# get line numbers for the code that is dragged in by the test macros.
338-set_property(TARGET gmock APPEND_STRING PROPERTY COMPILE_FLAGS " -g")
339-set_property(TARGET gmock_main APPEND_STRING PROPERTY COMPILE_FLAGS " -g")
340-set_property(TARGET gtest APPEND_STRING PROPERTY COMPILE_FLAGS " -g")
341-
342-include_directories(${GMOCK_ROOT}/gtest/include)
343+find_package(GMock)
344
345 set(LIBGTEST gtest gmock gmock_main)
346 set(TESTLIBS ${TESTLIBS} ${LIBGTEST} boost_regex)
347
348=== modified file 'test/gtest/scopes/Activation/Activation_test.cpp'
349--- test/gtest/scopes/Activation/Activation_test.cpp 2015-06-08 14:05:12 +0000
350+++ test/gtest/scopes/Activation/Activation_test.cpp 2016-11-28 10:48:16 +0000
351@@ -28,10 +28,14 @@
352 #include <unity/scopes/ActionMetadata.h>
353 #include <unity/UnityExceptions.h>
354 #include <functional>
355-#include <gtest/gtest.h>
356 #include <unity/scopes/testing/Result.h>
357 #include <TestScope.h>
358
359+#pragma GCC diagnostic push
360+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
361+#include <gtest/gtest.h>
362+#pragma GCC diagnostic pop
363+
364 using namespace unity::scopes;
365 using namespace unity::scopes::internal;
366
367
368=== modified file 'test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp'
369--- test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp 2015-07-14 15:11:48 +0000
370+++ test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp 2016-11-28 10:48:16 +0000
371@@ -22,7 +22,11 @@
372 #include <unity/scopes/internal/ResultImpl.h>
373 #include <unity/scopes/internal/RuntimeImpl.h>
374 #include <unity/UnityExceptions.h>
375+
376+#pragma GCC diagnostic push
377+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
378 #include <gtest/gtest.h>
379+#pragma GCC diagnostic pop
380
381 using namespace unity::scopes;
382 using namespace unity::scopes::internal;
383@@ -107,7 +111,7 @@
384
385 ActivationResponse resp(widgets);
386 EXPECT_EQ(ActivationResponse::Status::UpdatePreview, resp.status());
387- EXPECT_EQ(1, resp.updated_widgets().size());
388+ EXPECT_EQ(1u, resp.updated_widgets().size());
389 EXPECT_EQ("w1", resp.updated_widgets().begin()->id());
390 }
391
392@@ -170,7 +174,7 @@
393
394 ActivationResponse resp2 = internal::ActivationResponseImpl::create(var, runtime.get());
395 EXPECT_EQ(ActivationResponse::Status::UpdatePreview, resp2.status());
396- EXPECT_EQ(1, resp2.updated_widgets().size());
397+ EXPECT_EQ(1u, resp2.updated_widgets().size());
398 EXPECT_EQ("w1", resp2.updated_widgets().begin()->id());
399 }
400 }
401
402=== modified file 'test/gtest/scopes/Aggregation/ChildScopes_test.cpp'
403--- test/gtest/scopes/Aggregation/ChildScopes_test.cpp 2015-12-18 09:21:53 +0000
404+++ test/gtest/scopes/Aggregation/ChildScopes_test.cpp 2016-11-28 10:48:16 +0000
405@@ -26,7 +26,11 @@
406
407 #include <boost/filesystem/operations.hpp>
408 #include <fstream>
409+
410+#pragma GCC diagnostic push
411+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
412 #include <gtest/gtest.h>
413+#pragma GCC diagnostic pop
414
415 using namespace boost;
416 using namespace testing;
417@@ -152,7 +156,7 @@
418
419 // 1st TestScope::find_child_scopes() returns: "A,B,C"
420 ChildScopeList return_list = test_scope->child_scopes();
421- ASSERT_EQ(3, return_list.size());
422+ ASSERT_EQ(3u, return_list.size());
423 EXPECT_EQ("ScopeA", return_list[0].id);
424 EXPECT_TRUE(return_list[0].enabled);
425 EXPECT_EQ("ScopeB", return_list[1].id);
426@@ -168,7 +172,7 @@
427
428 // 2nd TestScope::find_child_scopes() returns: "D,A,B,C,E"
429 return_list = test_scope->child_scopes();
430- ASSERT_EQ(5, return_list.size());
431+ ASSERT_EQ(5u, return_list.size());
432 EXPECT_EQ("ScopeD", return_list[0].id);
433 EXPECT_FALSE(return_list[0].enabled);
434 EXPECT_EQ("ScopeA", return_list[1].id);
435@@ -182,7 +186,7 @@
436
437 // 3rd+ TestScope::find_child_scopes() returns: "D,A,B"
438 return_list = test_scope->child_scopes();
439- ASSERT_EQ(3, return_list.size());
440+ ASSERT_EQ(3u, return_list.size());
441 EXPECT_EQ("ScopeD", return_list[0].id);
442 EXPECT_FALSE(return_list[0].enabled);
443 EXPECT_EQ("ScopeA", return_list[1].id);
444@@ -199,7 +203,7 @@
445
446 // 3rd+ TestScope::find_child_scopes() returns: "D,A,B"
447 return_list = test_scope->child_scopes();
448- ASSERT_EQ(3, return_list.size());
449+ ASSERT_EQ(3u, return_list.size());
450 EXPECT_EQ("ScopeD", return_list[0].id);
451 EXPECT_TRUE(return_list[0].enabled);
452 EXPECT_EQ("ScopeA", return_list[1].id);
453@@ -216,7 +220,7 @@
454
455 // 1st TestScope::find_child_scopes() returns: "A,B,C"
456 ChildScopeList return_list = test_scope->child_scopes();
457- ASSERT_EQ(3, return_list.size());
458+ ASSERT_EQ(3u, return_list.size());
459 EXPECT_EQ("ScopeA", return_list[0].id);
460 EXPECT_FALSE(return_list[0].enabled);
461 EXPECT_EQ("ScopeB", return_list[1].id);
462@@ -242,7 +246,7 @@
463
464 // 1st TestScope::find_child_scopes() returns: "A,B,C"
465 ChildScopeList return_list = test_scope->child_scopes();
466- ASSERT_EQ(3, return_list.size());
467+ ASSERT_EQ(3u, return_list.size());
468 EXPECT_EQ("ScopeA", return_list[0].id);
469 EXPECT_TRUE(return_list[0].enabled);
470 EXPECT_EQ("ScopeB", return_list[1].id);
471@@ -263,7 +267,7 @@
472
473 // 1st TestScope::find_child_scopes() returns: "A,B,C"
474 ChildScopeList return_list = test_scope->child_scopes();
475- ASSERT_EQ(3, return_list.size());
476+ ASSERT_EQ(3u, return_list.size());
477 EXPECT_EQ("ScopeA", return_list[0].id);
478 EXPECT_TRUE(return_list[0].enabled);
479 EXPECT_EQ("ScopeB", return_list[1].id);
480@@ -278,7 +282,7 @@
481
482 // Check that nothing crashes and we simply get the list from the scope as is
483 return_list = test_scope->child_scopes();
484- ASSERT_EQ(3, return_list.size());
485+ ASSERT_EQ(3u, return_list.size());
486 EXPECT_EQ("ScopeA", return_list[0].id);
487 EXPECT_TRUE(return_list[0].enabled);
488 EXPECT_EQ("ScopeB", return_list[1].id);
489@@ -293,7 +297,7 @@
490
491 // Check that nothing crashes and we simply get the list from the scope as is
492 return_list = test_scope->child_scopes();
493- ASSERT_EQ(3, return_list.size());
494+ ASSERT_EQ(3u, return_list.size());
495 EXPECT_EQ("ScopeA", return_list[0].id);
496 EXPECT_TRUE(return_list[0].enabled);
497 EXPECT_EQ("ScopeB", return_list[1].id);
498
499=== modified file 'test/gtest/scopes/Aggregation/Keywords_test.cpp'
500--- test/gtest/scopes/Aggregation/Keywords_test.cpp 2015-12-18 09:21:53 +0000
501+++ test/gtest/scopes/Aggregation/Keywords_test.cpp 2016-11-28 10:48:16 +0000
502@@ -21,7 +21,11 @@
503 #include <unity/scopes/testing/ScopeMetadataBuilder.h>
504
505 #include <boost/filesystem/operations.hpp>
506+
507+#pragma GCC diagnostic push
508+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
509 #include <gtest/gtest.h>
510+#pragma GCC diagnostic pop
511
512 #include "AggTestScope.h"
513
514@@ -157,7 +161,7 @@
515
516 // Should see all scopes' results here as all children are enabled by default
517 auto r = receiver->results();
518- EXPECT_EQ(4, r.size());
519+ EXPECT_EQ(4u, r.size());
520 EXPECT_TRUE(r.find("A") != r.end());
521 EXPECT_TRUE(r.find("B") != r.end());
522 EXPECT_TRUE(r.find("C") != r.end());
523@@ -178,7 +182,7 @@
524
525 // Should not see scope C's results here as it has been disabled
526 r = receiver->results();
527- EXPECT_EQ(3, r.size());
528+ EXPECT_EQ(3u, r.size());
529 EXPECT_TRUE(r.find("A") != r.end());
530 EXPECT_TRUE(r.find("B") != r.end());
531 EXPECT_TRUE(r.find("D") != r.end());
532@@ -198,7 +202,7 @@
533
534 // Should not see scope C and D's results here as they are disabled
535 r = receiver->results();
536- EXPECT_EQ(2, r.size());
537+ EXPECT_EQ(2u, r.size());
538 EXPECT_TRUE(r.find("A") != r.end());
539 EXPECT_TRUE(r.find("B") != r.end());
540
541@@ -217,7 +221,7 @@
542
543 // Should not see scope D's results here as it is still disabled
544 r = receiver->results();
545- EXPECT_EQ(3, r.size());
546+ EXPECT_EQ(3u, r.size());
547 EXPECT_TRUE(r.find("A") != r.end());
548 EXPECT_TRUE(r.find("B") != r.end());
549 EXPECT_TRUE(r.find("C") != r.end());
550@@ -237,7 +241,7 @@
551
552 // Should see all scopes' results here as all children are enabled again
553 r = receiver->results();
554- EXPECT_EQ(4, r.size());
555+ EXPECT_EQ(4u, r.size());
556 EXPECT_TRUE(r.find("A") != r.end());
557 EXPECT_TRUE(r.find("B") != r.end());
558 EXPECT_TRUE(r.find("C") != r.end());
559@@ -267,7 +271,7 @@
560
561 // Should see all scopes' results here as all children are enabled by default
562 auto r = receiver->results();
563- EXPECT_EQ(4, r.size());
564+ EXPECT_EQ(4u, r.size());
565 EXPECT_TRUE(r.find("A") != r.end());
566 EXPECT_TRUE(r.find("B") != r.end());
567 EXPECT_TRUE(r.find("C") != r.end());
568
569=== modified file 'test/gtest/scopes/Aggregation/LoopDetection_test.cpp'
570--- test/gtest/scopes/Aggregation/LoopDetection_test.cpp 2015-11-23 10:09:11 +0000
571+++ test/gtest/scopes/Aggregation/LoopDetection_test.cpp 2016-11-28 10:48:16 +0000
572@@ -20,7 +20,10 @@
573 #include <unity/scopes/internal/RuntimeImpl.h>
574 #include <unity/scopes/SearchMetadata.h>
575
576+#pragma GCC diagnostic push
577+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
578 #include <gtest/gtest.h>
579+#pragma GCC diagnostic pop
580
581 #include "AggTestScope.h"
582
583@@ -124,7 +127,7 @@
584 receiver->wait_until_finished();
585
586 auto r = receiver->results();
587- EXPECT_EQ(3, r.size());
588+ EXPECT_EQ(3u, r.size());
589 EXPECT_TRUE(r.find("A") != r.end());
590 EXPECT_TRUE(r.find("B") != r.end());
591 EXPECT_TRUE(r.find("C") != r.end());
592@@ -141,12 +144,12 @@
593 receiver->wait_until_finished();
594
595 auto r = receiver->results();
596- EXPECT_EQ(4, r.size());
597+ EXPECT_EQ(4u, r.size());
598 EXPECT_TRUE(r.find("A") != r.end());
599 EXPECT_TRUE(r.find("B") != r.end());
600 EXPECT_TRUE(r.find("C") != r.end());
601 EXPECT_TRUE(r.find("D") != r.end());
602- EXPECT_EQ(2, r.find("D")->second.size()); // B, and C each forwarded to D, so there must be 2 results.
603+ EXPECT_EQ(2u, r.find("D")->second.size()); // B, and C each forwarded to D, so there must be 2 results.
604 }
605
606 TEST_F(LoopDetectionTest, immediate_loop)
607@@ -157,8 +160,8 @@
608 receiver->wait_until_finished();
609
610 auto r = receiver->results();
611- EXPECT_EQ(1, r.size());
612- EXPECT_EQ(3, r.find("A")->second.size()); // "A" has sent the query twice to itself, second attempt stops loop
613+ EXPECT_EQ(1u, r.size());
614+ EXPECT_EQ(3u, r.find("A")->second.size()); // "A" has sent the query twice to itself, second attempt stops loop
615 }
616
617 TEST_F(LoopDetectionTest, intermediate_loop)
618@@ -171,10 +174,10 @@
619 receiver->wait_until_finished();
620
621 auto r = receiver->results();
622- EXPECT_EQ(3, r.size());
623- EXPECT_EQ(2, r.find("A")->second.size()); // "A" got results from B and C
624- EXPECT_EQ(2, r.find("B")->second.size()); // "B" got results from C and A
625- EXPECT_EQ(1, r.find("C")->second.size()); // "C" got result from A
626+ EXPECT_EQ(3u, r.size());
627+ EXPECT_EQ(2u, r.find("A")->second.size()); // "A" got results from B and C
628+ EXPECT_EQ(2u, r.find("B")->second.size()); // "B" got results from C and A
629+ EXPECT_EQ(1u, r.find("C")->second.size()); // "C" got result from A
630 }
631
632 TEST_F(LoopDetectionTest, repeated_search_on_leaf)
633@@ -188,11 +191,11 @@
634 receiver->wait_until_finished();
635
636 auto r = receiver->results();
637- EXPECT_EQ(4, r.size());
638- EXPECT_EQ(1, r.find("A")->second.size());
639- EXPECT_EQ(1, r.find("B")->second.size());
640- EXPECT_EQ(1, r.find("C")->second.size());
641- EXPECT_EQ(3, r.find("D")->second.size());
642+ EXPECT_EQ(4u, r.size());
643+ EXPECT_EQ(1u, r.find("A")->second.size());
644+ EXPECT_EQ(1u, r.find("B")->second.size());
645+ EXPECT_EQ(1u, r.find("C")->second.size());
646+ EXPECT_EQ(3u, r.find("D")->second.size());
647 }
648
649 TEST_F(LoopDetectionTest, repeated_search_on_aggregator)
650@@ -206,10 +209,10 @@
651 receiver->wait_until_finished();
652
653 auto r = receiver->results();
654- EXPECT_EQ(3, r.size());
655- EXPECT_EQ(1, r.find("A")->second.size());
656- EXPECT_EQ(1, r.find("B")->second.size());
657- EXPECT_EQ(1, r.find("C")->second.size());
658+ EXPECT_EQ(3u, r.size());
659+ EXPECT_EQ(1u, r.find("A")->second.size());
660+ EXPECT_EQ(1u, r.find("B")->second.size());
661+ EXPECT_EQ(1u, r.find("C")->second.size());
662 }
663
664 #pragma GCC diagnostic pop
665
666=== modified file 'test/gtest/scopes/Annotation/Annotation_test.cpp'
667--- test/gtest/scopes/Annotation/Annotation_test.cpp 2014-11-18 07:04:04 +0000
668+++ test/gtest/scopes/Annotation/Annotation_test.cpp 2016-11-28 10:48:16 +0000
669@@ -16,7 +16,11 @@
670 * Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
671 */
672
673+#pragma GCC diagnostic push
674+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
675 #include <gtest/gtest.h>
676+#pragma GCC diagnostic pop
677+
678 #include <unity/scopes/Annotation.h>
679 #include <unity/scopes/CannedQuery.h>
680 #include <unity/scopes/internal/CannedQueryImpl.h>
681
682=== modified file 'test/gtest/scopes/CannedQuery/CannedQuery_test.cpp'
683--- test/gtest/scopes/CannedQuery/CannedQuery_test.cpp 2015-02-27 09:43:40 +0000
684+++ test/gtest/scopes/CannedQuery/CannedQuery_test.cpp 2016-11-28 10:48:16 +0000
685@@ -16,7 +16,11 @@
686 * Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
687 */
688
689+#pragma GCC diagnostic push
690+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
691 #include <gtest/gtest.h>
692+#pragma GCC diagnostic pop
693+
694 #include <unity/scopes/CannedQuery.h>
695 #include <unity/scopes/internal/CannedQueryImpl.h>
696 #include <unity/scopes/OptionSelectorFilter.h>
697@@ -278,7 +282,7 @@
698 filter->add_option("o1", "Option 1");
699 filter->add_option("o2", "Option 2");
700 auto actopts = filter->active_options(fstate);
701- EXPECT_EQ(1, actopts.size());
702+ EXPECT_EQ(1u, actopts.size());
703 EXPECT_EQ("o1", (*(actopts.begin()))->id());
704 }
705 {
706
707=== modified file 'test/gtest/scopes/CategorisedResult/CategorisedResult_test.cpp'
708--- test/gtest/scopes/CategorisedResult/CategorisedResult_test.cpp 2015-07-15 15:49:05 +0000
709+++ test/gtest/scopes/CategorisedResult/CategorisedResult_test.cpp 2016-11-28 10:48:16 +0000
710@@ -23,7 +23,11 @@
711 #include <unity/scopes/internal/ReplyObject.h>
712 #include <unity/scopes/internal/CategorisedResultImpl.h>
713 #include <unity/UnityExceptions.h>
714+
715+#pragma GCC diagnostic push
716+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
717 #include <gtest/gtest.h>
718+#pragma GCC diagnostic pop
719
720 using namespace unity::scopes;
721 using namespace unity::scopes::internal;
722
723=== modified file 'test/gtest/scopes/Category/Category_test.cpp'
724--- test/gtest/scopes/Category/Category_test.cpp 2014-07-02 09:36:34 +0000
725+++ test/gtest/scopes/Category/Category_test.cpp 2016-11-28 10:48:16 +0000
726@@ -21,7 +21,10 @@
727 #include <unity/UnityExceptions.h>
728 #include <unity/scopes/Variant.h>
729
730+#pragma GCC diagnostic push
731+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
732 #include <gtest/gtest.h>
733+#pragma GCC diagnostic pop
734
735 using namespace std;
736 using namespace unity;
737
738=== modified file 'test/gtest/scopes/CategoryRenderer/CategoryRenderer_test.cpp'
739--- test/gtest/scopes/CategoryRenderer/CategoryRenderer_test.cpp 2014-07-07 23:53:36 +0000
740+++ test/gtest/scopes/CategoryRenderer/CategoryRenderer_test.cpp 2016-11-28 10:48:16 +0000
741@@ -19,7 +19,11 @@
742 #include <unity/scopes/CategoryRenderer.h>
743 #include <unity/UnityExceptions.h>
744 #include <fstream>
745+
746+#pragma GCC diagnostic push
747+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
748 #include <gtest/gtest.h>
749+#pragma GCC diagnostic pop
750
751 using namespace unity::scopes;
752 using namespace unity::scopes::internal;
753
754=== modified file 'test/gtest/scopes/ColumnLayout/ColumnLayout_test.cpp'
755--- test/gtest/scopes/ColumnLayout/ColumnLayout_test.cpp 2014-02-25 12:08:41 +0000
756+++ test/gtest/scopes/ColumnLayout/ColumnLayout_test.cpp 2016-11-28 10:48:16 +0000
757@@ -19,7 +19,11 @@
758 #include <unity/scopes/ColumnLayout.h>
759 #include <unity/scopes/internal/ColumnLayoutImpl.h>
760 #include <unity/UnityExceptions.h>
761+
762+#pragma GCC diagnostic push
763+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
764 #include <gtest/gtest.h>
765+#pragma GCC diagnostic pop
766
767 using namespace unity::scopes;
768 using namespace unity::scopes::internal;
769
770=== modified file 'test/gtest/scopes/DateTimePickerFilter/DateTimePickerFilter_test.cpp'
771--- test/gtest/scopes/DateTimePickerFilter/DateTimePickerFilter_test.cpp 2015-11-12 12:45:41 +0000
772+++ test/gtest/scopes/DateTimePickerFilter/DateTimePickerFilter_test.cpp 2016-11-28 10:48:16 +0000
773@@ -16,7 +16,11 @@
774 * Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
775 */
776
777+#pragma GCC diagnostic push
778+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
779 #include <gtest/gtest.h>
780+#pragma GCC diagnostic pop
781+
782 #include <unity/scopes/FilterState.h>
783 #include <unity/scopes/DateTimePickerFilter.h>
784 #include <unity/scopes/internal/DateTimePickerFilterImpl.h>
785
786=== modified file 'test/gtest/scopes/Department/Department_test.cpp'
787--- test/gtest/scopes/Department/Department_test.cpp 2014-05-28 13:52:22 +0000
788+++ test/gtest/scopes/Department/Department_test.cpp 2016-11-28 10:48:16 +0000
789@@ -20,7 +20,11 @@
790 #include <unity/scopes/internal/DepartmentImpl.h>
791 #include <unity/scopes/CannedQuery.h>
792 #include <unity/UnityExceptions.h>
793+
794+#pragma GCC diagnostic push
795+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
796 #include <gtest/gtest.h>
797+#pragma GCC diagnostic pop
798
799 using namespace unity::scopes;
800 using namespace unity::scopes::internal;
801
802=== modified file 'test/gtest/scopes/Filters/Filters_test.cpp'
803--- test/gtest/scopes/Filters/Filters_test.cpp 2016-06-14 14:54:15 +0000
804+++ test/gtest/scopes/Filters/Filters_test.cpp 2016-11-28 10:48:16 +0000
805@@ -31,8 +31,12 @@
806 #include <unity/scopes/ValueSliderLabels.h>
807 #include <unity/scopes/SearchMetadata.h>
808 #include <unity/UnityExceptions.h>
809+#include <TestScope.h>
810+
811+#pragma GCC diagnostic push
812+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
813 #include <gtest/gtest.h>
814-#include <TestScope.h>
815+#pragma GCC diagnostic pop
816
817 using namespace unity::scopes;
818 using namespace unity::scopes::experimental;
819
820=== modified file 'test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp'
821--- test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp 2015-01-09 03:16:51 +0000
822+++ test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp 2016-11-28 10:48:16 +0000
823@@ -21,7 +21,11 @@
824 #include <unity/scopes/internal/RuntimeImpl.h>
825 #include <unity/scopes/internal/ScopeImpl.h>
826
827+
828+#pragma GCC diagnostic push
829+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
830 #include <gtest/gtest.h>
831+#pragma GCC diagnostic pop
832
833 #include "SlowSearchScope.h"
834
835
836=== modified file 'test/gtest/scopes/Invocation/Invocation_test.cpp'
837--- test/gtest/scopes/Invocation/Invocation_test.cpp 2015-01-09 03:16:51 +0000
838+++ test/gtest/scopes/Invocation/Invocation_test.cpp 2016-11-28 10:48:16 +0000
839@@ -30,7 +30,10 @@
840
841 #include <boost/regex.hpp> // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
842
843+#pragma GCC diagnostic push
844+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
845 #include <gtest/gtest.h>
846+#pragma GCC diagnostic pop
847
848 #include "EmptyScope.h"
849 #include "TestScope.h"
850
851=== modified file 'test/gtest/scopes/Location/Location_test.cpp'
852--- test/gtest/scopes/Location/Location_test.cpp 2015-03-06 07:56:37 +0000
853+++ test/gtest/scopes/Location/Location_test.cpp 2016-11-28 10:48:16 +0000
854@@ -18,8 +18,12 @@
855
856 #include <unity/scopes/ScopeExceptions.h>
857 #include <unity/scopes/Location.h>
858+#include <unity/UnityExceptions.h>
859+
860+#pragma GCC diagnostic push
861+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
862 #include <gtest/gtest.h>
863-#include <unity/UnityExceptions.h>
864+#pragma GCC diagnostic pop
865
866 using namespace unity;
867 using namespace unity::scopes;
868
869=== modified file 'test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp'
870--- test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp 2016-03-16 09:52:22 +0000
871+++ test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp 2016-11-28 10:48:16 +0000
872@@ -28,11 +28,15 @@
873 #include <boost/filesystem/operations.hpp>
874 #include <condition_variable>
875 #include <functional>
876-#include <gtest/gtest.h>
877 #include <libaccounts-glib/accounts-glib.h>
878 #include <libdbustest/dbus-test.h>
879 #include <thread>
880
881+#pragma GCC diagnostic push
882+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
883+#include <gtest/gtest.h>
884+#pragma GCC diagnostic pop
885+
886 using namespace unity;
887 using namespace unity::scopes;
888 using namespace unity::scopes::testing;
889@@ -421,13 +425,13 @@
890 TEST_F(OnlineAccountClientTest, refresh_services_main_loop)
891 {
892 auto statuses = oa_client()->get_service_statuses();
893- EXPECT_EQ(0, statuses.size());
894+ EXPECT_EQ(0u, statuses.size());
895
896 create_account();
897 oa_client()->refresh_service_statuses();
898
899 statuses = oa_client()->get_service_statuses();
900- EXPECT_EQ(1, statuses.size());
901+ EXPECT_EQ(1u, statuses.size());
902 EXPECT_FALSE(statuses[0].service_enabled);
903
904 enable_service();
905@@ -464,7 +468,7 @@
906 oa_client()->refresh_service_statuses();
907
908 statuses = oa_client()->get_service_statuses();
909- EXPECT_EQ(0, statuses.size());
910+ EXPECT_EQ(0u, statuses.size());
911 }
912
913 TEST_F(OnlineAccountClientTest, service_update_callback)
914
915=== modified file 'test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp'
916--- test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp 2016-03-09 12:06:02 +0000
917+++ test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp 2016-11-28 10:48:16 +0000
918@@ -16,7 +16,12 @@
919 * Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
920 */
921
922+
923+#pragma GCC diagnostic push
924+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
925 #include <gtest/gtest.h>
926+#pragma GCC diagnostic pop
927+
928 #include <unity/scopes/FilterState.h>
929 #include <unity/scopes/OptionSelectorFilter.h>
930 #include <unity/scopes/internal/OptionSelectorFilterImpl.h>
931
932=== modified file 'test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp'
933--- test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp 2014-08-29 14:11:24 +0000
934+++ test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp 2016-11-28 10:48:16 +0000
935@@ -21,7 +21,11 @@
936 #include <unity/UnityExceptions.h>
937 #include <unity/scopes/Variant.h>
938 #include <unity/scopes/internal/JsonCppNode.h>
939+
940+#pragma GCC diagnostic push
941+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
942 #include <gtest/gtest.h>
943+#pragma GCC diagnostic pop
944
945 using namespace unity::scopes;
946 using namespace unity::scopes::internal;
947
948=== modified file 'test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp'
949--- test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp 2015-10-29 06:24:06 +0000
950+++ test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp 2016-11-28 10:48:16 +0000
951@@ -21,8 +21,12 @@
952 #include <unity/scopes/ActionMetadata.h>
953 #include <unity/scopes/internal/ActionMetadataImpl.h>
954 #include <unity/scopes/internal/SearchMetadataImpl.h>
955+#include <unity/UnityExceptions.h>
956+
957+#pragma GCC diagnostic push
958+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
959 #include <gtest/gtest.h>
960-#include <unity/UnityExceptions.h>
961+#pragma GCC diagnostic pop
962
963 using namespace unity;
964 using namespace unity::scopes;
965
966=== modified file 'test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp'
967--- test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp 2015-11-12 12:45:41 +0000
968+++ test/gtest/scopes/RadioButtonsFilter/RadioButtonsFilter_test.cpp 2016-11-28 10:48:16 +0000
969@@ -16,7 +16,11 @@
970 * Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
971 */
972
973+#pragma GCC diagnostic push
974+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
975 #include <gtest/gtest.h>
976+#pragma GCC diagnostic pop
977+
978 #include <unity/scopes/FilterState.h>
979 #include <unity/scopes/RadioButtonsFilter.h>
980 #include <unity/UnityExceptions.h>
981
982=== modified file 'test/gtest/scopes/RangeInputFilter/RangeInputFilter_test.cpp'
983--- test/gtest/scopes/RangeInputFilter/RangeInputFilter_test.cpp 2016-03-09 11:33:52 +0000
984+++ test/gtest/scopes/RangeInputFilter/RangeInputFilter_test.cpp 2016-11-28 10:48:16 +0000
985@@ -16,7 +16,11 @@
986 * Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
987 */
988
989+#pragma GCC diagnostic push
990+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
991 #include <gtest/gtest.h>
992+#pragma GCC diagnostic pop
993+
994 #include <cmath>
995 #include <unity/scopes/FilterState.h>
996 #include <unity/scopes/RangeInputFilter.h>
997
998=== modified file 'test/gtest/scopes/RatingFilter/RatingFilter_test.cpp'
999--- test/gtest/scopes/RatingFilter/RatingFilter_test.cpp 2014-06-17 10:30:03 +0000
1000+++ test/gtest/scopes/RatingFilter/RatingFilter_test.cpp 2016-11-28 10:48:16 +0000
1001@@ -16,7 +16,12 @@
1002 * Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
1003 */
1004
1005+
1006+#pragma GCC diagnostic push
1007+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1008 #include <gtest/gtest.h>
1009+#pragma GCC diagnostic pop
1010+
1011 #include <unity/scopes/FilterState.h>
1012 #include <unity/scopes/RatingFilter.h>
1013 #include <unity/UnityExceptions.h>
1014
1015=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
1016--- test/gtest/scopes/Registry/Registry_test.cpp 2016-03-31 09:27:33 +0000
1017+++ test/gtest/scopes/Registry/Registry_test.cpp 2016-11-28 10:48:16 +0000
1018@@ -24,7 +24,11 @@
1019 #include <unity/scopes/SearchMetadata.h>
1020
1021 #include <boost/filesystem/operations.hpp>
1022+
1023+#pragma GCC diagnostic push
1024+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1025 #include <gtest/gtest.h>
1026+#pragma GCC diagnostic pop
1027
1028 #include <chrono>
1029 #include <condition_variable>
1030@@ -96,7 +100,7 @@
1031 EXPECT_EQ("scope-A.SearchHint", meta.search_hint());
1032 EXPECT_EQ(TEST_RUNTIME_PATH "/scopes/testscopeA", meta.scope_directory());
1033 auto defs = meta.settings_definitions();
1034- ASSERT_EQ(2, defs.size());
1035+ ASSERT_EQ(2u, defs.size());
1036 EXPECT_EQ("locationSetting", defs[0].get_dict()["id"].get_string());
1037 EXPECT_EQ("Location", defs[0].get_dict()["displayName"].get_string());
1038 EXPECT_EQ("string", defs[0].get_dict()["type"].get_string());
1039@@ -144,10 +148,10 @@
1040 EXPECT_EQ("scope-B.SearchHint", meta.search_hint());
1041 EXPECT_EQ(TEST_RUNTIME_PATH "/scopes/testscopeB", meta.scope_directory());
1042 defs = meta.settings_definitions();
1043- EXPECT_EQ(0, defs.size());
1044+ EXPECT_EQ(0u, defs.size());
1045 EXPECT_FALSE(meta.location_data_needed());
1046- EXPECT_EQ(0, meta.child_scope_ids().size());
1047- EXPECT_EQ(0, meta.keywords().size());
1048+ EXPECT_EQ(0u, meta.child_scope_ids().size());
1049+ EXPECT_EQ(0u, meta.keywords().size());
1050 EXPECT_EQ(0, meta.version());
1051 EXPECT_FALSE(meta.is_aggregator());
1052 }
1053@@ -211,7 +215,7 @@
1054
1055 auto meta = r->get_metadata("testscopeA");
1056 auto defs = meta.settings_definitions();
1057- EXPECT_EQ(2, defs.size());
1058+ EXPECT_EQ(2u, defs.size());
1059 auto sp = meta.proxy();
1060
1061 // testscopeA should not be running at this point
1062@@ -228,7 +232,7 @@
1063
1064 meta = r->get_metadata("testscopeB");
1065 defs = meta.settings_definitions();
1066- EXPECT_EQ(0, defs.size());
1067+ EXPECT_EQ(0u, defs.size());
1068 sp = meta.proxy();
1069
1070 // testscopeB should not be running at this point
1071@@ -478,7 +482,7 @@
1072
1073 // First check that we have 2 scopes registered
1074 MetadataMap list = r->list();
1075- EXPECT_EQ(2, list.size());
1076+ EXPECT_EQ(2u, list.size());
1077 EXPECT_NE(list.end(), list.find("testscopeA"));
1078 EXPECT_NE(list.end(), list.find("testscopeB"));
1079 EXPECT_EQ(list.end(), list.find("testscopeC"));
1080@@ -496,7 +500,7 @@
1081
1082 // Now check that we have 3 scopes registered
1083 list = r->list();
1084- EXPECT_EQ(3, list.size());
1085+ EXPECT_EQ(3u, list.size());
1086 EXPECT_NE(list.end(), list.find("testscopeA"));
1087 EXPECT_NE(list.end(), list.find("testscopeB"));
1088 EXPECT_NE(list.end(), list.find("testscopeC"));
1089@@ -540,7 +544,7 @@
1090
1091 // First check that we have 2 scopes registered
1092 MetadataMap list = r->list();
1093- EXPECT_EQ(2, list.size());
1094+ EXPECT_EQ(2u, list.size());
1095 EXPECT_NE(list.end(), list.find("testscopeA"));
1096 EXPECT_NE(list.end(), list.find("testscopeB"));
1097 EXPECT_EQ(list.end(), list.find("testscopeC"));
1098@@ -559,7 +563,7 @@
1099
1100 // Now check that we have 3 scopes registered
1101 list = r->list();
1102- EXPECT_EQ(3, list.size());
1103+ EXPECT_EQ(3u, list.size());
1104 EXPECT_NE(list.end(), list.find("testscopeA"));
1105 EXPECT_NE(list.end(), list.find("testscopeB"));
1106 EXPECT_NE(list.end(), list.find("testscopeC"));
1107@@ -617,7 +621,7 @@
1108
1109 // Now check that we have 3 scopes registered again
1110 list = r->list();
1111- EXPECT_EQ(3, list.size());
1112+ EXPECT_EQ(3u, list.size());
1113 EXPECT_NE(list.end(), list.find("testscopeA"));
1114 EXPECT_NE(list.end(), list.find("testscopeB"));
1115 EXPECT_EQ(list.end(), list.find("testscopeC"));
1116@@ -632,7 +636,7 @@
1117
1118 // Now check that we are back to having 2 scopes registered
1119 list = r->list();
1120- EXPECT_EQ(2, list.size());
1121+ EXPECT_EQ(2u, list.size());
1122 EXPECT_NE(list.end(), list.find("testscopeA"));
1123 EXPECT_NE(list.end(), list.find("testscopeB"));
1124 EXPECT_EQ(list.end(), list.find("testscopeC"));
1125@@ -645,7 +649,7 @@
1126
1127 // Check that no scopes were registered
1128 list = r->list();
1129- EXPECT_EQ(2, list.size());
1130+ EXPECT_EQ(2u, list.size());
1131 EXPECT_NE(list.end(), list.find("testscopeA"));
1132 EXPECT_NE(list.end(), list.find("testscopeB"));
1133 EXPECT_EQ(list.end(), list.find("testscopeC"));
1134@@ -660,7 +664,7 @@
1135
1136 // Now check that we have 3 scopes registered
1137 list = r->list();
1138- EXPECT_EQ(3, list.size());
1139+ EXPECT_EQ(3u, list.size());
1140 EXPECT_NE(list.end(), list.find("testscopeA"));
1141 EXPECT_NE(list.end(), list.find("testscopeB"));
1142 EXPECT_NE(list.end(), list.find("testscopeC"));
1143@@ -675,7 +679,7 @@
1144
1145 // Now check that we are back to having 2 scopes registered
1146 list = r->list();
1147- EXPECT_EQ(2, list.size());
1148+ EXPECT_EQ(2u, list.size());
1149 EXPECT_NE(list.end(), list.find("testscopeA"));
1150 EXPECT_NE(list.end(), list.find("testscopeB"));
1151 EXPECT_EQ(list.end(), list.find("testscopeC"));
1152
1153=== modified file 'test/gtest/scopes/ReplyReaper/NoReplyScope.cpp'
1154--- test/gtest/scopes/ReplyReaper/NoReplyScope.cpp 2014-07-29 05:50:14 +0000
1155+++ test/gtest/scopes/ReplyReaper/NoReplyScope.cpp 2016-11-28 10:48:16 +0000
1156@@ -22,7 +22,10 @@
1157
1158 #include <thread>
1159
1160+#pragma GCC diagnostic push
1161+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1162 #include <gtest/gtest.h>
1163+#pragma GCC diagnostic pop
1164
1165 using namespace std;
1166 using namespace unity::scopes;
1167
1168=== modified file 'test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp'
1169--- test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp 2015-01-09 03:16:51 +0000
1170+++ test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp 2016-11-28 10:48:16 +0000
1171@@ -21,7 +21,11 @@
1172 #include <unity/scopes/internal/ScopeImpl.h>
1173
1174 #include <boost/algorithm/string.hpp>
1175+
1176+#pragma GCC diagnostic push
1177+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1178 #include <gtest/gtest.h>
1179+#pragma GCC diagnostic pop
1180
1181 #include "NoReplyScope.h"
1182 #include <stdexcept>
1183
1184=== modified file 'test/gtest/scopes/ResultCache/ResultCache_test.cpp'
1185--- test/gtest/scopes/ResultCache/ResultCache_test.cpp 2016-06-14 14:54:15 +0000
1186+++ test/gtest/scopes/ResultCache/ResultCache_test.cpp 2016-11-28 10:48:16 +0000
1187@@ -23,7 +23,12 @@
1188 #include <unity/scopes/OptionSelectorFilter.h>
1189
1190 #include <boost/filesystem.hpp>
1191+
1192+#pragma GCC diagnostic push
1193+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1194 #include <gtest/gtest.h>
1195+#pragma GCC diagnostic pop
1196+
1197 #include <cstdint>
1198
1199 #include "CacheScope.h"
1200@@ -145,7 +150,7 @@
1201 receiver->wait_until_finished();
1202
1203 auto r = receiver->result();
1204- EXPECT_EQ(r, nullptr);
1205+ EXPECT_EQ(nullptr, r);
1206 }
1207
1208 TEST_F(CacheScopeTest, non_surfacing_query)
1209@@ -157,11 +162,11 @@
1210 receiver->wait_until_finished();
1211
1212 auto r = receiver->result();
1213- EXPECT_EQ(r->title(), "some query");
1214+ EXPECT_EQ("some query", r->title());
1215 auto d = receiver->dept();
1216- EXPECT_EQ(d->id(), "");
1217+ EXPECT_EQ("", d->id());
1218 auto sd = *d->subdepartments().begin();
1219- EXPECT_EQ(sd->id(), "subsome query");
1220+ EXPECT_EQ("subsome query", sd->id());
1221
1222 // Non-empty query, so there must be no cache file.
1223 boost::system::error_code ec;
1224@@ -181,13 +186,13 @@
1225 receiver->wait_until_finished();
1226
1227 auto r = receiver->result();
1228- EXPECT_EQ(r->title(), "");
1229- EXPECT_EQ(r->value("int64value").get_int64_t(), 1);
1230- EXPECT_EQ(r->value("int64value2").get_int64_t(), INT64_MAX);
1231+ EXPECT_EQ("", r->title());
1232+ EXPECT_EQ(1, r->value("int64value").get_int64_t());
1233+ EXPECT_EQ(INT64_MAX, r->value("int64value2").get_int64_t());
1234 auto d = receiver->dept();
1235- EXPECT_EQ(d->id(), "");
1236+ EXPECT_EQ("", d->id());
1237 auto sd = *d->subdepartments().begin();
1238- EXPECT_EQ(sd->id(), "sub");
1239+ EXPECT_EQ("sub", sd->id());
1240
1241 // Empty query, so there must be a cache file.
1242 boost::system::error_code ec;
1243@@ -207,11 +212,11 @@
1244 receiver->wait_until_finished();
1245
1246 auto r = receiver->result();
1247- EXPECT_EQ(r->title(), "some other query");
1248+ EXPECT_EQ("some other query", r->title());
1249 auto d = receiver->dept();
1250- EXPECT_EQ(d->id(), "");
1251+ EXPECT_EQ("", d->id());
1252 auto sd = *d->subdepartments().begin();
1253- EXPECT_EQ(sd->id(), "subsome other query");
1254+ EXPECT_EQ("subsome other query", sd->id());
1255
1256 // Cache file must still be there.
1257 boost::system::error_code ec;
1258@@ -225,15 +230,15 @@
1259 receiver->wait_until_finished();
1260
1261 auto r = receiver->result();
1262- EXPECT_EQ(r->title(), "");
1263- EXPECT_EQ(r->value("int64value").get_int(), 1);
1264- EXPECT_EQ(r->value("int64value2").get_int64_t(), INT64_MAX);
1265+ EXPECT_EQ("", r->title());
1266+ EXPECT_EQ(1, r->value("int64value").get_int());
1267+ EXPECT_EQ(INT64_MAX, r->value("int64value2").get_int64_t());
1268 auto d = receiver->dept();
1269- EXPECT_EQ(d->id(), "");
1270+ EXPECT_EQ("", d->id());
1271 auto sd = *d->subdepartments().begin();
1272- EXPECT_EQ(sd->id(), "sub");
1273+ EXPECT_EQ("sub", sd->id());
1274 auto filters = receiver->filters();
1275- ASSERT_EQ(1, filters.size());
1276+ ASSERT_EQ(1u, filters.size());
1277 auto f = *filters.begin();
1278 EXPECT_EQ("option_selector", f->filter_type());
1279 EXPECT_EQ(nullptr, f->filter_group());
1280@@ -262,15 +267,15 @@
1281
1282 auto r = receiver->result();
1283 ASSERT_TRUE(r != nullptr);
1284- EXPECT_EQ(r->title(), "");
1285- EXPECT_EQ(r->value("int64value").get_int(), 1);
1286- EXPECT_EQ(r->value("int64value2").get_int64_t(), INT64_MAX);
1287+ EXPECT_EQ("", r->title());
1288+ EXPECT_EQ(1, r->value("int64value").get_int());
1289+ EXPECT_EQ(INT64_MAX, r->value("int64value2").get_int64_t());
1290 auto d = receiver->dept();
1291- EXPECT_EQ(d->id(), "");
1292+ EXPECT_EQ("", d->id());
1293 auto sd = *d->subdepartments().begin();
1294- EXPECT_EQ(sd->id(), "sub");
1295+ EXPECT_EQ("sub", sd->id());
1296 auto filters = receiver->filters();
1297- ASSERT_EQ(1, filters.size());
1298+ ASSERT_EQ(1u, filters.size());
1299 auto f = *filters.begin();
1300 EXPECT_EQ("option_selector", f->filter_type());
1301 ASSERT_TRUE(f->filter_group() != nullptr);
1302@@ -317,14 +322,14 @@
1303 receiver->wait_until_finished();
1304
1305 auto r = receiver->result();
1306- EXPECT_EQ(r->title(), "");
1307- EXPECT_EQ(r->value("int64value").get_int64_t(), 1);
1308+ EXPECT_EQ("", r->title());
1309+ EXPECT_EQ(1, r->value("int64value").get_int64_t());
1310 auto d = receiver->dept();
1311- EXPECT_EQ(d->id(), "");
1312+ EXPECT_EQ("", d->id());
1313 auto sd = *d->subdepartments().begin();
1314- EXPECT_EQ(sd->id(), "sub");
1315+ EXPECT_EQ("sub", sd->id());
1316 auto filters = receiver->filters();
1317- ASSERT_EQ(1, filters.size());
1318+ ASSERT_EQ(1u, filters.size());
1319 auto f = *filters.begin();
1320 EXPECT_EQ("option_selector", f->filter_type());
1321 auto osf = dynamic_pointer_cast<OptionSelectorFilter const>(f);
1322@@ -342,7 +347,7 @@
1323 auto receiver = make_shared<Receiver>();
1324 scope()->search("", SearchMetadata("unused", "unused"), receiver);
1325 receiver->wait_until_finished();
1326- EXPECT_EQ(receiver->result(), nullptr);
1327+ EXPECT_EQ(nullptr, receiver->result());
1328 ::chmod(TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache", 0600);
1329
1330 // Cache file must still be there, but read will have failed.
1331@@ -362,7 +367,7 @@
1332 auto receiver = make_shared<Receiver>();
1333 scope()->search("", SearchMetadata("unused", "unused"), receiver);
1334 receiver->wait_until_finished();
1335- EXPECT_EQ(receiver->result(), nullptr);
1336+ EXPECT_EQ(nullptr, receiver->result());
1337
1338 // Cache file must still be there, but decode will have failed.
1339 boost::system::error_code ec;
1340@@ -376,7 +381,7 @@
1341 auto receiver = make_shared<Receiver>();
1342 scope()->search("", SearchMetadata("unused", "unused"), receiver);
1343 receiver->wait_until_finished();
1344- EXPECT_EQ(receiver->result(), nullptr);
1345+ EXPECT_EQ(nullptr, receiver->result());
1346
1347 // Cache file must still be there, but decode will have failed.
1348 boost::system::error_code ec;
1349@@ -390,7 +395,7 @@
1350 auto receiver = make_shared<Receiver>();
1351 scope()->search("", SearchMetadata("unused", "unused"), receiver);
1352 receiver->wait_until_finished();
1353- EXPECT_EQ(receiver->result(), nullptr);
1354+ EXPECT_EQ(nullptr, receiver->result());
1355
1356 // Cache file must still be there, but decode will have failed.
1357 boost::system::error_code ec;
1358@@ -404,7 +409,7 @@
1359 auto receiver = make_shared<Receiver>();
1360 scope()->search("", SearchMetadata("unused", "unused"), receiver);
1361 receiver->wait_until_finished();
1362- EXPECT_EQ(receiver->result(), nullptr);
1363+ EXPECT_EQ(nullptr, receiver->result());
1364
1365 // Cache file must still be there, but decode will have failed.
1366 boost::system::error_code ec;
1367
1368=== modified file 'test/gtest/scopes/Runtime/PusherScope.cpp'
1369--- test/gtest/scopes/Runtime/PusherScope.cpp 2014-07-30 20:39:04 +0000
1370+++ test/gtest/scopes/Runtime/PusherScope.cpp 2016-11-28 10:48:16 +0000
1371@@ -25,7 +25,10 @@
1372
1373 #include <atomic>
1374
1375+#pragma GCC diagnostic push
1376+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1377 #include <gtest/gtest.h>
1378+#pragma GCC diagnostic pop
1379
1380 using namespace std;
1381 using namespace unity::scopes;
1382
1383=== modified file 'test/gtest/scopes/Runtime/Runtime_test.cpp'
1384--- test/gtest/scopes/Runtime/Runtime_test.cpp 2015-01-09 03:16:51 +0000
1385+++ test/gtest/scopes/Runtime/Runtime_test.cpp 2016-11-28 10:48:16 +0000
1386@@ -28,7 +28,10 @@
1387 #include <unity/scopes/SearchMetadata.h>
1388 #include <unity/UnityExceptions.h>
1389
1390+#pragma GCC diagnostic push
1391+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1392 #include <gtest/gtest.h>
1393+#pragma GCC diagnostic pop
1394
1395 #include "PusherScope.h"
1396 #include "SlowCreateScope.h"
1397@@ -113,7 +116,7 @@
1398 EXPECT_EQ(1, annotation_count_);
1399 EXPECT_EQ(2, info_count_);
1400
1401- EXPECT_EQ(2, details.info_list().size());
1402+ EXPECT_EQ(2u, details.info_list().size());
1403 if (details.info_list().size() == 2)
1404 {
1405 EXPECT_EQ(OperationInfo::NoInternet, details.info_list()[0].code());
1406@@ -201,7 +204,7 @@
1407 EXPECT_EQ(2, data_pushes_);
1408 EXPECT_EQ(2, info_count_);
1409
1410- EXPECT_EQ(2, details.info_list().size());
1411+ EXPECT_EQ(2u, details.info_list().size());
1412 if (details.info_list().size() == 2)
1413 {
1414 EXPECT_EQ(OperationInfo::NoLocationData, details.info_list()[0].code());
1415
1416=== modified file 'test/gtest/scopes/Runtime/SlowCreateScope.cpp'
1417--- test/gtest/scopes/Runtime/SlowCreateScope.cpp 2014-09-08 05:55:39 +0000
1418+++ test/gtest/scopes/Runtime/SlowCreateScope.cpp 2016-11-28 10:48:16 +0000
1419@@ -24,7 +24,10 @@
1420 #include <mutex>
1421 #include <thread>
1422
1423+#pragma GCC diagnostic push
1424+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1425 #include <gtest/gtest.h>
1426+#pragma GCC diagnostic pop
1427
1428 using namespace std;
1429 using namespace unity::scopes;
1430
1431=== modified file 'test/gtest/scopes/Runtime/TestScope.cpp'
1432--- test/gtest/scopes/Runtime/TestScope.cpp 2014-07-30 20:39:04 +0000
1433+++ test/gtest/scopes/Runtime/TestScope.cpp 2016-11-28 10:48:16 +0000
1434@@ -25,7 +25,11 @@
1435 #include <unity/scopes/ScopeBase.h>
1436 #include <unity/scopes/SearchReply.h>
1437 #include <unity/UnityExceptions.h>
1438+
1439+#pragma GCC diagnostic push
1440+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1441 #include <gtest/gtest.h>
1442+#pragma GCC diagnostic pop
1443
1444 #include "TestScope.h"
1445
1446
1447=== modified file 'test/gtest/scopes/ScopeBase/ScopeBase_test.cpp'
1448--- test/gtest/scopes/ScopeBase/ScopeBase_test.cpp 2014-07-10 06:39:03 +0000
1449+++ test/gtest/scopes/ScopeBase/ScopeBase_test.cpp 2016-11-28 10:48:16 +0000
1450@@ -20,7 +20,10 @@
1451 #include <unity/scopes/internal/DynamicLoader.h>
1452 #include <unity/UnityExceptions.h>
1453
1454+#pragma GCC diagnostic push
1455+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1456 #include <gtest/gtest.h>
1457+#pragma GCC diagnostic pop
1458
1459 using namespace unity::scopes;
1460 using namespace unity::scopes::internal;
1461
1462=== modified file 'test/gtest/scopes/ScopeExceptions/ScopeExceptions_test.cpp'
1463--- test/gtest/scopes/ScopeExceptions/ScopeExceptions_test.cpp 2014-04-17 01:36:29 +0000
1464+++ test/gtest/scopes/ScopeExceptions/ScopeExceptions_test.cpp 2016-11-28 10:48:16 +0000
1465@@ -18,7 +18,10 @@
1466
1467 #include <unity/scopes/ScopeExceptions.h>
1468
1469+#pragma GCC diagnostic push
1470+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1471 #include <gtest/gtest.h>
1472+#pragma GCC diagnostic pop
1473
1474 using namespace std;
1475 using namespace unity::scopes;
1476
1477=== modified file 'test/gtest/scopes/StandAloneScope/StandAloneScope_test.cpp'
1478--- test/gtest/scopes/StandAloneScope/StandAloneScope_test.cpp 2015-08-05 05:59:00 +0000
1479+++ test/gtest/scopes/StandAloneScope/StandAloneScope_test.cpp 2016-11-28 10:48:16 +0000
1480@@ -22,7 +22,10 @@
1481 #include <unity/scopes/SearchListenerBase.h>
1482 #include <unity/scopes/SearchMetadata.h>
1483
1484+#pragma GCC diagnostic push
1485+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1486 #include <gtest/gtest.h>
1487+#pragma GCC diagnostic pop
1488
1489 #include <chrono>
1490 #include <condition_variable>
1491
1492=== modified file 'test/gtest/scopes/StripLocation/StripLocation_test.cpp'
1493--- test/gtest/scopes/StripLocation/StripLocation_test.cpp 2015-03-02 07:04:42 +0000
1494+++ test/gtest/scopes/StripLocation/StripLocation_test.cpp 2016-11-28 10:48:16 +0000
1495@@ -20,7 +20,10 @@
1496 #include <unity/scopes/internal/RuntimeImpl.h>
1497 #include <unity/scopes/SearchMetadata.h>
1498
1499+#pragma GCC diagnostic push
1500+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1501 #include <gtest/gtest.h>
1502+#pragma GCC diagnostic pop
1503
1504 using namespace std;
1505 using namespace unity::scopes;
1506
1507=== modified file 'test/gtest/scopes/SwitchFilter/SwitchFilter_test.cpp'
1508--- test/gtest/scopes/SwitchFilter/SwitchFilter_test.cpp 2015-11-12 12:45:41 +0000
1509+++ test/gtest/scopes/SwitchFilter/SwitchFilter_test.cpp 2016-11-28 10:48:16 +0000
1510@@ -16,7 +16,11 @@
1511 * Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
1512 */
1513
1514+#pragma GCC diagnostic push
1515+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1516 #include <gtest/gtest.h>
1517+#pragma GCC diagnostic pop
1518+
1519 #include <unity/scopes/FilterState.h>
1520 #include <unity/scopes/SwitchFilter.h>
1521 #include <unity/scopes/internal/SwitchFilterImpl.h>
1522
1523=== modified file 'test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp'
1524--- test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp 2015-11-26 05:48:01 +0000
1525+++ test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp 2016-11-28 10:48:16 +0000
1526@@ -21,7 +21,10 @@
1527
1528 #include <unity/UnityExceptions.h>
1529
1530+#pragma GCC diagnostic push
1531+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1532 #include <gtest/gtest.h>
1533+#pragma GCC diagnostic pop
1534
1535 #include <condition_variable>
1536
1537@@ -325,7 +328,7 @@
1538 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1539 EXPECT_EQ("", receiver->completion_msg());
1540 auto r = receiver->results();
1541- ASSERT_EQ(1, r.size());
1542+ ASSERT_EQ(1u, r.size());
1543 EXPECT_EQ("success", r[0].title());
1544 }
1545
1546@@ -413,7 +416,7 @@
1547 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1548 EXPECT_EQ("", receiver->completion_msg());
1549 auto r = receiver->results();
1550- ASSERT_EQ(1, r.size());
1551+ ASSERT_EQ(1u, r.size());
1552 EXPECT_EQ(r[0].title(), "success");
1553
1554 auto plistener = make_shared<PreviewListener>();
1555@@ -433,7 +436,7 @@
1556 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1557 EXPECT_EQ("", receiver->completion_msg());
1558 auto r = receiver->results();
1559- ASSERT_EQ(1, r.size());
1560+ ASSERT_EQ(1u, r.size());
1561 EXPECT_EQ(r[0].title(), "success");
1562
1563 auto plistener = make_shared<PreviewListener>("throw from preview push layout");
1564@@ -454,7 +457,7 @@
1565 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1566 EXPECT_EQ("", receiver->completion_msg());
1567 auto r = receiver->results();
1568- ASSERT_EQ(1, r.size());
1569+ ASSERT_EQ(1u, r.size());
1570 EXPECT_EQ(r[0].title(), "success");
1571
1572 auto plistener = make_shared<PreviewListener>("throw from preview push widget");
1573@@ -475,7 +478,7 @@
1574 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1575 EXPECT_EQ("", receiver->completion_msg());
1576 auto r = receiver->results();
1577- ASSERT_EQ(1, r.size());
1578+ ASSERT_EQ(1u, r.size());
1579 EXPECT_EQ(r[0].title(), "success");
1580
1581 auto plistener = make_shared<PreviewListener>("throw from preview push attribute");
1582@@ -496,7 +499,7 @@
1583 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1584 EXPECT_EQ("", receiver->completion_msg());
1585 auto r = receiver->results();
1586- ASSERT_EQ(1, r.size());
1587+ ASSERT_EQ(1u, r.size());
1588 EXPECT_EQ(r[0].title(), "success");
1589
1590 auto plistener = make_shared<PreviewListener>("throw from preview finished");
1591@@ -516,7 +519,7 @@
1592 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1593 EXPECT_EQ("", receiver->completion_msg());
1594 auto r = receiver->results();
1595- ASSERT_EQ(1, r.size());
1596+ ASSERT_EQ(1u, r.size());
1597 EXPECT_EQ(r[0].title(), "success");
1598
1599 auto alistener = make_shared<ActivationListener>();
1600@@ -536,7 +539,7 @@
1601 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1602 EXPECT_EQ("", receiver->completion_msg());
1603 auto r = receiver->results();
1604- ASSERT_EQ(1, r.size());
1605+ ASSERT_EQ(1u, r.size());
1606 EXPECT_EQ(r[0].title(), "success");
1607
1608 auto alistener = make_shared<ActivationListener>("throw from activation activate");
1609@@ -557,7 +560,7 @@
1610 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1611 EXPECT_EQ("", receiver->completion_msg());
1612 auto r = receiver->results();
1613- ASSERT_EQ(1, r.size());
1614+ ASSERT_EQ(1u, r.size());
1615 EXPECT_EQ(r[0].title(), "success");
1616
1617 auto alistener = make_shared<ActivationListener>("throw from activation finished");
1618
1619=== modified file 'test/gtest/scopes/ThrowingScope/ThrowingScope_test.cpp'
1620--- test/gtest/scopes/ThrowingScope/ThrowingScope_test.cpp 2015-02-06 06:33:23 +0000
1621+++ test/gtest/scopes/ThrowingScope/ThrowingScope_test.cpp 2016-11-28 10:48:16 +0000
1622@@ -20,7 +20,10 @@
1623 #include <unity/scopes/QueryCtrl.h>
1624 #include <unity/scopes/Runtime.h>
1625
1626+#pragma GCC diagnostic push
1627+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1628 #include <gtest/gtest.h>
1629+#pragma GCC diagnostic pop
1630
1631 #include <condition_variable>
1632 #include <thread>
1633@@ -240,7 +243,7 @@
1634 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1635 EXPECT_EQ("", receiver->completion_msg());
1636 auto r = receiver->results();
1637- EXPECT_EQ(1, r.size());
1638+ EXPECT_EQ(1u, r.size());
1639 }
1640
1641 TEST_F(ThrowingScopeTest, throw_from_search)
1642@@ -255,7 +258,7 @@
1643 " unity::ResourceException: exception from search",
1644 receiver->completion_msg());
1645 auto r = receiver->results();
1646- EXPECT_EQ(0, r.size());
1647+ EXPECT_EQ(0u, r.size());
1648 }
1649
1650 TEST_F(ThrowingScopeTest, throw_from_run)
1651@@ -267,7 +270,7 @@
1652 EXPECT_EQ(CompletionDetails::CompletionStatus::Error, receiver->completion_status());
1653 EXPECT_EQ("QueryBase::run(): unity::ResourceException: exception from run", receiver->completion_msg());
1654 auto r = receiver->results();
1655- EXPECT_EQ(0, r.size());
1656+ EXPECT_EQ(0u, r.size());
1657 }
1658
1659 TEST_F(ThrowingScopeTest, throw_from_cancelled)
1660@@ -280,7 +283,7 @@
1661 receiver->wait_until_finished();
1662
1663 auto r = receiver->results();
1664- EXPECT_EQ(0, r.size());
1665+ EXPECT_EQ(0u, r.size());
1666
1667 EXPECT_EQ(CompletionDetails::CompletionStatus::Cancelled, receiver->completion_status());
1668 // No exception string here because we short-cut the cancellation on the client side.
1669@@ -297,7 +300,7 @@
1670 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1671 EXPECT_EQ("", receiver->completion_msg());
1672 auto r = receiver->results();
1673- EXPECT_EQ(1, r.size());
1674+ EXPECT_EQ(1u, r.size());
1675
1676 auto plistener = make_shared<PreviewListener>();
1677 scope()->preview(r[0], ActionMetadata("unused", "unused"), plistener);
1678@@ -319,7 +322,7 @@
1679 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1680 EXPECT_EQ("", receiver->completion_msg());
1681 auto r = receiver->results();
1682- EXPECT_EQ(1, r.size());
1683+ EXPECT_EQ(1u, r.size());
1684
1685 auto plistener = make_shared<PreviewListener>();
1686 scope()->preview(r[0], ActionMetadata("unused", "unused"), plistener);
1687@@ -338,7 +341,7 @@
1688 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1689 EXPECT_EQ("", receiver->completion_msg());
1690 auto r = receiver->results();
1691- EXPECT_EQ(1, r.size());
1692+ EXPECT_EQ(1u, r.size());
1693
1694 auto plistener = make_shared<PreviewListener>();
1695 auto ctrl = scope()->preview(r[0], ActionMetadata("unused", "unused"), plistener);
1696@@ -361,7 +364,7 @@
1697 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1698 EXPECT_EQ("", receiver->completion_msg());
1699 auto r = receiver->results();
1700- EXPECT_EQ(1, r.size());
1701+ EXPECT_EQ(1u, r.size());
1702
1703 auto alistener = make_shared<ActivationListener>();
1704 scope()->activate(r[0], ActionMetadata("unused", "unused"), alistener);
1705@@ -383,7 +386,7 @@
1706 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1707 EXPECT_EQ("", receiver->completion_msg());
1708 auto r = receiver->results();
1709- EXPECT_EQ(1, r.size());
1710+ EXPECT_EQ(1u, r.size());
1711
1712 auto alistener = make_shared<ActivationListener>();
1713 scope()->activate(r[0], ActionMetadata("unused", "unused"), alistener);
1714@@ -403,7 +406,7 @@
1715 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1716 EXPECT_EQ("", receiver->completion_msg());
1717 auto r = receiver->results();
1718- EXPECT_EQ(1, r.size());
1719+ EXPECT_EQ(1u, r.size());
1720
1721 auto alistener = make_shared<ActivationListener>();
1722 auto ctrl = scope()->activate(r[0], ActionMetadata("unused", "unused"), alistener);
1723@@ -426,7 +429,7 @@
1724 EXPECT_EQ(CompletionDetails::CompletionStatus::OK, receiver->completion_status());
1725 EXPECT_EQ("", receiver->completion_msg());
1726 auto r = receiver->results();
1727- EXPECT_EQ(1, r.size());
1728+ EXPECT_EQ(1u, r.size());
1729
1730 auto alistener = make_shared<ActivationListener>();
1731 scope()->perform_action(r[0], ActionMetadata("unused", "unused"), "", "", alistener);
1732
1733=== modified file 'test/gtest/scopes/ValueSliderFilter/ValueSliderFilter_test.cpp'
1734--- test/gtest/scopes/ValueSliderFilter/ValueSliderFilter_test.cpp 2016-03-11 13:21:36 +0000
1735+++ test/gtest/scopes/ValueSliderFilter/ValueSliderFilter_test.cpp 2016-11-28 10:48:16 +0000
1736@@ -16,7 +16,11 @@
1737 * Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
1738 */
1739
1740+#pragma GCC diagnostic push
1741+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1742 #include <gtest/gtest.h>
1743+#pragma GCC diagnostic pop
1744+
1745 #include <unity/scopes/FilterState.h>
1746 #include <unity/scopes/ValueSliderFilter.h>
1747 #include <unity/scopes/ValueSliderLabels.h>
1748@@ -45,7 +49,7 @@
1749 EXPECT_EQ("f1", filter1->id());
1750 EXPECT_EQ("Min", filter1->labels().min_label());
1751 EXPECT_EQ("Max", filter1->labels().max_label());
1752- EXPECT_EQ(2, filter1->labels().extra_labels().size());
1753+ EXPECT_EQ(2u, filter1->labels().extra_labels().size());
1754 EXPECT_EQ("Ten", filter1->labels().extra_labels()[0].second);
1755 EXPECT_EQ("Fifty", filter1->labels().extra_labels()[1].second);
1756 EXPECT_EQ(50, filter1->default_value());
1757@@ -115,7 +119,7 @@
1758 EXPECT_EQ("f1", filter2->id());
1759 EXPECT_EQ("Min", filter2->labels().min_label());
1760 EXPECT_EQ("Max", filter2->labels().max_label());
1761- EXPECT_EQ(1, filter2->labels().extra_labels().size());
1762+ EXPECT_EQ(1u, filter2->labels().extra_labels().size());
1763 EXPECT_EQ(10, filter2->labels().extra_labels()[0].first);
1764 EXPECT_EQ("Ten", filter2->labels().extra_labels()[0].second);
1765 EXPECT_EQ(1, filter2->min());
1766
1767=== modified file 'test/gtest/scopes/Variant/Variant_test.cpp'
1768--- test/gtest/scopes/Variant/Variant_test.cpp 2015-06-17 10:15:34 +0000
1769+++ test/gtest/scopes/Variant/Variant_test.cpp 2016-11-28 10:48:16 +0000
1770@@ -21,7 +21,10 @@
1771
1772 #include <boost/variant.hpp>
1773
1774+#pragma GCC diagnostic push
1775+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1776 #include <gtest/gtest.h>
1777+#pragma GCC diagnostic pop
1778
1779 using namespace std;
1780 using namespace unity;
1781@@ -292,12 +295,12 @@
1782
1783 v = Variant::deserialize_json("{\"foo\": \"bar\"}");
1784 VariantMap vm = v.get_dict();
1785- EXPECT_EQ(1, vm.size());
1786+ EXPECT_EQ(1u, vm.size());
1787 EXPECT_EQ("bar", vm.at("foo").get_string());
1788
1789 v = Variant::deserialize_json("[1, \"two\"]");
1790 VariantArray va = v.get_array();
1791- EXPECT_EQ(2, va.size());
1792+ EXPECT_EQ(2u, va.size());
1793 EXPECT_EQ(1, va[0].get_int());
1794 EXPECT_EQ("two", va[1].get_string());
1795 }
1796
1797=== modified file 'test/gtest/scopes/VariantBuilder/VariantBuilder_test.cpp'
1798--- test/gtest/scopes/VariantBuilder/VariantBuilder_test.cpp 2014-02-25 12:08:41 +0000
1799+++ test/gtest/scopes/VariantBuilder/VariantBuilder_test.cpp 2016-11-28 10:48:16 +0000
1800@@ -17,8 +17,12 @@
1801 */
1802
1803 #include <unity/scopes/VariantBuilder.h>
1804+#include <unity/UnityExceptions.h>
1805+
1806+#pragma GCC diagnostic push
1807+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1808 #include <gtest/gtest.h>
1809-#include <unity/UnityExceptions.h>
1810+#pragma GCC diagnostic pop
1811
1812 using namespace unity;
1813 using namespace unity::scopes;
1814
1815=== modified file 'test/gtest/scopes/Version/Version_test.cpp'
1816--- test/gtest/scopes/Version/Version_test.cpp 2014-01-07 12:22:29 +0000
1817+++ test/gtest/scopes/Version/Version_test.cpp 2016-11-28 10:48:16 +0000
1818@@ -18,7 +18,10 @@
1819
1820 #include <unity/scopes/Version.h>
1821
1822+#pragma GCC diagnostic push
1823+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1824 #include <gtest/gtest.h>
1825+#pragma GCC diagnostic pop
1826
1827 using namespace unity::scopes;
1828
1829
1830=== modified file 'test/gtest/scopes/internal/CategoryRegistry/CategoryRegistry_test.cpp'
1831--- test/gtest/scopes/internal/CategoryRegistry/CategoryRegistry_test.cpp 2014-07-02 09:36:34 +0000
1832+++ test/gtest/scopes/internal/CategoryRegistry/CategoryRegistry_test.cpp 2016-11-28 10:48:16 +0000
1833@@ -21,7 +21,10 @@
1834 #include <unity/UnityExceptions.h>
1835 #include <unity/scopes/Variant.h>
1836
1837+#pragma GCC diagnostic push
1838+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1839 #include <gtest/gtest.h>
1840+#pragma GCC diagnostic pop
1841
1842 using namespace std;
1843 using namespace unity;
1844
1845=== modified file 'test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp'
1846--- test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp 2014-07-07 23:53:36 +0000
1847+++ test/gtest/scopes/internal/ConfigBase/ConfigBase_test.cpp 2016-11-28 10:48:16 +0000
1848@@ -20,7 +20,10 @@
1849 #include <unity/scopes/ScopeExceptions.h>
1850 #include <unity/UnityExceptions.h>
1851
1852+#pragma GCC diagnostic push
1853+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1854 #include <gtest/gtest.h>
1855+#pragma GCC diagnostic pop
1856
1857 using namespace std;
1858 using namespace unity;
1859
1860=== modified file 'test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp'
1861--- test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp 2014-08-28 00:20:56 +0000
1862+++ test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp 2016-11-28 10:48:16 +0000
1863@@ -19,7 +19,10 @@
1864 #include <unity/scopes/internal/DynamicLoader.h>
1865 #include <unity/UnityExceptions.h>
1866
1867+#pragma GCC diagnostic push
1868+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1869 #include <gtest/gtest.h>
1870+#pragma GCC diagnostic pop
1871
1872 #include <boost/regex.hpp> // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
1873 using namespace std;
1874
1875=== modified file 'test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp'
1876--- test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp 2014-11-20 21:33:33 +0000
1877+++ test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp 2016-11-28 10:48:16 +0000
1878@@ -21,7 +21,10 @@
1879 #include <unity/UnityExceptions.h>
1880
1881 #include <boost/regex.hpp> // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
1882+#pragma GCC diagnostic push
1883+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1884 #include <gtest/gtest.h>
1885+#pragma GCC diagnostic pop
1886
1887 using namespace unity;
1888 using namespace unity::scopes;
1889@@ -34,7 +37,7 @@
1890 s->add_location_setting();
1891
1892 auto defs = s->definitions();
1893- ASSERT_EQ(9, defs.size());
1894+ ASSERT_EQ(9u, defs.size());
1895
1896 EXPECT_EQ("location", defs[0].get_dict()["id"].get_string());
1897 EXPECT_EQ("string", defs[0].get_dict()["type"].get_string());
1898@@ -45,7 +48,7 @@
1899 EXPECT_EQ("list", defs[1].get_dict()["type"].get_string());
1900 EXPECT_EQ("Temperature Unit", defs[1].get_dict()["displayName"].get_string());
1901 EXPECT_EQ(1, defs[1].get_dict()["defaultValue"].get_int());
1902- ASSERT_EQ(2, defs[1].get_dict()["displayValues"].get_array().size());
1903+ ASSERT_EQ(2u, defs[1].get_dict()["displayValues"].get_array().size());
1904 EXPECT_EQ("Celsius", defs[1].get_dict()["displayValues"].get_array()[0].get_string());
1905 EXPECT_EQ("Fahrenheit", defs[1].get_dict()["displayValues"].get_array()[1].get_string());
1906
1907@@ -204,7 +207,7 @@
1908
1909 EXPECT_EQ("tempUnit", defs[1].get_dict()["id"].get_string());
1910 EXPECT_EQ("testTemperature Unit", defs[1].get_dict()["displayName"].get_string());
1911- ASSERT_EQ(2, defs[1].get_dict()["displayValues"].get_array().size());
1912+ ASSERT_EQ(2u, defs[1].get_dict()["displayValues"].get_array().size());
1913 EXPECT_EQ("testCelsius", defs[1].get_dict()["displayValues"].get_array()[0].get_string());
1914 EXPECT_EQ("testFahrenheit", defs[1].get_dict()["displayValues"].get_array()[1].get_string());
1915 }
1916@@ -215,11 +218,11 @@
1917 auto s = IniSettingsSchema::create(TEST_SRC_DIR "/locale_fallback.ini");
1918
1919 auto defs = s->definitions();
1920- ASSERT_EQ(1, defs.size());
1921+ ASSERT_EQ(1u, defs.size());
1922
1923 EXPECT_EQ("tempUnit", defs[0].get_dict()["id"].get_string());
1924 EXPECT_EQ("Temperature Unit", defs[0].get_dict()["displayName"].get_string());
1925- ASSERT_EQ(2, defs[0].get_dict()["displayValues"].get_array().size());
1926+ ASSERT_EQ(2u, defs[0].get_dict()["displayValues"].get_array().size());
1927 EXPECT_EQ("Celsius", defs[0].get_dict()["displayValues"].get_array()[0].get_string());
1928 EXPECT_EQ("Fahrenheit", defs[0].get_dict()["displayValues"].get_array()[1].get_string());
1929 }
1930@@ -235,7 +238,7 @@
1931 s->add_location_setting();
1932 {
1933 auto defs = s->definitions();
1934- ASSERT_EQ(1, defs.size());
1935+ ASSERT_EQ(1u, defs.size());
1936
1937 EXPECT_EQ("internal.location", defs[0].get_dict()["id"].get_string());
1938 EXPECT_EQ("Enable location data", defs[0].get_dict()["displayName"].get_string());
1939
1940=== modified file 'test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp'
1941--- test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp 2016-05-27 11:26:53 +0000
1942+++ test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp 2016-11-28 10:48:16 +0000
1943@@ -20,7 +20,11 @@
1944 #include <unity/UnityExceptions.h>
1945 #include <unity/scopes/Variant.h>
1946
1947+#pragma GCC diagnostic push
1948+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1949 #include <gtest/gtest.h>
1950+#pragma GCC diagnostic pop
1951+
1952 #include <memory>
1953 #include <algorithm>
1954
1955
1956=== modified file 'test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp'
1957--- test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp 2016-05-27 11:03:57 +0000
1958+++ test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp 2016-11-28 10:48:16 +0000
1959@@ -21,7 +21,10 @@
1960 #include <unity/UnityExceptions.h>
1961 #include <unity/util/FileIO.h>
1962
1963+#pragma GCC diagnostic push
1964+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
1965 #include <gtest/gtest.h>
1966+#pragma GCC diagnostic pop
1967
1968 using namespace unity;
1969 using namespace unity::scopes;
1970@@ -118,7 +121,7 @@
1971 auto s = JsonSettingsSchema::create(ok_schema);
1972
1973 auto defs = s->definitions();
1974- EXPECT_EQ(11, defs.size());
1975+ EXPECT_EQ(11u, defs.size());
1976
1977 EXPECT_EQ("location", defs[0].get_dict()["id"].get_string());
1978 EXPECT_EQ("string", defs[0].get_dict()["type"].get_string());
1979@@ -129,7 +132,7 @@
1980 EXPECT_EQ("list", defs[1].get_dict()["type"].get_string());
1981 EXPECT_EQ("Temperature Units", defs[1].get_dict()["displayName"].get_string());
1982 EXPECT_EQ(1, defs[1].get_dict()["defaultValue"].get_int());
1983- EXPECT_EQ(2, defs[1].get_dict()["displayValues"].get_array().size());
1984+ EXPECT_EQ(2u, defs[1].get_dict()["displayValues"].get_array().size());
1985 EXPECT_EQ("Celsius", defs[1].get_dict()["displayValues"].get_array()[0].get_string());
1986 EXPECT_EQ("Fahrenheit", defs[1].get_dict()["displayValues"].get_array()[1].get_string());
1987
1988@@ -181,7 +184,7 @@
1989 auto s = JsonSettingsSchema::create(schema);
1990
1991 auto defs = s->definitions();
1992- EXPECT_EQ(2, defs.size());
1993+ EXPECT_EQ(2u, defs.size());
1994
1995 EXPECT_EQ(3.14, defs[0].get_dict()["defaultValue"].get_double());
1996 EXPECT_EQ(2147483648, defs[1].get_dict()["defaultValue"].get_double());
1997@@ -705,7 +708,7 @@
1998 s->add_location_setting();
1999 {
2000 auto defs = s->definitions();
2001- ASSERT_EQ(1, defs.size());
2002+ ASSERT_EQ(1u, defs.size());
2003
2004 EXPECT_EQ("internal.location", defs[0].get_dict()["id"].get_string());
2005 EXPECT_EQ("Enable location data", defs[0].get_dict()["displayName"].get_string());
2006
2007=== modified file 'test/gtest/scopes/internal/Logger/Logger_test.cpp'
2008--- test/gtest/scopes/internal/Logger/Logger_test.cpp 2016-02-22 04:35:26 +0000
2009+++ test/gtest/scopes/internal/Logger/Logger_test.cpp 2016-11-28 10:48:16 +0000
2010@@ -19,7 +19,12 @@
2011 #include <unity/scopes/internal/Logger.h>
2012
2013 #include <boost/algorithm/string.hpp>
2014+
2015+#pragma GCC diagnostic push
2016+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2017 #include <gtest/gtest.h>
2018+#pragma GCC diagnostic pop
2019+
2020 #include <unity/UnityExceptions.h>
2021
2022 using namespace std;
2023
2024=== modified file 'test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp'
2025--- test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp 2014-12-02 00:16:04 +0000
2026+++ test/gtest/scopes/internal/MiddlewareFactory/MiddlewareFactory_test.cpp 2016-11-28 10:48:16 +0000
2027@@ -19,7 +19,10 @@
2028 #include <unity/scopes/internal/MiddlewareFactory.h>
2029 #include <unity/scopes/ScopeExceptions.h>
2030
2031+#pragma GCC diagnostic push
2032+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2033 #include <gtest/gtest.h>
2034+#pragma GCC diagnostic pop
2035
2036 using namespace std;
2037 using namespace unity::scopes;
2038
2039=== modified file 'test/gtest/scopes/internal/Reaper/Reaper_test.cpp'
2040--- test/gtest/scopes/internal/Reaper/Reaper_test.cpp 2014-11-05 05:00:38 +0000
2041+++ test/gtest/scopes/internal/Reaper/Reaper_test.cpp 2016-11-28 10:48:16 +0000
2042@@ -20,7 +20,10 @@
2043
2044 #include <unity/UnityExceptions.h>
2045
2046+#pragma GCC diagnostic push
2047+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2048 #include <gtest/gtest.h>
2049+#pragma GCC diagnostic pop
2050
2051 using namespace std;
2052 using namespace unity::scopes;
2053@@ -200,17 +203,17 @@
2054 auto e1 = r->add([]{});
2055 auto e2 = r->add([]{});
2056 auto e3 = r->add([]{});
2057- EXPECT_EQ(3, r->size());
2058+ EXPECT_EQ(3u, r->size());
2059 e2->cancel();
2060- EXPECT_EQ(2, r->size());
2061+ EXPECT_EQ(2u, r->size());
2062
2063 r->destroy();
2064
2065- EXPECT_EQ(2, r->size());
2066+ EXPECT_EQ(2u, r->size());
2067 e3->cancel();
2068- EXPECT_EQ(1, r->size());
2069+ EXPECT_EQ(1u, r->size());
2070 e1->cancel();
2071- EXPECT_EQ(0, r->size());
2072+ EXPECT_EQ(0u, r->size());
2073 }
2074 }
2075
2076@@ -326,7 +329,7 @@
2077 // Now we destroy the reaper, *before* the pass at t == 6.0.
2078 // Because CallbackOnDestroy is set, e3 is reaped.
2079 r->destroy();
2080- EXPECT_EQ(0, r->size());
2081+ EXPECT_EQ(0u, r->size());
2082 EXPECT_EQ(1, c1.get());
2083 EXPECT_EQ(0, c2.get());
2084 EXPECT_EQ(1, c3.get()); // Callback for e3 must have been invoked.
2085@@ -361,7 +364,7 @@
2086
2087 // e1 is oldest, so at the tail of the reap list.
2088
2089- EXPECT_EQ(2, r->size());
2090+ EXPECT_EQ(2u, r->size());
2091 EXPECT_LT(t(), 2000);
2092
2093 this_thread::sleep_for(chrono::milliseconds(2500)); // At t == 2.0, reaper kicks in.
2094@@ -370,14 +373,14 @@
2095 EXPECT_GE(t(), 2500);
2096 EXPECT_EQ(1, c1.get()); // Was reaped at t ~ 2.0 (tested by lambda on c1)
2097 EXPECT_EQ(0, c2.get()); // Expires at t ~ 2.0, but not reaped yet, because c1 has not completed
2098- EXPECT_EQ(1, r->size()); // e2 must still be there
2099+ EXPECT_EQ(1u, r->size()); // e2 must still be there
2100
2101 // We null out e2 while the reaping pass is still stuck in the callback for e1.
2102 EXPECT_LT(t(), 3000);
2103 e2 = nullptr; // Blocks until e1's callback completes at t ~ 3.0 (tested by lambda on c2)
2104 EXPECT_GE(t(), 3000);
2105 EXPECT_EQ(0, c2.get());
2106- EXPECT_EQ(0, r->size());
2107+ EXPECT_EQ(0u, r->size());
2108 }
2109 }
2110
2111@@ -419,7 +422,7 @@
2112 SelfDestroy sd(r);
2113 this_thread::sleep_for(chrono::milliseconds(1500));
2114 EXPECT_TRUE(sd.called());
2115- EXPECT_EQ(0, r->size());
2116+ EXPECT_EQ(0u, r->size());
2117 }
2118 }
2119
2120@@ -441,13 +444,13 @@
2121
2122 e1->refresh();
2123 e2->cancel();
2124- EXPECT_EQ(2, r->size());
2125+ EXPECT_EQ(2u, r->size());
2126 EXPECT_EQ(0, c1.get());
2127 EXPECT_EQ(0, c2.get());
2128 EXPECT_EQ(0, c3.get());
2129
2130 r->destroy();
2131- EXPECT_EQ(0, r->size());
2132+ EXPECT_EQ(0u, r->size());
2133 EXPECT_EQ(1, c1.get());
2134 EXPECT_EQ(0, c2.get());
2135 EXPECT_EQ(1, c3.get());
2136@@ -466,13 +469,13 @@
2137
2138 e1->refresh();
2139 e2->cancel();
2140- EXPECT_EQ(2, r->size());
2141+ EXPECT_EQ(2u, r->size());
2142 EXPECT_EQ(0, c1.get());
2143 EXPECT_EQ(0, c2.get());
2144 EXPECT_EQ(0, c3.get());
2145
2146 r->destroy();
2147- EXPECT_EQ(2, r->size());
2148+ EXPECT_EQ(2u, r->size());
2149 EXPECT_EQ(0, c1.get());
2150 EXPECT_EQ(0, c2.get());
2151 EXPECT_EQ(0, c3.get());
2152
2153=== modified file 'test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp'
2154--- test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp 2015-08-04 04:56:01 +0000
2155+++ test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp 2016-11-28 10:48:16 +0000
2156@@ -21,7 +21,10 @@
2157 #include <unity/scopes/ScopeExceptions.h>
2158
2159 #include <boost/regex.hpp> // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
2160+#pragma GCC diagnostic push
2161+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2162 #include <gtest/gtest.h>
2163+#pragma GCC diagnostic pop
2164
2165 using namespace std;
2166 using namespace unity;
2167
2168=== modified file 'test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp'
2169--- test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp 2015-05-29 10:17:42 +0000
2170+++ test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp 2016-11-28 10:48:16 +0000
2171@@ -24,8 +24,10 @@
2172 #include <unity/UnityExceptions.h>
2173 #include <unity/scopes/ScopeExceptions.h>
2174
2175-#include <gtest/gtest.h>
2176+#pragma GCC diagnostic push
2177+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2178 #include <gmock/gmock.h>
2179+#pragma GCC diagnostic pop
2180
2181 using namespace std;
2182 using namespace testing;
2183
2184=== modified file 'test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp'
2185--- test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp 2014-12-01 08:21:05 +0000
2186+++ test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp 2016-11-28 10:48:16 +0000
2187@@ -23,7 +23,11 @@
2188 #include <unity/scopes/SearchListenerBase.h>
2189 #include <unity/scopes/Department.h>
2190 #include <unity/scopes/CategorisedResult.h>
2191+
2192+#pragma GCC diagnostic push
2193+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2194 #include <gtest/gtest.h>
2195+#pragma GCC diagnostic pop
2196
2197 using namespace unity::scopes;
2198 using namespace unity::scopes::internal;
2199
2200=== modified file 'test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp'
2201--- test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp 2016-02-22 01:29:01 +0000
2202+++ test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp 2016-11-28 10:48:16 +0000
2203@@ -24,7 +24,10 @@
2204 #include <unity/UnityExceptions.h>
2205
2206 #include <boost/regex.hpp> // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
2207+#pragma GCC diagnostic push
2208+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2209 #include <gtest/gtest.h>
2210+#pragma GCC diagnostic pop
2211
2212 using namespace std;
2213 using namespace unity::scopes;
2214
2215=== modified file 'test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp'
2216--- test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp 2014-12-04 04:33:50 +0000
2217+++ test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp 2016-11-28 10:48:16 +0000
2218@@ -25,7 +25,11 @@
2219
2220 #include <boost/algorithm/string.hpp>
2221 #include <boost/filesystem.hpp>
2222+
2223+#pragma GCC diagnostic push
2224+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2225 #include <gtest/gtest.h>
2226+#pragma GCC diagnostic pop
2227
2228 #include <fstream>
2229
2230
2231=== modified file 'test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp'
2232--- test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp 2016-10-13 11:57:05 +0000
2233+++ test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp 2016-11-28 10:48:16 +0000
2234@@ -23,7 +23,10 @@
2235 #include <unity/UnityExceptions.h>
2236
2237 #include <boost/regex.hpp> // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
2238+#pragma GCC diagnostic push
2239+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2240 #include <gtest/gtest.h>
2241+#pragma GCC diagnostic pop
2242
2243 using namespace unity::scopes;
2244 using namespace unity::scopes::internal;
2245@@ -65,7 +68,7 @@
2246 EXPECT_TRUE(cfg.is_aggregator());
2247
2248 auto attrs = cfg.appearance_attributes();
2249- EXPECT_EQ(5, attrs.size());
2250+ EXPECT_EQ(5u, attrs.size());
2251 EXPECT_TRUE(attrs["arbitrary_key"].get_bool());
2252 EXPECT_EQ("bar", attrs["another_one"].get_string());
2253 EXPECT_EQ(11, attrs["num_key"].get_int());
2254@@ -97,7 +100,7 @@
2255 EXPECT_EQ(0, cfg.version());
2256 EXPECT_FALSE(cfg.is_aggregator());
2257
2258- EXPECT_EQ(0, cfg.appearance_attributes().size());
2259+ EXPECT_EQ(0u, cfg.appearance_attributes().size());
2260
2261 // Optional items that throw if not set
2262
2263@@ -137,13 +140,13 @@
2264 TEST(ScopeConfig, empty_scope_ids)
2265 {
2266 ScopeConfig cfg(EMPTY_CHILD_IDS);
2267- EXPECT_EQ(cfg.child_scope_ids().size(), 0);
2268+ EXPECT_EQ(0u, cfg.child_scope_ids().size());
2269 }
2270
2271 TEST(ScopeConfig, single_scope_id)
2272 {
2273 ScopeConfig cfg(SINGLE_CHILD_ID);
2274- EXPECT_EQ(cfg.child_scope_ids().size(), 1);
2275+ EXPECT_EQ(1u, cfg.child_scope_ids().size());
2276 }
2277
2278 TEST(ScopeConfig, bad_timeout)
2279@@ -206,13 +209,13 @@
2280 TEST(ScopeConfig, empty_keywords)
2281 {
2282 ScopeConfig cfg(EMPTY_KEYWORDS);
2283- EXPECT_EQ(cfg.keywords().size(), 0);
2284+ EXPECT_EQ(0u, cfg.keywords().size());
2285 }
2286
2287 TEST(ScopeConfig, single_keyword)
2288 {
2289 ScopeConfig cfg(SINGLE_KEYWORD);
2290- EXPECT_EQ(cfg.keywords().size(), 1);
2291+ EXPECT_EQ(1u, cfg.keywords().size());
2292 }
2293
2294 TEST(ScopeConfig, empty_display_name)
2295
2296=== modified file 'test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp'
2297--- test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp 2014-08-28 00:20:56 +0000
2298+++ test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp 2016-11-28 10:48:16 +0000
2299@@ -21,7 +21,10 @@
2300 #include <unity/scopes/internal/ScopeLoader.h>
2301 #include <unity/UnityExceptions.h>
2302
2303+#pragma GCC diagnostic push
2304+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2305 #include <gtest/gtest.h>
2306+#pragma GCC diagnostic pop
2307
2308 #include <boost/regex.hpp> // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
2309 #include "Counters.h"
2310
2311=== modified file 'test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp'
2312--- test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp 2015-01-27 12:46:11 +0000
2313+++ test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp 2016-11-28 10:48:16 +0000
2314@@ -25,7 +25,10 @@
2315 #include <unity/UnityExceptions.h>
2316
2317 #include <boost/regex.hpp> // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
2318+#pragma GCC diagnostic push
2319+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2320 #include <gtest/gtest.h>
2321+#pragma GCC diagnostic pop
2322
2323 using namespace std;
2324 using namespace unity;
2325@@ -61,7 +64,7 @@
2326 EXPECT_EQ("display_name", m.display_name());
2327 EXPECT_EQ("description", m.description());
2328 EXPECT_EQ("author", m.author());
2329- EXPECT_EQ(0, m.appearance_attributes().size());
2330+ EXPECT_EQ(0u, m.appearance_attributes().size());
2331 EXPECT_EQ(ScopeMetadata::ResultsTtlType::Medium, m.results_ttl_type());
2332
2333 // Check that optional fields that are not set throw
2334@@ -144,7 +147,7 @@
2335 EXPECT_EQ("display_name", mi2->display_name());
2336 EXPECT_EQ("description", mi2->description());
2337 EXPECT_EQ("author", mi2->author());
2338- EXPECT_EQ(0, mi2->appearance_attributes().size());
2339+ EXPECT_EQ(0u, mi2->appearance_attributes().size());
2340 EXPECT_EQ(ScopeMetadata::ResultsTtlType::Medium, mi2->results_ttl_type());
2341 EXPECT_EQ(0, mi2->version());
2342
2343
2344=== modified file 'test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp'
2345--- test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp 2016-03-15 04:36:08 +0000
2346+++ test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp 2016-11-28 10:48:16 +0000
2347@@ -24,7 +24,11 @@
2348
2349 #include <boost/algorithm/string.hpp>
2350 #include <boost/regex.hpp> // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
2351+#pragma GCC diagnostic push
2352+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2353 #include <gtest/gtest.h>
2354+#pragma GCC diagnostic pop
2355+
2356 #include <fcntl.h>
2357 #include <ctime>
2358 #include <thread>
2359@@ -91,7 +95,7 @@
2360 auto db = SettingsDB::create_from_ini_file(db_name, schema);
2361
2362 // If db doesn't exist, default values are returned.
2363- EXPECT_EQ(4, db->settings().size());
2364+ EXPECT_EQ(4u, db->settings().size());
2365 EXPECT_EQ("London", db->settings()["locationSetting"].get_string());
2366 EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
2367 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2368@@ -101,7 +105,7 @@
2369 write_db("db_empty.ini");
2370
2371 // Default values must still be there.
2372- EXPECT_EQ(4, db->settings().size());
2373+ EXPECT_EQ(4u, db->settings().size());
2374 EXPECT_EQ("London", db->settings()["locationSetting"].get_string());
2375 EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
2376 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2377@@ -111,7 +115,7 @@
2378 write_db("db_unknown_setting.ini");
2379
2380 // Default values must still be there.
2381- EXPECT_EQ(4, db->settings().size());
2382+ EXPECT_EQ(4u, db->settings().size());
2383 EXPECT_EQ("London", db->settings()["locationSetting"].get_string());
2384 EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
2385 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2386@@ -119,7 +123,7 @@
2387
2388 // Change the location.
2389 write_db("db_location.ini");
2390- EXPECT_EQ(4, db->settings().size());
2391+ EXPECT_EQ(4u, db->settings().size());
2392 EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
2393 EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
2394 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2395@@ -127,7 +131,7 @@
2396
2397 // Change the unit.
2398 write_db("db_loctemp.ini");
2399- EXPECT_EQ(4, db->settings().size());
2400+ EXPECT_EQ(4u, db->settings().size());
2401 EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
2402 EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
2403 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2404@@ -135,7 +139,7 @@
2405
2406 // Change the age.
2407 write_db("db_loctempage.ini");
2408- EXPECT_EQ(4, db->settings().size());
2409+ EXPECT_EQ(4u, db->settings().size());
2410 EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
2411 EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
2412 EXPECT_EQ(42.0, db->settings()["ageSetting"].get_double());
2413@@ -144,7 +148,7 @@
2414 // Call settings again. This causes state_changed_ in the implementation
2415 // to remain false because the generation count hasn't changed, meaning
2416 // that we must see the same unchanged values as last time.
2417- EXPECT_EQ(4, db->settings().size());
2418+ EXPECT_EQ(4u, db->settings().size());
2419 EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
2420 EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
2421 EXPECT_EQ(42, db->settings()["ageSetting"].get_double());
2422@@ -152,7 +156,7 @@
2423
2424 // Change enabled boolean.
2425 write_db("db_loctempageenabled.ini");
2426- EXPECT_EQ(4, db->settings().size());
2427+ EXPECT_EQ(4u, db->settings().size());
2428 EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
2429 EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
2430 EXPECT_EQ(42, db->settings()["ageSetting"].get_double());
2431@@ -167,7 +171,7 @@
2432 auto db = SettingsDB::create_from_ini_file(db_name, schema);
2433
2434 // Check that we now can see only the other two values. (DB doesn't exist yet.)
2435- EXPECT_EQ(2, db->settings().size());
2436+ EXPECT_EQ(2u, db->settings().size());
2437 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2438 EXPECT_TRUE(db->settings()["enabledSetting"].get_bool());
2439
2440@@ -175,7 +179,7 @@
2441 write_db("db_loctemp.ini");
2442
2443 // Check that they are correct
2444- EXPECT_EQ(4, db->settings().size());
2445+ EXPECT_EQ(4u, db->settings().size());
2446 EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
2447 EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
2448 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2449@@ -193,7 +197,7 @@
2450 write_db("db_loctemp.ini");
2451
2452 // Check that they are correct.
2453- EXPECT_EQ(4, db->settings().size());
2454+ EXPECT_EQ(4u, db->settings().size());
2455 EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
2456 EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
2457 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2458@@ -203,7 +207,7 @@
2459 write_db("db_loctemp_bad_age.ini");
2460
2461 // Check that nothing has changed.
2462- EXPECT_EQ(4, db->settings().size());
2463+ EXPECT_EQ(4u, db->settings().size());
2464 EXPECT_EQ("Paris", db->settings()["locationSetting"].get_string());
2465 EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
2466 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2467@@ -220,12 +224,12 @@
2468 auto db = SettingsDB::create_from_ini_file(db_name, schema);
2469
2470 // If db doesn't exist, default values are returned.
2471- EXPECT_EQ(1, db->settings().size());
2472+ EXPECT_EQ(1u, db->settings().size());
2473 EXPECT_EQ("çš„", db->settings()["locationSetting"].get_string());
2474
2475 // Change the location.
2476 write_db("db_chinese_location.ini");
2477- EXPECT_EQ(1, db->settings().size());
2478+ EXPECT_EQ(1u, db->settings().size());
2479 EXPECT_EQ("丈", db->settings()["locationSetting"].get_string());
2480 }
2481 }
2482@@ -239,7 +243,7 @@
2483 auto db = SettingsDB::create_from_ini_file(db_name, schema);
2484
2485 // If db doesn't exist, default values are returned.
2486- EXPECT_EQ(4, db->settings().size());
2487+ EXPECT_EQ(4u, db->settings().size());
2488 EXPECT_EQ("London", db->settings()["locationSetting"].get_string());
2489 EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
2490 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2491@@ -249,7 +253,7 @@
2492 write_db("db_loctempageenabled.ini");
2493
2494 // Settings should be updated.
2495- EXPECT_EQ(4, db->settings().size());
2496+ EXPECT_EQ(4u, db->settings().size());
2497 EXPECT_EQ("New York", db->settings()["locationSetting"].get_string());
2498 EXPECT_EQ(0, db->settings()["unitTempSetting"].get_int());
2499 EXPECT_EQ(42, db->settings()["ageSetting"].get_double());
2500@@ -259,7 +263,7 @@
2501 unlink(db_name.c_str());
2502
2503 // Default values should come back.
2504- EXPECT_EQ(4, db->settings().size());
2505+ EXPECT_EQ(4u, db->settings().size());
2506 EXPECT_EQ("London", db->settings()["locationSetting"].get_string());
2507 EXPECT_EQ(1, db->settings()["unitTempSetting"].get_int());
2508 EXPECT_EQ(23, db->settings()["ageSetting"].get_double());
2509@@ -290,12 +294,12 @@
2510 auto db = SettingsDB::create_from_json_string(db_name, ok_schema);
2511
2512 // If db doesn't exist, default values are returned.
2513- EXPECT_EQ(1, db->settings().size());
2514+ EXPECT_EQ(1u, db->settings().size());
2515 EXPECT_EQ("London", db->settings()["location"].get_string());
2516
2517 // Change the location.
2518 write_db("db_location_json.ini");
2519- EXPECT_EQ(1, db->settings().size());
2520+ EXPECT_EQ(1u, db->settings().size());
2521 EXPECT_EQ("New York", db->settings()["location"].get_string());
2522 }
2523 }
2524@@ -363,7 +367,7 @@
2525 auto schema = TEST_SRC_DIR "/schema.ini";
2526 auto db = SettingsDB::create_from_ini_file(db_name, schema);
2527
2528- EXPECT_EQ(4, db->settings().size());
2529+ EXPECT_EQ(4u, db->settings().size());
2530 EXPECT_EQ("Munich", db->settings()["locationSetting"].get_string());
2531
2532
2533@@ -381,7 +385,7 @@
2534 }
2535 catch (ResourceException const& e)
2536 {
2537- boost::regex r("unity::ResourceException: unity::FileException: Could not load ini file .*: Key file contains line 'x' which is not a key-value pair, group, or comment \\(errno = 1\\)");
2538+ boost::regex r("unity::ResourceException: unity::FileException: Could not load ini file .*: Key file contains line .*");
2539 EXPECT_TRUE(boost::regex_match(e.what(), r)) << e.what();
2540 }
2541 }
2542
2543=== modified file 'test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp'
2544--- test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp 2014-09-22 05:50:56 +0000
2545+++ test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp 2016-11-28 10:48:16 +0000
2546@@ -20,7 +20,11 @@
2547
2548 #include <unity/UnityExceptions.h>
2549
2550+#pragma GCC diagnostic push
2551+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2552 #include <gtest/gtest.h>
2553+#pragma GCC diagnostic pop
2554+
2555 #include <valgrind/valgrind.h>
2556
2557 using namespace std;
2558
2559=== modified file 'test/gtest/scopes/internal/ThreadSafeQueue/ThreadSafeQueue_test.cpp'
2560--- test/gtest/scopes/internal/ThreadSafeQueue/ThreadSafeQueue_test.cpp 2014-09-08 05:55:39 +0000
2561+++ test/gtest/scopes/internal/ThreadSafeQueue/ThreadSafeQueue_test.cpp 2016-11-28 10:48:16 +0000
2562@@ -18,7 +18,10 @@
2563
2564 #include <unity/scopes/internal/ThreadSafeQueue.h>
2565
2566+#pragma GCC diagnostic push
2567+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2568 #include <gtest/gtest.h>
2569+#pragma GCC diagnostic pop
2570
2571 #include <future>
2572
2573
2574=== modified file 'test/gtest/scopes/internal/UniqueID/UniqueID_test.cpp'
2575--- test/gtest/scopes/internal/UniqueID/UniqueID_test.cpp 2014-02-25 12:08:41 +0000
2576+++ test/gtest/scopes/internal/UniqueID/UniqueID_test.cpp 2016-11-28 10:48:16 +0000
2577@@ -18,7 +18,10 @@
2578
2579 #include <unity/scopes/internal/UniqueID.h>
2580
2581+#pragma GCC diagnostic push
2582+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2583 #include <gtest/gtest.h>
2584+#pragma GCC diagnostic pop
2585
2586 using namespace std;
2587 using namespace unity::scopes::internal;
2588
2589=== modified file 'test/gtest/scopes/internal/Utils/Utils_test.cpp'
2590--- test/gtest/scopes/internal/Utils/Utils_test.cpp 2016-10-07 15:42:53 +0000
2591+++ test/gtest/scopes/internal/Utils/Utils_test.cpp 2016-11-28 10:48:16 +0000
2592@@ -18,9 +18,14 @@
2593
2594 #include <unity/scopes/internal/Utils.h>
2595
2596+#include <unity/UnityExceptions.h>
2597+
2598 #include <boost/filesystem.hpp>
2599+
2600+#pragma GCC diagnostic push
2601+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2602 #include <gtest/gtest.h>
2603-#include <unity/UnityExceptions.h>
2604+#pragma GCC diagnostic pop
2605
2606 using namespace unity::scopes;
2607 using namespace unity::scopes::internal;
2608@@ -39,13 +44,24 @@
2609
2610 TEST(Utils, uncamelcase_turkish)
2611 {
2612- char *old_locale = strdup(getenv("LC_ALL"));
2613+ string old_locale;
2614+ char const* p = getenv("LC_ALL");
2615+ if (p)
2616+ {
2617+ old_locale = p;
2618+ }
2619 setenv("LC_ALL", "tr_TR.UTF-8", 1);
2620
2621 EXPECT_EQ("small-i", uncamelcase("smallI"));
2622
2623- setenv("LC_ALL", old_locale, 1);
2624- free(old_locale);
2625+ if (!old_locale.empty())
2626+ {
2627+ setenv("LC_ALL", old_locale.c_str(), 1);
2628+ }
2629+ else
2630+ {
2631+ unsetenv("LC_ALL");
2632+ }
2633 }
2634
2635 TEST(Utils, convert_to)
2636@@ -170,7 +186,7 @@
2637
2638 // Test argument splitting
2639 auto exec_args = split_exec_args("test", "/path\\ to/exec' 'file arg \"arg 2\" arg' '3 arg\\ 4");
2640- ASSERT_EQ(5, exec_args.size());
2641+ ASSERT_EQ(5u, exec_args.size());
2642 EXPECT_STREQ("\"/path to/exec file\"", exec_args[0].c_str());
2643 EXPECT_STREQ("arg", exec_args[1].c_str());
2644 EXPECT_STREQ("\"arg 2\"", exec_args[2].c_str());
2645
2646=== modified file 'test/gtest/scopes/internal/gobj_ptr/gobj_ptr_test.cpp'
2647--- test/gtest/scopes/internal/gobj_ptr/gobj_ptr_test.cpp 2016-03-15 04:43:56 +0000
2648+++ test/gtest/scopes/internal/gobj_ptr/gobj_ptr_test.cpp 2016-11-28 10:48:16 +0000
2649@@ -22,7 +22,11 @@
2650
2651 #include <unity/scopes/internal/gobj_memory.h>
2652 #include <glib-object.h>
2653+
2654+#pragma GCC diagnostic push
2655+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2656 #include <gtest/gtest.h>
2657+#pragma GCC diagnostic pop
2658
2659 using namespace std;
2660 using namespace unity::scopes::internal;
2661@@ -87,17 +91,17 @@
2662 TEST(Gobj_ptr, refcount)
2663 {
2664 GObject* o = G_OBJECT(g_object_new(G_TYPE_OBJECT, nullptr));
2665- EXPECT_EQ(1, o->ref_count);
2666+ EXPECT_EQ(1u, o->ref_count);
2667 g_object_ref(o);
2668
2669 {
2670- EXPECT_EQ(2, o->ref_count);
2671+ EXPECT_EQ(2u, o->ref_count);
2672 gobj_ptr<GObject> u(o);
2673- EXPECT_EQ(2, o->ref_count);
2674+ EXPECT_EQ(2u, o->ref_count);
2675 // Now it dies and refcount is reduced.
2676 }
2677
2678- EXPECT_EQ(1, o->ref_count);
2679+ EXPECT_EQ(1u, o->ref_count);
2680 g_object_unref(o);
2681 }
2682
2683@@ -105,14 +109,14 @@
2684 {
2685 GObject* o = G_OBJECT(g_object_new(G_TYPE_OBJECT, nullptr));
2686 gobj_ptr<GObject> u(o);
2687- EXPECT_EQ(1, u->ref_count);
2688+ EXPECT_EQ(1u, u->ref_count);
2689 gobj_ptr<GObject> u2(u);
2690- EXPECT_EQ(2, u->ref_count);
2691+ EXPECT_EQ(2u, u->ref_count);
2692 gobj_ptr<GObject> u3 = u2;
2693- EXPECT_EQ(3, u->ref_count);
2694+ EXPECT_EQ(3u, u->ref_count);
2695 u3.reset();
2696 u2.reset();
2697- EXPECT_EQ(1, u->ref_count);
2698+ EXPECT_EQ(1u, u->ref_count);
2699 }
2700
2701 TEST(Gobj_ptr, swap)
2702
2703=== modified file 'test/gtest/scopes/internal/safe_strerror/safe_strerror_test.cpp'
2704--- test/gtest/scopes/internal/safe_strerror/safe_strerror_test.cpp 2014-11-17 01:29:26 +0000
2705+++ test/gtest/scopes/internal/safe_strerror/safe_strerror_test.cpp 2016-11-28 10:48:16 +0000
2706@@ -17,7 +17,11 @@
2707 */
2708
2709 #include <unity/scopes/internal/safe_strerror.h>
2710+
2711+#pragma GCC diagnostic push
2712+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2713 #include <gtest/gtest.h>
2714+#pragma GCC diagnostic pop
2715
2716 using namespace unity::scopes::internal;
2717
2718
2719=== modified file 'test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp'
2720--- test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp 2015-01-16 06:13:57 +0000
2721+++ test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp 2016-11-28 10:48:16 +0000
2722@@ -21,7 +21,11 @@
2723
2724 #include "../RaiiServer.h"
2725
2726+#pragma GCC diagnostic push
2727+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2728 #include <gtest/gtest.h>
2729+#pragma GCC diagnostic pop
2730+
2731 #include <memory>
2732 #include <thread>
2733
2734
2735=== modified file 'test/gtest/scopes/internal/smartscopes/SSConfig/SSConfig_test.cpp'
2736--- test/gtest/scopes/internal/smartscopes/SSConfig/SSConfig_test.cpp 2014-07-25 07:29:19 +0000
2737+++ test/gtest/scopes/internal/smartscopes/SSConfig/SSConfig_test.cpp 2016-11-28 10:48:16 +0000
2738@@ -21,7 +21,10 @@
2739 #include <unity/scopes/ScopeExceptions.h>
2740 #include <unity/UnityExceptions.h>
2741
2742+#pragma GCC diagnostic push
2743+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2744 #include <gtest/gtest.h>
2745+#pragma GCC diagnostic pop
2746
2747 using namespace std;
2748 using namespace unity;
2749
2750=== modified file 'test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp'
2751--- test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp 2016-03-14 07:24:54 +0000
2752+++ test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp 2016-11-28 10:48:16 +0000
2753@@ -29,7 +29,11 @@
2754
2755 #include "../RaiiServer.h"
2756
2757+#pragma GCC diagnostic push
2758+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2759 #include <gtest/gtest.h>
2760+#pragma GCC diagnostic pop
2761+
2762 #include <memory>
2763 #include <thread>
2764
2765@@ -84,7 +88,7 @@
2766
2767 // first try an invalid locale (should throw)
2768 EXPECT_THROW(ssc_->get_remote_scopes(scopes, "test_FAIL", false), std::exception);
2769- ASSERT_EQ(0, scopes.size());
2770+ ASSERT_EQ(0u, scopes.size());
2771
2772 // now try an empty locale
2773 EXPECT_TRUE(ssc_->get_remote_scopes(scopes, "", false));
2774@@ -165,7 +169,7 @@
2775 params = vm["parameters"].get_dict();
2776 EXPECT_TRUE(params["defaultValue"].get_bool());
2777 }
2778- ASSERT_EQ(4, scopes[2].keywords.size());
2779+ ASSERT_EQ(4u, scopes[2].keywords.size());
2780 EXPECT_NE(scopes[2].keywords.end(), scopes[2].keywords.find("music"));
2781 EXPECT_NE(scopes[2].keywords.end(), scopes[2].keywords.find("video"));
2782 EXPECT_NE(scopes[2].keywords.end(), scopes[2].keywords.find("news"));
2783@@ -265,27 +269,27 @@
2784
2785 // check filters
2786 EXPECT_FALSE(filters.empty());
2787- EXPECT_EQ(filters.size(), 1);
2788+ EXPECT_EQ(1u, filters.size());
2789 auto filter1 = filters.front();
2790 auto option_filter = std::dynamic_pointer_cast<const OptionSelectorFilter>(filter1);
2791 EXPECT_TRUE(option_filter != nullptr);
2792- EXPECT_EQ(option_filter->label(), "Label");
2793- EXPECT_EQ(option_filter->id(), "sorting_primary_filter");
2794- EXPECT_EQ(option_filter->display_hints(), FilterBase::DisplayHints::Primary);
2795- EXPECT_EQ(option_filter->multi_select(), false);
2796+ EXPECT_EQ("Label", option_filter->label());
2797+ EXPECT_EQ("sorting_primary_filter", option_filter->id());
2798+ EXPECT_EQ(FilterBase::DisplayHints::Primary, option_filter->display_hints());
2799+ EXPECT_FALSE(option_filter->multi_select());
2800
2801 auto options = option_filter->options();
2802- EXPECT_EQ(options.size(), 3);
2803- EXPECT_EQ(options.front()->id(), "titlerank");
2804- EXPECT_EQ(options.front()->label(), "Title rank");
2805- EXPECT_EQ(options.back()->id(), "salesrank");
2806- EXPECT_EQ(options.back()->label(), "Bestselling");
2807+ EXPECT_EQ(3u, options.size());
2808+ EXPECT_EQ("titlerank", options.front()->id());
2809+ EXPECT_EQ("Title rank", options.front()->label());
2810+ EXPECT_EQ("salesrank", options.back()->id());
2811+ EXPECT_EQ("Bestselling", options.back()->label());
2812
2813 EXPECT_TRUE(option_filter->has_active_option(filter_state));
2814 auto active_options = option_filter->active_options(filter_state);
2815 EXPECT_FALSE(active_options.empty());
2816 auto active_option = *(active_options.begin());
2817- EXPECT_EQ(active_option->id(), "salesrank");
2818+ EXPECT_EQ("salesrank", active_option->id());
2819 }
2820
2821 TEST_F(SmartScopesClientTest, filter_groups)
2822@@ -326,7 +330,7 @@
2823
2824 // check filters
2825 EXPECT_FALSE(filters.empty());
2826- EXPECT_EQ(filters.size(), 1);
2827+ EXPECT_EQ(1u, filters.size());
2828 auto filter1 = filters.front();
2829 auto option_filter = std::dynamic_pointer_cast<const OptionSelectorFilter>(filter1);
2830 EXPECT_TRUE(option_filter != nullptr);
2831@@ -334,19 +338,19 @@
2832 EXPECT_TRUE(grp != nullptr);
2833 EXPECT_EQ("g1", grp->id());
2834 EXPECT_EQ("Group 1", grp->label());
2835- EXPECT_EQ(option_filter->label(), "Label");
2836- EXPECT_EQ(option_filter->id(), "sorting_primary_filter");
2837- EXPECT_EQ(option_filter->display_hints(), FilterBase::DisplayHints::Primary);
2838- EXPECT_EQ(option_filter->multi_select(), false);
2839+ EXPECT_EQ("Label", option_filter->label());
2840+ EXPECT_EQ("sorting_primary_filter", option_filter->id());
2841+ EXPECT_EQ(FilterBase::DisplayHints::Primary, option_filter->display_hints());
2842+ EXPECT_FALSE(option_filter->multi_select());
2843
2844 auto options = option_filter->options();
2845- EXPECT_EQ(options.size(), 2);
2846+ EXPECT_EQ(2u, options.size());
2847
2848 EXPECT_TRUE(option_filter->has_active_option(filter_state));
2849 auto active_options = option_filter->active_options(filter_state);
2850 EXPECT_FALSE(active_options.empty());
2851 auto active_option = *(active_options.begin());
2852- EXPECT_EQ(active_option->id(), "salesrank");
2853+ EXPECT_EQ("salesrank", active_option->id());
2854 }
2855
2856 TEST_F(SmartScopesClientTest, userAgentHeader)
2857
2858=== modified file 'test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp'
2859--- test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp 2015-04-29 17:01:02 +0000
2860+++ test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp 2016-11-28 10:48:16 +0000
2861@@ -32,7 +32,11 @@
2862 #include "../RaiiServer.h"
2863
2864 #include <memory>
2865+
2866+#pragma GCC diagnostic push
2867+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2868 #include <gtest/gtest.h>
2869+#pragma GCC diagnostic pop
2870
2871 using namespace testing;
2872 using namespace unity::scopes;
2873@@ -136,15 +140,15 @@
2874 EXPECT_EQ("Dummy demo scope 3.", meta.description());
2875 EXPECT_EQ("Mr.Fake", meta.author());
2876 EXPECT_FALSE(meta.invisible());
2877- EXPECT_EQ(4, meta.settings_definitions().size());
2878+ EXPECT_EQ(4u, meta.settings_definitions().size());
2879 EXPECT_EQ("unitTemp", meta.settings_definitions()[1].get_dict()["id"].get_string());
2880 EXPECT_EQ("Temperature Units", meta.settings_definitions()[1].get_dict()["displayName"].get_string());
2881 EXPECT_EQ("list", meta.settings_definitions()[1].get_dict()["type"].get_string());
2882 EXPECT_EQ(1, meta.settings_definitions()[1].get_dict()["defaultValue"].get_int());
2883- EXPECT_EQ(2, meta.settings_definitions()[1].get_dict()["displayValues"].get_array().size());
2884+ EXPECT_EQ(2u, meta.settings_definitions()[1].get_dict()["displayValues"].get_array().size());
2885 EXPECT_EQ("Celsius", meta.settings_definitions()[1].get_dict()["displayValues"].get_array()[0].get_string());
2886 EXPECT_EQ("Fahrenheit", meta.settings_definitions()[1].get_dict()["displayValues"].get_array()[1].get_string());
2887- ASSERT_EQ(4, meta.keywords().size());
2888+ ASSERT_EQ(4u, meta.keywords().size());
2889 EXPECT_NE(meta.keywords().end(), meta.keywords().find("music"));
2890 EXPECT_NE(meta.keywords().end(), meta.keywords().find("video"));
2891 EXPECT_NE(meta.keywords().end(), meta.keywords().find("news"));
2892@@ -176,12 +180,12 @@
2893 EXPECT_EQ("Dummy demo scope 3.", meta.description());
2894 EXPECT_EQ("Mr.Fake", meta.author());
2895 EXPECT_FALSE(meta.invisible());
2896- EXPECT_EQ(4, meta.settings_definitions().size());
2897+ EXPECT_EQ(4u, meta.settings_definitions().size());
2898 EXPECT_EQ("unitTemp", meta.settings_definitions()[1].get_dict()["id"].get_string());
2899 EXPECT_EQ("Temperature Units", meta.settings_definitions()[1].get_dict()["displayName"].get_string());
2900 EXPECT_EQ("list", meta.settings_definitions()[1].get_dict()["type"].get_string());
2901 EXPECT_EQ(1, meta.settings_definitions()[1].get_dict()["defaultValue"].get_int());
2902- EXPECT_EQ(2, meta.settings_definitions()[1].get_dict()["displayValues"].get_array().size());
2903+ EXPECT_EQ(2u, meta.settings_definitions()[1].get_dict()["displayValues"].get_array().size());
2904 EXPECT_EQ("Celsius", meta.settings_definitions()[1].get_dict()["displayValues"].get_array()[0].get_string());
2905 EXPECT_EQ("Fahrenheit", meta.settings_definitions()[1].get_dict()["displayValues"].get_array()[1].get_string());
2906 }
2907@@ -192,7 +196,7 @@
2908 // set an invalid LANGUAGE env var (should return 0 scopes)
2909 ::setenv("LANGUAGE", "test_FAIL", 1);
2910 reset_reg();
2911- EXPECT_EQ(0, reg_->list().size());
2912+ EXPECT_EQ(0u, reg_->list().size());
2913
2914 // set an empty LANGUAGE env var (should return 2 scopes)
2915 ::setenv("LANGUAGE", "", 1);
2916@@ -217,7 +221,7 @@
2917 // set a colon seperated LANGUAGE env var (first invalid - should return 0 scopes)
2918 ::setenv("LANGUAGE", "test_FAIL:test_TEST", 1);
2919 reset_reg();
2920- EXPECT_EQ(0, reg_->list().size());
2921+ EXPECT_EQ(0u, reg_->list().size());
2922 }
2923
2924 class Receiver : public SearchListenerBase
2925
2926=== modified file 'test/gtest/scopes/internal/zmq_middleware/ConnectionPool/ConnectionPool_test.cpp'
2927--- test/gtest/scopes/internal/zmq_middleware/ConnectionPool/ConnectionPool_test.cpp 2014-10-09 00:49:02 +0000
2928+++ test/gtest/scopes/internal/zmq_middleware/ConnectionPool/ConnectionPool_test.cpp 2016-11-28 10:48:16 +0000
2929@@ -20,7 +20,10 @@
2930
2931 #include <zmqpp/context.hpp>
2932
2933+#pragma GCC diagnostic push
2934+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2935 #include <gtest/gtest.h>
2936+#pragma GCC diagnostic pop
2937
2938 using namespace std;
2939 using namespace unity::scopes::internal::zmq_middleware;
2940
2941=== modified file 'test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp'
2942--- test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp 2014-11-18 07:04:04 +0000
2943+++ test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp 2016-11-28 10:48:16 +0000
2944@@ -30,7 +30,11 @@
2945
2946 #include <boost/regex.hpp> // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
2947 #include <capnp/serialize.h>
2948+
2949+#pragma GCC diagnostic push
2950+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2951 #include <gtest/gtest.h>
2952+#pragma GCC diagnostic pop
2953
2954 using namespace std;
2955 using namespace unity;
2956
2957=== modified file 'test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp'
2958--- test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp 2014-11-18 07:04:04 +0000
2959+++ test/gtest/scopes/internal/zmq_middleware/PubSub/PubSub_test.cpp 2016-11-28 10:48:16 +0000
2960@@ -20,7 +20,11 @@
2961 #include <unity/scopes/internal/zmq_middleware/ZmqMiddleware.h>
2962 #include <unity/scopes/ScopeExceptions.h>
2963
2964+#pragma GCC diagnostic push
2965+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2966 #include <gtest/gtest.h>
2967+#pragma GCC diagnostic pop
2968+
2969 #include <condition_variable>
2970 #include <mutex>
2971
2972
2973=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp'
2974--- test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp 2016-02-22 00:19:46 +0000
2975+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp 2016-11-28 10:48:16 +0000
2976@@ -52,7 +52,10 @@
2977
2978 #pragma pop_macro("BOOST_RANGE_ENABLE_CONCEPT_ASSERT")
2979
2980+#pragma GCC diagnostic push
2981+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
2982 #include <gtest/gtest.h>
2983+#pragma GCC diagnostic pop
2984
2985 #include <array>
2986 #include <cassert>
2987@@ -459,7 +462,7 @@
2988 pid_t only_child_pid()
2989 {
2990 auto pids = child_pids();
2991- EXPECT_EQ(1, pids.size()) << "Expected to find a single child process";
2992+ EXPECT_EQ(1u, pids.size()) << "Expected to find a single child process";
2993 return pids[0];
2994 }
2995
2996
2997=== modified file 'test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp'
2998--- test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp 2014-11-18 07:04:04 +0000
2999+++ test/gtest/scopes/internal/zmq_middleware/ServantBase/ServantBase_test.cpp 2016-11-28 10:48:16 +0000
3000@@ -22,7 +22,10 @@
3001 #include <unity/scopes/internal/zmq_middleware/ObjectAdapter.h>
3002 #include <unity/UnityExceptions.h>
3003
3004+#pragma GCC diagnostic push
3005+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3006 #include <gtest/gtest.h>
3007+#pragma GCC diagnostic pop
3008
3009 #include <cassert>
3010
3011
3012=== modified file 'test/gtest/scopes/internal/zmq_middleware/StopPublisher/StopPublisher_test.cpp'
3013--- test/gtest/scopes/internal/zmq_middleware/StopPublisher/StopPublisher_test.cpp 2014-04-14 23:47:33 +0000
3014+++ test/gtest/scopes/internal/zmq_middleware/StopPublisher/StopPublisher_test.cpp 2016-11-28 10:48:16 +0000
3015@@ -20,7 +20,10 @@
3016 #include <unity/scopes/ScopeExceptions.h>
3017 #include <zmqpp/poller.hpp>
3018
3019+#pragma GCC diagnostic push
3020+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3021 #include <gtest/gtest.h>
3022+#pragma GCC diagnostic pop
3023
3024 using namespace std;
3025 using namespace unity::scopes;
3026
3027=== modified file 'test/gtest/scopes/internal/zmq_middleware/Util/Util_test.cpp'
3028--- test/gtest/scopes/internal/zmq_middleware/Util/Util_test.cpp 2014-08-28 00:20:56 +0000
3029+++ test/gtest/scopes/internal/zmq_middleware/Util/Util_test.cpp 2016-11-28 10:48:16 +0000
3030@@ -22,7 +22,11 @@
3031 #include <unity/scopes/ScopeExceptions.h>
3032
3033 #include <sys/un.h>
3034+
3035+#pragma GCC diagnostic push
3036+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3037 #include <gtest/gtest.h>
3038+#pragma GCC diagnostic pop
3039
3040 using namespace std;
3041 using namespace unity;
3042
3043=== modified file 'test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp'
3044--- test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp 2015-03-30 15:58:45 +0000
3045+++ test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp 2016-11-28 10:48:16 +0000
3046@@ -20,8 +20,12 @@
3047 #include <scopes/internal/zmq_middleware/capnproto/ValueDict.capnp.h>
3048 #include <unity/UnityExceptions.h>
3049
3050+#include <capnp/message.h>
3051+
3052+#pragma GCC diagnostic push
3053+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3054 #include <gtest/gtest.h>
3055-#include <capnp/message.h>
3056+#pragma GCC diagnostic pop
3057
3058 using namespace std;
3059 using namespace unity;
3060
3061=== modified file 'test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp'
3062--- test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp 2015-05-29 12:02:54 +0000
3063+++ test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp 2016-11-28 10:48:16 +0000
3064@@ -23,7 +23,10 @@
3065 #include <unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h>
3066 #include <unity/scopes/ScopeExceptions.h>
3067
3068+#pragma GCC diagnostic push
3069+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3070 #include <gtest/gtest.h>
3071+#pragma GCC diagnostic pop
3072
3073 using namespace std;
3074 using namespace unity::scopes;
3075
3076=== modified file 'test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp'
3077--- test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp 2015-02-19 02:30:09 +0000
3078+++ test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp 2016-11-28 10:48:16 +0000
3079@@ -23,7 +23,11 @@
3080
3081 #include <QtCore/QJsonObject>
3082
3083+#pragma GCC diagnostic push
3084+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3085 #include <gtest/gtest.h>
3086+#pragma GCC diagnostic pop
3087+
3088 #include <core/posix/exec.h>
3089
3090 namespace posix = core::posix;
3091@@ -162,7 +166,7 @@
3092 }
3093
3094 // check that we've got 5 valid results
3095- EXPECT_EQ(results.size(), 5);
3096+ EXPECT_EQ(5u, results.size());
3097 }
3098
3099 TEST_F(ExceptionsTest, check_xml_bad_formed)
3100
3101=== modified file 'test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp'
3102--- test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp 2015-02-19 02:30:09 +0000
3103+++ test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp 2016-11-28 10:48:16 +0000
3104@@ -23,7 +23,10 @@
3105 #include <QtCore/QXmlStreamReader>
3106 #include <QtCore/QJsonObject>
3107
3108+#pragma GCC diagnostic push
3109+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3110 #include <gtest/gtest.h>
3111+#pragma GCC diagnostic pop
3112
3113 #include <core/posix/exec.h>
3114
3115
3116=== modified file 'test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp'
3117--- test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp 2015-02-19 02:30:09 +0000
3118+++ test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp 2016-11-28 10:48:16 +0000
3119@@ -16,7 +16,10 @@
3120 * Authored by: Xavi Garcia <xavi.garcia.mena@canonical.com>
3121 */
3122
3123+#pragma GCC diagnostic push
3124+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3125 #include <gtest/gtest.h>
3126+#pragma GCC diagnostic pop
3127
3128 #include <unity/scopes/qt/QActionMetadata.h>
3129
3130
3131=== modified file 'test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp'
3132--- test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp 2015-02-24 02:11:17 +0000
3133+++ test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp 2016-11-28 10:48:16 +0000
3134@@ -16,7 +16,10 @@
3135 * Authored by: Xavi Garcia <xavi.garcia.mena@canonical.com>
3136 */
3137
3138+#pragma GCC diagnostic push
3139+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3140 #include <gtest/gtest.h>
3141+#pragma GCC diagnostic pop
3142
3143 #include <unity/scopes/qt/QCannedQuery.h>
3144 #include <unity/scopes/qt/internal/QCannedQueryImpl.h>
3145@@ -49,7 +52,7 @@
3146
3147 unity::scopes::VariantMap api_map = api_query->serialize();
3148 QVariantMap qt_map = query.serialize();
3149- EXPECT_EQ(api_map.size(), qt_map.size());
3150+ EXPECT_EQ(int(api_map.size()), qt_map.size());
3151 EXPECT_TRUE(qt_map.size() != 0);
3152 EXPECT_EQ(variantmap_to_qvariantmap(api_map), qt_map);
3153
3154
3155=== modified file 'test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp'
3156--- test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp 2015-02-25 12:37:03 +0000
3157+++ test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp 2016-11-28 10:48:16 +0000
3158@@ -16,7 +16,10 @@
3159 * Authored by: Xavi Garcia <xavi.garcia.mena@canonical.com>
3160 */
3161
3162+#pragma GCC diagnostic push
3163+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3164 #include <gtest/gtest.h>
3165+#pragma GCC diagnostic pop
3166
3167 #include <unity/scopes/qt/QCategorisedResult.h>
3168 #include <unity/scopes/qt/QCategory.h>
3169
3170=== modified file 'test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp'
3171--- test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp 2015-02-24 02:11:17 +0000
3172+++ test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp 2016-11-28 10:48:16 +0000
3173@@ -16,7 +16,10 @@
3174 * Authored by: Xavi Garcia <xavi.garcia.mena@canonical.com>
3175 */
3176
3177+#pragma GCC diagnostic push
3178+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3179 #include <gtest/gtest.h>
3180+#pragma GCC diagnostic pop
3181
3182 #include <unity/scopes/qt/QColumnLayout.h>
3183 #include <unity/scopes/qt/internal/QColumnLayoutImpl.h>
3184@@ -50,7 +53,7 @@
3185 QVector<QString> retrieved_widget_ids = layout.column(0);
3186
3187 std::vector<std::string> api_widgets = api_layout->column(0);
3188- EXPECT_EQ(api_widgets.size(), retrieved_widget_ids.size());
3189+ EXPECT_EQ(int(api_widgets.size()), retrieved_widget_ids.size());
3190 EXPECT_TRUE(api_widgets.size() != 0);
3191 for (uint i = 0; i < api_widgets.size(); ++i)
3192 {
3193@@ -59,7 +62,7 @@
3194
3195 retrieved_widget_ids = layout.column(1);
3196 api_widgets = api_layout->column(1);
3197- EXPECT_EQ(api_widgets.size(), retrieved_widget_ids.size());
3198+ EXPECT_EQ(int(api_widgets.size()), retrieved_widget_ids.size());
3199 EXPECT_TRUE(api_widgets.size() != 0);
3200 for (uint i = 0; i < api_widgets.size(); ++i)
3201 {
3202
3203=== modified file 'test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp'
3204--- test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp 2015-02-24 02:11:17 +0000
3205+++ test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp 2016-11-28 10:48:16 +0000
3206@@ -16,7 +16,10 @@
3207 * Authored by: Xavi Garcia <xavi.garcia.mena@canonical.com>
3208 */
3209
3210+#pragma GCC diagnostic push
3211+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3212 #include <gtest/gtest.h>
3213+#pragma GCC diagnostic pop
3214
3215 #include <unity/scopes/qt/QCannedQuery.h>
3216 #include <unity/scopes/qt/QDepartment.h>
3217@@ -63,7 +66,7 @@
3218 unity::scopes::DepartmentList api_list = api_dep->subdepartments();
3219
3220 EXPECT_TRUE(qt_list.size() != 0);
3221- EXPECT_EQ(qt_list.size(), api_list.size());
3222+ EXPECT_EQ(qt_list.size(), int(api_list.size()));
3223
3224 std::vector<std::string> dep_ids;
3225 for (auto item : api_list)
3226
3227=== modified file 'test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp'
3228--- test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp 2015-02-19 05:27:04 +0000
3229+++ test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp 2016-11-28 10:48:16 +0000
3230@@ -16,8 +16,10 @@
3231 * Authored by: Xavi Garcia <xavi.garcia.mena@canonical.com>
3232 */
3233
3234-#include <gtest/gtest.h>
3235+#pragma GCC diagnostic push
3236+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3237 #include <gmock/gmock.h>
3238+#pragma GCC diagnostic pop
3239
3240 #include "BasicEventsChecker.h"
3241 #include "TestSetup.h"
3242
3243=== modified file 'test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp'
3244--- test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp 2015-02-24 06:56:42 +0000
3245+++ test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp 2016-11-28 10:48:16 +0000
3246@@ -16,7 +16,10 @@
3247 * Authored by: Michi Henning <michi.henning@canonical.com>
3248 */
3249
3250+#pragma GCC diagnostic push
3251+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3252 #include <gtest/gtest.h>
3253+#pragma GCC diagnostic pop
3254
3255 #include <unity/scopes/qt/QPreviewWidget.h>
3256 #include <unity/scopes/qt/internal/QPreviewWidgetImpl.h>
3257
3258=== modified file 'test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp'
3259--- test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp 2015-02-24 04:03:22 +0000
3260+++ test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp 2016-11-28 10:48:16 +0000
3261@@ -16,9 +16,11 @@
3262 * Authored by: Xavi Garcia <xavi.garcia.mena@canonical.com>
3263 */
3264
3265-#include <gtest/gtest.h>
3266+#pragma GCC diagnostic push
3267+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3268 #include <gmock/gmock.h>
3269 #include <gmock/gmock-actions.h>
3270+#pragma GCC diagnostic pop
3271
3272 #include "QMockScope.h"
3273 #include "QScopeBaseAPIMock.h"
3274
3275=== modified file 'test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp'
3276--- test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp 2015-02-24 04:05:51 +0000
3277+++ test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp 2016-11-28 10:48:16 +0000
3278@@ -17,7 +17,11 @@
3279 */
3280
3281 #include "FakeScope.h"
3282+
3283+#pragma GCC diagnostic push
3284+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3285 #include <gtest/gtest.h>
3286+#pragma GCC diagnostic pop
3287
3288 #include <unity/scopes/qt/QScopeBaseAPI.h>
3289
3290
3291=== modified file 'test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp'
3292--- test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp 2015-02-19 02:30:09 +0000
3293+++ test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp 2016-11-28 10:48:16 +0000
3294@@ -16,7 +16,10 @@
3295 * Authored by: Xavi Garcia <xavi.garcia.mena@canonical.com>
3296 */
3297
3298+#pragma GCC diagnostic push
3299+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3300 #include <gtest/gtest.h>
3301+#pragma GCC diagnostic pop
3302
3303 #include <unity/scopes/qt/QSearchMetadata.h>
3304
3305
3306=== modified file 'test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp'
3307--- test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp 2015-02-19 02:30:09 +0000
3308+++ test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp 2016-11-28 10:48:16 +0000
3309@@ -16,8 +16,10 @@
3310 * Authored by: Xavi Garcia <xavi.garcia.mena@canonical.com>
3311 */
3312
3313-#include <gtest/gtest.h>
3314+#pragma GCC diagnostic push
3315+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3316 #include <gmock/gmock.h>
3317+#pragma GCC diagnostic pop
3318
3319 #include "BasicEventsChecker.h"
3320 #include "TestSetup.h"
3321
3322=== modified file 'test/gtest/scopes/qt/qt-bindings/QUtils_test.cpp'
3323--- test/gtest/scopes/qt/qt-bindings/QUtils_test.cpp 2015-02-24 02:11:17 +0000
3324+++ test/gtest/scopes/qt/qt-bindings/QUtils_test.cpp 2016-11-28 10:48:16 +0000
3325@@ -16,7 +16,10 @@
3326 * Authored by: Michi Henning <michi.henning@canonical.com>
3327 */
3328
3329+#pragma GCC diagnostic push
3330+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3331 #include <gtest/gtest.h>
3332+#pragma GCC diagnostic pop
3333
3334 #include <unity/scopes/qt/internal/QUtils.h>
3335
3336@@ -161,7 +164,7 @@
3337 qvm["string"] = "Hello";
3338
3339 VariantMap vm = qvariantmap_to_variantmap(qvm);
3340- ASSERT_EQ(2, vm.size());
3341+ ASSERT_EQ(2u, vm.size());
3342 EXPECT_EQ(42, vm["int"].get_int());
3343 EXPECT_EQ("Hello", vm["string"].get_string());
3344 }
3345
3346=== modified file 'test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp'
3347--- test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp 2015-02-24 02:11:17 +0000
3348+++ test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp 2016-11-28 10:48:16 +0000
3349@@ -16,7 +16,10 @@
3350 * Authored by: Xavi Garcia <xavi.garcia.mena@canonical.com>
3351 */
3352
3353+#pragma GCC diagnostic push
3354+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3355 #include <gtest/gtest.h>
3356+#pragma GCC diagnostic pop
3357
3358 #include <unity/scopes/qt/QVariantBuilder.h>
3359 #include <unity/scopes/qt/internal/QVariantBuilderImpl.h>
3360
3361=== modified file 'test/gtest/scopes/stress/scopes-stress.cpp'
3362--- test/gtest/scopes/stress/scopes-stress.cpp 2014-10-24 17:59:48 +0000
3363+++ test/gtest/scopes/stress/scopes-stress.cpp 2016-11-28 10:48:16 +0000
3364@@ -18,7 +18,11 @@
3365
3366 // You may also include individual headers if you prefer.
3367 #include <unity-scopes.h>
3368+
3369+#pragma GCC diagnostic push
3370+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3371 #include <gtest/gtest.h>
3372+#pragma GCC diagnostic pop
3373
3374 #include <boost/filesystem.hpp>
3375 #include <condition_variable>
3376@@ -107,7 +111,7 @@
3377 RegistryProxy r = rt->registry();
3378
3379 auto scopes_meta = r->list();
3380- EXPECT_EQ(scopes_meta.size(), 3);
3381+ EXPECT_EQ(3u, scopes_meta.size());
3382
3383 const std::list<std::string> scopes {"scope1", "scope2", "scope3"};
3384
3385@@ -131,7 +135,7 @@
3386 {
3387 reply->wait_until_finished();
3388 cout << "finished query for scope " << reply->scope_id() << endl;
3389- EXPECT_EQ(reply->result_count(), 20u);
3390+ EXPECT_EQ(20, reply->result_count());
3391 }
3392 }
3393 }
3394
3395=== modified file 'test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp'
3396--- test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp 2015-01-28 09:03:59 +0000
3397+++ test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp 2016-11-28 10:48:16 +0000
3398@@ -32,7 +32,10 @@
3399
3400 #include <unity/scopes/CategoryRenderer.h>
3401
3402+#pragma GCC diagnostic push
3403+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3404 #include <gtest/gtest.h>
3405+#pragma GCC diagnostic pop
3406
3407 #include "scope.h"
3408
3409
3410=== modified file 'test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp'
3411--- test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp 2014-08-01 14:31:16 +0000
3412+++ test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp 2016-11-28 10:48:16 +0000
3413@@ -26,7 +26,10 @@
3414
3415 #include <unity/scopes/CategoryRenderer.h>
3416
3417+#pragma GCC diagnostic push
3418+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3419 #include <gtest/gtest.h>
3420+#pragma GCC diagnostic pop
3421
3422 #include "config.h"
3423 #include "scope.h"
3424
3425=== modified file 'test/gtest/scopes/testing/Statistics/Statistics_test.cpp'
3426--- test/gtest/scopes/testing/Statistics/Statistics_test.cpp 2014-08-28 00:20:56 +0000
3427+++ test/gtest/scopes/testing/Statistics/Statistics_test.cpp 2016-11-28 10:48:16 +0000
3428@@ -19,7 +19,10 @@
3429 #include <unity/scopes/testing/Benchmark.h>
3430 #include <unity/scopes/testing/Statistics.h>
3431
3432+#pragma GCC diagnostic push
3433+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3434 #include <gtest/gtest.h>
3435+#pragma GCC diagnostic pop
3436
3437 #include "config.h"
3438
3439
3440=== modified file 'test/gtest/scopes/utility/BufferedResultForwarder/BufferedResultForwarder_test.cpp'
3441--- test/gtest/scopes/utility/BufferedResultForwarder/BufferedResultForwarder_test.cpp 2014-12-01 01:51:38 +0000
3442+++ test/gtest/scopes/utility/BufferedResultForwarder/BufferedResultForwarder_test.cpp 2016-11-28 10:48:16 +0000
3443@@ -16,7 +16,11 @@
3444 * Authored by: Pawel Stolowski <pawel.stolowski@canonical.com>
3445 */
3446
3447+#pragma GCC diagnostic push
3448+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
3449 #include <gtest/gtest.h>
3450+#pragma GCC diagnostic pop
3451+
3452 #include <unity/scopes/utility/BufferedResultForwarder.h>
3453 #include <unity/scopes/CategoryRenderer.h>
3454 #include <unity/scopes/testing/MockSearchReply.h>

Subscribers

People subscribed via source and target branches

to all changes: