feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Refactored string adapters: only one IsString<T> and adaptString()

Browse Source
This commit is contained in:
Benoit Blanchon
2021-07-27 12:06:44 +02:00
parent 4073b52c00
commit 5790f3c8f7
21 changed files with 176 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
extras/tests/Misc/StringAdapters.cpp
View File

@ -2,23 +2,22 @@
// Copyright Benoit Blanchon 2014-2021
// MIT License
#define ARDUINOJSON_ENABLE_PROGMEM 1
#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
#include "custom_string.hpp"
#include "progmem_emulation.hpp"
#include "weird_strcmp.hpp"
#include <ArduinoJson/Strings/ArduinoStringAdapter.hpp>
#include <ArduinoJson/Strings/ConstRamStringAdapter.hpp>
#include <ArduinoJson/Strings/FlashStringAdapter.hpp>
#include <ArduinoJson/Strings/SizedRamStringAdapter.hpp>
#include <ArduinoJson/Strings/StdStringAdapter.hpp>
#include <ArduinoJson/Strings/StringAdapters.hpp>
#include <catch.hpp>
using namespace ARDUINOJSON_NAMESPACE;
TEST_CASE("ConstRamStringAdapter") {
TEST_CASE("const char*") {
SECTION("null") {
ConstRamStringAdapter adapter(NULL);
StringAdapter<const char*> adapter(NULL);
CHECK(adapter.compare("bravo") < 0);
CHECK(adapter.compare(NULL) == 0);
@ -30,7 +29,7 @@ TEST_CASE("ConstRamStringAdapter") {
}
SECTION("non-null") {
ConstRamStringAdapter adapter("bravo");
StringAdapter<const char*> adapter("bravo");
CHECK(adapter.compare(NULL) > 0);
CHECK(adapter.compare("alpha") > 0);
@ -44,9 +43,9 @@ TEST_CASE("ConstRamStringAdapter") {
}
}
TEST_CASE("SizedRamStringAdapter") {
TEST_CASE("const char* + size") {
SECTION("null") {
SizedRamStringAdapter adapter(NULL, 10);
StringAdapter<const char*, true> adapter(NULL, 10);
CHECK(adapter.compare("bravo") < 0);
CHECK(adapter.compare(NULL) == 0);
@ -58,7 +57,7 @@ TEST_CASE("SizedRamStringAdapter") {
}
SECTION("non-null") {
SizedRamStringAdapter adapter("bravo", 5);
StringAdapter<const char*, true> adapter("bravo", 5);
CHECK(adapter.compare(NULL) > 0);
CHECK(adapter.compare("alpha") > 0);
@ -72,9 +71,9 @@ TEST_CASE("SizedRamStringAdapter") {
}
}
TEST_CASE("FlashStringAdapter") {
TEST_CASE("const __FlashStringHelper*") {
SECTION("null") {
FlashStringAdapter adapter(NULL);
StringAdapter<const __FlashStringHelper*> adapter(NULL);
CHECK(adapter.compare("bravo") < 0);
CHECK(adapter.compare(NULL) == 0);
@ -86,7 +85,7 @@ TEST_CASE("FlashStringAdapter") {
}
SECTION("non-null") {
FlashStringAdapter adapter = adaptString(F("bravo"));
StringAdapter<const __FlashStringHelper*> adapter = adaptString(F("bravo"));
CHECK(adapter.compare(NULL) > 0);
CHECK(adapter.compare("alpha") > 0);
@ -102,7 +101,7 @@ TEST_CASE("FlashStringAdapter") {
TEST_CASE("std::string") {
std::string str("bravo");
StdStringAdapter<std::string> adapter = adaptString(str);
StringAdapter<std::string> adapter(str);
CHECK(adapter.compare(NULL) > 0);
CHECK(adapter.compare("alpha") > 0);
@ -117,7 +116,7 @@ TEST_CASE("std::string") {
TEST_CASE("Arduino String") {
::String str("bravo");
ArduinoStringAdapter adapter = adaptString(str);
StringAdapter< ::String> adapter(str);
CHECK(adapter.compare(NULL) > 0);
CHECK(adapter.compare("alpha") > 0);
@ -132,7 +131,7 @@ TEST_CASE("Arduino String") {
TEST_CASE("custom_string") {
custom_string str("bravo");
StdStringAdapter<custom_string> adapter = adaptString(str);
StringAdapter<custom_string> adapter(str);
CHECK(adapter.compare(NULL) > 0);
CHECK(adapter.compare("alpha") > 0);