Thumbnailer

Merge lp:~michihenning/thumbnailer/fix-warnings into lp:thumbnailer/devel

  1. fix-warnings
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: Michi Henning
Approved revision: 366
Merged at revision: 367
Proposed branch: lp:~michihenning/thumbnailer/fix-warnings
Merge into: lp:thumbnailer/devel
Diff against target: 567 lines (+107/-55)
25 files modified
doc/libthumbnailer-qt/examples/qt_example_test.cpp (+4/-0)
include/internal/image.h (+1/-1)
src/image.cpp (+1/-1)
tests/art_extractor/art_extractor_test.cpp (+1/-1)
tests/backoff_adjuster/backoff_adjuster_test.cpp (+1/-1)
tests/check_access/check_access_test.cpp (+1/-1)
tests/dbus/dbus_test.cpp (+5/-5)
tests/download/download_test.cpp (+1/-1)
tests/file_io/file_io_test.cpp (+2/-2)
tests/file_lock/file_lock_test.cpp (+1/-1)
tests/gmock_nowarn.h (+24/-0)
tests/gobj_ptr/gobj_ptr_test.cpp (+9/-9)
tests/gtest_nowarn.h (+24/-0)
tests/image-provider/image-provider_test.cpp (+1/-1)
tests/image/image_test.cpp (+12/-12)
tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp (+1/-1)
tests/recovery/MockCache.h (+1/-1)
tests/safe_strerror/safe_strerror_test.cpp (+1/-1)
tests/settings/settings_test.cpp (+1/-1)
tests/slow-vs-thumb/slow-vs-thumb_test.cpp (+1/-1)
tests/stress/stress_test.cpp (+1/-1)
tests/thumbnailer-admin/thumbnailer-admin_test.cpp (+10/-10)
tests/thumbnailer/thumbnailer_test.cpp (+1/-1)
tests/version/version_test.cpp (+1/-1)
tests/vs-thumb/vs-thumb_test.cpp (+1/-1)
To merge this branch: bzr merge lp:~michihenning/thumbnailer/fix-warnings
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
James Henstridge Approve
Review via email: mp+314889@code.launchpad.net

Commit message

Fixed a bunch of compiler warnings on zesty.

Description of the change

Fixed a bunch of compiler warnings on zesty.

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

PASSED: Continuous integration, rev:366
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1415
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1422
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1200/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1200/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1200/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1200/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1200/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1200/artifact/output/*zip*/output.zip

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

review: Approve (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-thumbnailer-autoland/120/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1508/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1515
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1293/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1293
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1293/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1293
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1293/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1293
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1293/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1293/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1293
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1293/artifact/output/*zip*/output.zip

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/libthumbnailer-qt/examples/qt_example_test.cpp'
2--- doc/libthumbnailer-qt/examples/qt_example_test.cpp 2016-09-23 01:39:55 +0000
3+++ doc/libthumbnailer-qt/examples/qt_example_test.cpp 2017-01-17 04:15:24 +0000
4@@ -115,7 +115,11 @@
5 #include <QTemporaryDir>
6
7 #include <boost/filesystem.hpp>
8+
9+#pragma GCC diagnostic push
10+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
11 #include <gtest/gtest.h>
12+#pragma GCC diagnostic pop
13
14 #include <memory>
15
16
17=== modified file 'include/internal/image.h'
18--- include/internal/image.h 2016-03-02 04:10:45 +0000
19+++ include/internal/image.h 2017-01-17 04:15:24 +0000
20@@ -61,7 +61,7 @@
21
22 // Return the pixel value at the (x,y) coordinates as an integer:
23 // r << 24 | g << 16 | b << 8 | a
24- int pixel(int x, int y) const;
25+ uint32_t pixel(int x, int y) const;
26
27 // Return a scaled version of the image that fits within the given
28 // requested size.
29
30=== modified file 'src/image.cpp'
31--- src/image.cpp 2016-02-29 07:04:54 +0000
32+++ src/image.cpp 2017-01-17 04:15:24 +0000
33@@ -430,7 +430,7 @@
34 return h;
35 }
36
37-int Image::pixel(int x, int y) const
38+uint32_t Image::pixel(int x, int y) const
39 {
40 assert(gdk_pixbuf_get_colorspace(pixbuf_.get()) == GDK_COLORSPACE_RGB);
41 assert(gdk_pixbuf_get_bits_per_sample(pixbuf_.get()) == 8);
42
43=== modified file 'tests/art_extractor/art_extractor_test.cpp'
44--- tests/art_extractor/art_extractor_test.cpp 2016-02-09 04:09:37 +0000
45+++ tests/art_extractor/art_extractor_test.cpp 2017-01-17 04:15:24 +0000
46@@ -23,7 +23,7 @@
47 #include <boost/algorithm/string.hpp>
48
49 #include <testsetup.h>
50-#include <gtest/gtest.h>
51+#include <gtest_nowarn.h>
52
53 #define AIFF_FILE TESTDATADIR "/testsong.aiff"
54 #define FLAC_FILE TESTDATADIR "/testsong.flac"
55
56=== modified file 'tests/backoff_adjuster/backoff_adjuster_test.cpp'
57--- tests/backoff_adjuster/backoff_adjuster_test.cpp 2016-01-04 06:09:41 +0000
58+++ tests/backoff_adjuster/backoff_adjuster_test.cpp 2017-01-17 04:15:24 +0000
59@@ -18,7 +18,7 @@
60
61 #include <internal/backoff_adjuster.h>
62
63-#include <gtest/gtest.h>
64+#include <gtest_nowarn.h>
65
66 #include <thread>
67
68
69=== modified file 'tests/check_access/check_access_test.cpp'
70--- tests/check_access/check_access_test.cpp 2015-06-24 01:08:06 +0000
71+++ tests/check_access/check_access_test.cpp 2017-01-17 04:15:24 +0000
72@@ -18,7 +18,7 @@
73
74 #include <internal/check_access.h>
75
76-#include <gtest/gtest.h>
77+#include <gtest_nowarn.h>
78 #include <testsetup.h>
79
80 #include <cstdio>
81
82=== modified file 'tests/dbus/dbus_test.cpp'
83--- tests/dbus/dbus_test.cpp 2016-09-26 00:30:42 +0000
84+++ tests/dbus/dbus_test.cpp 2017-01-17 04:15:24 +0000
85@@ -25,7 +25,7 @@
86 #include "utils/env_var_guard.h"
87
88 #include <boost/algorithm/string/predicate.hpp>
89-#include <gtest/gtest.h>
90+#include <gtest_nowarn.h>
91 #include <QProcess>
92 #include <QSignalSpy>
93 #include <QTemporaryDir>
94@@ -423,7 +423,7 @@
95 {
96 CacheStats s = reply.value().full_size_stats;
97 EXPECT_EQ(temp_dir() + "/cache/unity-thumbnailer/images", s.cache_path.toStdString());
98- EXPECT_EQ(1, s.policy);
99+ EXPECT_EQ(1u, s.policy);
100 EXPECT_EQ(0, s.size);
101 EXPECT_EQ(0, s.size_in_bytes);
102 EXPECT_NE(0, s.max_size_in_bytes);
103@@ -444,21 +444,21 @@
104 auto list = s.histogram;
105 for (auto c : list)
106 {
107- EXPECT_EQ(0, c);
108+ EXPECT_EQ(0u, c);
109 }
110 }
111
112 {
113 CacheStats s = reply.value().thumbnail_stats;
114 EXPECT_EQ(temp_dir() + "/cache/unity-thumbnailer/thumbnails", s.cache_path.toStdString());
115- EXPECT_EQ(1, s.policy);
116+ EXPECT_EQ(1u, s.policy);
117 EXPECT_EQ(0, s.size);
118 }
119
120 {
121 CacheStats s = reply.value().failure_stats;
122 EXPECT_EQ(temp_dir() + "/cache/unity-thumbnailer/failures", s.cache_path.toStdString());
123- EXPECT_EQ(0, s.policy);
124+ EXPECT_EQ(0u, s.policy);
125 EXPECT_EQ(0, s.size);
126 }
127
128
129=== modified file 'tests/download/download_test.cpp'
130--- tests/download/download_test.cpp 2015-12-28 05:05:23 +0000
131+++ tests/download/download_test.cpp 2017-01-17 04:15:24 +0000
132@@ -22,7 +22,7 @@
133 #include "utils/artserver.h"
134 #include <testsetup.h>
135
136-#include <gtest/gtest.h>
137+#include <gtest_nowarn.h>
138
139 #include <QSignalSpy>
140 #include <QUrl>
141
142=== modified file 'tests/file_io/file_io_test.cpp'
143--- tests/file_io/file_io_test.cpp 2015-11-30 06:55:46 +0000
144+++ tests/file_io/file_io_test.cpp 2017-01-17 04:15:24 +0000
145@@ -19,7 +19,7 @@
146 #include <internal/file_io.h>
147
148 #include <boost/algorithm/string.hpp>
149-#include <gtest/gtest.h>
150+#include <gtest_nowarn.h>
151 #include <testsetup.h>
152
153 #include <fcntl.h>
154@@ -34,7 +34,7 @@
155 ASSERT_NE(-1, stat(in_file.c_str(), &st));
156
157 string data = read_file(in_file);
158- ASSERT_EQ(st.st_size, data.size());
159+ ASSERT_EQ(unsigned(st.st_size), data.size());
160
161 string out_file = TESTBINDIR "/testimage.jpg";
162 write_file(out_file, data);
163
164=== modified file 'tests/file_lock/file_lock_test.cpp'
165--- tests/file_lock/file_lock_test.cpp 2016-01-09 04:25:19 +0000
166+++ tests/file_lock/file_lock_test.cpp 2017-01-17 04:15:24 +0000
167@@ -20,7 +20,7 @@
168
169 #include <unity/UnityExceptions.h>
170
171-#include <gtest/gtest.h>
172+#include <gtest_nowarn.h>
173
174 using namespace std;
175 using namespace unity::thumbnailer::internal;
176
177=== added file 'tests/gmock_nowarn.h'
178--- tests/gmock_nowarn.h 1970-01-01 00:00:00 +0000
179+++ tests/gmock_nowarn.h 2017-01-17 04:15:24 +0000
180@@ -0,0 +1,24 @@
181+/*
182+ * Copyright (C) 2017 Canonical Ltd
183+ *
184+ * This program is free software: you can redistribute it and/or modify
185+ * it under the terms of the GNU Lesser General Public License version 3 as
186+ * published by the Free Software Foundation.
187+ *
188+ * This program is distributed in the hope that it will be useful,
189+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
190+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
191+ * GNU Lesser General Public License for more details.
192+ *
193+ * You should have received a copy of the GNU Lesser General Public License
194+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
195+ *
196+ * Authors: Michi Henning <michi.henning@canonical.com>
197+ */
198+
199+#pragma once
200+
201+#pragma GCC diagnostic push
202+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
203+#include <gmock/gmock.h>
204+#pragma GCC diagnostic pop
205
206=== modified file 'tests/gobj_ptr/gobj_ptr_test.cpp'
207--- tests/gobj_ptr/gobj_ptr_test.cpp 2015-11-13 04:36:08 +0000
208+++ tests/gobj_ptr/gobj_ptr_test.cpp 2017-01-17 04:15:24 +0000
209@@ -22,7 +22,7 @@
210
211 #include <internal/gobj_memory.h>
212 #include <glib-object.h>
213-#include <gtest/gtest.h>
214+#include <gtest_nowarn.h>
215
216 using namespace std;
217 using namespace unity::thumbnailer::internal;
218@@ -87,17 +87,17 @@
219 TEST(Gobj_ptr, refcount)
220 {
221 GObject* o = G_OBJECT(g_object_new(G_TYPE_OBJECT, nullptr));
222- EXPECT_EQ(1, o->ref_count);
223+ EXPECT_EQ(1u, o->ref_count);
224 g_object_ref(o);
225
226 {
227- EXPECT_EQ(2, o->ref_count);
228+ EXPECT_EQ(2u, o->ref_count);
229 gobj_ptr<GObject> u(o);
230- EXPECT_EQ(2, o->ref_count);
231+ EXPECT_EQ(2u, o->ref_count);
232 // Now it dies and refcount is reduced.
233 }
234
235- EXPECT_EQ(1, o->ref_count);
236+ EXPECT_EQ(1u, o->ref_count);
237 g_object_unref(o);
238 }
239
240@@ -105,14 +105,14 @@
241 {
242 GObject* o = G_OBJECT(g_object_new(G_TYPE_OBJECT, nullptr));
243 gobj_ptr<GObject> u(o);
244- EXPECT_EQ(1, u->ref_count);
245+ EXPECT_EQ(1u, u->ref_count);
246 gobj_ptr<GObject> u2(u);
247- EXPECT_EQ(2, u->ref_count);
248+ EXPECT_EQ(2u, u->ref_count);
249 gobj_ptr<GObject> u3 = u2;
250- EXPECT_EQ(3, u->ref_count);
251+ EXPECT_EQ(3u, u->ref_count);
252 u3.reset();
253 u2.reset();
254- EXPECT_EQ(1, u->ref_count);
255+ EXPECT_EQ(1u, u->ref_count);
256 }
257
258 TEST(Gobj_ptr, swap)
259
260=== added file 'tests/gtest_nowarn.h'
261--- tests/gtest_nowarn.h 1970-01-01 00:00:00 +0000
262+++ tests/gtest_nowarn.h 2017-01-17 04:15:24 +0000
263@@ -0,0 +1,24 @@
264+/*
265+ * Copyright (C) 2017 Canonical Ltd
266+ *
267+ * This program is free software: you can redistribute it and/or modify
268+ * it under the terms of the GNU Lesser General Public License version 3 as
269+ * published by the Free Software Foundation.
270+ *
271+ * This program is distributed in the hope that it will be useful,
272+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
273+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
274+ * GNU Lesser General Public License for more details.
275+ *
276+ * You should have received a copy of the GNU Lesser General Public License
277+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
278+ *
279+ * Authors: Michi Henning <michi.henning@canonical.com>
280+ */
281+
282+#pragma once
283+
284+#pragma GCC diagnostic push
285+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
286+#include <gtest/gtest.h>
287+#pragma GCC diagnostic pop
288
289=== modified file 'tests/image-provider/image-provider_test.cpp'
290--- tests/image-provider/image-provider_test.cpp 2016-09-26 00:30:42 +0000
291+++ tests/image-provider/image-provider_test.cpp 2017-01-17 04:15:24 +0000
292@@ -27,7 +27,7 @@
293 #include "utils/dbusserver.h"
294 #include "utils/testutils.h"
295
296-#include <gtest/gtest.h>
297+#include <gtest_nowarn.h>
298 #include <QGuiApplication>
299 #include <QImage>
300 #include <QQuickImageProvider>
301
302=== modified file 'tests/image/image_test.cpp'
303--- tests/image/image_test.cpp 2016-02-29 07:04:54 +0000
304+++ tests/image/image_test.cpp 2017-01-17 04:15:24 +0000
305@@ -19,7 +19,7 @@
306 #include <internal/image.h>
307
308 #include <boost/algorithm/string.hpp>
309-#include <gtest/gtest.h>
310+#include <gtest_nowarn.h>
311 #include <sys/types.h>
312 #include <fcntl.h>
313
314@@ -53,8 +53,8 @@
315 EXPECT_EQ(480, i.height());
316 EXPECT_EQ(0xFE0000FF, i.pixel(0, 0));
317 EXPECT_EQ(0xFFFF00FF, i.pixel(639, 0));
318- EXPECT_EQ(0x00FF01FF, i.pixel(639, 479));
319- EXPECT_EQ(0x0000FEFF, i.pixel(0, 479));
320+ EXPECT_EQ(0x00FF01FFu, i.pixel(639, 479));
321+ EXPECT_EQ(0x0000FEFFu, i.pixel(0, 479));
322 EXPECT_FALSE(i.has_alpha());
323
324 // Move constructor
325@@ -251,8 +251,8 @@
326 EXPECT_EQ(150, img.height());
327 EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
328 EXPECT_EQ(0xFFFF00FF, img.pixel(199, 0));
329- EXPECT_EQ(0x00FF01FF, img.pixel(199, 149));
330- EXPECT_EQ(0x0000FEFF, img.pixel(0, 149));
331+ EXPECT_EQ(0x00FF01FFu, img.pixel(199, 149));
332+ EXPECT_EQ(0x0000FEFFu, img.pixel(0, 149));
333 }
334 }
335
336@@ -267,8 +267,8 @@
337 EXPECT_EQ(480, img.height());
338 EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
339 EXPECT_EQ(0xFFFF00FF, img.pixel(639, 0));
340- EXPECT_EQ(0x00FF01FF, img.pixel(639, 479));
341- EXPECT_EQ(0x0000FEFF, img.pixel(0, 479));
342+ EXPECT_EQ(0x00FF01FFu, img.pixel(639, 479));
343+ EXPECT_EQ(0x0000FEFFu, img.pixel(0, 479));
344
345 // Scaled version
346 img = Image(data, QSize(320, 240));
347@@ -276,8 +276,8 @@
348 EXPECT_EQ(240, img.height());
349 EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
350 EXPECT_EQ(0xFFFF00FF, img.pixel(319, 0));
351- EXPECT_EQ(0x00FF01FF, img.pixel(319, 239));
352- EXPECT_EQ(0x0000FEFF, img.pixel(0, 239));
353+ EXPECT_EQ(0x00FF01FFu, img.pixel(319, 239));
354+ EXPECT_EQ(0x0000FEFFu, img.pixel(0, 239));
355
356 // This version will be produced from the thumbnail, which has
357 // been tinted to distinguish it from the original.
358@@ -448,7 +448,7 @@
359 Image img(fd.get(), QSize(400, 400));
360 EXPECT_EQ(200, img.width());
361 EXPECT_EQ(200, img.height());
362- EXPECT_EQ(0x0, img.pixel(0, 0));
363+ EXPECT_EQ(0x0u, img.pixel(0, 0));
364 EXPECT_EQ(0xFF0000FF, img.pixel(100, 100));
365 EXPECT_TRUE(img.has_alpha());
366 }
367@@ -461,7 +461,7 @@
368 Image img(fd.get(), QSize());
369 EXPECT_EQ(200, img.width());
370 EXPECT_EQ(200, img.height());
371- EXPECT_EQ(0x0, img.pixel(0, 0));
372+ EXPECT_EQ(0x0u, img.pixel(0, 0));
373 EXPECT_EQ(0xFF0000FF, img.pixel(100, 100));
374 EXPECT_TRUE(img.has_alpha());
375 }
376@@ -474,7 +474,7 @@
377 Image img(fd.get(), QSize(400, 400));
378 EXPECT_EQ(200, img.width());
379 EXPECT_EQ(200, img.height());
380- EXPECT_EQ(0x0, img.pixel(0, 0));
381+ EXPECT_EQ(0x0u, img.pixel(0, 0));
382 EXPECT_EQ(0xFF0000FF, img.pixel(100, 100));
383 EXPECT_TRUE(img.has_alpha());
384 }
385
386=== modified file 'tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp'
387--- tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp 2016-09-26 00:30:42 +0000
388+++ tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp 2017-01-17 04:15:24 +0000
389@@ -43,7 +43,7 @@
390
391 #include <boost/algorithm/string/predicate.hpp>
392 #include <boost/filesystem.hpp>
393-#include <gtest/gtest.h>
394+#include <gtest_nowarn.h>
395
396 #include <QSignalSpy>
397 #include <QTemporaryDir>
398
399=== modified file 'tests/recovery/MockCache.h'
400--- tests/recovery/MockCache.h 2015-09-01 08:05:02 +0000
401+++ tests/recovery/MockCache.h 2017-01-17 04:15:24 +0000
402@@ -22,7 +22,7 @@
403 #include <core/optional.h>
404 #include <core/persistent_cache_stats.h>
405
406-#include <gmock/gmock.h>
407+#include <gmock_nowarn.h>
408
409 #include <chrono>
410 #include <system_error>
411
412=== modified file 'tests/safe_strerror/safe_strerror_test.cpp'
413--- tests/safe_strerror/safe_strerror_test.cpp 2015-11-13 04:36:08 +0000
414+++ tests/safe_strerror/safe_strerror_test.cpp 2017-01-17 04:15:24 +0000
415@@ -17,7 +17,7 @@
416 */
417
418 #include <internal/safe_strerror.h>
419-#include <gtest/gtest.h>
420+#include <gtest_nowarn.h>
421
422 using namespace unity::thumbnailer::internal;
423
424
425=== modified file 'tests/settings/settings_test.cpp'
426--- tests/settings/settings_test.cpp 2016-01-11 07:33:57 +0000
427+++ tests/settings/settings_test.cpp 2017-01-17 04:15:24 +0000
428@@ -27,7 +27,7 @@
429 #pragma GCC diagnostic ignored "-Wcast-qual"
430 #include <gio/gio.h>
431 #pragma GCC diagnostic pop
432-#include <gtest/gtest.h>
433+#include <gtest_nowarn.h>
434 #include <QTemporaryDir>
435
436 #include <unistd.h>
437
438=== modified file 'tests/slow-vs-thumb/slow-vs-thumb_test.cpp'
439--- tests/slow-vs-thumb/slow-vs-thumb_test.cpp 2016-09-26 00:50:50 +0000
440+++ tests/slow-vs-thumb/slow-vs-thumb_test.cpp 2017-01-17 04:15:24 +0000
441@@ -22,7 +22,7 @@
442 #include <testsetup.h>
443
444 #include <boost/filesystem.hpp>
445-#include <gtest/gtest.h>
446+#include <gtest_nowarn.h>
447 #include <QSignalSpy>
448 #include <QTemporaryDir>
449 #include <unity/UnityExceptions.h>
450
451=== modified file 'tests/stress/stress_test.cpp'
452--- tests/stress/stress_test.cpp 2016-09-26 00:30:42 +0000
453+++ tests/stress/stress_test.cpp 2017-01-17 04:15:24 +0000
454@@ -40,7 +40,7 @@
455 #pragma GCC diagnostic pop
456
457 #include <boost/filesystem.hpp>
458-#include <gtest/gtest.h>
459+#include <gtest_nowarn.h>
460 #include <QSignalSpy>
461 #include <QTemporaryDir>
462
463
464=== modified file 'tests/thumbnailer-admin/thumbnailer-admin_test.cpp'
465--- tests/thumbnailer-admin/thumbnailer-admin_test.cpp 2016-02-29 09:07:16 +0000
466+++ tests/thumbnailer-admin/thumbnailer-admin_test.cpp 2017-01-17 04:15:24 +0000
467@@ -25,7 +25,7 @@
468 #include <testsetup.h>
469
470 #include <boost/algorithm/string/predicate.hpp>
471-#include <gtest/gtest.h>
472+#include <gtest_nowarn.h>
473
474 using namespace std;
475 using namespace boost;
476@@ -434,8 +434,8 @@
477 EXPECT_EQ(480, img.height());
478 EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
479 EXPECT_EQ(0xFFFF00FF, img.pixel(639, 0));
480- EXPECT_EQ(0x00FF01FF, img.pixel(639, 479));
481- EXPECT_EQ(0x0000FEFF, img.pixel(0, 479));
482+ EXPECT_EQ(0x00FF01FFu, img.pixel(639, 479));
483+ EXPECT_EQ(0x0000FEFFu, img.pixel(0, 479));
484 }
485
486 TEST_F(AdminTest, get_large_thumbnail)
487@@ -452,8 +452,8 @@
488 EXPECT_EQ(240, img.height());
489 EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
490 EXPECT_EQ(0xFFFF00FF, img.pixel(319, 0));
491- EXPECT_EQ(0x00FF01FF, img.pixel(319, 239));
492- EXPECT_EQ(0x0000FEFF, img.pixel(0, 239));
493+ EXPECT_EQ(0x00FF01FFu, img.pixel(319, 239));
494+ EXPECT_EQ(0x0000FEFFu, img.pixel(0, 239));
495 }
496
497 TEST_F(AdminTest, get_small_thumbnail_square)
498@@ -539,7 +539,7 @@
499 Image img(data);
500 EXPECT_EQ(200, img.width());
501 EXPECT_EQ(200, img.height());
502- EXPECT_EQ(0, img.pixel(0, 0));
503+ EXPECT_EQ(0u, img.pixel(0, 0));
504 }
505
506 TEST_F(AdminTest, get_png_no_alpha)
507@@ -572,8 +572,8 @@
508 EXPECT_EQ(480, img.height());
509 EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
510 EXPECT_EQ(0xFFFF00FF, img.pixel(639, 0));
511- EXPECT_EQ(0x00FF01FF, img.pixel(639, 479));
512- EXPECT_EQ(0x0000FEFF, img.pixel(0, 479));
513+ EXPECT_EQ(0x00FF01FFu, img.pixel(639, 479));
514+ EXPECT_EQ(0x0000FEFFu, img.pixel(0, 479));
515 }
516
517 TEST_F(AdminTest, get_with_relative_input_path)
518@@ -591,8 +591,8 @@
519 EXPECT_EQ(480, img.height());
520 EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
521 EXPECT_EQ(0xFFFF00FF, img.pixel(639, 0));
522- EXPECT_EQ(0x00FF01FF, img.pixel(639, 479));
523- EXPECT_EQ(0x0000FEFF, img.pixel(0, 479));
524+ EXPECT_EQ(0x00FF01FFu, img.pixel(639, 479));
525+ EXPECT_EQ(0x0000FEFFu, img.pixel(0, 479));
526 }
527
528 TEST_F(AdminTest, empty_input_path)
529
530=== modified file 'tests/thumbnailer/thumbnailer_test.cpp'
531--- tests/thumbnailer/thumbnailer_test.cpp 2016-11-11 06:43:10 +0000
532+++ tests/thumbnailer/thumbnailer_test.cpp 2017-01-17 04:15:24 +0000
533@@ -34,7 +34,7 @@
534 #pragma GCC diagnostic ignored "-Wcast-qual"
535 #include <gio/gio.h>
536 #pragma GCC diagnostic pop
537-#include <gtest/gtest.h>
538+#include <gtest_nowarn.h>
539 #include <QCoreApplication>
540 #include <QSignalSpy>
541 #include <QTemporaryDir>
542
543=== modified file 'tests/version/version_test.cpp'
544--- tests/version/version_test.cpp 2016-02-25 06:05:42 +0000
545+++ tests/version/version_test.cpp 2017-01-17 04:15:24 +0000
546@@ -19,7 +19,7 @@
547 #include <internal/version.h>
548
549 #include <testsetup.h>
550-#include <gtest/gtest.h>
551+#include <gtest_nowarn.h>
552
553 using namespace std;
554 using namespace unity::thumbnailer::internal;
555
556=== modified file 'tests/vs-thumb/vs-thumb_test.cpp'
557--- tests/vs-thumb/vs-thumb_test.cpp 2016-03-21 02:08:39 +0000
558+++ tests/vs-thumb/vs-thumb_test.cpp 2017-01-17 04:15:24 +0000
559@@ -40,7 +40,7 @@
560 #pragma clang diagnostic pop
561 #endif
562 #pragma GCC diagnostic pop
563-#include <gtest/gtest.h>
564+#include <gtest_nowarn.h>
565 #include <QUrl>
566
567 #include <cstdio>

Subscribers

People subscribed via source and target branches

to all changes: