Skip to content

Commit 842ea24

Browse files
authored
Merge pull request #7 from lizan/split_test
Split test to another directory
2 parents a55f07e + 578ac30 commit 842ea24

22 files changed

+259
-244
lines changed

src/BUILD

Lines changed: 1 addition & 214 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
#
1717
package(default_visibility = ["//visibility:public"])
1818

19-
load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
20-
2119
cc_library(
2220
name = "prefix_writer",
2321
srcs = [
@@ -162,7 +160,7 @@ cc_library(
162160
"transcoder_input_stream.h",
163161
],
164162
deps = [
165-
"@protobuf_git//:protobuf",
163+
"//external:protobuf",
166164
],
167165
)
168166

@@ -180,67 +178,6 @@ cc_library(
180178
],
181179
)
182180

183-
cc_test(
184-
name = "http_template_test",
185-
size = "small",
186-
srcs = [
187-
"http_template_test.cc",
188-
],
189-
linkstatic = 1,
190-
deps = [
191-
":http_template",
192-
"//external:googletest_main",
193-
],
194-
)
195-
196-
cc_test(
197-
name = "path_matcher_test",
198-
size = "small",
199-
srcs = [
200-
"path_matcher_test.cc",
201-
],
202-
linkstatic = 1,
203-
deps = [
204-
":path_matcher",
205-
"//external:googletest_main",
206-
],
207-
)
208-
209-
cc_test(
210-
name = "prefix_writer_test",
211-
size = "small",
212-
srcs = [
213-
"prefix_writer_test.cc",
214-
],
215-
deps = [
216-
":prefix_writer",
217-
"//external:googletest_main",
218-
],
219-
)
220-
221-
cc_test(
222-
name = "request_weaver_test",
223-
size = "small",
224-
srcs = [
225-
"request_weaver_test.cc",
226-
],
227-
deps = [
228-
":request_weaver",
229-
"//external:googletest_main",
230-
],
231-
)
232-
233-
cc_proto_library(
234-
name = "bookstore_test_proto",
235-
testonly = 1,
236-
srcs = ["bookstore.proto"],
237-
default_runtime = "//external:protobuf",
238-
protoc = "//external:protoc",
239-
deps = [
240-
"//external:cc_wkt_protos",
241-
],
242-
)
243-
244181
cc_library(
245182
name = "type_helper",
246183
srcs = [
@@ -253,153 +190,3 @@ cc_library(
253190
"//external:protobuf",
254191
],
255192
)
256-
257-
cc_test(
258-
name = "type_helper_test",
259-
size = "small",
260-
srcs = [
261-
"type_helper_test.cc",
262-
],
263-
data = [
264-
"testdata/bookstore_service.pb.txt",
265-
],
266-
deps = [
267-
":test_common",
268-
":type_helper",
269-
"//external:googletest_main",
270-
"//external:service_config",
271-
],
272-
)
273-
274-
cc_library(
275-
name = "test_common",
276-
testonly = 1,
277-
srcs = ["test_common.cc"],
278-
hdrs = ["test_common.h"],
279-
deps = [
280-
":transcoder_input_stream",
281-
"//external:googletest",
282-
"//external:protobuf",
283-
"//external:service_config",
284-
],
285-
)
286-
287-
cc_library(
288-
name = "request_translator_test_base",
289-
testonly = 1,
290-
srcs = [
291-
"proto_stream_tester.cc",
292-
"proto_stream_tester.h",
293-
"request_translator_test_base.cc",
294-
],
295-
hdrs = [
296-
"request_translator_test_base.h",
297-
],
298-
deps = [
299-
":bookstore_test_proto",
300-
":request_message_translator",
301-
":test_common",
302-
":type_helper",
303-
"//external:googletest",
304-
"//external:protobuf",
305-
"//external:service_config",
306-
],
307-
)
308-
309-
cc_test(
310-
name = "request_message_translator_test",
311-
size = "small",
312-
srcs = [
313-
"request_message_translator_test.cc",
314-
],
315-
data = [
316-
"testdata/bookstore_service.pb.txt",
317-
],
318-
deps = [
319-
":bookstore_test_proto",
320-
":request_message_translator",
321-
":request_translator_test_base",
322-
":test_common",
323-
"//external:googletest_main",
324-
],
325-
)
326-
327-
cc_test(
328-
name = "request_stream_translator_test",
329-
size = "small",
330-
srcs = [
331-
"request_stream_translator_test.cc",
332-
],
333-
data = [
334-
"testdata/bookstore_service.pb.txt",
335-
],
336-
deps = [
337-
":bookstore_test_proto",
338-
":request_stream_translator",
339-
":request_translator_test_base",
340-
"//external:googletest_main",
341-
],
342-
)
343-
344-
cc_test(
345-
name = "json_request_translator_test",
346-
size = "small",
347-
srcs = [
348-
"json_request_translator_test.cc",
349-
],
350-
data = [
351-
"testdata/bookstore_service.pb.txt",
352-
],
353-
deps = [
354-
":bookstore_test_proto",
355-
":json_request_translator",
356-
":request_translator_test_base",
357-
":test_common",
358-
"//external:googletest_main",
359-
],
360-
)
361-
362-
cc_test(
363-
name = "message_reader_test",
364-
size = "small",
365-
srcs = [
366-
"message_reader_test.cc",
367-
],
368-
deps = [
369-
":message_reader",
370-
":test_common",
371-
"//external:googletest_main",
372-
],
373-
)
374-
375-
cc_test(
376-
name = "response_to_json_translator_test",
377-
size = "small",
378-
srcs = [
379-
"response_to_json_translator_test.cc",
380-
],
381-
data = [
382-
"testdata/bookstore_service.pb.txt",
383-
],
384-
deps = [
385-
":bookstore_test_proto",
386-
":message_reader",
387-
":response_to_json_translator",
388-
":test_common",
389-
":type_helper",
390-
"//external:googletest_main",
391-
],
392-
)
393-
394-
cc_test(
395-
name = "message_stream_test",
396-
size = "small",
397-
srcs = [
398-
"message_stream_test.cc",
399-
],
400-
deps = [
401-
":message_stream",
402-
":test_common",
403-
"//external:googletest_main",
404-
],
405-
)

src/path_matcher.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -473,11 +473,10 @@ void PathMatcherBuilder<Method>::InsertPathToNode(
473473
// This wrapper converts the |http_rule| into a HttpTemplate. Then, inserts the
474474
// template into the trie.
475475
template <class Method>
476-
bool PathMatcherBuilder<Method>::Register(const std::string& http_method,
477-
const std::string& http_template,
478-
const std::string& body_field_path,
479-
const std::set<std::string>& system_query_parameter_names,
480-
Method method) {
476+
bool PathMatcherBuilder<Method>::Register(
477+
const std::string& http_method, const std::string& http_template,
478+
const std::string& body_field_path,
479+
const std::set<std::string>& system_query_parameter_names, Method method) {
481480
std::unique_ptr<HttpTemplate> ht(HttpTemplate::Parse(http_template));
482481
if (nullptr == ht) {
483482
return false;

0 commit comments

Comments
 (0)