Skip to content

Commit fd163f5

Browse files
lizanlizan
authored
Various test fixes (#18)
1 parent 1745812 commit fd163f5

File tree

4 files changed

+31
-33
lines changed

4 files changed

+31
-33
lines changed

‎src/http_template.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,14 +367,14 @@ const char HttpTemplate::kWildCardPathPartKey[] = "*";
367367

368368
const char HttpTemplate::kWildCardPathKey[] = "**";
369369

370-
HttpTemplate *HttpTemplate::Parse(const std::string &ht) {
370+
std::unique_ptr<HttpTemplate> HttpTemplate::Parse(const std::string &ht) {
371371
Parser p(ht);
372372
if (!p.Parse() || !p.ValidateParts()) {
373373
return nullptr;
374374
}
375375

376-
return new HttpTemplate(std::move(p.segments()), std::move(p.verb()),
377-
std::move(p.variables()));
376+
return std::unique_ptr<HttpTemplate>(new HttpTemplate(
377+
std::move(p.segments()), std::move(p.verb()), std::move(p.variables())));
378378
}
379379

380380
} // namespace transcoding

‎src/include/grpc_transcoding/http_template.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#ifndef GRPC_TRANSCODING_HTTP_TEMPLATE_H_
1616
#define GRPC_TRANSCODING_HTTP_TEMPLATE_H_
1717

18+
#include <memory>
1819
#include <string>
1920
#include <vector>
2021

@@ -24,7 +25,7 @@ namespace transcoding {
2425

2526
class HttpTemplate {
2627
public:
27-
static HttpTemplate *Parse(const std::string &ht);
28+
static std::unique_ptr<HttpTemplate> Parse(const std::string &ht);
2829
const std::vector<std::string> &segments() const { return segments_; }
2930
const std::string &verb() const { return verb_; }
3031

‎test/http_template_test.cc

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ std::ostream &operator<<(std::ostream &os, const Variables &vars) {
6262
}
6363

6464
TEST(HttpTemplate, ParseTest1) {
65-
HttpTemplate *ht = HttpTemplate::Parse("/shelves/{shelf}/books/{book}");
65+
auto ht = HttpTemplate::Parse("/shelves/{shelf}/books/{book}");
6666
ASSERT_NE(nullptr, ht);
6767
ASSERT_EQ(Segments({"shelves", "*", "books", "*"}), ht->segments());
6868
ASSERT_EQ(Variables({
@@ -73,55 +73,55 @@ TEST(HttpTemplate, ParseTest1) {
7373
}
7474

7575
TEST(HttpTemplate, ParseTest2) {
76-
HttpTemplate *ht = HttpTemplate::Parse("/shelves/**");
76+
auto ht = HttpTemplate::Parse("/shelves/**");
7777
ASSERT_NE(nullptr, ht);
7878
ASSERT_EQ(Segments({"shelves", "**"}), ht->segments());
7979
ASSERT_EQ("", ht->verb());
8080
ASSERT_EQ(Variables({}), ht->Variables());
8181
}
8282

8383
TEST(HttpTemplate, ParseTest3) {
84-
HttpTemplate *ht = HttpTemplate::Parse("/**");
84+
auto ht = HttpTemplate::Parse("/**");
8585
ASSERT_NE(nullptr, ht);
8686
ASSERT_EQ(Segments({"**"}), ht->segments());
8787
ASSERT_EQ("", ht->verb());
8888
ASSERT_EQ(Variables(), ht->Variables());
8989
}
9090

9191
TEST(HttpTemplate, ParseTest4a) {
92-
HttpTemplate *ht = HttpTemplate::Parse("/a:foo");
92+
auto ht = HttpTemplate::Parse("/a:foo");
9393
ASSERT_NE(nullptr, ht);
9494
ASSERT_EQ(Segments({"a"}), ht->segments());
9595
ASSERT_EQ("foo", ht->verb());
9696
ASSERT_EQ(Variables(), ht->Variables());
9797
}
9898

9999
TEST(HttpTemplate, ParseTest4b) {
100-
HttpTemplate *ht = HttpTemplate::Parse("/a/b/c:foo");
100+
auto ht = HttpTemplate::Parse("/a/b/c:foo");
101101
ASSERT_NE(nullptr, ht);
102102
ASSERT_EQ(Segments({"a", "b", "c"}), ht->segments());
103103
ASSERT_EQ("foo", ht->verb());
104104
ASSERT_EQ(Variables(), ht->Variables());
105105
}
106106

107107
TEST(HttpTemplate, ParseTest5) {
108-
HttpTemplate *ht = HttpTemplate::Parse("/*/**");
108+
auto ht = HttpTemplate::Parse("/*/**");
109109
ASSERT_NE(nullptr, ht);
110110
ASSERT_EQ(Segments({"*", "**"}), ht->segments());
111111
ASSERT_EQ("", ht->verb());
112112
ASSERT_EQ(Variables(), ht->Variables());
113113
}
114114

115115
TEST(HttpTemplate, ParseTest6) {
116-
HttpTemplate *ht = HttpTemplate::Parse("/*/a/**");
116+
auto ht = HttpTemplate::Parse("/*/a/**");
117117
ASSERT_NE(nullptr, ht);
118118
ASSERT_EQ(Segments({"*", "a", "**"}), ht->segments());
119119
ASSERT_EQ("", ht->verb());
120120
ASSERT_EQ(Variables(), ht->Variables());
121121
}
122122

123123
TEST(HttpTemplate, ParseTest7) {
124-
HttpTemplate *ht = HttpTemplate::Parse("/a/{a.b.c}");
124+
auto ht = HttpTemplate::Parse("/a/{a.b.c}");
125125
ASSERT_NE(nullptr, ht);
126126
ASSERT_EQ(Segments({"a", "*"}), ht->segments());
127127
ASSERT_EQ("", ht->verb());
@@ -132,7 +132,7 @@ TEST(HttpTemplate, ParseTest7) {
132132
}
133133

134134
TEST(HttpTemplate, ParseTest8) {
135-
HttpTemplate *ht = HttpTemplate::Parse("/a/{a.b.c=*}");
135+
auto ht = HttpTemplate::Parse("/a/{a.b.c=*}");
136136
ASSERT_NE(nullptr, ht);
137137
ASSERT_EQ(Segments({"a", "*"}), ht->segments());
138138
ASSERT_EQ("", ht->verb());
@@ -143,7 +143,7 @@ TEST(HttpTemplate, ParseTest8) {
143143
}
144144

145145
TEST(HttpTemplate, ParseTest9) {
146-
HttpTemplate *ht = HttpTemplate::Parse("/a/{b=*}");
146+
auto ht = HttpTemplate::Parse("/a/{b=*}");
147147
ASSERT_NE(nullptr, ht);
148148
ASSERT_EQ(Segments({"a", "*"}), ht->segments());
149149
ASSERT_EQ("", ht->verb());
@@ -154,7 +154,7 @@ TEST(HttpTemplate, ParseTest9) {
154154
}
155155

156156
TEST(HttpTemplate, ParseTest10) {
157-
HttpTemplate *ht = HttpTemplate::Parse("/a/{b=**}");
157+
auto ht = HttpTemplate::Parse("/a/{b=**}");
158158
ASSERT_NE(nullptr, ht);
159159
ASSERT_EQ(Segments({"a", "**"}), ht->segments());
160160
ASSERT_EQ("", ht->verb());
@@ -165,7 +165,7 @@ TEST(HttpTemplate, ParseTest10) {
165165
}
166166

167167
TEST(HttpTemplate, ParseTest11) {
168-
HttpTemplate *ht = HttpTemplate::Parse("/a/{b=c/*}");
168+
auto ht = HttpTemplate::Parse("/a/{b=c/*}");
169169
ASSERT_NE(nullptr, ht);
170170
ASSERT_EQ(Segments({"a", "c", "*"}), ht->segments());
171171
ASSERT_EQ("", ht->verb());
@@ -176,7 +176,7 @@ TEST(HttpTemplate, ParseTest11) {
176176
}
177177

178178
TEST(HttpTemplate, ParseTest12) {
179-
HttpTemplate *ht = HttpTemplate::Parse("/a/{b=c/*/d}");
179+
auto ht = HttpTemplate::Parse("/a/{b=c/*/d}");
180180
ASSERT_NE(nullptr, ht);
181181
ASSERT_EQ(Segments({"a", "c", "*", "d"}), ht->segments());
182182
ASSERT_EQ("", ht->verb());
@@ -187,7 +187,7 @@ TEST(HttpTemplate, ParseTest12) {
187187
}
188188

189189
TEST(HttpTemplate, ParseTest13) {
190-
HttpTemplate *ht = HttpTemplate::Parse("/a/{b=c/**}");
190+
auto ht = HttpTemplate::Parse("/a/{b=c/**}");
191191
ASSERT_NE(nullptr, ht);
192192
ASSERT_EQ(Segments({"a", "c", "**"}), ht->segments());
193193
ASSERT_EQ("", ht->verb());
@@ -198,7 +198,7 @@ TEST(HttpTemplate, ParseTest13) {
198198
}
199199

200200
TEST(HttpTemplate, ParseTest14) {
201-
HttpTemplate *ht = HttpTemplate::Parse("/a/{b=c/**}/d/e");
201+
auto ht = HttpTemplate::Parse("/a/{b=c/**}/d/e");
202202
ASSERT_NE(nullptr, ht);
203203
ASSERT_EQ(Segments({"a", "c", "**", "d", "e"}), ht->segments());
204204
ASSERT_EQ("", ht->verb());
@@ -209,7 +209,7 @@ TEST(HttpTemplate, ParseTest14) {
209209
}
210210

211211
TEST(HttpTemplate, ParseTest15) {
212-
HttpTemplate *ht = HttpTemplate::Parse("/a/{b=c/**/d}/e");
212+
auto ht = HttpTemplate::Parse("/a/{b=c/**/d}/e");
213213
ASSERT_NE(nullptr, ht);
214214
ASSERT_EQ(Segments({"a", "c", "**", "d", "e"}), ht->segments());
215215
ASSERT_EQ("", ht->verb());
@@ -220,7 +220,7 @@ TEST(HttpTemplate, ParseTest15) {
220220
}
221221

222222
TEST(HttpTemplate, ParseTest16) {
223-
HttpTemplate *ht = HttpTemplate::Parse("/a/{b=c/**/d}/e:verb");
223+
auto ht = HttpTemplate::Parse("/a/{b=c/**/d}/e:verb");
224224
ASSERT_NE(nullptr, ht);
225225
ASSERT_EQ(Segments({"a", "c", "**", "d", "e"}), ht->segments());
226226
ASSERT_EQ("verb", ht->verb());
@@ -231,9 +231,7 @@ TEST(HttpTemplate, ParseTest16) {
231231
}
232232

233233
TEST(HttpTemplate, CustomVerbTests) {
234-
HttpTemplate *ht;
235-
236-
ht = HttpTemplate::Parse("/*:verb");
234+
auto ht = HttpTemplate::Parse("/*:verb");
237235
ASSERT_EQ(Segments({"*"}), ht->segments());
238236
ASSERT_EQ(Variables(), ht->Variables());
239237

@@ -265,7 +263,7 @@ TEST(HttpTemplate, CustomVerbTests) {
265263
}
266264

267265
TEST(HttpTemplate, MoreVariableTests) {
268-
HttpTemplate *ht = HttpTemplate::Parse("/{x}");
266+
auto ht = HttpTemplate::Parse("/{x}");
269267

270268
ASSERT_NE(nullptr, ht);
271269
ASSERT_EQ(Segments({"*"}), ht->segments());
@@ -357,7 +355,7 @@ TEST(HttpTemplate, MoreVariableTests) {
357355
}
358356

359357
TEST(HttpTemplate, VariableAndCustomVerbTests) {
360-
HttpTemplate *ht = HttpTemplate::Parse("/{x}:verb");
358+
auto ht = HttpTemplate::Parse("/{x}:verb");
361359

362360
ASSERT_NE(nullptr, ht);
363361
ASSERT_EQ(Segments({"*"}), ht->segments());
@@ -482,21 +480,21 @@ TEST(HttpTemplate, ErrorTests) {
482480
}
483481

484482
TEST(HttpTemplate, ParseVerbTest2) {
485-
HttpTemplate *ht = HttpTemplate::Parse("/a/*:verb");
483+
auto ht = HttpTemplate::Parse("/a/*:verb");
486484
ASSERT_NE(nullptr, ht);
487485
ASSERT_EQ(ht->segments(), Segments({"a", "*"}));
488486
ASSERT_EQ("verb", ht->verb());
489487
}
490488

491489
TEST(HttpTemplate, ParseVerbTest3) {
492-
HttpTemplate *ht = HttpTemplate::Parse("/a/**:verb");
490+
auto ht = HttpTemplate::Parse("/a/**:verb");
493491
ASSERT_NE(nullptr, ht);
494492
ASSERT_EQ(ht->segments(), Segments({"a", "**"}));
495493
ASSERT_EQ("verb", ht->verb());
496494
}
497495

498496
TEST(HttpTemplate, ParseVerbTest4) {
499-
HttpTemplate *ht = HttpTemplate::Parse("/a/{b=*}/**:verb");
497+
auto ht = HttpTemplate::Parse("/a/{b=*}/**:verb");
500498
ASSERT_NE(nullptr, ht);
501499
ASSERT_EQ(ht->segments(), Segments({"a", "*", "**"}));
502500
ASSERT_EQ("verb", ht->verb());

‎test/message_stream_test.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ namespace transcoding {
2929
namespace testing {
3030
namespace {
3131

32-
namespace pbio = ::google::protobuf::io;
33-
namespace pbutil = ::google::protobuf::util;
34-
3532
// A test MessageStream implementation for testing ZeroCopyInputStream over
3633
// MessageStream implementation.
3734
class TestMessageStream : public MessageStream {
@@ -55,7 +52,9 @@ class TestMessageStream : public MessageStream {
5552
}
5653
}
5754
bool Finished() const { return messages_.empty() && finished_; }
58-
pbutil::Status Status() const { return pbutil::Status::OK; }
55+
google::protobuf::util::Status Status() const {
56+
return google::protobuf::util::Status::OK;
57+
}
5958

6059
private:
6160
bool finished_;

0 commit comments

Comments
 (0)