Merge lp:~pete-woods/libqtdbusmock/add-connection-bindings into lp:libqtdbusmock

[Pete Woods]

Add bindings for NetworkManager mock interface methods for adding connection settings

Add bindings for NetworkManager mock interface methods for adding connection settings

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-08 10:01:36 +0000
+++ CMakeLists.txt	2016-12-06 12:07:40 +0000
@@ -53,23 +53,11 @@
 	-Wextra
 )
 
-#set(DOXYFILE_SOURCE_DIR "include")
-#set(DOXYFILE_EXTRA_SOURCES "doc")
-#include(UseDoxygen)
-#if(DOXYGEN_FOUND AND BUILD_DOXYGEN)
-#	install(
-#		DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html
-#		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/libusermetrics-doc/
-#	)
-#endif()
-
 configure_file(
 	"${SOURCE_DIR}/libqtdbusmock/config.h.in"
 	"${SOURCE_BINARY_DIR}/libqtdbusmock/config.h"
 )
 
-
-#add_subdirectory("po")
 add_subdirectory("src")
 add_subdirectory("data")
 
 
=== removed file 'cmake/FindGMock.cmake'
--- cmake/FindGMock.cmake	2013-07-24 09:42:07 +0000
+++ cmake/FindGMock.cmake	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# Build with system gmock and embedded gtest
-set (GMOCK_INCLUDE_DIRS "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
-set (GTEST_INCLUDE_DIRS "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
-
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
-
-set(GTEST_LIBRARIES gtest)
-set(GTEST_MAIN_LIBRARIES gtest_main)
-set(GMOCK_LIBRARIES gmock gmock_main)
 
=== modified file 'data/nm-manager-mock.xml'
--- data/nm-manager-mock.xml	2015-09-15 10:00:27 +0000
+++ data/nm-manager-mock.xml	2016-12-06 12:07:40 +0000
@@ -41,6 +41,14 @@
 			<arg name="path" type="s" direction="out"/>
 		</method>
 
+		<method name="AddDeviceConnection">
+			<arg name="device_name" type="s" direction="in"/>
+			<annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QtDBusMock::VariantDictMap"/>
+			<arg name="settings" type="a{sa{sv}}" direction="in"/>
+
+			<arg name="path" type="s" direction="out"/>
+		</method>
+
 		<method name="AddActiveConnection">
 			<arg name="devices" type="as" direction="in"/>
 			<arg name="connection_device" type="s" direction="in"/>
@@ -74,6 +82,13 @@
 			<arg name="name" type="s" direction="in"/>
 			<arg name="value" type="v" direction="in"/>
 		</method>
+		
+		<method name="SettingsAddConnection">
+			<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QtDBusMock::VariantDictMap"/>
+			<arg name="settings" type="a{sa{sv}}" direction="in"/>
+
+			<arg name="path" type="s" direction="out"/>
+		</method>
 
 		<method name="RemoveWifiConnection">
 			<arg name="device_path" type="s" direction="in"/>
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-10-09 11:12:09 +0000
+++ debian/changelog	2016-12-06 12:07:40 +0000
@@ -1,3 +1,11 @@
+libqtdbusmock (0.6-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add AddDeviceConnection, SettingsAddConnection methods to network manager mock interface.
+  * Switch to cmake-extras version of FindGMock.
+  * CHange to pragma once for header guard macros.
+
+ -- Pete <[e-mail]>  Fri, 25 Nov 2016 10:33:33 +0000
+
 libqtdbusmock (0.5+15.10.20151009-0ubuntu1) wily; urgency=medium
 
   [ Pete Woods ]
 
=== modified file 'debian/control'
--- debian/control	2015-10-09 10:55:52 +0000
+++ debian/control	2016-12-06 12:07:40 +0000
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras,
                debhelper (>= 9),
                gettext,
                google-mock (>= 1.6.0+svn437),
 
=== modified file 'debian/libqtdbusmock1.symbols'
--- debian/libqtdbusmock1.symbols	2015-10-09 11:12:09 +0000
+++ debian/libqtdbusmock1.symbols	2016-12-06 12:07:40 +0000
@@ -75,6 +75,7 @@
  (c++)"NetworkManagerMockInterface::AddAccessPoint(QString const&, QString const&, QString const&, QString const&, unsigned int, unsigned int, unsigned int, unsigned char, unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
  (c++)"NetworkManagerMockInterface::SetDeviceActive(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
  (c++)"NetworkManagerMockInterface::AddWiFiConnection(QString const&, QString const&, QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
+ (c++)"NetworkManagerMockInterface::AddDeviceConnection(QString const&, QMap<QString, QMap<QString, QVariant> > const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
  (c++)"NetworkManagerMockInterface::RemoveAccessPoint(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
  (c++)"NetworkManagerMockInterface::AddActiveConnection(QStringList const&, QString const&, QString const&, QString const&, unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
  (c++)"NetworkManagerMockInterface::RemoveWifiConnection(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
@@ -84,6 +85,7 @@
  (c++)"NetworkManagerMockInterface::SetDeviceDisconnected(QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.4+15.10.20151006.3
  (c++)"NetworkManagerMockInterface::SetGlobalConnectionState(unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
  (c++)"NetworkManagerMockInterface::SetProperty(QString const&, QString const&, QString const&, QDBusVariant const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
+ (c++)"NetworkManagerMockInterface::SettingsAddConnection(QMap<QString, QMap<QString, QVariant> > const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
  (c++)"OrgFreedesktopDBusMockInterface::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.1
  (c++)"OrgFreedesktopDBusMockInterface::qt_metacast(char const*)@Base" 0.1
  (c++)"OrgFreedesktopDBusMockInterface::MethodCalled(QString const&, QList<QVariant> const&)@Base" 0.1
 
=== modified file 'src/libqtdbusmock/CMakeLists.txt'
--- src/libqtdbusmock/CMakeLists.txt	2015-03-31 10:37:05 +0000
+++ src/libqtdbusmock/CMakeLists.txt	2016-12-06 12:07:40 +0000
@@ -11,6 +11,7 @@
 	QTDBUSMOCK_PUBLIC_HEADERS
 	"${CMAKE_CURRENT_BINARY_DIR}/config.h"
 	DBusMock.h
+	DeclareMetatypes.h
 	ExportInterfaces.h
 	Method.h
 	MethodCall.h
 
=== modified file 'src/libqtdbusmock/DBusMock.cpp'
--- src/libqtdbusmock/DBusMock.cpp	2015-10-09 10:55:52 +0000
+++ src/libqtdbusmock/DBusMock.cpp	2016-12-06 12:07:40 +0000
@@ -66,6 +66,9 @@
 	Method::registerMetaType();
 	MethodCall::registerMetaType();
 	NamedMethodCall::registerMetaType();
+
+    qRegisterMetaType<VariantDictMap>("QtDBusMock::VariantDictMap");
+    qDBusRegisterMetaType<VariantDictMap>();
 }
 
 void DBusMock::registerTemplate(const QString &service,
 
=== modified file 'src/libqtdbusmock/DBusMock.h'
--- src/libqtdbusmock/DBusMock.h	2015-10-09 10:55:52 +0000
+++ src/libqtdbusmock/DBusMock.h	2016-12-06 12:07:40 +0000
@@ -16,8 +16,7 @@
  * Author: Pete Woods <[e-mail]>
  */
 
-#ifndef QTDBUSMOCK_DBUSMOCK_H_
-#define QTDBUSMOCK_DBUSMOCK_H_
+#pragma once
 
 #include <libqtdbustest/DBusTestRunner.h>
 #include <libqtdbusmock/MockInterface.h>
@@ -114,5 +113,3 @@
 };
 
 }
-
-#endif /* QTDBUSMOCK_DBUSMOCK_H_ */
 
=== added file 'src/libqtdbusmock/DeclareMetatypes.h'
--- src/libqtdbusmock/DeclareMetatypes.h	1970-01-01 00:00:00 +0000
+++ src/libqtdbusmock/DeclareMetatypes.h	2016-12-06 12:07:40 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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 Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtCore/QVariantMap>
+
+Q_DECLARE_METATYPE(QMap<QString,QVariantMap>)
 
=== modified file 'src/libqtdbusmock/ExportInterfaces.h'
--- src/libqtdbusmock/ExportInterfaces.h	2013-08-05 12:09:47 +0000
+++ src/libqtdbusmock/ExportInterfaces.h	2016-12-06 12:07:40 +0000
@@ -16,16 +16,19 @@
  * Author: Pete Woods <[e-mail]>
  */
 
-#ifndef LIBQTDBUSMOCK_EXPORTINTERFACES_H_
-#define LIBQTDBUSMOCK_EXPORTINTERFACES_H_
+#pragma once
 
 #include <QtCore/QObject>
 class Q_DECL_EXPORT OrgFreedesktopDBusMockInterface;
 class Q_DECL_EXPORT NetworkManagerMockInterface;
 class Q_DECL_EXPORT OrgFreedesktopDBusPropertiesInterface;
 
+namespace QtDBusMock {
+
+typedef QMap<QString, QVariantMap> VariantDictMap;
+
+}
+
 #include <libqtdbusmock/MockInterface.h>
 #include <libqtdbusmock/NetworkManagerMockInterface.h>
 #include <libqtdbusmock/PropertiesInterface.h>
-
-#endif /* LIBQTDBUSMOCK_EXPORTINTERFACES_H_ */
 
=== modified file 'src/libqtdbusmock/Method.h'
--- src/libqtdbusmock/Method.h	2013-08-05 12:59:22 +0000
+++ src/libqtdbusmock/Method.h	2016-12-06 12:07:40 +0000
@@ -16,8 +16,7 @@
  * Author: Pete Woods <[e-mail]>
  */
 
-#ifndef LIBQTDBUSMOCK_METHOD_H_
-#define LIBQTDBUSMOCK_METHOD_H_
+#pragma once
 
 #include <QtDBus>
 
@@ -72,5 +71,3 @@
 		QtDBusMock::Method &method);
 
 Q_DECLARE_METATYPE(QtDBusMock::Method)
-
-#endif // LIBQTDBUSMOCK_METHOD_H_
 
=== modified file 'src/libqtdbusmock/MethodCall.h'
--- src/libqtdbusmock/MethodCall.h	2013-08-05 12:59:22 +0000
+++ src/libqtdbusmock/MethodCall.h	2016-12-06 12:07:40 +0000
@@ -16,8 +16,7 @@
  * Author: Pete Woods <[e-mail]>
  */
 
-#ifndef LIBQTDBUSMOCK_METHODCALLS_H_
-#define LIBQTDBUSMOCK_METHODCALLS_H_
+#pragma once
 
 #include <QtDBus>
 
@@ -60,5 +59,3 @@
 		QtDBusMock::MethodCall &methodCalls);
 
 Q_DECLARE_METATYPE(QtDBusMock::MethodCall)
-
-#endif // LIBQTDBUSMOCK_METHODCALLS_H_
 
=== modified file 'src/libqtdbusmock/MockInterfaceClasses.h'
--- src/libqtdbusmock/MockInterfaceClasses.h	2013-08-05 12:09:47 +0000
+++ src/libqtdbusmock/MockInterfaceClasses.h	2016-12-06 12:07:40 +0000
@@ -16,8 +16,11 @@
  * Author: Pete Woods <[e-mail]>
  */
 
+#pragma once
+
 #include <libqtdbusmock/ExportInterfaces.h>
 
 #include <libqtdbusmock/Method.h>
 #include <libqtdbusmock/MethodCall.h>
 #include <libqtdbusmock/NamedMethodCall.h>
+
 
=== modified file 'src/libqtdbusmock/NamedMethodCall.h'
--- src/libqtdbusmock/NamedMethodCall.h	2013-08-05 12:59:22 +0000
+++ src/libqtdbusmock/NamedMethodCall.h	2016-12-06 12:07:40 +0000
@@ -16,8 +16,7 @@
  * Author: Pete Woods <[e-mail]>
  */
 
-#ifndef LIBQTDBUSMOCK_NAMEDMETHODCALL_H_
-#define LIBQTDBUSMOCK_NAMEDMETHODCALL_H_
+#pragma once
 
 #include <QtDBus>
 
@@ -66,5 +65,3 @@
 		QtDBusMock::NamedMethodCall &methodCalls);
 
 Q_DECLARE_METATYPE(QtDBusMock::NamedMethodCall)
-
-#endif // LIBQTDBUSMOCK_NAMEDMETHODCALL_H_
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-08-07 11:02:23 +0000
+++ tests/CMakeLists.txt	2016-12-06 12:07:40 +0000
@@ -1,6 +1,6 @@
 
 set(CMAKE_AUTOMOC OFF)
-include(FindGMock)
+find_package(GMock REQUIRED)
 set(CMAKE_AUTOMOC ON)
 
 find_package("Valgrind" REQUIRED)