Make IHttpHandler purely virtual

- add new class BaseHttpHandler - rename lin- and winHttpHandler to Lin- and WinHttpHandler - print error messages to std::cerr

Make IHttpHandler purely virtual
- add new class BaseHttpHandler - rename lin- and winHttpHandler to Lin- and WinHttpHandler - print error messages to std::cerr
Moritz Wirger
1 parent 1e1caf35
Showing 10 changed files with 338 additions and 176 deletions
README.md
hueplusplus/linHttpHandler.cpp → hueplusplus/LinHttpHandler.cpp
hueplusplus/winHttpHandler.cpp → hueplusplus/WinHttpHandler.cpp
hueplusplus/include/BaseHttpHandler.h
hueplusplus/include/IHttpHandler.h
hueplusplus/include/linHttpHandler.h → hueplusplus/include/LinHttpHandler.h
hueplusplus/include/winHttpHandler.h → hueplusplus/include/WinHttpHandler.h
hueplusplus/test/CMakeLists.txt
hueplusplus/test/mocks/mock_linHttpHandler.h → hueplusplus/test/mocks/mock_LinHttpHandler.h
hueplusplus/test/test_IHttpHandler.cpp → hueplusplus/test/test_BaseHttpHandler.cpp
@@ -15,14 +15,14 @@ A simple and easy to use library for Philips Hue Lights
 ## How to use
 ### <a name="searchingBridges"></a>Searching for Bridges
-To start searching for a Hue Bridge you will need to choose an IHttpHandler and create one. The options are a "winHttpHandler" (for windows) or a "linHttpHandler" (for linux).
+To start searching for a Hue Bridge you will need to choose an IHttpHandler and create one. The options are a "WinHttpHandler" (for windows) or a "LinHttpHandler" (for linux).
 Then create a HueFinder object with the handler.
 The handler is needed, because it tells the finder which functions to use to communicate with a bridge or your local network.
 After that you can call FindBridges(), which will return a vector containing the ip and mac address of all found Bridges.
 If no Bridges were found the vector is empty, so make sure that in that case you provide an ip and mac address.
 ```C++
-// For windows use std::make_shared<winHttpHandler>();
-handler = std::make_shared<linHttpHandler>();
+// For windows use std::make_shared<WinHttpHandler>();
+handler = std::make_shared<LinHttpHandler>();
 HueFinder finder(handler);
 std::vector<HueFinder::HueIdentification> bridges = finder.FindBridges();
 if (bridges.empty())
@@ -46,8 +46,8 @@ Hue bridge = finder.GetBridge(bridges[0]);
 If you do not want to use the HueFinder or you already know the ip and username of your bridge you have the option to create your own Hue object.
 Here you will need to provide the ip address, a username and an HttpHandler
 ```C++
-// For windows use std::make_shared<winHttpHandler>();
-handler = std::make_shared<linHttpHandler>();
+// For windows use std::make_shared<WinHttpHandler>();
+handler = std::make_shared<LinHttpHandler>();
 Hue bridge("192.168.2.102", "<username>", handler);
 ```
 /**
-	\file linHttpHandler.cpp
+	\file LinHttpHandler.cpp
 	Copyright Notice\n
 	Copyright (C) 2017  Jan Rogall		- developer\n
 	Copyright (C) 2017  Moritz Wirger	- developer\n
@@ -17,7 +17,7 @@
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 **/
-#include "include/linHttpHandler.h"
+#include "include/LinHttpHandler.h"
 #include <chrono>
 #include <netinet/in.h> 	// struct sockaddr_in, struct sockaddr
@@ -38,7 +38,7 @@ class SocketCloser {
 	private: int s;
 };
-std::string linHttpHandler::send(const std::string & msg, const std::string & adr, int port) const
+std::string LinHttpHandler::send(const std::string & msg, const std::string & adr, int port) const
 {
 	// create socket
 	int socketFD = socket(AF_INET, SOCK_STREAM, 0);
@@ -46,8 +46,8 @@ std::string linHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 	SocketCloser closeMySocket(socketFD);
 	if (socketFD < 0)
 	{
-		std::cerr << "linHttpHandler: Failed to open socket\n";
-		throw(std::runtime_error("linHttpHandler: Failed to open socket"));
+		std::cerr << "LinHttpHandler: Failed to open socket\n";
+		throw(std::runtime_error("LinHttpHandler: Failed to open socket"));
 	}
 	// lookup ip address
@@ -55,8 +55,8 @@ std::string linHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 	server = gethostbyname(adr.c_str());
 	if (server == NULL)
 	{
-		std::cerr << "linHttpHandler: Failed to find host with address " << adr << "\n";
-		throw(std::runtime_error("linHttpHandler: Failed to find host"));
+		std::cerr << "LinHttpHandler: Failed to find host with address " << adr << "\n";
+		throw(std::runtime_error("LinHttpHandler: Failed to find host"));
 	}
 	// fill in the structure
@@ -69,8 +69,8 @@ std::string linHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 	// connect the socket
 	if (connect(socketFD, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0)
 	{
-		std::cerr << "linHttpHandler: Failed to connect socket\n";
-		throw(std::runtime_error("linHttpHandler: Failed to connect socket"));
+		std::cerr << "LinHttpHandler: Failed to connect socket\n";
+		throw(std::runtime_error("LinHttpHandler: Failed to connect socket"));
 	}
 	// send the request
@@ -81,8 +81,8 @@ std::string linHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 		ssize_t bytes = write(socketFD, msg.c_str() + sent, total - sent);
 		if (bytes < 0)
 		{
-			std::cerr << "linHttpHandler: Failed to write message to socket\n";
-			throw(std::runtime_error("linHttpHandler: Failed to write message to socket"));
+			std::cerr << "LinHttpHandler: Failed to write message to socket\n";
+			throw(std::runtime_error("LinHttpHandler: Failed to write message to socket"));
 		}
 		if (bytes == 0)
 		{
@@ -104,8 +104,8 @@ std::string linHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 		ssize_t bytes = read(socketFD, buffer, 127);
 		if (bytes < 0)
 		{
-			std::cerr << "linHttpHandler: Failed to read response from socket: " << errno << std::endl;
-			throw(std::runtime_error("linHttpHandler: Failed to read response from socket"));
+			std::cerr << "LinHttpHandler: Failed to read response from socket: " << errno << std::endl;
+			throw(std::runtime_error("LinHttpHandler: Failed to read response from socket"));
 		}
 		if (bytes == 0)
 		{
@@ -120,14 +120,14 @@ std::string linHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 	if (received == total)
 	{
-		std::cerr << "linHttpHandler: Failed to store complete response from socket\n";
-		throw(std::runtime_error("linHttpHandler: Failed to store complete response from socket"));
+		std::cerr << "LinHttpHandler: Failed to store complete response from socket\n";
+		throw(std::runtime_error("LinHttpHandler: Failed to store complete response from socket"));
 	}
 	return response;
 }
-std::vector<std::string> linHttpHandler::sendMulticast(const std::string & msg, const std::string & adr, int port, int timeout) const
+std::vector<std::string> LinHttpHandler::sendMulticast(const std::string & msg, const std::string & adr, int port, int timeout) const
 {
 	hostent *server;			// host information
 	sockaddr_in server_addr;	// server address
@@ -141,8 +141,8 @@ std::vector&lt;std::string&gt; linHttpHandler::sendMulticast(const std::string &amp; msg, 
 	server = gethostbyname(adr.c_str());
 	if (!server)
 	{
-		std::cerr << "linHttpHandler: sendMulticast: Failed to obtain address of " << msg << "\n";
-		throw(std::runtime_error("linHttpHandler: sendMulticast: Failed to obtain address of host"));
+		std::cerr << "LinHttpHandler: sendMulticast: Failed to obtain address of " << msg << "\n";
+		throw(std::runtime_error("LinHttpHandler: sendMulticast: Failed to obtain address of host"));
 	}
 	// put the host's address into the server address structure
@@ -153,15 +153,15 @@ std::vector&lt;std::string&gt; linHttpHandler::sendMulticast(const std::string &amp; msg, 
 	SocketCloser closeMySendSocket(socketFD);
 	if (socketFD < 0)
 	{
-		std::cerr << "linHttpHandler: sendMulticast: Failed to open socket\n";
-		throw(std::runtime_error("linHttpHandler: sendMulticast: Failed to open socket"));
+		std::cerr << "LinHttpHandler: sendMulticast: Failed to open socket\n";
+		throw(std::runtime_error("LinHttpHandler: sendMulticast: Failed to open socket"));
 	}
 	// send a message to the server
 	if (sendto(socketFD, msg.c_str(), strlen(msg.c_str()), 0, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0)
 	{
-		std::cerr << "linHttpHandler: sendMulticast: Failed to send message\n";
-		throw(std::runtime_error("linHttpHandler: sendMulticast: Failed to send message"));
+		std::cerr << "LinHttpHandler: sendMulticast: Failed to send message\n";
+		throw(std::runtime_error("LinHttpHandler: sendMulticast: Failed to send message"));
 	}
 	std::string response;
@@ -176,8 +176,8 @@ std::vector&lt;std::string&gt; linHttpHandler::sendMulticast(const std::string &amp; msg, 
 		{
 			if (errno != EAGAIN && errno != EWOULDBLOCK)
 			{
-				std::cerr << "linHttpHandler: sendMulticast: Failed to read response from socket\n";
-				throw(std::runtime_error("linHttpHandler: sendMulticast: Failed to read response from socket"));
+				std::cerr << "LinHttpHandler: sendMulticast: Failed to read response from socket\n";
+				throw(std::runtime_error("LinHttpHandler: sendMulticast: Failed to read response from socket"));
 			}
 			continue;
 		}
 /**
-\file winHttpHandler.cpp
+\file WinHttpHandler.cpp
 Copyright Notice\n
 Copyright (C) 2017  Jan Rogall		- developer\n
 Copyright (C) 2017  Moritz Wirger	- developer\n
@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation,
 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 **/
-#include "include/winHttpHandler.h"
+#include "include/WinHttpHandler.h"
 #include <chrono>
 #include <iostream>
@@ -27,23 +27,23 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 #pragma comment(lib, "Ws2_32.lib")
-winHttpHandler::winHttpHandler()
+WinHttpHandler::WinHttpHandler()
 {
 	// Initialize Winsock
 	int return_code = WSAStartup(MAKEWORD(2, 2), &wsaData);
 	if (return_code != 0)
 	{
 		std::cerr << "Failed to open socket: " << return_code << std::endl;
-		throw(std::runtime_error("winHttpHandler: Failed to open socket"));
+		throw(std::runtime_error("WinHttpHandler: Failed to open socket"));
 	}
 }
-winHttpHandler::~winHttpHandler()
+WinHttpHandler::~WinHttpHandler()
 {
 	WSACleanup();
 }
-std::string winHttpHandler::send(const std::string & msg, const std::string & adr, int port) const
+std::string WinHttpHandler::send(const std::string & msg, const std::string & adr, int port) const
 {
 	struct addrinfo hints = {};
 	hints.ai_family = AF_INET;
@@ -54,8 +54,8 @@ std::string winHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 	struct addrinfo *result = nullptr;
 	if (getaddrinfo(adr.c_str(), std::to_string(port).c_str(), &hints, &result) != 0)
 	{
-		std::cerr << "winHttpHandler: getaddrinfo failed: " << WSAGetLastError() << std::endl;
-		throw(std::runtime_error("winHttpHandler: getaddrinfo failed"));
+		std::cerr << "WinHttpHandler: getaddrinfo failed: " << WSAGetLastError() << std::endl;
+		throw(std::runtime_error("WinHttpHandler: getaddrinfo failed"));
 	}
 	// Attempt to connect to the first address returned by
@@ -68,8 +68,8 @@ std::string winHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 	if (connect_socket == INVALID_SOCKET)
 	{
 		freeaddrinfo(result);
-		std::cerr << "winHttpHandler: Error at socket(): " << WSAGetLastError() << std::endl;
-		throw(std::runtime_error("winHttpHandler: Error at socket()"));
+		std::cerr << "WinHttpHandler: Error at socket(): " << WSAGetLastError() << std::endl;
+		throw(std::runtime_error("WinHttpHandler: Error at socket()"));
 	}
 	// Connect to server.
@@ -88,16 +88,16 @@ std::string winHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 	if (connect_socket == INVALID_SOCKET)
 	{
-		std::cerr << "winHttpHandler: Unable to connect to server!" << std::endl;
-		throw(std::runtime_error("winHttpHandler: Unable to connect to server!"));
+		std::cerr << "WinHttpHandler: Unable to connect to server!" << std::endl;
+		throw(std::runtime_error("WinHttpHandler: Unable to connect to server!"));
 	}
 	// Send an initial buffer
 	if (::send(connect_socket, msg.c_str(), msg.size(), 0) == SOCKET_ERROR)
 	{
 		closesocket(connect_socket);
-		std::cerr << "winHttpHandler: send failed: " << WSAGetLastError() << std::endl;
-		throw(std::runtime_error("winHttpHandler: send failed"));
+		std::cerr << "WinHttpHandler: send failed: " << WSAGetLastError() << std::endl;
+		throw(std::runtime_error("WinHttpHandler: send failed"));
 	}
 	// shutdown the connection for sending since no more data will be sent
@@ -105,8 +105,8 @@ std::string winHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 	if (shutdown(connect_socket, SD_SEND) == SOCKET_ERROR)
 	{
 		closesocket(connect_socket);
-		std::cerr << "winHttpHandler: shutdown failed: " << WSAGetLastError() << std::endl;
-		throw(std::runtime_error("winHttpHandler: shutdown failed"));
+		std::cerr << "WinHttpHandler: shutdown failed: " << WSAGetLastError() << std::endl;
+		throw(std::runtime_error("WinHttpHandler: shutdown failed"));
 	}
 	const int recvbuflen = 128;
@@ -120,18 +120,18 @@ std::string winHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 		res = recv(connect_socket, recvbuf, recvbuflen, 0);
 		if (res > 0)
 		{
-			//std::cout << "winHttpHandler: Bytes received: " << res << std::endl;
+			//std::cout << "WinHttpHandler: Bytes received: " << res << std::endl;
 			response.append(recvbuf, res);
 		}
 		else if (res == 0)
 		{
-			//std::cout << "winHttpHandler: Connection closed " << std::endl;
+			//std::cout << "WinHttpHandler: Connection closed " << std::endl;
 		}
 		else
 		{
 			closesocket(connect_socket);
-			std::cerr << "winHttpHandler: recv failed: " << WSAGetLastError() << std::endl;
-			throw(std::runtime_error("winHttpHandler: recv failed"));
+			std::cerr << "WinHttpHandler: recv failed: " << WSAGetLastError() << std::endl;
+			throw(std::runtime_error("WinHttpHandler: recv failed"));
 		}
 	} while (res > 0);
 	closesocket(connect_socket);
@@ -139,7 +139,7 @@ std::string winHttpHandler::send(const std::string &amp; msg, const std::string &amp; ad
 	return response;
 }
-std::vector<std::string> winHttpHandler::sendMulticast(const std::string & msg, const std::string & adr, int port, int timeout) const
+std::vector<std::string> WinHttpHandler::sendMulticast(const std::string & msg, const std::string & adr, int port, int timeout) const
 {
 	struct addrinfo hints = {};
 	hints.ai_family = AF_INET;
@@ -150,8 +150,8 @@ std::vector&lt;std::string&gt; winHttpHandler::sendMulticast(const std::string &amp; msg, 
 	struct addrinfo *result = nullptr;
 	if (getaddrinfo(adr.c_str(), std::to_string(port).c_str(), &hints, &result) != 0)
 	{
-		std::cerr << "winHttpHandler: sendMulticast: getaddrinfo failed: " << WSAGetLastError() << std::endl;
-		throw(std::runtime_error("winHttpHandler: sendMulticast: getaddrinfo failed"));
+		std::cerr << "WinHttpHandler: sendMulticast: getaddrinfo failed: " << WSAGetLastError() << std::endl;
+		throw(std::runtime_error("WinHttpHandler: sendMulticast: getaddrinfo failed"));
 	}
 	// Attempt to connect to the first address returned by
@@ -163,8 +163,8 @@ std::vector&lt;std::string&gt; winHttpHandler::sendMulticast(const std::string &amp; msg, 
 	if ((connect_socket = socket(ptr->ai_family, ptr->ai_socktype, 0)) == INVALID_SOCKET)
 	{
 		freeaddrinfo(result);
-		std::cerr << "winHttpHandler: sendMulticast: Error at socket(): " << WSAGetLastError() << std::endl;
-		throw(std::runtime_error("winHttpHandler: sendMulticast: Error at socket()"));
+		std::cerr << "WinHttpHandler: sendMulticast: Error at socket(): " << WSAGetLastError() << std::endl;
+		throw(std::runtime_error("WinHttpHandler: sendMulticast: Error at socket()"));
 	}
 	// Fill out source socket's address information.
@@ -177,8 +177,8 @@ std::vector&lt;std::string&gt; winHttpHandler::sendMulticast(const std::string &amp; msg, 
 	if (bind(connect_socket, (struct sockaddr FAR *) &source_sin, sizeof(source_sin)) == SOCKET_ERROR)
 	{
 		closesocket(connect_socket);
-		std::cerr << "winHttpHandler: sendMulticast: Binding socket failed: " << WSAGetLastError() << std::endl;
-		throw(std::runtime_error("winHttpHandler: sendMulticast: Binding socket failed"));
+		std::cerr << "WinHttpHandler: sendMulticast: Binding socket failed: " << WSAGetLastError() << std::endl;
+		throw(std::runtime_error("WinHttpHandler: sendMulticast: Binding socket failed"));
 	}
 	u_long sock_mode = 1;
@@ -192,8 +192,8 @@ std::vector&lt;std::string&gt; winHttpHandler::sendMulticast(const std::string &amp; msg, 
 	if (setsockopt(connect_socket, IPPROTO_IP, IP_MULTICAST_TTL, (char FAR *)&iOptVal, sizeof(int)) == SOCKET_ERROR)
 	{
 		closesocket(connect_socket);
-		std::cerr << "winHttpHandler: sendMulticast: setsockopt failed: " << WSAGetLastError() << std::endl;
-		throw(std::runtime_error("winHttpHandler: sendMulticast: setsockopt failed"));
+		std::cerr << "WinHttpHandler: sendMulticast: setsockopt failed: " << WSAGetLastError() << std::endl;
+		throw(std::runtime_error("WinHttpHandler: sendMulticast: setsockopt failed"));
 	}
 	// Fill out the desination socket's address information.
@@ -206,8 +206,8 @@ std::vector&lt;std::string&gt; winHttpHandler::sendMulticast(const std::string &amp; msg, 
 	if (sendto(connect_socket, msg.c_str(), msg.size(), 0, (struct sockaddr FAR *) &dest_sin, sizeof(dest_sin)) == SOCKET_ERROR)
 	{
 		closesocket(connect_socket);
-		std::cerr << "winHttpHandler: sendMulticast: sendto failed: " << WSAGetLastError() << std::endl;
-		throw(std::runtime_error("winHttpHandler: sendMulticast: sendto failed"));
+		std::cerr << "WinHttpHandler: sendMulticast: sendto failed: " << WSAGetLastError() << std::endl;
+		throw(std::runtime_error("WinHttpHandler: sendMulticast: sendto failed"));
 	}
 	// shutdown the connection for sending since no more data will be sent
@@ -215,8 +215,8 @@ std::vector&lt;std::string&gt; winHttpHandler::sendMulticast(const std::string &amp; msg, 
 	if (shutdown(connect_socket, SD_SEND) == SOCKET_ERROR)
 	{
 		closesocket(connect_socket);
-		std::cerr << "winHttpHandler: sendMulticast: shutdown failed: " << WSAGetLastError() << std::endl;
-		throw(std::runtime_error("winHttpHandler: sendMulticast: shutdown failed"));
+		std::cerr << "WinHttpHandler: sendMulticast: shutdown failed: " << WSAGetLastError() << std::endl;
+		throw(std::runtime_error("WinHttpHandler: sendMulticast: shutdown failed"));
 	}
 	std::string response;
@@ -229,12 +229,12 @@ std::vector&lt;std::string&gt; winHttpHandler::sendMulticast(const std::string &amp; msg, 
 		res = recv(connect_socket, recvbuf, recvbuflen, 0);
 		if (res > 0)
 		{
-			//std::cout << "winHttpHandler: sendMulticast: Bytes received: " << res << std::endl;
+			//std::cout << "WinHttpHandler: sendMulticast: Bytes received: " << res << std::endl;
 			response.append(recvbuf, res);
 		}
 		else if (res == 0)
 		{
-			//std::cout << "winHttpHandler: sendMulticast: Connection closed " << std::endl;
+			//std::cout << "WinHttpHandler: sendMulticast: Connection closed " << std::endl;
 		}
 		else
 		{
+/**
+	\file BaseHttpHandler.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 _BASE_HTTPHANDLER_H
+#define _BASE_HTTPHANDLER_H
+
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "IHttpHandler.h"
+#include "json/json.h"
+
+//! Base class for classes that handle http requests and multicast requests
+class BaseHttpHandler : public IHttpHandler
+{
+public:
+    //! \brief Virtual dtor
+    virtual ~BaseHttpHandler() = default;
+
+    //! \brief Virtual function that should send a given message to a specified host and return the response.
+    //!
+    //! \param msg String that contains the message that should be sent to the specified address
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request should be sent to. Default is 80
+    //! \return String containing the response of the host
+    virtual std::string send(const std::string &msg, const std::string &adr, int port=80) const = 0;
+
+    //! \brief Virtual function that should given message to a specified host and return the body of the response.
+    //!
+    //! Note if no body is found a runtime error is thrown!
+    //! \param msg String that contains the message that should sent to the specified address
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request should be sent. Default is 80
+    //! \return String containing the body of the response of the host
+    virtual std::string sendGetHTTPBody(const std::string &msg, const std::string &adr, int port = 80) const
+	{
+		std::string response = send(msg, adr, port);
+		size_t start = response.find("\r\n\r\n");
+		if (start == std::string::npos)
+		{
+			std::cerr << "IHttpHandler: Failed to find body in response\n";
+			throw(std::runtime_error("IHttpHandler: Failed to find body in response"));
+		}
+		response.erase(0, start + 4);
+		return response;
+	};
+
+    //! \brief Virtual function that should send a multicast request with a specified message.
+    //!
+    //! \param msg String that contains the request that should be sent to the specified address
+    //! \param adr Optional String that contains an ip or hostname in dotted decimal notation, default is "239.255.255.250"
+    //! \param port Optional integer that specifies the port to which the request should be sent. Default is 1900
+    //! \param timeout Optional Integer that specifies the timeout of the request in seconds. Default is 5
+    //! \return Vector containing strings of each answer received
+    virtual std::vector<std::string> sendMulticast(const std::string &msg, const std::string &adr = "239.255.255.250", int port = 1900, int timeout = 5) const = 0;
+
+    //! \brief Virtual function that should send a HTTP request with the given method to the specified host and return the body of the response.
+    //!
+    //! Note body can also be left empty!
+    //! \param method String that contains the HTTP method type e.g. GET, HEAD, POST, PUT, DELETE, ...
+    //! \param uri String that contains the uniform resource identifier
+    //! \param content_type String that contains the type(MIME) of the body data e.g. "text/html", "application/json", ...
+    //! \param body String that contains the data of the request
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
+    //! \return String containing the body of the response of the host
+    virtual std::string sendHTTPRequest(std::string method, std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const
+	{
+		std::string request;
+		// Protocol reference: https://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html
+		// Request-Line
+		request.append(method);			// Method
+		request.append(" ");			// Separation
+		request.append(uri);			// Request-URI
+		request.append(" ");			// Separation
+		request.append("HTTP/1.0");		// HTTP-Version
+		request.append("\r\n");			// Ending
+		// Entities
+		request.append("Content-Type:");	// entity-header
+		request.append(" ");				// Separation
+		request.append(content_type);		// media-type
+		request.append("\r\n");				// Entity ending
+		request.append("Content-Length:");				// entity-header
+		request.append(" ");							// Separation
+		request.append(std::to_string(body.size()));	// length
+		request.append("\r\n\r\n");		// Entity ending & Request-Line ending
+		request.append(body);			// message-body
+		request.append("\r\n\r\n");		// Ending
+
+		return sendGetHTTPBody(request.c_str(), adr, port);
+	};
+
+    //! \brief Virtual function that should send a HTTP GET request to the specified host and return the body of the response.
+    //!
+    //! Note body can also be left empty!
+    //! \param uri String that contains the uniform resource identifier
+    //! \param content_type String that contains the type(MIME) of the body data e.g. "text/html", "application/json", ...
+    //! \param body String that contains the data of the request
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
+    //! \return String containing the body of the response of the host
+    virtual std::string GETString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const
+	{
+		return sendHTTPRequest("GET", uri, content_type, body, adr, port);
+	};
+
+    //! \brief Virtual function that should send a HTTP POST request to the specified host and returns the body of the response.
+    //!
+    //! Note body can also be left empty!
+    //! \param uri String that contains the uniform resource identifier
+    //! \param content_type String that contains the type(MIME) of the body data e.g. "text/html", "application/json", ...
+    //! \param body String that contains the data of the request
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
+    //! \return String containing the body of the response of the host
+    virtual std::string POSTString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const
+	{
+		return sendHTTPRequest("POST", uri, content_type, body, adr, port);
+	};
+
+    //! \brief Virtual function that should send a HTTP PUT request to the specified host and return the body of the response.
+    //!
+    //! Note body can also be left empty!
+    //! \param uri String that contains the uniform resource identifier
+    //! \param content_type String that contains the type(MIME) of the body data e.g. "text/html", "application/json", ...
+    //! \param body String that contains the data of the request
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
+    //! \return String containing the body of the response of the host
+    virtual std::string PUTString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const
+	{
+		return sendHTTPRequest("PUT", uri, content_type, body, adr, port);
+	};
+
+    //! \brief Virtual function that should send a HTTP DELETE request to the specified host and return the body of the response.
+    //!
+    //! Note body can also be left empty!
+    //! \param uri String that contains the uniform resource identifier
+    //! \param content_type String that contains the type(MIME) of the body data e.g. "text/html", "application/json", ...
+    //! \param body String that contains the data of the request
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
+    //! \return String containing the body of the response of the host
+    virtual std::string DELETEString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const
+	{
+		return sendHTTPRequest("DELETE", uri, content_type, body, adr, port);
+	};
+
+    //! \brief Virtual function that should send a HTTP GET request to the specified host and return the body of the response.
+    //!
+    //! Note body can also be left empty!
+    //! \param uri String that contains the uniform resource identifier
+    //! \param body Json::Value that contains the data of the request
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
+    //! \return Json::Value containing the parsed body of the response of the host
+    virtual Json::Value GETJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const
+	{
+        return strToJsonValue(GETString(uri, "application/json", body.toStyledString(), adr, port));
+	};
+
+    //! \brief Virtual function that should send a HTTP POST request to the specified host and return the body of the response.
+    //!
+    //! Note body can also be left empty!
+    //! \param uri String that contains the uniform resource identifier
+    //! \param body Json::Value that contains the data of the request
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
+    //! \return Json::Value containing the parsed body of the response of the host
+    virtual Json::Value POSTJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const
+	{
+        return strToJsonValue(POSTString(uri, "application/json", body.toStyledString(), adr, port));
+	}
+
+    //! \brief Virtual function that should send a HTTP PUT request to the specified host and return the body of the response.
+    //!
+    //! Note body can also be left empty!
+    //! \param uri String that contains the uniform resource identifier
+    //! \param body Json::Value that contains the data of the request
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
+    //! \return Json::Value containing the parsed body of the response of the host
+    virtual Json::Value PUTJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const
+	{
+        return strToJsonValue(PUTString(uri, "application/json", body.toStyledString(), adr, port));
+	};
+
+    //! \brief Virtual function that should send a HTTP DELETE request to the specified host and return the body of the response.
+    //!
+    //! Note body can also be left empty!
+    //! \param uri String that contains the uniform resource identifier
+    //! \param body Json::Value that contains the data of the request
+    //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
+    //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
+    //! \return Json::Value containing the parsed body of the response of the host
+    virtual Json::Value DELETEJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const
+    {
+        return strToJsonValue(DELETEString(uri, "application/json", body.toStyledString(), adr, port));
+    };
+
+private:
+
+    //! \brief Function that converts a given string to a Json::Value
+    //!
+    //! \param str String that gets converted
+    //! \return Json::Value containing parsed string
+    Json::Value strToJsonValue(std::string str) const
+    {
+        std::string error;
+        Json::Value result;
+        Json::CharReaderBuilder builder;
+        builder["collectComments"] = false;
+        std::unique_ptr<Json::CharReader> reader = std::unique_ptr<Json::CharReader>(builder.newCharReader());
+        if (!reader->parse(str.c_str(), str.c_str() + str.length(), &result, &error))
+        {
+        	std::cerr << "IHttpHandler: Error while parsing JSON in function strToJsonValue(): " << error << std::endl;
+        	throw(std::runtime_error("IHttpHandler: Error while parsing JSON in function strToJsonValue()"));
+        }
+        return result;
+    }
+};
+
+#endif
@@ -49,18 +49,7 @@ public:
     //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
     //! \param port Optional integer that specifies the port to which the request should be sent. Default is 80
     //! \return String containing the body of the response of the host
-    virtual std::string sendGetHTTPBody(const std::string &msg, const std::string &adr, int port = 80) const
-	{
-		std::string response = send(msg, adr, port);
-		size_t start = response.find("\r\n\r\n");
-		if (start == std::string::npos)
-		{
-			std::cerr << "IHttpHandler: Failed to find body in response\n";
-			throw(std::runtime_error("IHttpHandler: Failed to find body in response"));
-		}
-		response.erase(0, start + 4);
-		return response;
-	};
+    virtual std::string sendGetHTTPBody(const std::string &msg, const std::string &adr, int port = 80) const = 0;
     //! \brief Virtual function that should send a multicast request with a specified message.
     //!
@@ -81,31 +70,7 @@ public:
     //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
     //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
     //! \return String containing the body of the response of the host
-    virtual std::string sendHTTPRequest(std::string method, std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const
-	{
-		std::string request;
-		// Protocol reference: https://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html
-		// Request-Line
-		request.append(method);			// Method
-		request.append(" ");			// Separation
-		request.append(uri);			// Request-URI
-		request.append(" ");			// Separation
-		request.append("HTTP/1.0");		// HTTP-Version
-		request.append("\r\n");			// Ending
-		// Entities
-		request.append("Content-Type:");	// entity-header
-		request.append(" ");				// Separation
-		request.append(content_type);		// media-type
-		request.append("\r\n");				// Entity ending
-		request.append("Content-Length:");				// entity-header
-		request.append(" ");							// Separation
-		request.append(std::to_string(body.size()));	// length
-		request.append("\r\n\r\n");		// Entity ending & Request-Line ending
-		request.append(body);			// message-body
-		request.append("\r\n\r\n");		// Ending
-
-		return sendGetHTTPBody(request.c_str(), adr, port);
-	};
+    virtual std::string sendHTTPRequest(std::string method, std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const = 0;
     //! \brief Virtual function that should send a HTTP GET request to the specified host and return the body of the response.
     //!
@@ -116,10 +81,7 @@ public:
     //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
     //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
     //! \return String containing the body of the response of the host
-    virtual std::string GETString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const
-	{
-		return sendHTTPRequest("GET", uri, content_type, body, adr, port);
-	};
+    virtual std::string GETString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const = 0;
     //! \brief Virtual function that should send a HTTP POST request to the specified host and returns the body of the response.
     //!
@@ -130,10 +92,7 @@ public:
     //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
     //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
     //! \return String containing the body of the response of the host
-    virtual std::string POSTString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const
-	{
-		return sendHTTPRequest("POST", uri, content_type, body, adr, port);
-	};
+    virtual std::string POSTString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const = 0;
     //! \brief Virtual function that should send a HTTP PUT request to the specified host and return the body of the response.
     //!
@@ -144,10 +103,7 @@ public:
     //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
     //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
     //! \return String containing the body of the response of the host
-    virtual std::string PUTString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const
-	{
-		return sendHTTPRequest("PUT", uri, content_type, body, adr, port);
-	};
+    virtual std::string PUTString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const = 0;
     //! \brief Virtual function that should send a HTTP DELETE request to the specified host and return the body of the response.
     //!
@@ -158,10 +114,7 @@ public:
     //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
     //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
     //! \return String containing the body of the response of the host
-    virtual std::string DELETEString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const
-	{
-		return sendHTTPRequest("DELETE", uri, content_type, body, adr, port);
-	};
+    virtual std::string DELETEString(std::string uri, std::string content_type, std::string body, const std::string &adr, int port=80) const = 0;
     //! \brief Virtual function that should send a HTTP GET request to the specified host and return the body of the response.
     //!
@@ -171,10 +124,7 @@ public:
     //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
     //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
     //! \return Json::Value containing the parsed body of the response of the host
-    virtual Json::Value GETJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const
-	{
-        return strToJsonValue(GETString(uri, "application/json", body.toStyledString(), adr, port));
-	};
+    virtual Json::Value GETJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const = 0;
     //! \brief Virtual function that should send a HTTP POST request to the specified host and return the body of the response.
     //!
@@ -184,10 +134,7 @@ public:
     //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
     //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
     //! \return Json::Value containing the parsed body of the response of the host
-    virtual Json::Value POSTJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const
-	{
-        return strToJsonValue(POSTString(uri, "application/json", body.toStyledString(), adr, port));
-	}
+    virtual Json::Value POSTJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const = 0;
     //! \brief Virtual function that should send a HTTP PUT request to the specified host and return the body of the response.
     //!
@@ -197,10 +144,7 @@ public:
     //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
     //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
     //! \return Json::Value containing the parsed body of the response of the host
-    virtual Json::Value PUTJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const
-	{
-        return strToJsonValue(PUTString(uri, "application/json", body.toStyledString(), adr, port));
-	};
+    virtual Json::Value PUTJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const = 0;
     //! \brief Virtual function that should send a HTTP DELETE request to the specified host and return the body of the response.
     //!
@@ -210,31 +154,8 @@ public:
     //! \param adr String that contains an ip or hostname in dotted decimal notation like "192.168.2.1"
     //! \param port Optional integer that specifies the port to which the request is sent to. Default is 80
     //! \return Json::Value containing the parsed body of the response of the host
-    virtual Json::Value DELETEJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const
-    {
-        return strToJsonValue(DELETEString(uri, "application/json", body.toStyledString(), adr, port));
-    };
+    virtual Json::Value DELETEJson(std::string uri, const Json::Value& body, const std::string &adr, int port=80) const = 0;
-private:
-
-    //! \brief Function that converts a given string to a Json::Value
-    //!
-    //! \param str String that gets converted
-    //! \return Json::Value containing parsed string
-    Json::Value strToJsonValue(std::string str) const
-    {
-        std::string error;
-        Json::Value result;
-        Json::CharReaderBuilder builder;
-        builder["collectComments"] = false;
-        std::unique_ptr<Json::CharReader> reader = std::unique_ptr<Json::CharReader>(builder.newCharReader());
-        if (!reader->parse(str.c_str(), str.c_str() + str.length(), &result, &error))
-        {
-        	std::cout << "IHttpHandler: Error while parsing JSON in function strToJsonValue(): " << error << std::endl;
-        	throw(std::runtime_error("IHttpHandler: Error while parsing JSON in function strToJsonValue()"));
-        }
-        return result;
-    }
 };
 #endif
 /**
-	\file linHttpHandler.h
+	\file LinHttpHandler.h
 	Copyright Notice\n
 	Copyright (C) 2017  Jan Rogall		- developer\n
 	Copyright (C) 2017  Moritz Wirger	- developer\n
@@ -23,12 +23,12 @@
 #include <string>
 #include <vector>
-#include "IHttpHandler.h"
+#include "BaseHttpHandler.h"
 #include "json/json.h"
 //! Class to handle http requests and multicast requests on linux systems
-class linHttpHandler : public IHttpHandler
+class LinHttpHandler : public BaseHttpHandler
 {
 public:
     //! \brief Function that sends a given message to the specified host and returns the response.
 /**
-\file winHttpHandler.h
+\file WinHttpHandler.h
 Copyright Notice\n
 Copyright (C) 2017  Jan Rogall		- developer\n
 Copyright (C) 2017  Moritz Wirger	- developer\n
@@ -24,19 +24,19 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 #include <vector>
 #include <winsock2.h>
-#include "IHttpHandler.h"
+#include "BaseHttpHandler.h"
 #include "json/json.h"
 //! Class to handle http requests and multicast requests on windows systems
-class winHttpHandler : public IHttpHandler
+class WinHttpHandler : public BaseHttpHandler
 {
 public:
 	//! \brief Ctor needed for initializing wsaData
-	winHttpHandler();
+	WinHttpHandler();
 	//! \brief Dtor needed for wsaData cleanup
-	~winHttpHandler();
+	~WinHttpHandler();
 	//! \brief Function that sends a given message to the specified host and returns the response.
 	//!
@@ -34,11 +34,11 @@ endif()
 # define all test sources
 set(TEST_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_BaseHttpHandler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_ExtendedColorHueStrategy.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_ExtendedColorTemperatureStrategy.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_Hue.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_HueLight.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_IHttpHandler.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_Main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_SimpleBrightnessStrategy.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_SimpleColorHueStrategy.cpp
 /**
-	\file mock_linHttpHandler.h
+	\file mock_LinHttpHandler.h
 	Copyright Notice\n
 	Copyright (C) 2017  Jan Rogall		- developer\n
 	Copyright (C) 2017  Moritz Wirger	- developer\n
@@ -25,11 +25,11 @@
 #include <gmock/gmock.h>
-#include "../hueplusplus/include/linHttpHandler.h"
+#include "../hueplusplus/include/LinHttpHandler.h"
 #include "../hueplusplus/include/json/json.h"
 //! Mock Class
-class MockLinHttpHandler : public linHttpHandler
+class MockLinHttpHandler : public LinHttpHandler
 {
 public:
     MOCK_CONST_METHOD3( send, std::string(const std::string &msg, const std::string &adr, int port) );
@@ -2,13 +2,13 @@
 #include <gmock/gmock.h>
 #include "../include/json/json.h"
-#include "mocks/mock_linHttpHandler.h"
+#include "mocks/mock_LinHttpHandler.h"
 #include "testhelper.h"
 #include <memory>
 #include <string>
-TEST(IHttpHandler, sendGetHTTPBody)
+TEST(BaseHttpHandler, sendGetHTTPBody)
 {
     using namespace ::testing;
     MockLinHttpHandler handler;
@@ -22,7 +22,7 @@ TEST(IHttpHandler, sendGetHTTPBody)
     EXPECT_EQ("testreply", handler.sendGetHTTPBody("testmsg", "192.168.2.1", 90));
 }
-TEST(IHttpHandler, sendHTTPRequest)
+TEST(BaseHttpHandler, sendHTTPRequest)
 {
     using namespace ::testing;
     MockLinHttpHandler handler;
@@ -36,7 +36,7 @@ TEST(IHttpHandler, sendHTTPRequest)
     EXPECT_EQ("testreply", handler.sendHTTPRequest("GET", "UrI", "text/html", "body", "192.168.2.1", 90));
 }
-TEST(IHttpHandler, GETString)
+TEST(BaseHttpHandler, GETString)
 {
     using namespace ::testing;
     MockLinHttpHandler handler;
@@ -50,7 +50,7 @@ TEST(IHttpHandler, GETString)
     EXPECT_EQ("testreply", handler.GETString("UrI", "text/html", "body", "192.168.2.1", 90));
 }
-TEST(IHttpHandler, POSTString)
+TEST(BaseHttpHandler, POSTString)
 {
     using namespace ::testing;
     MockLinHttpHandler handler;
@@ -64,7 +64,7 @@ TEST(IHttpHandler, POSTString)
     EXPECT_EQ("testreply", handler.POSTString("UrI", "text/html", "body", "192.168.2.1", 90));
 }
-TEST(IHttpHandler, PUTString)
+TEST(BaseHttpHandler, PUTString)
 {
     using namespace ::testing;
     MockLinHttpHandler handler;
@@ -78,7 +78,7 @@ TEST(IHttpHandler, PUTString)
     EXPECT_EQ("testreply", handler.PUTString("UrI", "text/html", "body", "192.168.2.1", 90));
 }
-TEST(IHttpHandler, DELETEString)
+TEST(BaseHttpHandler, DELETEString)
 {
     using namespace ::testing;
     MockLinHttpHandler handler;
@@ -92,7 +92,7 @@ TEST(IHttpHandler, DELETEString)
     EXPECT_EQ("testreply", handler.DELETEString("UrI", "text/html", "body", "192.168.2.1", 90));
 }
-TEST(IHttpHandler, GETJson)
+TEST(BaseHttpHandler, GETJson)
 {
     using namespace ::testing;
     MockLinHttpHandler handler;
@@ -118,7 +118,7 @@ TEST(IHttpHandler, GETJson)
     EXPECT_EQ(expected, handler.GETJson("UrI", testval, "192.168.2.1", 90));
 }
-TEST(IHttpHandler, POSTJson)
+TEST(BaseHttpHandler, POSTJson)
 {
     using namespace ::testing;
     MockLinHttpHandler handler;
@@ -144,7 +144,7 @@ TEST(IHttpHandler, POSTJson)
     EXPECT_EQ(expected, handler.POSTJson("UrI", testval, "192.168.2.1", 90));
 }
-TEST(IHttpHandler, PUTJson)
+TEST(BaseHttpHandler, PUTJson)
 {
     using namespace ::testing;
     MockLinHttpHandler handler;
@@ -170,7 +170,7 @@ TEST(IHttpHandler, PUTJson)
     EXPECT_EQ(expected, handler.PUTJson("UrI", testval, "192.168.2.1", 90));
 }
-TEST(IHttpHandler, DELETEJson)
+TEST(BaseHttpHandler, DELETEJson)
 {
     using namespace ::testing;
     MockLinHttpHandler handler;