[cjson] Bugfixes and GTest unittest

Author: suluke

constexpr_json/include/constexpr_json/ext/printing.h

@@ -193,6 +193,11 @@ struct PrinterBase {
     constexpr char aDecSep = '.';
     using IntMantissaTy = size_t;
 
+    if (theNumber < 0) {
+      aStream = (aStream << '-');
+      theNumber *= -1.;
+    }
+
     // determine highest power of 10 fitting into theNumber
     IntMantissaTy aPowRadix = 1;
     while (theNumber >= aPowRadix)

constexpr_json/include/constexpr_json/impl/document_access.h

@@ -155,6 +155,10 @@ template <typename DocumentTy> struct EntityRefImpl {
     }
     return false;
   }
+  template <typename OtherRefTy>
+  constexpr bool operator!=(const OtherRefTy &theOther) const noexcept {
+    return !(*this == theOther);
+  }
 
   constexpr Entity::KIND getType() const { return itsEntity->itsKind; }
   constexpr bool toBool() const { return itsEntity->itsPayload; }

constexpr_json/include/constexpr_json/impl/document_allocator.h

@@ -105,7 +105,7 @@ struct DocumentAllocator : private DocumentInfo {
     case Entity::NUL:
       return Entity{Entity::NUL, 0};
     case Entity::BOOL:
-      return Entity{Entity::NUL, theJson.toBool()};
+      return Entity{Entity::BOOL, theJson.toBool()};
     case Entity::NUMBER:
       return allocateNumber(theDoc, theJson.toNumber());
     case Entity::STRING:

constexpr_json/test/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_executable(cjson_basic basic.cc)
-target_link_libraries(cjson_basic PRIVATE constexpr_json)
-add_test(NAME cjson_basic COMMAND cjson_basic)
+target_link_libraries(cjson_basic PRIVATE constexpr_json gtest_main)
+gtest_discover_tests(cjson_basic)
 
 add_executable(cjson_static_unittests static_unittests.cc)
 target_link_libraries(cjson_static_unittests PRIVATE constexpr_json)

constexpr_json/test/basic.cc

@@ -2,27 +2,49 @@
 #include "constexpr_json/dynamic_document.h"
 #include "constexpr_json/static_document.h"
 
-#include <cassert>
+#include <gtest/gtest.h>
 
-int main() {
-  using namespace cjson;
+using namespace cjson;
+
+TEST(cjson_basic, static_doc) {
   constexpr std::string_view aJsonStr{"1234"};
   constexpr auto aDocInfo = DocumentParser<>::computeDocInfo(aJsonStr);
-  if (!aDocInfo)
-    return 1;
+  ASSERT_TRUE(aDocInfo);
   // Static json object creation
   using StaticDocTy = CJSON_STATIC_DOCTY(*aDocInfo);
   constexpr auto aDocStatic =
       DocumentParser<>::parseDocument<StaticDocTy>(aJsonStr, aDocInfo);
   static_assert(aDocStatic);
   static_assert(aDocStatic->getRoot().toNumber() == 1234.);
+}
 
+TEST(cjson_basic, dynamic_doc) {
   // Dynamic json object creation
-  using DynamicDocTy = DynamicDocument;
-  auto aDocDynamic =
-      DocumentParser<>::parseDocument<DynamicDocTy>(aJsonStr, aDocInfo);
-  assert(aDocDynamic);
-  assert(aDocDynamic->getRoot().toNumber() == 1234.);
+  auto aDocDynamic = DynamicDocument::parseJson("1234");
+  ASSERT_TRUE(aDocDynamic);
+  ASSERT_TRUE(*aDocDynamic);
+  EXPECT_EQ((*aDocDynamic)->getRoot().toNumber(), 1234.);
+}
 
-  return 0;
+TEST(cjson_basic, access_equal) {
+  // Dynamic json object creation
+  const std::string_view aJson(R"{"}""{"}(
+    {
+      "a": 1,
+      "b": [123],
+      "c": {
+        "x": true,
+        "y": false,
+        "z": null
+      }
+    }
+  ){"}""{"}");
+  auto aDoc1 = DynamicDocument::parseJson(aJson);
+  auto aDoc2 = DynamicDocument::parseJson(aJson);
+  ASSERT_TRUE(aDoc1 && *aDoc1);
+  ASSERT_TRUE(aDoc2 && *aDoc2);
+  const auto aRoot1 = (*aDoc1)->getRoot();
+  const auto aRoot2 = (*aDoc2)->getRoot();
+  EXPECT_EQ(aRoot1, aRoot2);
+  EXPECT_FALSE(aRoot1 != aRoot2);
 }