organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Make test code runnable with C++11

Browse source 
Preprocessor token right after string literal without whitespace results
in parse failure in C++11.
This commit is contained in:
Nobuaki Sukegawa 2014-11-30 19:42:51 +09:00
parent 77931993f4
commit 8ba0e35764
3 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/google/protobuf/compiler/command_line_interface_unittest.cc
View file

@ -725,7 +725,7 @@ TEST_F(CommandLineInterfaceTest, ColonDelimitedPath) {
#endif
Run("protocol_compiler --test_out=$tmpdir "
"--proto_path=$tmpdir/a"PATH_SEPARATOR"$tmpdir/b foo.proto");
"--proto_path=$tmpdir/a" PATH_SEPARATOR "$tmpdir/b foo.proto");
#undef PATH_SEPARATOR

56
src/google/protobuf/compiler/parser_unittest.cc
View file

@ -379,35 +379,35 @@ TEST_F(ParseMessageTest, FieldDefaults) {
#define ETC "name:\"foo\" label:LABEL_REQUIRED number:1"
"message_type {"
" name: \"TestMessage\""
" field { type:TYPE_INT32 default_value:\"1\" "ETC" }"
" field { type:TYPE_INT32 default_value:\"-2\" "ETC" }"
" field { type:TYPE_INT64 default_value:\"3\" "ETC" }"
" field { type:TYPE_INT64 default_value:\"-4\" "ETC" }"
" field { type:TYPE_UINT32 default_value:\"5\" "ETC" }"
" field { type:TYPE_UINT64 default_value:\"6\" "ETC" }"
" field { type:TYPE_FLOAT default_value:\"7.5\" "ETC" }"
" field { type:TYPE_FLOAT default_value:\"-8.5\" "ETC" }"
" field { type:TYPE_FLOAT default_value:\"9\" "ETC" }"
" field { type:TYPE_DOUBLE default_value:\"10.5\" "ETC" }"
" field { type:TYPE_DOUBLE default_value:\"-11.5\" "ETC" }"
" field { type:TYPE_DOUBLE default_value:\"12\" "ETC" }"
" field { type:TYPE_DOUBLE default_value:\"inf\" "ETC" }"
" field { type:TYPE_DOUBLE default_value:\"-inf\" "ETC" }"
" field { type:TYPE_DOUBLE default_value:\"nan\" "ETC" }"
" field { type:TYPE_STRING default_value:\"13\\001\" "ETC" }"
" field { type:TYPE_STRING default_value:\"abc\" "ETC" }"
" field { type:TYPE_BYTES default_value:\"14\\\\002\" "ETC" }"
" field { type:TYPE_BYTES default_value:\"abc\" "ETC" }"
" field { type:TYPE_BOOL default_value:\"true\" "ETC" }"
" field { type_name:\"Foo\" default_value:\"FOO\" "ETC" }"
" field { type:TYPE_INT32 default_value:\"1\" " ETC " }"
" field { type:TYPE_INT32 default_value:\"-2\" " ETC " }"
" field { type:TYPE_INT64 default_value:\"3\" " ETC " }"
" field { type:TYPE_INT64 default_value:\"-4\" " ETC " }"
" field { type:TYPE_UINT32 default_value:\"5\" " ETC " }"
" field { type:TYPE_UINT64 default_value:\"6\" " ETC " }"
" field { type:TYPE_FLOAT default_value:\"7.5\" " ETC " }"
" field { type:TYPE_FLOAT default_value:\"-8.5\" " ETC " }"
" field { type:TYPE_FLOAT default_value:\"9\" " ETC " }"
" field { type:TYPE_DOUBLE default_value:\"10.5\" " ETC " }"
" field { type:TYPE_DOUBLE default_value:\"-11.5\" " ETC " }"
" field { type:TYPE_DOUBLE default_value:\"12\" " ETC " }"
" field { type:TYPE_DOUBLE default_value:\"inf\" " ETC " }"
" field { type:TYPE_DOUBLE default_value:\"-inf\" " ETC " }"
" field { type:TYPE_DOUBLE default_value:\"nan\" " ETC " }"
" field { type:TYPE_STRING default_value:\"13\\001\" " ETC " }"
" field { type:TYPE_STRING default_value:\"abc\" " ETC " }"
" field { type:TYPE_BYTES default_value:\"14\\\\002\" " ETC " }"
" field { type:TYPE_BYTES default_value:\"abc\" " ETC " }"
" field { type:TYPE_BOOL default_value:\"true\" " ETC " }"
" field { type_name:\"Foo\" default_value:\"FOO\" " ETC " }"
" field { type:TYPE_INT32 default_value:\"2147483647\" "ETC" }"
" field { type:TYPE_INT32 default_value:\"-2147483648\" "ETC" }"
" field { type:TYPE_UINT32 default_value:\"4294967295\" "ETC" }"
" field { type:TYPE_INT64 default_value:\"9223372036854775807\" "ETC" }"
" field { type:TYPE_INT64 default_value:\"-9223372036854775808\" "ETC" }"
" field { type:TYPE_UINT64 default_value:\"18446744073709551615\" "ETC" }"
" field { type:TYPE_DOUBLE default_value:\"43981\" "ETC" }"
" field { type:TYPE_INT32 default_value:\"2147483647\" " ETC " }"
" field { type:TYPE_INT32 default_value:\"-2147483648\" " ETC " }"
" field { type:TYPE_UINT32 default_value:\"4294967295\" " ETC " }"
" field { type:TYPE_INT64 default_value:\"9223372036854775807\" " ETC " }"
" field { type:TYPE_INT64 default_value:\"-9223372036854775808\" " ETC " }"
" field { type:TYPE_UINT64 default_value:\"18446744073709551615\" " ETC " }"
" field { type:TYPE_DOUBLE default_value:\"43981\" " ETC " }"
"}");
#undef ETC
}

14
src/google/protobuf/stubs/common_unittest.cc
View file

@ -95,9 +95,9 @@ TEST(LoggingTest, DefaultLogging) {
string text = GetCapturedTestStderr();
EXPECT_EQ(
"[libprotobuf INFO "__FILE__":" + SimpleItoa(line + 1) + "] A message.\n"
"[libprotobuf WARNING "__FILE__":" + SimpleItoa(line + 2) + "] A warning.\n"
"[libprotobuf ERROR "__FILE__":" + SimpleItoa(line + 3) + "] An error.\n",
"[libprotobuf INFO " __FILE__ ":" + SimpleItoa(line + 1) + "] A message.\n"
"[libprotobuf WARNING " __FILE__ ":" + SimpleItoa(line + 2) + "] A warning.\n"
"[libprotobuf ERROR " __FILE__ ":" + SimpleItoa(line + 3) + "] An error.\n",
text);
}
@ -128,10 +128,10 @@ TEST(LoggingTest, CaptureLogging) {
ASSERT_EQ(2, captured_messages_.size());
EXPECT_EQ(
"2 "__FILE__":" + SimpleItoa(start_line + 1) + ": An error.",
"2 " __FILE__ ":" + SimpleItoa(start_line + 1) + ": An error.",
captured_messages_[0]);
EXPECT_EQ(
"1 "__FILE__":" + SimpleItoa(start_line + 2) + ": A warning.",
"1 " __FILE__ ":" + SimpleItoa(start_line + 2) + ": A warning.",
captured_messages_[1]);
}
@ -154,10 +154,10 @@ TEST(LoggingTest, SilenceLogging) {
ASSERT_EQ(2, captured_messages_.size());
EXPECT_EQ(
"0 "__FILE__":" + SimpleItoa(line1) + ": Visible1",
"0 " __FILE__ ":" + SimpleItoa(line1) + ": Visible1",
captured_messages_[0]);
EXPECT_EQ(
"0 "__FILE__":" + SimpleItoa(line2) + ": Visible2",
"0 " __FILE__ ":" + SimpleItoa(line2) + ": Visible2",
captured_messages_[1]);
}