Changed unit testing framework from Google Test to Catch

test/JsonArray/set.cpp

@@ -6,87 +6,83 @@
 // If you like this project, please add a star!
 
 #include <ArduinoJson.h>
-#include <gtest/gtest.h>
+#include <catch.hpp>
 
-class JsonArray_Set_Tests : public ::testing::Test {
- protected:
-  JsonArray_Set_Tests() : _array(_jsonBuffer.createArray()) {
-    _array.add(0);
+using namespace Catch::Matchers;
+
+TEST_CASE("JsonArray::set()") {
+  DynamicJsonBuffer _jsonBuffer;
+  JsonArray& _array = _jsonBuffer.createArray();
+  _array.add(0);
+
+  SECTION("SizeIsUnchanged") {
+    _array.set(0, "hello");
+    REQUIRE(1U == _array.size());
   }
 
-  DynamicJsonBuffer _jsonBuffer;
-  JsonArray& _array;
-};
+  SECTION("StoreInteger") {
+    _array.set(0, 123);
+    REQUIRE(123 == _array[0].as<int>());
+    REQUIRE(_array[0].is<int>());
+    REQUIRE_FALSE(_array[0].is<double>());
+  }
 
-#define TEST_(name) TEST_F(JsonArray_Set_Tests, name)
+  SECTION("StoreDouble") {
+    _array.set(0, 123.45);
+    REQUIRE(123.45 == _array[0].as<double>());
+    REQUIRE(_array[0].is<double>());
+    REQUIRE_FALSE(_array[0].is<int>());
+  }
 
-TEST_(SizeIsUnchanged) {
-  _array.set(0, "hello");
-  EXPECT_EQ(1U, _array.size());
-}
-
-TEST_(StoreInteger) {
-  _array.set(0, 123);
-  EXPECT_EQ(123, _array[0].as<int>());
-  EXPECT_TRUE(_array[0].is<int>());
-  EXPECT_FALSE(_array[0].is<double>());
-}
-
-TEST_(StoreDouble) {
-  _array.set(0, 123.45);
-  EXPECT_EQ(123.45, _array[0].as<double>());
-  EXPECT_TRUE(_array[0].is<double>());
-  EXPECT_FALSE(_array[0].is<int>());
-}
-
-TEST_(StoreBoolean) {
-  _array.set(0, true);
-  EXPECT_EQ(true, _array[0].as<bool>());
-  EXPECT_TRUE(_array[0].is<bool>());
-  EXPECT_FALSE(_array[0].is<int>());
-}
-
-TEST_(StoreString) {
-  _array.set(0, "hello");
-  EXPECT_STREQ("hello", _array[0].as<const char*>());
-  EXPECT_TRUE(_array[0].is<const char*>());
-  EXPECT_FALSE(_array[0].is<int>());
-}
-
-TEST_(StoreNestedArray) {
-  JsonArray& arr = _jsonBuffer.createArray();
-
-  _array.set(0, arr);
-
-  EXPECT_EQ(&arr, &_array[0].as<JsonArray&>());
-  EXPECT_TRUE(_array[0].is<JsonArray&>());
-  EXPECT_FALSE(_array[0].is<int>());
-}
-
-TEST_(StoreNestedObject) {
-  JsonObject& obj = _jsonBuffer.createObject();
-
-  _array.set(0, obj);
-
-  EXPECT_EQ(&obj, &_array[0].as<JsonObject&>());
-  EXPECT_TRUE(_array[0].is<JsonObject&>());
-  EXPECT_FALSE(_array[0].is<int>());
-}
-
-TEST_(StoreArraySubscript) {
-  JsonArray& arr = _jsonBuffer.createArray();
-  arr.add("hello");
-
-  _array.set(0, arr[0]);
-
-  EXPECT_STREQ("hello", _array[0]);
-}
-
-TEST_(StoreObjectSubscript) {
-  JsonObject& obj = _jsonBuffer.createObject();
-  obj["x"] = "hello";
-
-  _array.set(0, obj["x"]);
-
-  EXPECT_STREQ("hello", _array[0]);
+  SECTION("StoreBoolean") {
+    _array.set(0, true);
+    REQUIRE(true == _array[0].as<bool>());
+    REQUIRE(_array[0].is<bool>());
+    REQUIRE_FALSE(_array[0].is<int>());
+  }
+
+  SECTION("StoreString") {
+    _array.set(0, "hello");
+    REQUIRE_THAT(_array[0].as<const char*>(), Equals("hello"));
+    REQUIRE(_array[0].is<const char*>());
+    REQUIRE_FALSE(_array[0].is<int>());
+  }
+
+  SECTION("StoreNestedArray") {
+    JsonArray& arr = _jsonBuffer.createArray();
+
+    _array.set(0, arr);
+
+    REQUIRE(&arr == &_array[0].as<JsonArray&>());
+    REQUIRE(_array[0].is<JsonArray&>());
+    REQUIRE_FALSE(_array[0].is<int>());
+  }
+
+  SECTION("StoreNestedObject") {
+    JsonObject& obj = _jsonBuffer.createObject();
+
+    _array.set(0, obj);
+
+    REQUIRE(&obj == &_array[0].as<JsonObject&>());
+    REQUIRE(_array[0].is<JsonObject&>());
+    REQUIRE_FALSE(_array[0].is<int>());
+  }
+
+  SECTION("StoreArraySubscript") {
+    JsonArray& arr = _jsonBuffer.createArray();
+    arr.add("hello");
+
+    _array.set(0, arr[0]);
+
+    REQUIRE_THAT(_array[0].as<char*>(), Equals("hello"));
+  }
+
+  SECTION("StoreObjectSubscript") {
+    JsonObject& obj = _jsonBuffer.createObject();
+    obj["x"] = "hello";
+
+    _array.set(0, obj["x"]);
+
+    REQUIRE_THAT(_array[0].as<char*>(), Equals("hello"));
+  }
 }