Merge lp:~michihenning/storage-framework/better-gtest-output into lp:storage-framework/devel

[Michi Henning]

Added custom type ostream operators for gtest so we get decent output when a QString comparison fails.

Added custom type ostream operators for gtest so we get decent output when a QString comparison fails.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:82
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/163/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/929
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/936
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/739
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/739/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/739
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/739/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/739
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/739/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/739
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/739/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/739
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/739/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/739
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/739/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/739
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/739/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/739
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/739/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/739
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/739/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'tests/remote-client/remote-client_test.cpp'
--- tests/remote-client/remote-client_test.cpp	2016-10-17 13:01:16 +0000
+++ tests/remote-client/remote-client_test.cpp	2016-11-01 02:52:56 +0000
@@ -19,6 +19,7 @@
 #include <unity/storage/qt/client-api.h>
 
 #include "MockProvider.h"
+#include <utils/gtest_printer.h>
 #include <utils/ProviderFixture.h>
 
 #include <gtest/gtest.h>

=== modified file 'tests/utils/CMakeLists.txt'
--- tests/utils/CMakeLists.txt	2016-08-22 04:56:44 +0000
+++ tests/utils/CMakeLists.txt	2016-11-01 02:52:56 +0000
@@ -13,6 +13,7 @@
 add_library(testutils STATIC
   DBusEnvironment.cpp
   ProviderFixture.cpp
+  gtest_printer.cpp
   ${generated_files}
 )
 target_compile_options(testutils PRIVATE ${QTDBUSTEST_DEPS_CFLAGS} ${ONLINEACCOUNTS_DEPS_CFLAGS})

=== added file 'tests/utils/gtest_printer.cpp'
--- tests/utils/gtest_printer.cpp	1970-01-01 00:00:00 +0000
+++ tests/utils/gtest_printer.cpp	2016-11-01 02:52:56 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michi Henning <[e-mail]>
+ */
+
+#include "gtest_printer.h"
+
+#include <QString>
+#include <ostream>
+
+using namespace std;
+
+ostream& operator<<(ostream& stream, const QString& s)
+{
+    return stream << s.toUtf8().constData();
+}
+
+ostream& operator<<(ostream& stream, const char* s)
+{
+    return std::operator<<(stream, s);
+}
+
+void PrintTo(const QString& s, ostream* stream)
+{
+    *stream << s;
+}

=== added file 'tests/utils/gtest_printer.h'
--- tests/utils/gtest_printer.h	1970-01-01 00:00:00 +0000
+++ tests/utils/gtest_printer.h	2016-11-01 02:52:56 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <iosfwd>
+
+class QString;
+
+// Helper for gtest to allow us to insert QString into a stream.
+std::ostream& operator<<(std::ostream& stream, const QString& s);
+// Needed because the QString version will take precedence over the std:: one
+std::ostream& operator<<(std::ostream& stream, const char* s);
+
+void PrintTo(const QString& s, std::ostream* stream);