From 10b9b262ca3bb8a7cddefb5cd146394ad37ccdc5 Mon Sep 17 00:00:00 2001 From: Jojo-1000 <33495614+Jojo-1000@users.noreply.github.com> Date: Fri, 26 Jan 2018 22:23:49 +0100 Subject: [PATCH] Change mock of LinHttpHandler to mock of BaseHttpHandler. Test also works on windows now. --- hueplusplus/test/mocks/mock_BaseHttpHandler.h | 40 ++++++++++++++++++++++++++++++++++++++++ hueplusplus/test/mocks/mock_LinHttpHandler.h | 40 ---------------------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 hueplusplus/test/mocks/mock_BaseHttpHandler.h delete mode 100755 hueplusplus/test/mocks/mock_LinHttpHandler.h diff --git a/hueplusplus/test/mocks/mock_BaseHttpHandler.h b/hueplusplus/test/mocks/mock_BaseHttpHandler.h new file mode 100644 index 0000000..132a6d3 --- /dev/null +++ b/hueplusplus/test/mocks/mock_BaseHttpHandler.h @@ -0,0 +1,40 @@ +/** + \file mock_LinHttpHandler.h + Copyright Notice\n + Copyright (C) 2017 Jan Rogall - developer\n + Copyright (C) 2017 Moritz Wirger - developer\n + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + 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, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +**/ + +#ifndef _MOCK_LIN_HTTPHANDLER_H +#define _MOCK_LIN_HTTPHANDLER_H + +#include +#include + +#include + +#include "../hueplusplus/include/BaseHttpHandler.h" +#include "../hueplusplus/include/json/json.h" + +//! Mock Class +class MockBaseHttpHandler : public BaseHttpHandler +{ +public: + MOCK_CONST_METHOD3( send, std::string(const std::string &msg, const std::string &adr, int port) ); + + MOCK_CONST_METHOD4( sendMulticast, std::vector(const std::string &msg, const std::string &adr, int port, int timeout) ); +}; + +#endif diff --git a/hueplusplus/test/mocks/mock_LinHttpHandler.h b/hueplusplus/test/mocks/mock_LinHttpHandler.h deleted file mode 100755 index 574fb3d..0000000 --- a/hueplusplus/test/mocks/mock_LinHttpHandler.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - \file mock_LinHttpHandler.h - Copyright Notice\n - Copyright (C) 2017 Jan Rogall - developer\n - Copyright (C) 2017 Moritz Wirger - developer\n - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - 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, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -**/ - -#ifndef _MOCK_LIN_HTTPHANDLER_H -#define _MOCK_LIN_HTTPHANDLER_H - -#include -#include - -#include - -#include "../hueplusplus/include/LinHttpHandler.h" -#include "../hueplusplus/include/json/json.h" - -//! Mock Class -class MockLinHttpHandler : public LinHttpHandler -{ -public: - MOCK_CONST_METHOD3( send, std::string(const std::string &msg, const std::string &adr, int port) ); - - MOCK_CONST_METHOD4( sendMulticast, std::vector(const std::string &msg, const std::string &adr, int port, int timeout) ); -}; - -#endif -- libgit2 0.21.4