getml · liuzicheng1987 · Apr 22, 2024 · Apr 21, 2024 · Apr 21, 2024 · Apr 21, 2024
diff --git a/.gitignore b/.gitignore
@@ -45,6 +45,7 @@
 *.cbor
 *.json
 *.fb
+*.flexbuf
 *.msgpack
 *.toml
 *.xml

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ option(REFLECTCPP_YAML "Enable YAML support" OFF)
 option(REFLECTCPP_BUILD_TESTS "Build tests" OFF)
 
 set(REFLECTCPP_USE_VCPKG_DEFAULT OFF)
-if (REFLECTCPP_BSON OR REFLECTCPP_CBOR OR REFLECTCPP_FLEXBUFFERS OR REFLECTCPP_MSGPACK OR REFLECTCPP_XML OR REFLECTCPP_TOML OR REFLECTCPP_YAML)
+if (REFLECTCPP_BUILD_TESTS OR REFLECTCPP_BSON OR REFLECTCPP_CBOR OR REFLECTCPP_FLEXBUFFERS OR REFLECTCPP_MSGPACK OR REFLECTCPP_XML OR REFLECTCPP_TOML OR REFLECTCPP_YAML)
     # enable vcpkg per default if require features other than JSON
     set(REFLECTCPP_USE_VCPKG_DEFAULT ON)
 endif()
@@ -85,10 +85,14 @@ endif ()
 target_compile_options(reflectcpp PRIVATE -Wall)
 
 if (REFLECTCPP_BUILD_TESTS)
+    if (MSVC)
+        set(REFLECT_CPP_GTEST_LIB "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    else ()
+        set(REFLECT_CPP_GTEST_LIB "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libgtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    endif ()
     add_subdirectory(tests)
 endif ()
 
-
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 

diff --git a/README.md b/README.md
@@ -530,6 +530,17 @@ vcpkg is a great, but very ambitious and complex project (just like C++ is a gre
 
 ## Compiling and running the tests
 
+reflect-cpp uses vcpkg for dependency management, including
+gtest, which is required for the tests.
+
+```bash
+# bootstrap vcpkg if you haven't done so already 
+git submodule update --init
+./vcpkg/bootstrap-vcpkg.sh # Linux, macOS
+./vcpkg/bootstrap-vcpkg.bat # Windows
+# You may be prompted to install additional dependencies.
+```
+
 ### JSON only
 
 To compile the tests, do the following:
@@ -551,12 +562,6 @@ To run the tests, do the following:
 To compile the tests with serialization formats other than JSON, do the following:
 
 ```bash
-# bootstrap vcpkg if you haven't done so already 
-git submodule update --init
-./vcpkg/bootstrap-vcpkg.sh # Linux, macOS
-./vcpkg/bootstrap-vcpkg.bat # Windows
-# You may be prompted to install additional dependencies.
-
 cmake -S . -B build -DREFLECTCPP_BUILD_TESTS=ON -DREFLECTCPP_BSON=ON -DREFLECTCPP_CBOR=ON -DREFLECTCPP_FLEXBUFFERS=ON -DREFLECTCPP_MSGPACK=ON -DREFLECTCPP_XML=ON -DREFLECTCPP_TOML=ON -DREFLECTCPP_YAML=ON -DCMAKE_BUILD_TYPE=Release
 cmake --build build -j 4 # gcc, clang
 cmake --build build --config Release -j 4 # MSVC

diff --git a/tests/bson/CMakeLists.txt b/tests/bson/CMakeLists.txt
@@ -1,8 +1,18 @@
 project(reflect-cpp-bson-tests)
 
-file(GLOB_RECURSE SOURCES "*.cpp")
+file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "*.cpp")
 
-add_executable(reflect-cpp-bson-tests ${SOURCES})
+add_executable(
+    reflect-cpp-bson-tests 
+    ${SOURCES}
+    "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/src/gtest_main.cc"
+)
 
 target_include_directories(reflect-cpp-bson-tests SYSTEM PRIVATE "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
-target_link_libraries(reflect-cpp-bson-tests PRIVATE reflectcpp)
+
+target_link_libraries(
+    reflect-cpp-bson-tests 
+    PRIVATE 
+    reflectcpp
+    "${REFLECT_CPP_GTEST_LIB}"
+)
diff --git a/tests/bson/test_array.cpp b/tests/bson/test_array.cpp
@@ -1,5 +1,3 @@
-#include "test_array.hpp"
-
 #include <array>
 #include <iostream>
 #include <memory>
@@ -8,7 +6,7 @@
 #include <string>
 
 // Make sure things still compile when
-// rfl.hpp is included after rfl/bson.hpp.
+// rfl.hpp is included after rfl/cbor.hpp.
 #include <rfl.hpp>
 
 #include "write_and_read.hpp"
@@ -21,9 +19,7 @@ struct Person {
   std::unique_ptr<std::array<Person, 3>> children = nullptr;
 };
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_array) {
   auto bart = Person{.first_name = "Bart"};
 
   auto lisa = Person{.first_name = "Lisa"};

diff --git a/tests/bson/test_array.hpp b/tests/bson/test_array.hpp
diff --git a/tests/bson/test_box.cpp b/tests/bson/test_box.cpp
@@ -1,5 +1,3 @@
-#include "test_box.hpp"
-
 #include <cassert>
 #include <iostream>
 #include <rfl.hpp>
@@ -29,9 +27,7 @@ struct DecisionTree {
   rfl::Field<"leafOrNode", LeafOrNode> leaf_or_node;
 };
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_box) {
   auto leaf1 = DecisionTree::Leaf{.value = 3.0};
 
   auto leaf2 = DecisionTree::Leaf{.value = 5.0};

diff --git a/tests/bson/test_box.hpp b/tests/bson/test_box.hpp
diff --git a/tests/bson/test_custom_class1.cpp b/tests/bson/test_custom_class1.cpp
@@ -1,5 +1,3 @@
-#include "test_custom_class1.hpp"
-
 #include <cassert>
 #include <iostream>
 #include <rfl.hpp>
@@ -31,9 +29,7 @@ struct Person {
   PersonImpl impl;
 };
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_custom_class1) {
   const auto bart = Person("Bart");
 
   write_and_read(bart);

diff --git a/tests/bson/test_custom_class1.hpp b/tests/bson/test_custom_class1.hpp
diff --git a/tests/bson/test_custom_class3.cpp b/tests/bson/test_custom_class3.cpp
@@ -1,5 +1,3 @@
-#include "test_custom_class3.hpp"
-
 #include <cassert>
 #include <iostream>
 #include <rfl.hpp>
@@ -56,9 +54,7 @@ struct Parser<ReaderType, WriterType, test_custom_class3::Person>
 
 namespace test_custom_class3 {
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_custom_class3) {
   const auto bart = Person("Bart", "Simpson", 10);
 
   write_and_read(bart);

diff --git a/tests/bson/test_custom_class3.hpp b/tests/bson/test_custom_class3.hpp
diff --git a/tests/bson/test_custom_class4.cpp b/tests/bson/test_custom_class4.cpp
@@ -1,5 +1,3 @@
-#include "test_custom_class4.hpp"
-
 #include <cassert>
 #include <iostream>
 #include <rfl.hpp>
@@ -57,9 +55,7 @@ struct Parser<ReaderType, WriterType, test_custom_class4::Person>
 
 namespace test_custom_class4 {
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_custom_class4) {
   const auto bart = test_custom_class4::Person(
       "Bart", rfl::make_box<std::string>("Simpson"), 10);
 

diff --git a/tests/bson/test_custom_class4.hpp b/tests/bson/test_custom_class4.hpp
diff --git a/tests/bson/test_default_values.cpp b/tests/bson/test_default_values.cpp
@@ -1,5 +1,3 @@
-#include "test_default_values.hpp"
-
 #include <cassert>
 #include <iostream>
 #include <rfl.hpp>
@@ -17,9 +15,7 @@ struct Person {
   std::vector<Person> children;
 };
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_default_values) {
   const auto bart = Person{.first_name = "Bart"};
   const auto lisa = Person{.first_name = "Lisa"};
   const auto maggie = Person{.first_name = "Maggie"};

diff --git a/tests/bson/test_default_values.hpp b/tests/bson/test_default_values.hpp
diff --git a/tests/bson/test_deque.cpp b/tests/bson/test_deque.cpp
@@ -1,5 +1,3 @@
-#include "test_deque.hpp"
-
 #include <iostream>
 #include <rfl.hpp>
 #include <source_location>
@@ -16,9 +14,7 @@ struct Person {
   std::unique_ptr<std::deque<Person>> children;
 };
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_default_values) {
   auto children = std::make_unique<std::deque<Person>>();
   children->emplace_back(Person{.first_name = "Bart"});
   children->emplace_back(Person{.first_name = "Lisa"});

diff --git a/tests/bson/test_deque.hpp b/tests/bson/test_deque.hpp
diff --git a/tests/bson/test_enum.cpp b/tests/bson/test_enum.cpp
@@ -1,5 +1,3 @@
-#include "test_enum.hpp"
-
 #include <cassert>
 #include <iostream>
 #include <rfl.hpp>
@@ -18,9 +16,7 @@ struct Circle {
   Color color;
 };
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_enum) {
   const auto circle = Circle{.radius = 2.0, .color = Color::green};
 
   write_and_read(circle);

diff --git a/tests/bson/test_enum.hpp b/tests/bson/test_enum.hpp
diff --git a/tests/bson/test_field_variant.cpp b/tests/bson/test_field_variant.cpp
@@ -1,5 +1,3 @@
-#include "test_field_variant.hpp"
-
 #include <cassert>
 #include <iostream>
 #include <rfl.hpp>
@@ -28,9 +26,7 @@ using Shapes = rfl::Variant<rfl::Field<"circle", Circle>,
                             rfl::Field<"rectangle", Rectangle>,
                             rfl::Field<"square", rfl::Box<Square>>>;
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_field_variant) {
   const Shapes r =
       rfl::make_field<"rectangle">(Rectangle{.height = 10, .width = 5});
 

diff --git a/tests/bson/test_field_variant.hpp b/tests/bson/test_field_variant.hpp
diff --git a/tests/bson/test_flag_enum.cpp b/tests/bson/test_flag_enum.cpp
@@ -5,7 +5,6 @@
 #include <string>
 #include <vector>
 
-#include "test_enum.hpp"
 #include "write_and_read.hpp"
 
 namespace test_flag_enum {
@@ -27,9 +26,7 @@ struct Circle {
   Color color;
 };
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_flag_enum) {
   const auto circle =
       Circle{.radius = 2.0, .color = Color::blue | Color::orange};
 

diff --git a/tests/bson/test_flag_enum.hpp b/tests/bson/test_flag_enum.hpp
diff --git a/tests/bson/test_flag_enum_with_int.cpp b/tests/bson/test_flag_enum_with_int.cpp
@@ -5,7 +5,6 @@
 #include <string>
 #include <vector>
 
-#include "test_enum.hpp"
 #include "write_and_read.hpp"
 
 namespace test_flag_enum_with_int {
@@ -27,9 +26,7 @@ struct Circle {
   Color color;
 };
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_flag_enum_with_int) {
   const auto circle = Circle{.radius = 2.0, .color = static_cast<Color>(10000)};
 
   write_and_read(circle);

diff --git a/tests/bson/test_flag_enum_with_int.hpp b/tests/bson/test_flag_enum_with_int.hpp
diff --git a/tests/bson/test_flatten.cpp b/tests/bson/test_flatten.cpp
@@ -1,5 +1,3 @@
-#include "test_flatten.hpp"
-
 #include <cassert>
 #include <iostream>
 #include <rfl.hpp>
@@ -23,9 +21,7 @@ struct Employee {
   rfl::Field<"salary", float> salary;
 };
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_flatten) {
   const auto employee = Employee{
       .person = Person{.first_name = "Homer",
                        .last_name = rfl::make_box<std::string>("Simpson"),

diff --git a/tests/bson/test_flatten.hpp b/tests/bson/test_flatten.hpp
diff --git a/tests/bson/test_flatten_anonymous.cpp b/tests/bson/test_flatten_anonymous.cpp
@@ -1,5 +1,3 @@
-#include "test_flatten_anonymous.hpp"
-
 #include <cassert>
 #include <iostream>
 #include <rfl.hpp>
@@ -23,9 +21,7 @@ struct Employee {
   float salary;
 };
 
-void test() {
-  std::cout << std::source_location::current().function_name() << std::endl;
-
+TEST(bson, test_flatten_anonymous) {
   const auto employee = Employee{
       .person = Person{.first_name = "Homer",
                        .last_name = rfl::make_box<std::string>("Simpson"),

diff --git a/tests/bson/test_flatten_anonymous.hpp b/tests/bson/test_flatten_anonymous.hpp