summaryrefslogtreecommitdiff
path: root/tests/test_builder.cpp
diff options
context:
space:
mode:
authorDerek Bailey <derekbailey@google.com>2019-11-07 12:22:54 -0800
committerWouter van Oortmerssen <aardappel@gmail.com>2019-11-07 12:22:54 -0800
commitf0f0efe7b8bb1e32e7ea21b17bdea28835ad81c4 (patch)
treeeb0c5f977400166f7c6f8067d7764d9753aa1ea3 /tests/test_builder.cpp
parente837d5a296c725d141802777808aaff944e7b427 (diff)
downloadflatbuffers-f0f0efe7b8bb1e32e7ea21b17bdea28835ad81c4.tar.gz
flatbuffers-f0f0efe7b8bb1e32e7ea21b17bdea28835ad81c4.tar.bz2
flatbuffers-f0f0efe7b8bb1e32e7ea21b17bdea28835ad81c4.zip
[C++] Refactor to conform to Google C++ style guide (#5608)
* Automatic refractor of C++ headers to Google C++ style guide * Automatic refractor of C++ source to Google C++ style guide * Automatic refractor of C++ tests to Google C++ style guide * Fixed clang-format issues by running clang-format twice to correct itself. Kotlin was missing clang-format on after turning it off, so it was changed,
Diffstat (limited to 'tests/test_builder.cpp')
-rw-r--r--tests/test_builder.cpp82
1 files changed, 47 insertions, 35 deletions
diff --git a/tests/test_builder.cpp b/tests/test_builder.cpp
index 8c070c11..685c643c 100644
--- a/tests/test_builder.cpp
+++ b/tests/test_builder.cpp
@@ -1,7 +1,7 @@
-#include "flatbuffers/stl_emulation.h"
+#include "test_builder.h"
+#include "flatbuffers/stl_emulation.h"
#include "monster_test_generated.h"
-#include "test_builder.h"
using namespace MyGame::Example;
@@ -13,7 +13,7 @@ const Color m2_color = Color_Green;
struct OwnedAllocator : public flatbuffers::DefaultAllocator {};
class TestHeapBuilder : public flatbuffers::FlatBufferBuilder {
-private:
+ private:
// clang-format off
#if !defined(FLATBUFFERS_CPP98_STL)
TestHeapBuilder(const TestHeapBuilder &);
@@ -21,15 +21,15 @@ private:
#endif // !defined(FLATBUFFERS_CPP98_STL)
// clang-format on
-public:
+ public:
TestHeapBuilder()
- : flatbuffers::FlatBufferBuilder(2048, new OwnedAllocator(), true) {}
+ : flatbuffers::FlatBufferBuilder(2048, new OwnedAllocator(), true) {}
// clang-format off
#if !defined(FLATBUFFERS_CPP98_STL)
// clang-format on
TestHeapBuilder(TestHeapBuilder &&other)
- : FlatBufferBuilder(std::move(other)) { }
+ : FlatBufferBuilder(std::move(other)) {}
TestHeapBuilder &operator=(TestHeapBuilder &&other) {
FlatBufferBuilder::operator=(std::move(other));
@@ -47,16 +47,16 @@ struct AllocatorMember {
struct GrpcLikeMessageBuilder : private AllocatorMember,
public flatbuffers::FlatBufferBuilder {
-private:
+ private:
GrpcLikeMessageBuilder(const GrpcLikeMessageBuilder &);
GrpcLikeMessageBuilder &operator=(const GrpcLikeMessageBuilder &);
-public:
+ public:
GrpcLikeMessageBuilder()
- : flatbuffers::FlatBufferBuilder(1024, &member_allocator_, false) {}
+ : flatbuffers::FlatBufferBuilder(1024, &member_allocator_, false) {}
GrpcLikeMessageBuilder(GrpcLikeMessageBuilder &&other)
- : FlatBufferBuilder(1024, &member_allocator_, false) {
+ : FlatBufferBuilder(1024, &member_allocator_, false) {
// Default construct and swap idiom.
Swap(other);
}
@@ -77,53 +77,63 @@ public:
void Swap(GrpcLikeMessageBuilder &other) {
// No need to swap member_allocator_ because it's stateless.
FlatBufferBuilder::Swap(other);
- // After swapping the FlatBufferBuilder, we swap back the allocator, which restores
- // the original allocator back in place. This is necessary because MessageBuilder's
- // allocator is its own member (SliceAllocatorMember). The allocator passed to
- // FlatBufferBuilder::vector_downward must point to this member.
+ // After swapping the FlatBufferBuilder, we swap back the allocator, which
+ // restores the original allocator back in place. This is necessary because
+ // MessageBuilder's allocator is its own member (SliceAllocatorMember). The
+ // allocator passed to FlatBufferBuilder::vector_downward must point to this
+ // member.
buf_.swap_allocator(other.buf_);
}
};
-flatbuffers::Offset<Monster> populate1(flatbuffers::FlatBufferBuilder &builder) {
+flatbuffers::Offset<Monster> populate1(
+ flatbuffers::FlatBufferBuilder &builder) {
auto name_offset = builder.CreateString(m1_name);
return CreateMonster(builder, nullptr, 0, 0, name_offset, 0, m1_color);
}
-flatbuffers::Offset<Monster> populate2(flatbuffers::FlatBufferBuilder &builder) {
+flatbuffers::Offset<Monster> populate2(
+ flatbuffers::FlatBufferBuilder &builder) {
auto name_offset = builder.CreateString(m2_name);
return CreateMonster(builder, nullptr, 0, 0, name_offset, 0, m2_color);
}
-uint8_t *release_raw_base(flatbuffers::FlatBufferBuilder &fbb, size_t &size, size_t &offset) {
+uint8_t *release_raw_base(flatbuffers::FlatBufferBuilder &fbb, size_t &size,
+ size_t &offset) {
return fbb.ReleaseRaw(size, offset);
}
void free_raw(flatbuffers::grpc::MessageBuilder &, uint8_t *) {
- // release_raw_base calls FlatBufferBuilder::ReleaseRaw on the argument MessageBuilder.
- // It's semantically wrong as MessageBuilder has its own ReleaseRaw member function that
- // takes three arguments. In such cases though, ~MessageBuilder() invokes
- // ~SliceAllocator() that takes care of deleting memory as it calls grpc_slice_unref.
- // Obviously, this behavior is very surprising as the pointer returned by
- // FlatBufferBuilder::ReleaseRaw is not valid as soon as MessageBuilder goes out of scope.
- // This problem does not occur with FlatBufferBuilder.
+ // release_raw_base calls FlatBufferBuilder::ReleaseRaw on the argument
+ // MessageBuilder. It's semantically wrong as MessageBuilder has its own
+ // ReleaseRaw member function that takes three arguments. In such cases
+ // though, ~MessageBuilder() invokes ~SliceAllocator() that takes care of
+ // deleting memory as it calls grpc_slice_unref. Obviously, this behavior is
+ // very surprising as the pointer returned by FlatBufferBuilder::ReleaseRaw is
+ // not valid as soon as MessageBuilder goes out of scope. This problem does
+ // not occur with FlatBufferBuilder.
}
void free_raw(flatbuffers::FlatBufferBuilder &, uint8_t *buf) {
flatbuffers::DefaultAllocator().deallocate(buf, 0);
}
-bool verify(const flatbuffers::DetachedBuffer &buf, const std::string &expected_name, Color color) {
+bool verify(const flatbuffers::DetachedBuffer &buf,
+ const std::string &expected_name, Color color) {
const Monster *monster = flatbuffers::GetRoot<Monster>(buf.data());
- return (monster->name()->str() == expected_name) && (monster->color() == color);
+ return (monster->name()->str() == expected_name) &&
+ (monster->color() == color);
}
-bool verify(const uint8_t *buf, size_t offset, const std::string &expected_name, Color color) {
- const Monster *monster = flatbuffers::GetRoot<Monster>(buf+offset);
- return (monster->name()->str() == expected_name) && (monster->color() == color);
+bool verify(const uint8_t *buf, size_t offset, const std::string &expected_name,
+ Color color) {
+ const Monster *monster = flatbuffers::GetRoot<Monster>(buf + offset);
+ return (monster->name()->str() == expected_name) &&
+ (monster->color() == color);
}
-bool release_n_verify(flatbuffers::FlatBufferBuilder &fbb, const std::string &expected_name, Color color) {
+bool release_n_verify(flatbuffers::FlatBufferBuilder &fbb,
+ const std::string &expected_name, Color color) {
flatbuffers::DetachedBuffer buf = fbb.Release();
return verify(buf, expected_name, color);
}
@@ -136,13 +146,15 @@ void FlatBufferBuilderTest() {
BuilderTests<GrpcLikeMessageBuilder>::all_tests();
BuilderReuseTestSelector tests[4] = {
- REUSABLE_AFTER_RELEASE,
- REUSABLE_AFTER_RELEASE_RAW,
+ REUSABLE_AFTER_RELEASE, REUSABLE_AFTER_RELEASE_RAW,
REUSABLE_AFTER_RELEASE_AND_MOVE_ASSIGN,
REUSABLE_AFTER_RELEASE_RAW_AND_MOVE_ASSIGN
};
- BuilderReuseTests<FlatBufferBuilder, FlatBufferBuilder>::run_tests(TestSelector(tests, tests+4));
- BuilderReuseTests<TestHeapBuilder, TestHeapBuilder>::run_tests(TestSelector(tests, tests+4));
- BuilderReuseTests<GrpcLikeMessageBuilder, GrpcLikeMessageBuilder>::run_tests(TestSelector(tests, tests+4));
+ BuilderReuseTests<FlatBufferBuilder, FlatBufferBuilder>::run_tests(
+ TestSelector(tests, tests + 4));
+ BuilderReuseTests<TestHeapBuilder, TestHeapBuilder>::run_tests(
+ TestSelector(tests, tests + 4));
+ BuilderReuseTests<GrpcLikeMessageBuilder, GrpcLikeMessageBuilder>::run_tests(
+ TestSelector(tests, tests + 4));
}