Skip to content

Commit dfb20c9

Browse files
segoonsegoon
committed
bug chaotic: build fix for old gmock
Tests: протестировано CI Pull Request resolved: #776 commit_hash:501558764f4f45afcb745a1e3ad71f0f43da19ee
1 parent e0aefc2 commit dfb20c9

File tree

2 files changed

+46
-77
lines changed

2 files changed

+46
-77
lines changed

‎chaotic/src/chaotic/openapi/parameters_read_test.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ USERVER_NAMESPACE_BEGIN
99

1010
namespace co = chaotic::openapi;
1111

12+
static constexpr co::Name kName{"foo"};
13+
1214
UTEST(OpenapiParametersRead, SourceHttpRequest) {
1315
auto request = server::http::HttpRequestBuilder()
1416
.AddRequestArg("foo", "bar")
@@ -19,8 +21,6 @@ UTEST(OpenapiParametersRead, SourceHttpRequest) {
1921
.Build();
2022
const auto& source = *request;
2123

22-
static constexpr co::Name kName{"foo"};
23-
2424
auto query_multi = co::ReadParameter<co::ArrayParameter<co::In::kQueryExplode, kName, ',', std::string>>(source);
2525
auto query = co::ReadParameter<co::TrivialParameter<co::In::kQuery, kName, std::string>>(source);
2626
auto path = co::ReadParameter<co::TrivialParameter<co::In::kPath, kName, std::string>>(source);
@@ -36,23 +36,20 @@ UTEST(OpenapiParametersRead, SourceHttpRequest) {
3636

3737
UTEST(OpenapiParametersRead, TypeBoolean) {
3838
auto request = server::http::HttpRequestBuilder().AddRequestArg("foo", "true").Build();
39-
static constexpr co::Name kName{"foo"};
4039

4140
bool foo{co::ReadParameter<co::TrivialParameter<co::In::kQuery, kName, bool>>(*request)};
4241
EXPECT_EQ(foo, true);
4342
}
4443

4544
UTEST(OpenapiParametersRead, TypeDouble) {
4645
auto request = server::http::HttpRequestBuilder().AddRequestArg("foo", "12.2").Build();
47-
static constexpr co::Name kName{"foo"};
4846

4947
double foo{co::ReadParameter<co::TrivialParameter<co::In::kQuery, kName, double>>(*request)};
5048
EXPECT_EQ(foo, 12.2);
5149
}
5250

5351
UTEST(OpenapiParametersRead, UserType) {
5452
auto request = server::http::HttpRequestBuilder().AddRequestArg("foo", "12.2").Build();
55-
static constexpr co::Name kName{"foo"};
5653

5754
using Decimal = decimal64::Decimal<10>;
5855
Decimal foo{co::ReadParameter<co::TrivialParameter<co::In::kQuery, kName, std::string, Decimal>>(*request)};
@@ -61,15 +58,13 @@ UTEST(OpenapiParametersRead, UserType) {
6158

6259
UTEST(OpenapiParametersRead, TypeInt) {
6360
auto request = server::http::HttpRequestBuilder().AddRequestArg("foo", "12").Build();
64-
static constexpr co::Name kName{"foo"};
6561

6662
int foo{co::ReadParameter<co::TrivialParameter<co::In::kQuery, kName, int>>(*request)};
6763
EXPECT_EQ(foo, 12);
6864
}
6965

7066
UTEST(OpenapiParametersRead, TypeArrayOfString) {
7167
auto request = server::http::HttpRequestBuilder().AddRequestArg("foo", "bar,baz").Build();
72-
static constexpr co::Name kName{"foo"};
7368

7469
std::vector<std::string> foo{
7570
co::ReadParameter<co::ArrayParameter<co::In::kQuery, kName, ',', std::string>>(*request)};
@@ -78,7 +73,6 @@ UTEST(OpenapiParametersRead, TypeArrayOfString) {
7873

7974
UTEST(OpenapiParametersRead, TypeArrayOfUser) {
8075
auto request = server::http::HttpRequestBuilder().AddRequestArg("foo", "1.2,3.4").Build();
81-
static constexpr co::Name kName{"foo"};
8276

8377
using Decimal = decimal64::Decimal<10>;
8478
std::vector<Decimal> foo{
@@ -92,7 +86,6 @@ UTEST(OpenapiParametersRead, TypeStringExplode) {
9286
.AddRequestArg("foo", "2")
9387
.AddRequestArg("foo", "3")
9488
.Build();
95-
static constexpr co::Name kName{"foo"};
9689

9790
std::vector<int> foo{co::ReadParameter<co::ArrayParameter<co::In::kQueryExplode, kName, ',', int>>(*request)};
9891
EXPECT_EQ(foo, (std::vector{1, 2, 3}));

‎chaotic/src/chaotic/openapi/parameters_write_test.cpp‎

Lines changed: 44 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -26,143 +26,130 @@ class ParameterSinkMock : public co::ParameterSinkBase {
2626
MOCK_METHOD(void, SetMultiQuery, (std::string_view, std::vector<std::string>&&), (override));
2727
};
2828

29-
UTEST(OpenapiParameters, Cookie) {
30-
static constexpr co::Name kName{"test"};
29+
static constexpr co::Name kTest{
30+
"test",
31+
};
3132

33+
UTEST(OpenapiParameters, Cookie) {
3234
ParameterSinkMock sink;
33-
EXPECT_CALL(sink, SetCookie("test", std::string{"value"}));
35+
EXPECT_CALL(sink, SetCookie(std::string_view{"test"}, std::string{"value"}));
3436

35-
co::WriteParameter<co::TrivialParameter<co::In::kCookie, kName, std::string>>("value", sink);
37+
co::WriteParameter<co::TrivialParameter<co::In::kCookie, kTest, std::string>>("value", sink);
3638
}
3739

3840
UTEST(OpenapiParameters, Path) {
39-
static constexpr co::Name kName{"test"};
40-
4141
ParameterSinkMock sink;
4242
EXPECT_CALL(sink, SetPath("test", std::string{"value"}));
4343

44-
co::WriteParameter<co::TrivialParameter<co::In::kPath, kName, std::string>>("value", sink);
44+
co::WriteParameter<co::TrivialParameter<co::In::kPath, kTest, std::string>>("value", sink);
4545
}
4646

4747
UTEST(OpenapiParameters, Header) {
48-
static constexpr co::Name kName{"test"};
49-
5048
ParameterSinkMock sink;
51-
EXPECT_CALL(sink, SetHeader("test", std::string{"value"}));
49+
EXPECT_CALL(sink, SetHeader(std::string_view{"test"}, std::string{"value"}));
5250

53-
co::WriteParameter<co::TrivialParameter<co::In::kHeader, kName, std::string>>("value", sink);
51+
co::WriteParameter<co::TrivialParameter<co::In::kHeader, kTest, std::string>>("value", sink);
5452
}
5553

5654
UTEST(OpenapiParameters, Query) {
57-
static constexpr co::Name kName{"test"};
58-
5955
ParameterSinkMock sink;
60-
EXPECT_CALL(sink, SetQuery("test", std::string{"value"}));
56+
EXPECT_CALL(sink, SetQuery(std::string_view{"test"}, std::string{"value"}));
6157

62-
co::WriteParameter<co::TrivialParameter<co::In::kQuery, kName, std::string>>("value", sink);
58+
co::WriteParameter<co::TrivialParameter<co::In::kQuery, kTest, std::string>>("value", sink);
6359
}
6460

6561
UTEST(OpenapiParameters, QueryExplode) {
66-
static constexpr co::Name kName{"test"};
67-
6862
ParameterSinkMock sink;
69-
EXPECT_CALL(sink, SetMultiQuery("test", (std::vector<std::string>{"foo", "bar"})));
63+
EXPECT_CALL(sink, SetMultiQuery(std::string_view{"test"}, (std::vector<std::string>{"foo", "bar"})));
7064

71-
co::WriteParameter<co::ArrayParameter<co::In::kQueryExplode, kName, ',', std::string>>(
65+
co::WriteParameter<co::ArrayParameter<co::In::kQueryExplode, kTest, ',', std::string>>(
7266
std::vector<std::string>{"foo", "bar"}, sink
7367
);
7468
}
7569

7670
UTEST(OpenapiParameters, QueryExplodeInteger) {
77-
static constexpr co::Name kName{"test"};
78-
7971
ParameterSinkMock sink;
80-
EXPECT_CALL(sink, SetMultiQuery("test", (std::vector<std::string>{"1", "2"})));
72+
EXPECT_CALL(sink, SetMultiQuery(std::string_view{"test"}, (std::vector<std::string>{"1", "2"})));
8173

82-
co::WriteParameter<co::ArrayParameter<co::In::kQueryExplode, kName, ',', int>>(std::vector<int>{1, 2}, sink);
74+
co::WriteParameter<co::ArrayParameter<co::In::kQueryExplode, kTest, ',', int>>(std::vector<int>{1, 2}, sink);
8375
}
8476

8577
UTEST(OpenapiParameters, QueryExplodeUser) {
86-
static constexpr co::Name kName{"test"};
87-
8878
ParameterSinkMock sink;
89-
EXPECT_CALL(sink, SetMultiQuery("test", (std::vector<std::string>{"1.2", "3.4"})));
79+
EXPECT_CALL(sink, SetMultiQuery(std::string_view{"test"}, (std::vector<std::string>{"1.2", "3.4"})));
9080

9181
using Decimal = decimal64::Decimal<10>;
92-
co::WriteParameter<co::ArrayParameter<co::In::kQueryExplode, kName, ',', std::string, Decimal>>(
82+
co::WriteParameter<co::ArrayParameter<co::In::kQueryExplode, kTest, ',', std::string, Decimal>>(
9383
std::vector<Decimal>{Decimal{"1.2"}, Decimal{"3.4"}}, sink
9484
);
9585
}
9686

9787
UTEST(OpenapiParameters, CookieArray) {
98-
static constexpr co::Name kName{"test"};
99-
10088
ParameterSinkMock sink;
101-
EXPECT_CALL(sink, SetCookie("test", std::string{"foo,bar"}));
89+
EXPECT_CALL(sink, SetCookie(std::string_view{"test"}, std::string{"foo,bar"}));
10290

103-
co::WriteParameter<co::ArrayParameter<co::In::kCookie, kName, ',', std::string, std::string>>({"foo", "bar"}, sink);
91+
co::WriteParameter<co::ArrayParameter<co::In::kCookie, kTest, ',', std::string, std::string>>({"foo", "bar"}, sink);
10492
}
10593

10694
UTEST(OpenapiParameters, QueryArrayOfInteger) {
107-
static constexpr co::Name kName{"test"};
108-
10995
ParameterSinkMock sink;
110-
EXPECT_CALL(sink, SetQuery("test", std::string{"1,2"}));
96+
EXPECT_CALL(sink, SetQuery(std::string_view{"test"}, std::string{"1,2"}));
11197

112-
co::WriteParameter<co::ArrayParameter<co::In::kQuery, kName, ',', int>>({1, 2}, sink);
98+
co::WriteParameter<co::ArrayParameter<co::In::kQuery, kTest, ',', int>>({1, 2}, sink);
11399
}
114100

115101
UTEST(OpenapiParameters, QueryArrayOfUserTypes) {
116-
static constexpr co::Name kName{"test"};
117-
118102
ParameterSinkMock sink;
119-
EXPECT_CALL(sink, SetQuery("test", std::string{"1.1,2.2"}));
103+
EXPECT_CALL(sink, SetQuery(std::string_view{"test"}, std::string{"1.1,2.2"}));
120104

121105
using Decimal = decimal64::Decimal<10>;
122-
co::WriteParameter<co::ArrayParameter<co::In::kQuery, kName, ',', std::string, Decimal>>(
106+
co::WriteParameter<co::ArrayParameter<co::In::kQuery, kTest, ',', std::string, Decimal>>(
123107
{Decimal{"1.1"}, Decimal{"2.2"}}, sink
124108
);
125109
}
126110

127111
UTEST(OpenapiParameters, UserType) {
128-
static constexpr co::Name kName{"test"};
129-
130112
ParameterSinkMock sink;
131-
EXPECT_CALL(sink, SetCookie("test", std::string{"1.1"}));
113+
EXPECT_CALL(sink, SetCookie(std::string_view{"test"}, std::string{"1.1"}));
132114

133115
using Decimal = decimal64::Decimal<10>;
134-
co::WriteParameter<co::TrivialParameter<co::In::kCookie, kName, std::string, Decimal>>(Decimal{"1.1"}, sink);
116+
co::WriteParameter<co::TrivialParameter<co::In::kCookie, kTest, std::string, Decimal>>(Decimal{"1.1"}, sink);
135117
}
136118

137119
UTEST(OpenapiParameters, TypeBoolean) {
138-
static constexpr co::Name kName{"test"};
139-
140120
ParameterSinkMock sink;
141-
EXPECT_CALL(sink, SetCookie("test", std::string{"true"}));
121+
EXPECT_CALL(sink, SetCookie(std::string_view{"test"}, std::string{"true"}));
142122

143123
bool bool_var = true;
144-
co::WriteParameter<co::TrivialParameter<co::In::kCookie, kName, bool>>(bool_var, sink);
124+
co::WriteParameter<co::TrivialParameter<co::In::kCookie, kTest, bool>>(bool_var, sink);
145125
}
146126

147127
UTEST(OpenapiParameters, TypeDouble) {
148-
static constexpr co::Name kName{"test"};
149-
150128
ParameterSinkMock sink;
151-
EXPECT_CALL(sink, SetCookie("test", std::string{"2.1"}));
129+
EXPECT_CALL(sink, SetCookie(std::string_view{"test"}, std::string{"2.1"}));
152130

153131
double double_var = 2.1;
154-
co::WriteParameter<co::TrivialParameter<co::In::kCookie, kName, double>>(double_var, sink);
132+
co::WriteParameter<co::TrivialParameter<co::In::kCookie, kTest, double>>(double_var, sink);
155133
}
156134

157135
UTEST(OpenapiParameters, TypeInt) {
158-
static constexpr co::Name kName{"test"};
159-
160136
ParameterSinkMock sink;
161-
EXPECT_CALL(sink, SetCookie("test", std::string{"1"}));
137+
EXPECT_CALL(sink, SetCookie(std::string_view{"test"}, std::string{"1"}));
162138
int int_var = 1;
163-
co::WriteParameter<co::TrivialParameter<co::In::kCookie, kName, int>>(int_var, sink);
139+
co::WriteParameter<co::TrivialParameter<co::In::kCookie, kTest, int>>(int_var, sink);
164140
}
165141

142+
static constexpr co::Name kName{
143+
"name",
144+
};
145+
146+
static constexpr co::Name kVar1{
147+
"var1",
148+
};
149+
static constexpr co::Name kVar2{
150+
"var2",
151+
};
152+
166153
UTEST(OpenapiParameters, SinkHttpClient) {
167154
auto http_client_ptr = utest::CreateHttpClient();
168155
auto request = http_client_ptr->CreateRequest();
@@ -182,18 +169,8 @@ UTEST(OpenapiParameters, SinkHttpClient) {
182169
return utest::HttpServerMock::HttpResponse{};
183170
});
184171

185-
static constexpr co::Name kName{
186-
"name",
187-
};
188-
189172
co::ParameterSinkHttpClient sink(request, http_server.GetBaseUrl() + "/{name}");
190173

191-
static constexpr co::Name kVar1{
192-
"var1",
193-
};
194-
static constexpr co::Name kVar2{
195-
"var2",
196-
};
197174
co::WriteParameter<co::ArrayParameter<co::In::kQueryExplode, kVar1, ',', std::string>>(
198175
std::vector<std::string>{"foo", "bar"}, sink
199176
);
@@ -210,15 +187,14 @@ UTEST(OpenapiParameters, SinkHttpClient) {
210187

211188
UTEST(OpenapiParameters, InvalidPathVariable) {
212189
ParameterSinkMock sink;
213-
static constexpr co::Name kName{"test"};
214190

215191
EXPECT_THROW(
216-
(co::WriteParameter<co::TrivialParameter<co::In::kPath, kName, std::string, std::string>>("foo?bar", sink)),
192+
(co::WriteParameter<co::TrivialParameter<co::In::kPath, kTest, std::string, std::string>>("foo?bar", sink)),
217193
std::runtime_error
218194
);
219195

220196
EXPECT_THROW(
221-
(co::WriteParameter<co::TrivialParameter<co::In::kPath, kName, std::string, std::string>>("foo/bar", sink)),
197+
(co::WriteParameter<co::TrivialParameter<co::In::kPath, kTest, std::string, std::string>>("foo/bar", sink)),
222198
std::runtime_error
223199
);
224200
}

0 commit comments

Comments
 (0)