Converted all StaticJsonBuffer::parseArray() tests

bblanchon · bblanchon · commit b66867d689cf · 2017-07-01T15:53:52.000+02:00
diff --git a/src/ArduinoJson/StaticJsonArray.hpp b/src/ArduinoJson/StaticJsonArray.hpp
@@ -22,8 +22,8 @@ class StaticJsonArray : public JsonArray {
     _buffer.alloc(sizeof(JsonArray));
   }
 
-  StaticJsonBufferBase* buffer() {
-    return &_buffer;
+  StaticJsonBufferBase& buffer() {
+    return _buffer;
   }
 };
 }
diff --git a/src/ArduinoJson/parseJson.hpp b/src/ArduinoJson/parseJson.hpp
@@ -14,7 +14,7 @@ template <typename TDestination, typename TString>
 typename TypeTraits::EnableIf<!TypeTraits::IsArray<TString>::value, bool>::type
 parseJson(TDestination &destination, const TString &json,
           uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
-  return Internals::makeParser(destination.buffer(), json, nestingLimit)
+  return Internals::makeParser(&destination.buffer(), json, nestingLimit)
       .parseArray(destination);
 }
 //
@@ -23,7 +23,7 @@ parseJson(TDestination &destination, const TString &json,
 template <typename TDestination, typename TString>
 bool parseJson(TDestination &destination, TString *json,
                uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
-  return Internals::makeParser(destination.buffer(), json, nestingLimit)
+  return Internals::makeParser(&destination.buffer(), json, nestingLimit)
       .parseArray(destination);
 }
 //
@@ -32,7 +32,7 @@ bool parseJson(TDestination &destination, TString *json,
 template <typename TDestination, typename TString>
 bool parseJson(TDestination &destination, TString &json,
                uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
-  return Internals::makeParser(destination.buffer(), json, nestingLimit)
+  return Internals::makeParser(&destination.buffer(), json, nestingLimit)
       .parseArray(destination);
 }
 }
diff --git a/test/StaticJsonBuffer/parseArray.cpp b/test/StaticJsonBuffer/parseArray.cpp
@@ -8,6 +8,7 @@
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
+// TODO: move
 TEST_CASE("StaticJsonBuffer::parseArray()") {
   SECTION("StaticJsonArray of the right size of 0 elements") {
     StaticJsonArray<JSON_ARRAY_SIZE(0)> arr;
@@ -49,10 +50,10 @@ TEST_CASE("StaticJsonBuffer::parseArray()") {
     REQUIRE(false == parseJson(arr, static_cast<const char*>(0)));
   }
 
-  SECTION("CopyStringNotSpaces") {
-    StaticJsonBuffer<100> jsonBuffer;
-    jsonBuffer.parseArray("  [ \"1234567\" ] ");
-    REQUIRE(JSON_ARRAY_SIZE(1) + sizeof("1234567") == jsonBuffer.size());
+  SECTION("Copy string not spaces") {
+    StaticJsonArray<100> arr;
+    parseJson(arr, "  [ \"1234567\" ] ");
+    REQUIRE(JSON_ARRAY_SIZE(1) + sizeof("1234567") == arr.buffer().size());
     // note we use a string of 8 bytes to be sure that the StaticJsonBuffer
     // will not insert bytes to enforce alignement
   }

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ class StaticJsonArray : public JsonArray {`
`22`	`22`	`_buffer.alloc(sizeof(JsonArray));`
`23`	`23`	`}`
`24`	`24`
`25`		`- StaticJsonBufferBase* buffer() {`
`26`		`- return &_buffer;`
	`25`	`+ StaticJsonBufferBase& buffer() {`
	`26`	`+ return _buffer;`
`27`	`27`	`}`
`28`	`28`	`};`
`29`	`29`	`}`