Skip to content

Commit 6c65954

Browse files
BrennanConroyBrennanConroy
committed
stash
1 parent ec71d74 commit 6c65954

File tree

5 files changed

+42
-47
lines changed

5 files changed

+42
-47
lines changed

‎src/SignalR/clients/cpp/test/signalrclient-e2e-tests/connection_tests.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ extern std::string url;
1414

1515
TEST(connection_tests, connection_status_start_stop)
1616
{
17-
auto conn = std::make_shared<signalr::connection>(url + U("raw-connection"));
17+
auto conn = std::make_shared<signalr::connection>(url + "raw-connection");
1818

1919
conn->start().get();
2020
ASSERT_EQ(conn->get_connection_state(), signalr::connection_state::connected);
@@ -28,7 +28,7 @@ TEST(connection_tests, connection_status_start_stop)
2828

2929
TEST(connection_tests, send_message)
3030
{
31-
auto conn = std::make_shared<signalr::connection>(url + U("raw-connection"));
31+
auto conn = std::make_shared<signalr::connection>(url + "raw-connection");
3232
auto message = std::make_shared<std::string>();
3333
auto received_event = std::make_shared<signalr::event>();
3434

@@ -43,18 +43,18 @@ TEST(connection_tests, send_message)
4343
web::json::value obj;
4444
obj[U("type")] = web::json::value::number(0);
4545
obj[U("value")] = web::json::value::string(U("test"));
46-
return conn->send(obj.serialize());
46+
return conn->send(utility::conversions::to_utf8string(obj.serialize()));
4747

4848
}).get();
4949

5050
ASSERT_FALSE(received_event->wait(2000));
5151

52-
ASSERT_EQ(*message, U("{\"data\":\"test\",\"type\":0}"));
52+
ASSERT_EQ(*message, "{\"data\":\"test\",\"type\":0}");
5353
}
5454

5555
TEST(connection_tests, send_message_after_connection_restart)
5656
{
57-
auto conn = std::make_shared<signalr::connection>(url + U("raw-connection"));
57+
auto conn = std::make_shared<signalr::connection>(url + "raw-connection");
5858
auto message = std::make_shared<std::string>();
5959
auto received_event = std::make_shared<signalr::event>();
6060

@@ -73,29 +73,29 @@ TEST(connection_tests, send_message_after_connection_restart)
7373
web::json::value obj;
7474
obj[U("type")] = web::json::value::number(0);
7575
obj[U("value")] = web::json::value::string(U("test"));
76-
return conn->send(obj.serialize());
76+
return conn->send(utility::conversions::to_utf8string(obj.serialize()));
7777

7878
}).get();
7979

8080
ASSERT_FALSE(received_event->wait(2000));
8181

82-
ASSERT_EQ(*message, U("{\"data\":\"test\",\"type\":0}"));
82+
ASSERT_EQ(*message, "{\"data\":\"test\",\"type\":0}");
8383
}
8484

8585
TEST(connection_tests, connection_id_start_stop)
8686
{
87-
auto conn = std::make_shared<signalr::connection>(url + U("raw-connection"));
87+
auto conn = std::make_shared<signalr::connection>(url + "raw-connection");
8888

89-
ASSERT_EQ(U(""), conn->get_connection_id());
89+
ASSERT_EQ("", conn->get_connection_id());
9090

9191
conn->start().get();
9292
auto connection_id = conn->get_connection_id();
93-
ASSERT_NE(connection_id, U(""));
93+
ASSERT_NE(connection_id, "");
9494

9595
conn->stop().get();
9696
ASSERT_EQ(conn->get_connection_id(), connection_id);
9797

9898
conn->start().get();
99-
ASSERT_NE(conn->get_connection_id(), U(""));
99+
ASSERT_NE(conn->get_connection_id(), "");
100100
ASSERT_NE(conn->get_connection_id(), connection_id);
101101
}

‎src/SignalR/clients/cpp/test/signalrclient-e2e-tests/hub_connection_tests.cpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ TEST(hub_connection_tests, connection_status_start_stop_start)
3030

3131
TEST(hub_connection_tests, send_message)
3232
{
33-
auto hub_conn = std::make_shared<signalr::hub_connection>(url + U("custom"), signalr::trace_level::all, nullptr);
33+
auto hub_conn = std::make_shared<signalr::hub_connection>(url + "custom", signalr::trace_level::all, nullptr);
3434
auto message = std::make_shared<std::string>();
3535
auto received_event = std::make_shared<signalr::event>();
3636

37-
hub_conn->on(U("sendString"), [message, received_event](const web::json::value& arguments)
37+
hub_conn->on("sendString", [message, received_event](const web::json::value& arguments)
3838
{
39-
*message = arguments.serialize();
39+
*message = utility::conversions::to_utf8string(arguments.serialize());
4040
received_event->set();
4141
});
4242

@@ -45,13 +45,13 @@ TEST(hub_connection_tests, send_message)
4545
web::json::value obj{};
4646
obj[0] = web::json::value(U("test"));
4747

48-
return hub_conn->send(U("invokeWithString"), obj);
48+
return hub_conn->send("invokeWithString", obj);
4949

5050
}).get();
5151

5252
ASSERT_FALSE(received_event->wait(2000));
5353

54-
ASSERT_EQ(*message, U("[\"Send: test\"]"));
54+
ASSERT_EQ(*message, "[\"Send: test\"]");
5555
}
5656

5757
TEST(hub_connection_tests, send_message_return)
@@ -63,7 +63,7 @@ TEST(hub_connection_tests, send_message_return)
6363
web::json::value obj{};
6464
obj[0] = web::json::value(U("test"));
6565

66-
return hub_conn->invoke(U("returnString"), obj);
66+
return hub_conn->invoke("returnString", obj);
6767

6868
}).get();
6969

@@ -76,9 +76,9 @@ TEST(hub_connection_tests, send_message_after_connection_restart)
7676
auto message = std::make_shared<std::string>();
7777
auto received_event = std::make_shared<signalr::event>();
7878

79-
hub_conn->on(U("sendString"), [message, received_event](const web::json::value& arguments)
79+
hub_conn->on("sendString", [message, received_event](const web::json::value& arguments)
8080
{
81-
*message = arguments.serialize();
81+
*message = utility::conversions::to_utf8string(arguments.serialize());
8282
received_event->set();
8383
});
8484

@@ -91,13 +91,13 @@ TEST(hub_connection_tests, send_message_after_connection_restart)
9191
web::json::value obj{};
9292
obj[0] = web::json::value(U("test"));
9393

94-
return hub_conn->send(U("invokeWithString"), obj);
94+
return hub_conn->send("invokeWithString", obj);
9595

9696
}).get();
9797

9898
ASSERT_FALSE(received_event->wait(2000));
9999

100-
ASSERT_EQ(*message, U("[\"Send: test\"]"));
100+
ASSERT_EQ(*message, "[\"Send: test\"]");
101101
}
102102

103103
TEST(hub_connection_tests, send_message_empty_param)
@@ -106,21 +106,21 @@ TEST(hub_connection_tests, send_message_empty_param)
106106
auto message = std::make_shared<std::string>();
107107
auto received_event = std::make_shared<signalr::event>();
108108

109-
hub_conn->on(U("sendString"), [message, received_event](const web::json::value& arguments)
109+
hub_conn->on("sendString", [message, received_event](const web::json::value& arguments)
110110
{
111-
*message = arguments.serialize();
111+
*message = utility::conversions::to_utf8string(arguments.serialize());
112112
received_event->set();
113113
});
114114

115115
hub_conn->start().then([&hub_conn]()
116116
{
117-
return hub_conn->invoke(U("invokeWithEmptyParam"));
117+
return hub_conn->invoke("invokeWithEmptyParam");
118118

119119
}).get();
120120

121121
ASSERT_FALSE(received_event->wait(2000));
122122

123-
ASSERT_EQ(*message, U("[\"Send\"]"));
123+
ASSERT_EQ(*message, "[\"Send\"]");
124124
}
125125

126126
TEST(hub_connection_tests, send_message_primitive_params)
@@ -129,9 +129,9 @@ TEST(hub_connection_tests, send_message_primitive_params)
129129
auto message = std::make_shared<std::string>();
130130
auto received_event = std::make_shared<signalr::event>();
131131

132-
hub_conn->on(U("sendPrimitiveParams"), [message, received_event](const web::json::value& arguments)
132+
hub_conn->on("sendPrimitiveParams", [message, received_event](const web::json::value& arguments)
133133
{
134-
*message = arguments.serialize();
134+
*message = utility::conversions::to_utf8string(arguments.serialize());
135135
received_event->set();
136136
});
137137

@@ -143,7 +143,7 @@ TEST(hub_connection_tests, send_message_primitive_params)
143143
obj[2] = web::json::value(8.999999999);
144144
obj[3] = web::json::value(true);
145145
obj[4] = web::json::value('a');
146-
return hub_conn->send(U("invokeWithPrimitiveParams"), obj);
146+
return hub_conn->send("invokeWithPrimitiveParams", obj);
147147

148148
}).get();
149149

@@ -156,7 +156,7 @@ TEST(hub_connection_tests, send_message_primitive_params)
156156
obj[3] = web::json::value(true);
157157
obj[4] = web::json::value::string(U("a"));
158158

159-
ASSERT_EQ(*message, obj.serialize());
159+
ASSERT_EQ(*message, utility::conversions::to_utf8string(obj.serialize()));
160160
}
161161

162162
TEST(hub_connection_tests, send_message_complex_type)
@@ -165,9 +165,9 @@ TEST(hub_connection_tests, send_message_complex_type)
165165
auto message = std::make_shared<std::string>();
166166
auto received_event = std::make_shared<signalr::event>();
167167

168-
hub_conn->on(U("sendComplexType"), [message, received_event](const web::json::value& arguments)
168+
hub_conn->on("sendComplexType", [message, received_event](const web::json::value& arguments)
169169
{
170-
*message = arguments.serialize();
170+
*message = utility::conversions::to_utf8string(arguments.serialize());
171171
received_event->set();
172172
});
173173

@@ -183,13 +183,13 @@ TEST(hub_connection_tests, send_message_complex_type)
183183
person[U("age")] = web::json::value::number(15);
184184
obj[0] = person;
185185

186-
return hub_conn->send(U("invokeWithComplexType"), obj);
186+
return hub_conn->send("invokeWithComplexType", obj);
187187

188188
}).get();
189189

190190
ASSERT_FALSE(received_event->wait(2000));
191191

192-
ASSERT_EQ(*message, U("[{\"Address\":{\"Street\":\"main st\",\"Zip\":\"98052\"},\"Age\":15,\"Name\":\"test\"}]"));
192+
ASSERT_EQ(*message, "[{\"Address\":{\"Street\":\"main st\",\"Zip\":\"98052\"},\"Age\":15,\"Name\":\"test\"}]");
193193
}
194194

195195
TEST(hub_connection_tests, send_message_complex_type_return)
@@ -208,7 +208,7 @@ TEST(hub_connection_tests, send_message_complex_type_return)
208208
person[U("age")] = web::json::value::number(15);
209209
obj[0] = person;
210210

211-
return hub_conn->invoke(U("returnComplexType"), obj);
211+
return hub_conn->invoke("returnComplexType", obj);
212212

213213
}).get();
214214

@@ -222,17 +222,17 @@ TEST(hub_connection_tests, connection_id_start_stop_start)
222222

223223
std::string connection_id;
224224

225-
ASSERT_EQ(U(""), hub_conn->get_connection_id());
225+
ASSERT_EQ(u8"", hub_conn->get_connection_id());
226226

227227
hub_conn->start().get();
228228
connection_id = hub_conn->get_connection_id();
229-
ASSERT_NE(connection_id, U(""));
229+
ASSERT_NE(connection_id, u8"");
230230

231231
hub_conn->stop().get();
232232
ASSERT_EQ(hub_conn->get_connection_id(), connection_id);
233233

234234
hub_conn->start().get();
235-
ASSERT_NE(hub_conn->get_connection_id(), U(""));
235+
ASSERT_NE(hub_conn->get_connection_id(), u8"");
236236
ASSERT_NE(hub_conn->get_connection_id(), connection_id);
237237

238238
connection_id = hub_conn->get_connection_id();

‎src/SignalR/clients/cpp/test/signalrclient-e2e-tests/signalrclient-e2e-tests.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@
55
#include <vector>
66
#include "test_utils.h"
77

8-
#if defined(_WIN32)
9-
int wmain(int argc, wchar_t* argv[])
10-
#else
118
int main(int argc, char* argv[])
12-
#endif
139
{
1410
get_url(argc, argv);
1511

1612
::testing::InitGoogleTest(&argc, argv);
1713
RUN_ALL_TESTS();
1814
return 0;
19-
}
15+
}

‎src/SignalR/clients/cpp/test/signalrclient-e2e-tests/test_utils.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
std::string url;
1313

14-
void get_url(int argc, utility::char_t* argv[])
14+
void get_url(int argc, char* argv[])
1515
{
16-
url = U("http://localhost:42524/");
16+
url = "http://localhost:42524/";
1717

1818
for (int i = 0; i < argc; ++i)
1919
{
2020
std::string str = argv[i];
2121

22-
auto pos = str.find(U("url="));
22+
auto pos = str.find("url=");
2323
if (pos != std::string::npos)
2424
{
2525
url = str.substr(pos + 4);

‎src/SignalR/clients/cpp/test/signalrclient-e2e-tests/test_utils.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
#pragma once
55

66
#include "stdafx.h"
7-
#include "cpprest/details/basic_types.h"
87

9-
void get_url(int argc, utility::char_t* argv[]);
8+
void get_url(int argc, char* argv[]);

0 commit comments

Comments
 (0)