Storage Framework

Merge lp:~michihenning/storage-framework/fix-gtest-warnings into lp:storage-framework/devel

  1. fix-gtest-warnings
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: Michi Henning
Approved revision: 96
Merged at revision: 97
Proposed branch: lp:~michihenning/storage-framework/fix-gtest-warnings
Merge into: lp:storage-framework/devel
Diff against target: 195 lines (+36/-22)
7 files modified
tests/CMakeLists.txt (+0/-6)
tests/local-client/local-client_test.cpp (+4/-0)
tests/provider-AccountData/AccountData_test.cpp (+4/-0)
tests/provider-DBusPeerCache/DBusPeerCache_test.cpp (+4/-0)
tests/provider-ProviderInterface/TestProvider.cpp (+5/-5)
tests/remote-client/remote-client_test.cpp (+15/-11)
tests/utils/ProviderFixture.h (+4/-0)
To merge this branch: bzr merge lp:~michihenning/storage-framework/fix-gtest-warnings
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
James Henstridge Approve
Review via email: mp+311564@code.launchpad.net

Commit message

Fixed a bunch of warnings caused by new gtest.

Description of the change

Fixed a bunch of warnings caused by new gtest.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:96
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/217/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1152/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1159
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/946
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/946/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/946/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/946
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/946/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/946/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/946
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/946/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/946/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

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

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-autoland/71/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1153/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1160
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/947
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/947/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/947/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/947
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/947/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/947/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/947
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/947/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/947/console

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

FAILED: Continuous integration, rev:96
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/218/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1154/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1161
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/948
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/948/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/948/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/948
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/948/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/948/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/948
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/948/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/948/console

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

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

FAILED: Continuous integration, rev:96
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/219/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1156/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1163
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/950
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/950/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/950/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/950
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/950/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/950/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/950
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/950/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/950/console

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

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

PASSED: Continuous integration, rev:96
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/222/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1173
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1180
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/966
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/966/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/966
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/966/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/966
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/966/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/966
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/966/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/966
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/966/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/966
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/966/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/CMakeLists.txt'
2--- tests/CMakeLists.txt 2016-09-08 08:33:59 +0000
3+++ tests/CMakeLists.txt 2016-11-23 03:09:23 +0000
4@@ -1,10 +1,4 @@
5-# We add -g so we get debug info for the gtest stack frames with gdb.
6-# The warnings are suppressed so we get a noise-free build for gtest and gmock.
7-
8-set(old_cxx_flags ${CMAKE_CXX_FLAGS})
9-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wno-old-style-cast -Wno-missing-field-initializers")
10 find_package(GMock)
11-set(CMAKE_CXX_FLAGS ${old_cxx_flags})
12
13 configure_file(testsetup.h.in testsetup.h @ONLY)
14 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
15
16=== modified file 'tests/local-client/local-client_test.cpp'
17--- tests/local-client/local-client_test.cpp 2016-08-26 04:45:56 +0000
18+++ tests/local-client/local-client_test.cpp 2016-11-23 03:09:23 +0000
19@@ -21,7 +21,11 @@
20 #include <unity/storage/qt/client/internal/local_client/boost_filesystem.h>
21 #include <unity/storage/qt/client/internal/local_client/tmpfile_prefix.h>
22
23+#pragma GCC diagnostic push
24+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
25 #include <gtest/gtest.h>
26+#pragma GCC diagnostic pop
27+
28 #include <QCoreApplication>
29 #include <QFile>
30 #include <QFutureWatcher>
31
32=== modified file 'tests/provider-AccountData/AccountData_test.cpp'
33--- tests/provider-AccountData/AccountData_test.cpp 2016-09-28 11:58:35 +0000
34+++ tests/provider-AccountData/AccountData_test.cpp 2016-11-23 03:09:23 +0000
35@@ -22,7 +22,11 @@
36
37 #include <utils/DBusEnvironment.h>
38
39+#pragma GCC diagnostic push
40+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
41 #include <gtest/gtest.h>
42+#pragma GCC diagnostic pop
43+
44 #include <OnlineAccounts/Account>
45 #include <OnlineAccounts/Manager>
46 #include <QCoreApplication>
47
48=== modified file 'tests/provider-DBusPeerCache/DBusPeerCache_test.cpp'
49--- tests/provider-DBusPeerCache/DBusPeerCache_test.cpp 2016-07-28 03:10:57 +0000
50+++ tests/provider-DBusPeerCache/DBusPeerCache_test.cpp 2016-11-23 03:09:23 +0000
51@@ -20,7 +20,11 @@
52
53 #include <utils/DBusEnvironment.h>
54
55+#pragma GCC diagnostic push
56+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
57 #include <gtest/gtest.h>
58+#pragma GCC diagnostic pop
59+
60 #include <OnlineAccounts/Account>
61 #include <OnlineAccounts/Manager>
62 #include <QCoreApplication>
63
64=== modified file 'tests/provider-ProviderInterface/TestProvider.cpp'
65--- tests/provider-ProviderInterface/TestProvider.cpp 2016-11-03 02:43:43 +0000
66+++ tests/provider-ProviderInterface/TestProvider.cpp 2016-11-23 03:09:23 +0000
67@@ -87,7 +87,7 @@
68 boost::future<Item> TestUploadJob::finish()
69 {
70 boost::promise<Item> p;
71- printf("TestUploadJob::finish(): %d read of expected %d\n", (int) bytes_read_, (int) size_);
72+ printf("TestUploadJob::finish(): %d read of expected %d\n", int(bytes_read_), int(size_));
73 notifier_.setEnabled(false);
74 drain();
75 if (bytes_read_ == size_)
76@@ -139,7 +139,7 @@
77
78 void TestUploadJob::read_some()
79 {
80- printf("TestUploadJob::read_some(): %d read of expected %d\n", (int) bytes_read_, (int) size_);
81+ printf("TestUploadJob::read_some(): %d read of expected %d\n", int(bytes_read_), int(size_));
82
83 char buf[5];
84 ssize_t n_read = read(read_socket(), buf, sizeof(buf));
85@@ -248,7 +248,7 @@
86 boost::future<void> TestDownloadJob::finish()
87 {
88 boost::promise<void> p;
89- if (bytes_written_ < (ssize_t)data_.size())
90+ if (bytes_written_ < ssize_t(data_.size()))
91 {
92 p.set_exception(LogicException("Not all data read"));
93 }
94@@ -261,14 +261,14 @@
95
96 void TestDownloadJob::write_some()
97 {
98- if (bytes_written_ >= (ssize_t)data_.size()) {
99+ if (bytes_written_ >= ssize_t(data_.size())) {
100 report_complete();
101 timer_.stop();
102 return;
103 }
104
105 ssize_t n_written = write(write_socket(), data_.data() + bytes_written_,
106- min(data_.size() - bytes_written_, (size_t)2));
107+ min(data_.size() - bytes_written_, size_t(2)));
108 if (n_written < 0)
109 {
110 int error_code = errno;
111
112=== modified file 'tests/remote-client/remote-client_test.cpp'
113--- tests/remote-client/remote-client_test.cpp 2016-11-04 07:33:07 +0000
114+++ tests/remote-client/remote-client_test.cpp 2016-11-23 03:09:23 +0000
115@@ -22,7 +22,11 @@
116 #include <utils/gtest_printer.h>
117 #include <utils/ProviderFixture.h>
118
119+#pragma GCC diagnostic push
120+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
121 #include <gtest/gtest.h>
122+#pragma GCC diagnostic pop
123+
124 #include <QSignalSpy>
125
126 #include <unordered_set>
127@@ -319,14 +323,14 @@
128 unordered_set<Account>(); // Just to show that this works.
129
130 Account a1;
131- EXPECT_EQ(0, hash<Account>()(a1));
132- EXPECT_EQ(0, a1.hash());
133- EXPECT_EQ(0, qHash(a1));
134+ EXPECT_EQ(0u, hash<Account>()(a1));
135+ EXPECT_EQ(0u, a1.hash());
136+ EXPECT_EQ(0u, qHash(a1));
137
138 auto a2 = runtime_->make_test_account(service_connection_->baseService(), object_path(), "a", "a", "a");
139 // Due to different return types (size_t vs uint), hash() and qHash() do not return the same value.
140- EXPECT_NE(0, a2.hash());
141- EXPECT_NE(0, qHash(a2));
142+ EXPECT_NE(0u, a2.hash());
143+ EXPECT_NE(0u, qHash(a2));
144 }
145
146 TEST_F(AccountTest, accounts)
147@@ -1121,9 +1125,9 @@
148
149 unordered_set<Item>(); // Just to show that this works.
150
151- EXPECT_EQ(0, hash<Item>()(i1));
152- EXPECT_EQ(0, i1.hash());
153- EXPECT_EQ(0, qHash(i1));
154+ EXPECT_EQ(0u, hash<Item>()(i1));
155+ EXPECT_EQ(0u, i1.hash());
156+ EXPECT_EQ(0u, qHash(i1));
157 }
158
159 {
160@@ -1155,8 +1159,8 @@
161 EXPECT_FALSE(i2 > i1);
162 EXPECT_FALSE(i2 >= i1);
163
164- EXPECT_NE(0, i1.hash());
165- EXPECT_NE(0, qHash(i1));
166+ EXPECT_NE(0u, i1.hash());
167+ EXPECT_NE(0u, qHash(i1));
168 }
169
170 {
171@@ -3026,7 +3030,7 @@
172
173 unique_ptr<Uploader> uploader(child.createUploader(Item::ConflictPolicy::IgnoreConflict, 20));
174 EXPECT_FALSE(uploader->isValid());
175- EXPECT_EQ(Downloader::Status::Error, uploader->status());
176+ EXPECT_EQ(Uploader::Status::Error, uploader->status());
177 EXPECT_EQ(StorageError::RuntimeDestroyed, uploader->error().type());
178 EXPECT_EQ("RuntimeDestroyed: Item::createUploader(): Runtime was destroyed previously",
179 uploader->error().errorString());
180
181=== modified file 'tests/utils/ProviderFixture.h'
182--- tests/utils/ProviderFixture.h 2016-09-26 02:37:03 +0000
183+++ tests/utils/ProviderFixture.h 2016-11-23 03:09:23 +0000
184@@ -23,7 +23,11 @@
185 #include <utils/DBusEnvironment.h>
186 #include <utils/ProviderClient.h>
187
188+#pragma GCC diagnostic push
189+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
190 #include <gtest/gtest.h>
191+#pragma GCC diagnostic pop
192+
193 #include <OnlineAccounts/Account>
194 #include <OnlineAccounts/Manager>
195 #include <QDBusConnection>

Subscribers

People subscribed via source and target branches

to all changes: