Peter M. Groen / hueplusplus

Commit 1d2d1f94a70374515c85c1d73ce8176dfa0d2df2

Authored by Jojo-1000
Committed by Moritz Wirger
1 parent 10b9b262

Fix missing renames of MockLinHttpHandler.

Inline Side-by-side
Showing 2 changed files with 14 additions and 14 deletions
hueplusplus/test/mocks/mock_BaseHttpHandler.h
  View file @1d2d1f9
1 1 /**
2   - \file mock_LinHttpHandler.h
  2 + \file mock_BaseHttpHandler.h
3 3 Copyright Notice\n
4 4 Copyright (C) 2017 Jan Rogall - developer\n
5 5 Copyright (C) 2017 Moritz Wirger - developer\n
... ... @@ -17,8 +17,8 @@
17 17 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18 18 **/
19 19  
20   -#ifndef _MOCK_LIN_HTTPHANDLER_H
21   -#define _MOCK_LIN_HTTPHANDLER_H
  20 +#ifndef _MOCK_BASE_HTTPHANDLER_H
  21 +#define _MOCK_BASE_HTTPHANDLER_H
22 22  
23 23 #include <string>
24 24 #include <vector>
... ...
hueplusplus/test/test_BaseHttpHandler.cpp
  View file @1d2d1f9
... ... @@ -2,7 +2,7 @@
2 2 #include <gmock/gmock.h>
3 3  
4 4 #include "../include/json/json.h"
5   -#include "mocks/mock_LinHttpHandler.h"
  5 +#include "mocks/mock_BaseHttpHandler.h"
6 6 #include "testhelper.h"
7 7  
8 8 #include <memory>
... ... @@ -11,7 +11,7 @@
11 11 TEST(BaseHttpHandler, sendGetHTTPBody)
12 12 {
13 13 using namespace ::testing;
14   - MockLinHttpHandler handler;
  14 + MockBaseHttpHandler handler;
15 15  
16 16 EXPECT_CALL(handler, send("testmsg", "192.168.2.1", 90))
17 17 .Times(AtLeast(2))
... ... @@ -25,7 +25,7 @@ TEST(BaseHttpHandler, sendGetHTTPBody)
25 25 TEST(BaseHttpHandler, sendHTTPRequest)
26 26 {
27 27 using namespace ::testing;
28   - MockLinHttpHandler handler;
  28 + MockBaseHttpHandler handler;
29 29  
30 30 EXPECT_CALL(handler, send("GET UrI HTTP/1.0\r\nContent-Type: text/html\r\nContent-Length: 4\r\n\r\nbody\r\n\r\n", "192.168.2.1", 90))
31 31 .Times(AtLeast(2))
... ... @@ -39,7 +39,7 @@ TEST(BaseHttpHandler, sendHTTPRequest)
39 39 TEST(BaseHttpHandler, GETString)
40 40 {
41 41 using namespace ::testing;
42   - MockLinHttpHandler handler;
  42 + MockBaseHttpHandler handler;
43 43  
44 44 EXPECT_CALL(handler, send("GET UrI HTTP/1.0\r\nContent-Type: text/html\r\nContent-Length: 4\r\n\r\nbody\r\n\r\n", "192.168.2.1", 90))
45 45 .Times(AtLeast(2))
... ... @@ -53,7 +53,7 @@ TEST(BaseHttpHandler, GETString)
53 53 TEST(BaseHttpHandler, POSTString)
54 54 {
55 55 using namespace ::testing;
56   - MockLinHttpHandler handler;
  56 + MockBaseHttpHandler handler;
57 57  
58 58 EXPECT_CALL(handler, send("POST UrI HTTP/1.0\r\nContent-Type: text/html\r\nContent-Length: 4\r\n\r\nbody\r\n\r\n", "192.168.2.1", 90))
59 59 .Times(AtLeast(2))
... ... @@ -67,7 +67,7 @@ TEST(BaseHttpHandler, POSTString)
67 67 TEST(BaseHttpHandler, PUTString)
68 68 {
69 69 using namespace ::testing;
70   - MockLinHttpHandler handler;
  70 + MockBaseHttpHandler handler;
71 71  
72 72 EXPECT_CALL(handler, send("PUT UrI HTTP/1.0\r\nContent-Type: text/html\r\nContent-Length: 4\r\n\r\nbody\r\n\r\n", "192.168.2.1", 90))
73 73 .Times(AtLeast(2))
... ... @@ -81,7 +81,7 @@ TEST(BaseHttpHandler, PUTString)
81 81 TEST(BaseHttpHandler, DELETEString)
82 82 {
83 83 using namespace ::testing;
84   - MockLinHttpHandler handler;
  84 + MockBaseHttpHandler handler;
85 85  
86 86 EXPECT_CALL(handler, send("DELETE UrI HTTP/1.0\r\nContent-Type: text/html\r\nContent-Length: 4\r\n\r\nbody\r\n\r\n", "192.168.2.1", 90))
87 87 .Times(AtLeast(2))
... ... @@ -95,7 +95,7 @@ TEST(BaseHttpHandler, DELETEString)
95 95 TEST(BaseHttpHandler, GETJson)
96 96 {
97 97 using namespace ::testing;
98   - MockLinHttpHandler handler;
  98 + MockBaseHttpHandler handler;
99 99  
100 100 Json::Value testval;
101 101 testval["test"] = 100;
... ... @@ -121,7 +121,7 @@ TEST(BaseHttpHandler, GETJson)
121 121 TEST(BaseHttpHandler, POSTJson)
122 122 {
123 123 using namespace ::testing;
124   - MockLinHttpHandler handler;
  124 + MockBaseHttpHandler handler;
125 125  
126 126 Json::Value testval;
127 127 testval["test"] = 100;
... ... @@ -147,7 +147,7 @@ TEST(BaseHttpHandler, POSTJson)
147 147 TEST(BaseHttpHandler, PUTJson)
148 148 {
149 149 using namespace ::testing;
150   - MockLinHttpHandler handler;
  150 + MockBaseHttpHandler handler;
151 151  
152 152 Json::Value testval;
153 153 testval["test"] = 100;
... ... @@ -173,7 +173,7 @@ TEST(BaseHttpHandler, PUTJson)
173 173 TEST(BaseHttpHandler, DELETEJson)
174 174 {
175 175 using namespace ::testing;
176   - MockLinHttpHandler handler;
  176 + MockBaseHttpHandler handler;
177 177  
178 178 Json::Value testval;
179 179 testval["test"] = 100;
... ...