Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ObjC] Split helpers_unittest in to a helpers and names test.

Browse Source
pull/10720/head
Thomas Van Lenten 2 years ago
parent 0953c1be58
commit 16c9b4691d
4 changed files with 283 additions and 222 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/file_lists.cmake
  2. 12
      src/google/protobuf/compiler/objectivec/BUILD.bazel
  3. 227
      src/google/protobuf/compiler/objectivec/helpers_unittest.cc
  4. 265
      src/google/protobuf/compiler/objectivec/names_unittest.cc

1
src/file_lists.cmake
Unescape View File

@ -681,6 +681,7 @@ set(compiler_test_files
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_serialization_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/plugin_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/helpers_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/names_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/parser_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/plugin_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc

12
src/google/protobuf/compiler/objectivec/BUILD.bazel
Unescape View File

@ -80,12 +80,22 @@ cc_library(
],
)
cc_test(
name = "names_unittest",
srcs = ["names_unittest.cc"],
deps = [
":names",
"//src/google/protobuf/io",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
],
)
cc_test(
name = "helpers_unittest",
srcs = ["helpers_unittest.cc"],
deps = [
":objectivec",
"//src/google/protobuf/io",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
],

227
src/google/protobuf/compiler/objectivec/helpers_unittest.cc
Unescape View File

@ -28,11 +28,13 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "google/protobuf/compiler/objectivec/names.h"
#include "google/protobuf/compiler/objectivec/helpers.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
#include <gtest/gtest.h>
// Must be included last
#include "google/protobuf/port_def.inc"
namespace google {
namespace protobuf {
namespace compiler {
@ -251,227 +253,10 @@ TEST(ObjCHelperDeathTest, TextFormatDecodeData_Failures) {
}
#endif // PROTOBUF_HAS_DEATH_TEST
class TestLineCollector : public LineConsumer {
public:
explicit TestLineCollector(std::vector<std::string>* inout_lines,
const std::string* reject_line = nullptr,
bool skip_msg = false)
: lines_(inout_lines), reject_(reject_line), skip_msg_(skip_msg) {}
bool ConsumeLine(const absl::string_view& line, std::string* out_error) override {
if (reject_ && *reject_ == line) {
if (!skip_msg_) {
*out_error = std::string("Rejected '") + *reject_ + "'";
}
return false;
}
if (lines_) {
lines_->emplace_back(line);
}
return true;
}
private:
std::vector<std::string>* lines_;
const std::string* reject_;
bool skip_msg_;
};
const int kBlockSizes[] = {-1, 1, 2, 5, 64};
const int kBlockSizeCount = ABSL_ARRAYSIZE(kBlockSizes);
TEST(ObjCHelper, ParseSimple_BasicsSuccess) {
const std::vector<std::pair<std::string, std::vector<std::string>>> tests = {
{"", {}},
{"a", {"a"}},
{"a c", {"a c"}},
{" a c ", {"a c"}},
{"\ta c ", {"a c"}},
{"abc\n", {"abc"}},
{"abc\nd f", {"abc", "d f"}},
{"\n abc \n def \n\n", {"abc", "def"}},
};
for (const auto& test : tests) {
for (int i = 0; i < kBlockSizeCount; i++) {
io::ArrayInputStream input(test.first.data(), test.first.size(), kBlockSizes[i]);
std::string err_str;
std::vector<std::string> lines;
TestLineCollector collector(&lines);
EXPECT_TRUE(ParseSimpleStream(input, "dummy", &collector, &err_str));
EXPECT_EQ(lines, test.second);
EXPECT_TRUE(err_str.empty());
}
}
}
TEST(ObjCHelper, ParseSimple_DropsComments) {
const std::vector<std::pair<std::string, std::vector<std::string>>> tests = {
{"# nothing", {}},
{"#", {}},
{"##", {}},
{"\n# nothing\n", {}},
{"a # same line", {"a"}},
{"a # same line\n", {"a"}},
{"a\n# line\nc", {"a", "c"}},
{"# n o t # h i n g #", {}},
{"## n o # t h i n g #", {}},
{"a# n o t # h i n g #", {"a"}},
{"a\n## n o # t h i n g #", {"a"}},
};
for (const auto& test : tests) {
for (int i = 0; i < kBlockSizeCount; i++) {
io::ArrayInputStream input(test.first.data(), test.first.size(), kBlockSizes[i]);
std::string err_str;
std::vector<std::string> lines;
TestLineCollector collector(&lines);
EXPECT_TRUE(ParseSimpleStream(input, "dummy", &collector, &err_str));
EXPECT_EQ(lines, test.second);
EXPECT_TRUE(err_str.empty());
}
}
}
TEST(ObjCHelper, ParseSimple_RejectLines) {
const std::vector<std::tuple<std::string, std::string, int>> tests = {
std::make_tuple("a\nb\nc", "a", 1),
std::make_tuple("a\nb\nc", "b", 2),
std::make_tuple("a\nb\nc", "c", 3),
std::make_tuple("a\nb\nc\n", "c", 3),
};
for (const auto& test : tests) {
for (int i = 0; i < kBlockSizeCount; i++) {
io::ArrayInputStream input(std::get<0>(test).data(), std::get<0>(test).size(),
kBlockSizes[i]);
std::string err_str;
TestLineCollector collector(nullptr, &std::get<1>(test));
EXPECT_FALSE(ParseSimpleStream(input, "dummy", &collector, &err_str));
std::string expected_err =
absl::StrCat("error: dummy Line ", std::get<2>(test), ", Rejected '", std::get<1>(test), "'");
EXPECT_EQ(err_str, expected_err);
}
}
}
TEST(ObjCHelper, ParseSimple_RejectLinesNoMessage) {
const std::vector<std::tuple<std::string, std::string, int>> tests = {
std::make_tuple("a\nb\nc", "a", 1),
std::make_tuple("a\nb\nc", "b", 2),
std::make_tuple("a\nb\nc", "c", 3),
std::make_tuple("a\nb\nc\n", "c", 3),
};
for (const auto& test : tests) {
for (int i = 0; i < kBlockSizeCount; i++) {
io::ArrayInputStream input(std::get<0>(test).data(), std::get<0>(test).size(),
kBlockSizes[i]);
std::string err_str;
TestLineCollector collector(nullptr, &std::get<1>(test), true /* skip msg */);
EXPECT_FALSE(ParseSimpleStream(input, "dummy", &collector, &err_str));
std::string expected_err =
absl::StrCat("error: dummy Line ", std::get<2>(test),
", ConsumeLine failed without setting an error.");
EXPECT_EQ(err_str, expected_err);
}
}
}
TEST(ObjCHelper, IsRetainedName) {
EXPECT_TRUE(IsRetainedName("new"));
EXPECT_TRUE(IsRetainedName("alloc"));
EXPECT_TRUE(IsRetainedName("copy"));
EXPECT_TRUE(IsRetainedName("mutableCopy"));
EXPECT_TRUE(IsRetainedName("newFoo"));
EXPECT_TRUE(IsRetainedName("allocFoo"));
EXPECT_TRUE(IsRetainedName("copyFoo"));
EXPECT_TRUE(IsRetainedName("mutableCopyFoo"));
EXPECT_TRUE(IsRetainedName("new_foo"));
EXPECT_TRUE(IsRetainedName("alloc_foo"));
EXPECT_TRUE(IsRetainedName("copy_foo"));
EXPECT_TRUE(IsRetainedName("mutableCopy_foo"));
EXPECT_FALSE(IsRetainedName(""));
EXPECT_FALSE(IsRetainedName("ne"));
EXPECT_FALSE(IsRetainedName("all"));
EXPECT_FALSE(IsRetainedName("co"));
EXPECT_FALSE(IsRetainedName("mutable"));
EXPECT_FALSE(IsRetainedName("New"));
EXPECT_FALSE(IsRetainedName("Alloc"));
EXPECT_FALSE(IsRetainedName("Copy"));
EXPECT_FALSE(IsRetainedName("MutableCopy"));
EXPECT_FALSE(IsRetainedName("newer"));
EXPECT_FALSE(IsRetainedName("alloced"));
EXPECT_FALSE(IsRetainedName("copying"));
EXPECT_FALSE(IsRetainedName("mutableCopying"));
EXPECT_FALSE(IsRetainedName("init"));
EXPECT_FALSE(IsRetainedName("Create"));
EXPECT_FALSE(IsRetainedName("Copy"));
}
TEST(ObjCHelper, IsInitName) {
EXPECT_TRUE(IsInitName("init"));
EXPECT_TRUE(IsInitName("initFoo"));
EXPECT_TRUE(IsInitName("init_foo"));
EXPECT_FALSE(IsInitName(""));
EXPECT_FALSE(IsInitName("in"));
EXPECT_FALSE(IsInitName("Init"));
EXPECT_FALSE(IsInitName("inIt"));
EXPECT_FALSE(IsInitName("initial"));
EXPECT_FALSE(IsInitName("initiAl"));
EXPECT_FALSE(IsInitName("fooInit"));
EXPECT_FALSE(IsInitName("foo_init"));
EXPECT_FALSE(IsInitName("new"));
EXPECT_FALSE(IsInitName("alloc"));
EXPECT_FALSE(IsInitName("copy"));
EXPECT_FALSE(IsInitName("mutableCopy"));
EXPECT_FALSE(IsInitName("Create"));
EXPECT_FALSE(IsInitName("Copy"));
}
TEST(ObjCHelper, IsCreateName) {
EXPECT_TRUE(IsCreateName("Create"));
EXPECT_TRUE(IsCreateName("Copy"));
EXPECT_TRUE(IsCreateName("CreateFoo"));
EXPECT_TRUE(IsCreateName("CopyFoo"));
EXPECT_TRUE(IsCreateName("Create_foo"));
EXPECT_TRUE(IsCreateName("Copy_foo"));
EXPECT_TRUE(IsCreateName("ReCreate"));
EXPECT_TRUE(IsCreateName("ReCopy"));
EXPECT_TRUE(IsCreateName("FOOCreate"));
EXPECT_TRUE(IsCreateName("FOOCopy"));
EXPECT_TRUE(IsCreateName("CreateWithCopy"));
EXPECT_FALSE(IsCreateName(""));
EXPECT_FALSE(IsCreateName("Crea"));
EXPECT_FALSE(IsCreateName("Co"));
EXPECT_FALSE(IsCreateName("create"));
EXPECT_FALSE(IsCreateName("recreate"));
EXPECT_FALSE(IsCreateName("recopy"));
EXPECT_FALSE(IsCreateName("ReCreated"));
EXPECT_FALSE(IsCreateName("ReCopying"));
EXPECT_FALSE(IsCreateName("init"));
EXPECT_FALSE(IsCreateName("new"));
EXPECT_FALSE(IsCreateName("alloc"));
EXPECT_FALSE(IsCreateName("copy"));
EXPECT_TRUE(IsCreateName("mutableCopy"));
}
// TODO(thomasvl): Should probably add some unittests for all the special cases
// of name mangling (class name, field name, enum names). Rather than doing
// this with an ObjC test in the objectivec directory, we should be able to
// use src/google/protobuf/compiler/importer* (like other tests) to support a
// virtual file system to feed in protos, once we have the Descriptor tree, the
// tests could use the helper methods for generating names and validate the
// right things are happening.
} // namespace
} // namespace objectivec
} // namespace compiler
} // namespace protobuf
} // namespace google
#include "google/protobuf/port_undef.inc"

265
src/google/protobuf/compiler/objectivec/names_unittest.cc
Unescape View File

@ -0,0 +1,265 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2014 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "google/protobuf/compiler/objectivec/names.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
#include <gtest/gtest.h>
namespace google {
namespace protobuf {
namespace compiler {
namespace objectivec {
namespace {
class TestLineCollector : public LineConsumer {
public:
explicit TestLineCollector(std::vector<std::string>* inout_lines,
const std::string* reject_line = nullptr,
bool skip_msg = false)
: lines_(inout_lines), reject_(reject_line), skip_msg_(skip_msg) {}
bool ConsumeLine(const absl::string_view& line, std::string* out_error) override {
if (reject_ && *reject_ == line) {
if (!skip_msg_) {
*out_error = std::string("Rejected '") + *reject_ + "'";
}
return false;
}
if (lines_) {
lines_->emplace_back(line);
}
return true;
}
private:
std::vector<std::string>* lines_;
const std::string* reject_;
bool skip_msg_;
};
const int kBlockSizes[] = {-1, 1, 2, 5, 64};
const int kBlockSizeCount = ABSL_ARRAYSIZE(kBlockSizes);
TEST(ObjCHelper, ParseSimple_BasicsSuccess) {
const std::vector<std::pair<std::string, std::vector<std::string>>> tests = {
{"", {}},
{"a", {"a"}},
{"a c", {"a c"}},
{" a c ", {"a c"}},
{"\ta c ", {"a c"}},
{"abc\n", {"abc"}},
{"abc\nd f", {"abc", "d f"}},
{"\n abc \n def \n\n", {"abc", "def"}},
};
for (const auto& test : tests) {
for (int i = 0; i < kBlockSizeCount; i++) {
io::ArrayInputStream input(test.first.data(), test.first.size(), kBlockSizes[i]);
std::string err_str;
std::vector<std::string> lines;
TestLineCollector collector(&lines);
EXPECT_TRUE(ParseSimpleStream(input, "dummy", &collector, &err_str));
EXPECT_EQ(lines, test.second);
EXPECT_TRUE(err_str.empty());
}
}
}
TEST(ObjCHelper, ParseSimple_DropsComments) {
const std::vector<std::pair<std::string, std::vector<std::string>>> tests = {
{"# nothing", {}},
{"#", {}},
{"##", {}},
{"\n# nothing\n", {}},
{"a # same line", {"a"}},
{"a # same line\n", {"a"}},
{"a\n# line\nc", {"a", "c"}},
{"# n o t # h i n g #", {}},
{"## n o # t h i n g #", {}},
{"a# n o t # h i n g #", {"a"}},
{"a\n## n o # t h i n g #", {"a"}},
};
for (const auto& test : tests) {
for (int i = 0; i < kBlockSizeCount; i++) {
io::ArrayInputStream input(test.first.data(), test.first.size(), kBlockSizes[i]);
std::string err_str;
std::vector<std::string> lines;
TestLineCollector collector(&lines);
EXPECT_TRUE(ParseSimpleStream(input, "dummy", &collector, &err_str));
EXPECT_EQ(lines, test.second);
EXPECT_TRUE(err_str.empty());
}
}
}
TEST(ObjCHelper, ParseSimple_RejectLines) {
const std::vector<std::tuple<std::string, std::string, int>> tests = {
std::make_tuple("a\nb\nc", "a", 1),
std::make_tuple("a\nb\nc", "b", 2),
std::make_tuple("a\nb\nc", "c", 3),
std::make_tuple("a\nb\nc\n", "c", 3),
};
for (const auto& test : tests) {
for (int i = 0; i < kBlockSizeCount; i++) {
io::ArrayInputStream input(std::get<0>(test).data(), std::get<0>(test).size(),
kBlockSizes[i]);
std::string err_str;
TestLineCollector collector(nullptr, &std::get<1>(test));
EXPECT_FALSE(ParseSimpleStream(input, "dummy", &collector, &err_str));
std::string expected_err =
absl::StrCat("error: dummy Line ", std::get<2>(test), ", Rejected '", std::get<1>(test), "'");
EXPECT_EQ(err_str, expected_err);
}
}
}
TEST(ObjCHelper, ParseSimple_RejectLinesNoMessage) {
const std::vector<std::tuple<std::string, std::string, int>> tests = {
std::make_tuple("a\nb\nc", "a", 1),
std::make_tuple("a\nb\nc", "b", 2),
std::make_tuple("a\nb\nc", "c", 3),
std::make_tuple("a\nb\nc\n", "c", 3),
};
for (const auto& test : tests) {
for (int i = 0; i < kBlockSizeCount; i++) {
io::ArrayInputStream input(std::get<0>(test).data(), std::get<0>(test).size(),
kBlockSizes[i]);
std::string err_str;
TestLineCollector collector(nullptr, &std::get<1>(test), true /* skip msg */);
EXPECT_FALSE(ParseSimpleStream(input, "dummy", &collector, &err_str));
std::string expected_err =
absl::StrCat("error: dummy Line ", std::get<2>(test),
", ConsumeLine failed without setting an error.");
EXPECT_EQ(err_str, expected_err);
}
}
}
TEST(ObjCHelper, IsRetainedName) {
EXPECT_TRUE(IsRetainedName("new"));
EXPECT_TRUE(IsRetainedName("alloc"));
EXPECT_TRUE(IsRetainedName("copy"));
EXPECT_TRUE(IsRetainedName("mutableCopy"));
EXPECT_TRUE(IsRetainedName("newFoo"));
EXPECT_TRUE(IsRetainedName("allocFoo"));
EXPECT_TRUE(IsRetainedName("copyFoo"));
EXPECT_TRUE(IsRetainedName("mutableCopyFoo"));
EXPECT_TRUE(IsRetainedName("new_foo"));
EXPECT_TRUE(IsRetainedName("alloc_foo"));
EXPECT_TRUE(IsRetainedName("copy_foo"));
EXPECT_TRUE(IsRetainedName("mutableCopy_foo"));
EXPECT_FALSE(IsRetainedName(""));
EXPECT_FALSE(IsRetainedName("ne"));
EXPECT_FALSE(IsRetainedName("all"));
EXPECT_FALSE(IsRetainedName("co"));
EXPECT_FALSE(IsRetainedName("mutable"));
EXPECT_FALSE(IsRetainedName("New"));
EXPECT_FALSE(IsRetainedName("Alloc"));
EXPECT_FALSE(IsRetainedName("Copy"));
EXPECT_FALSE(IsRetainedName("MutableCopy"));
EXPECT_FALSE(IsRetainedName("newer"));
EXPECT_FALSE(IsRetainedName("alloced"));
EXPECT_FALSE(IsRetainedName("copying"));
EXPECT_FALSE(IsRetainedName("mutableCopying"));
EXPECT_FALSE(IsRetainedName("init"));
EXPECT_FALSE(IsRetainedName("Create"));
EXPECT_FALSE(IsRetainedName("Copy"));
}
TEST(ObjCHelper, IsInitName) {
EXPECT_TRUE(IsInitName("init"));
EXPECT_TRUE(IsInitName("initFoo"));
EXPECT_TRUE(IsInitName("init_foo"));
EXPECT_FALSE(IsInitName(""));
EXPECT_FALSE(IsInitName("in"));
EXPECT_FALSE(IsInitName("Init"));
EXPECT_FALSE(IsInitName("inIt"));
EXPECT_FALSE(IsInitName("initial"));
EXPECT_FALSE(IsInitName("initiAl"));
EXPECT_FALSE(IsInitName("fooInit"));
EXPECT_FALSE(IsInitName("foo_init"));
EXPECT_FALSE(IsInitName("new"));
EXPECT_FALSE(IsInitName("alloc"));
EXPECT_FALSE(IsInitName("copy"));
EXPECT_FALSE(IsInitName("mutableCopy"));
EXPECT_FALSE(IsInitName("Create"));
EXPECT_FALSE(IsInitName("Copy"));
}
TEST(ObjCHelper, IsCreateName) {
EXPECT_TRUE(IsCreateName("Create"));
EXPECT_TRUE(IsCreateName("Copy"));
EXPECT_TRUE(IsCreateName("CreateFoo"));
EXPECT_TRUE(IsCreateName("CopyFoo"));
EXPECT_TRUE(IsCreateName("Create_foo"));
EXPECT_TRUE(IsCreateName("Copy_foo"));
EXPECT_TRUE(IsCreateName("ReCreate"));
EXPECT_TRUE(IsCreateName("ReCopy"));
EXPECT_TRUE(IsCreateName("FOOCreate"));
EXPECT_TRUE(IsCreateName("FOOCopy"));
EXPECT_TRUE(IsCreateName("CreateWithCopy"));
EXPECT_FALSE(IsCreateName(""));
EXPECT_FALSE(IsCreateName("Crea"));
EXPECT_FALSE(IsCreateName("Co"));
EXPECT_FALSE(IsCreateName("create"));
EXPECT_FALSE(IsCreateName("recreate"));
EXPECT_FALSE(IsCreateName("recopy"));
EXPECT_FALSE(IsCreateName("ReCreated"));
EXPECT_FALSE(IsCreateName("ReCopying"));
EXPECT_FALSE(IsCreateName("init"));
EXPECT_FALSE(IsCreateName("new"));
EXPECT_FALSE(IsCreateName("alloc"));
EXPECT_FALSE(IsCreateName("copy"));
EXPECT_TRUE(IsCreateName("mutableCopy"));
}
// TODO(thomasvl): Should probably add some unittests for all the special cases
// of name mangling (class name, field name, enum names). Rather than doing
// this with an ObjC test in the objectivec directory, we should be able to
// use src/google/protobuf/compiler/importer* (like other tests) to support a
// virtual file system to feed in protos, once we have the Descriptor tree, the
// tests could use the helper methods for generating names and validate the
// right things are happening.
} // namespace
} // namespace objectivec
} // namespace compiler
} // namespace protobuf
} // namespace google
Write Preview
Loading…
Cancel
Save