From df516837cc2d0f37e9d3fa56537a10a1c171da5a Mon Sep 17 00:00:00 2001 From: Moirtz Wagner Date: Tue, 13 May 2025 19:21:20 +0200 Subject: [PATCH] try to add tahoma functionality--> RAM overflow -->removed Tahome for now --- CAD/UPgehaeuse v37_top.step | 3921 ++++ CAD/UPgehaeuse_front.3mf | Bin 143712 -> 160920 bytes Raumtermostat/.vscode/settings.json | 67 +- Raumtermostat/lib/ArduinoJson/.clang-format | 12 + Raumtermostat/lib/ArduinoJson/.gitattributes | 2 + Raumtermostat/lib/ArduinoJson/.gitignore | 20 + Raumtermostat/lib/ArduinoJson/.mbedignore | 4 + Raumtermostat/lib/ArduinoJson/.prettierignore | 1 + .../lib/ArduinoJson/.vscode/settings.json | 17 + Raumtermostat/lib/ArduinoJson/ArduinoJson.h | 5 + Raumtermostat/lib/ArduinoJson/CHANGELOG.md | 245 + Raumtermostat/lib/ArduinoJson/CMakeLists.txt | 25 + Raumtermostat/lib/ArduinoJson/CONTRIBUTING.md | 10 + Raumtermostat/lib/ArduinoJson/LICENSE.txt | 10 + Raumtermostat/lib/ArduinoJson/README.md | 158 + Raumtermostat/lib/ArduinoJson/SUPPORT.md | 27 + Raumtermostat/lib/ArduinoJson/appveyor.yml | 28 + Raumtermostat/lib/ArduinoJson/component.mk | 1 + .../JsonConfigFile/JsonConfigFile.ino | 152 + .../JsonFilterExample/JsonFilterExample.ino | 64 + .../JsonGeneratorExample.ino | 65 + .../JsonHttpClient/JsonHttpClient.ino | 125 + .../JsonParserExample/JsonParserExample.ino | 65 + .../examples/JsonServer/JsonServer.ino | 118 + .../examples/JsonUdpBeacon/JsonUdpBeacon.ino | 106 + .../examples/MsgPackParser/MsgPackParser.ino | 61 + .../ProgmemExample/ProgmemExample.ino | 63 + .../examples/StringExample/StringExample.ino | 76 + .../extras/ArduinoJsonConfig.cmake.in | 4 + .../ArduinoJson/extras/CompileOptions.cmake | 112 + .../extras/ci/espidf/CMakeLists.txt | 8 + .../extras/ci/espidf/main/CMakeLists.txt | 8 + .../extras/ci/espidf/main/component.mk | 4 + .../extras/ci/espidf/main/main.cpp | 16 + .../lib/ArduinoJson/extras/ci/particle.sh | 10 + .../lib/ArduinoJson/extras/conf_test/avr.cpp | 18 + .../ArduinoJson/extras/conf_test/esp8266.cpp | 16 + .../lib/ArduinoJson/extras/conf_test/x64.cpp | 16 + .../lib/ArduinoJson/extras/conf_test/x86.cpp | 15 + .../ArduinoJson/extras/fuzzing/CMakeLists.txt | 67 + .../lib/ArduinoJson/extras/fuzzing/Makefile | 22 + .../extras/fuzzing/json_corpus/.gitignore | 2 + .../extras/fuzzing/json_fuzzer.cpp | 11 + .../fuzzing/json_seed_corpus/Comments.json | 10 + .../fuzzing/json_seed_corpus/EmptyArray.json | 1 + .../fuzzing/json_seed_corpus/EmptyObject.json | 1 + .../json_seed_corpus/ExcessiveNesting.json | 1 + .../json_seed_corpus/IntegerOverflow.json | 1 + .../fuzzing/json_seed_corpus/Numbers.json | 24 + .../json_seed_corpus/OpenWeatherMap.json | 53 + .../fuzzing/json_seed_corpus/Strings.json | 8 + .../json_seed_corpus/WeatherUnderground.json | 90 + .../extras/fuzzing/msgpack_corpus/.gitignore | 2 + .../extras/fuzzing/msgpack_fuzzer.cpp | 11 + .../fuzzing/msgpack_seed_corpus/array16 | Bin 0 -> 15 bytes .../fuzzing/msgpack_seed_corpus/array32 | Bin 0 -> 15 bytes .../extras/fuzzing/msgpack_seed_corpus/false | 1 + .../fuzzing/msgpack_seed_corpus/fixarray | 1 + .../msgpack_seed_corpus/fixint_negative | 1 + .../msgpack_seed_corpus/fixint_positive | 1 + .../extras/fuzzing/msgpack_seed_corpus/fixmap | 1 + .../extras/fuzzing/msgpack_seed_corpus/fixstr | 1 + .../fuzzing/msgpack_seed_corpus/float32 | 1 + .../fuzzing/msgpack_seed_corpus/float64 | 1 + .../extras/fuzzing/msgpack_seed_corpus/int16 | 1 + .../extras/fuzzing/msgpack_seed_corpus/int32 | 1 + .../extras/fuzzing/msgpack_seed_corpus/int64 | 1 + .../extras/fuzzing/msgpack_seed_corpus/int8 | 1 + .../extras/fuzzing/msgpack_seed_corpus/map16 | Bin 0 -> 19 bytes .../extras/fuzzing/msgpack_seed_corpus/map32 | Bin 0 -> 23 bytes .../extras/fuzzing/msgpack_seed_corpus/nil | 1 + .../extras/fuzzing/msgpack_seed_corpus/str16 | Bin 0 -> 8 bytes .../extras/fuzzing/msgpack_seed_corpus/str32 | Bin 0 -> 10 bytes .../extras/fuzzing/msgpack_seed_corpus/str8 | 1 + .../extras/fuzzing/msgpack_seed_corpus/true | 1 + .../extras/fuzzing/msgpack_seed_corpus/uint16 | 1 + .../extras/fuzzing/msgpack_seed_corpus/uint32 | 1 + .../extras/fuzzing/msgpack_seed_corpus/uint64 | 1 + .../extras/fuzzing/msgpack_seed_corpus/uint8 | 1 + .../ArduinoJson/extras/fuzzing/reproducer.cpp | 50 + .../extras/particle/project.properties | 1 + .../extras/particle/src/smocktest.ino | 5 + .../extras/scripts/build-single-header.sh | 65 + .../extras/scripts/extract_changes.awk | 29 + .../extras/scripts/get-release-page.sh | 18 + .../scripts/publish-particle-library.sh | 18 + .../lib/ArduinoJson/extras/scripts/publish.sh | 87 + .../scripts/wandbox/JsonGeneratorExample.cpp | 42 + .../scripts/wandbox/JsonParserExample.cpp | 43 + .../scripts/wandbox/MsgPackParserExample.cpp | 51 + .../extras/scripts/wandbox/publish.sh | 29 + .../lib/ArduinoJson/extras/tests/.clang-tidy | 1 + .../ArduinoJson/extras/tests/CMakeLists.txt | 36 + .../extras/tests/Cpp17/CMakeLists.txt | 29 + .../extras/tests/Cpp17/string_view.cpp | 113 + .../extras/tests/Cpp20/CMakeLists.txt | 29 + .../extras/tests/Cpp20/smoke_test.cpp | 15 + .../tests/Deprecated/BasicJsonDocument.cpp | 69 + .../extras/tests/Deprecated/CMakeLists.txt | 35 + .../tests/Deprecated/DynamicJsonDocument.cpp | 37 + .../tests/Deprecated/StaticJsonDocument.cpp | 32 + .../extras/tests/Deprecated/add.cpp | 38 + .../extras/tests/Deprecated/containsKey.cpp | 246 + .../tests/Deprecated/createNestedArray.cpp | 113 + .../tests/Deprecated/createNestedObject.cpp | 113 + .../extras/tests/Deprecated/macros.cpp | 18 + .../extras/tests/Deprecated/memoryUsage.cpp | 51 + .../extras/tests/Deprecated/shallowCopy.cpp | 14 + .../extras/tests/FailingBuilds/CMakeLists.txt | 32 + .../extras/tests/FailingBuilds/Issue978.cpp | 13 + .../tests/FailingBuilds/assign_char.cpp | 12 + .../FailingBuilds/deserialize_object.cpp | 12 + .../tests/FailingBuilds/read_long_long.cpp | 16 + .../tests/FailingBuilds/variant_as_char.cpp | 12 + .../tests/FailingBuilds/write_long_long.cpp | 15 + .../extras/tests/Helpers/Allocators.hpp | 288 + .../extras/tests/Helpers/Arduino.h | 13 + .../extras/tests/Helpers/CustomReader.hpp | 24 + .../extras/tests/Helpers/Literals.hpp | 12 + .../extras/tests/Helpers/api/Print.h | 33 + .../extras/tests/Helpers/api/Stream.h | 14 + .../extras/tests/Helpers/api/String.h | 75 + .../extras/tests/Helpers/avr/pgmspace.h | 31 + .../tests/IntegrationTests/CMakeLists.txt | 24 + .../tests/IntegrationTests/gbathree.cpp | 210 + .../tests/IntegrationTests/issue772.cpp | 28 + .../tests/IntegrationTests/openweathermap.cpp | 68 + .../tests/IntegrationTests/round_trip.cpp | 82 + .../extras/tests/JsonArray/CMakeLists.txt | 25 + .../extras/tests/JsonArray/add.cpp | 262 + .../extras/tests/JsonArray/clear.cpp | 46 + .../extras/tests/JsonArray/compare.cpp | 512 + .../extras/tests/JsonArray/copyArray.cpp | 335 + .../extras/tests/JsonArray/equals.cpp | 63 + .../extras/tests/JsonArray/isNull.cpp | 32 + .../extras/tests/JsonArray/iterator.cpp | 34 + .../extras/tests/JsonArray/nesting.cpp | 35 + .../extras/tests/JsonArray/remove.cpp | 126 + .../extras/tests/JsonArray/size.cpp | 31 + .../extras/tests/JsonArray/subscript.cpp | 171 + .../extras/tests/JsonArray/unbound.cpp | 27 + .../tests/JsonArrayConst/CMakeLists.txt | 19 + .../extras/tests/JsonArrayConst/equals.cpp | 63 + .../extras/tests/JsonArrayConst/isNull.cpp | 32 + .../extras/tests/JsonArrayConst/iterator.cpp | 34 + .../extras/tests/JsonArrayConst/nesting.cpp | 35 + .../extras/tests/JsonArrayConst/size.cpp | 27 + .../extras/tests/JsonArrayConst/subscript.cpp | 27 + .../tests/JsonDeserializer/CMakeLists.txt | 26 + .../JsonDeserializer/DeserializationError.cpp | 122 + .../extras/tests/JsonDeserializer/array.cpp | 337 + .../JsonDeserializer/destination_types.cpp | 109 + .../extras/tests/JsonDeserializer/errors.cpp | 162 + .../extras/tests/JsonDeserializer/filter.cpp | 831 + .../tests/JsonDeserializer/input_types.cpp | 232 + .../extras/tests/JsonDeserializer/misc.cpp | 49 + .../tests/JsonDeserializer/nestingLimit.cpp | 105 + .../extras/tests/JsonDeserializer/number.cpp | 133 + .../extras/tests/JsonDeserializer/object.cpp | 400 + .../extras/tests/JsonDeserializer/string.cpp | 214 + .../extras/tests/JsonDocument/CMakeLists.txt | 31 + .../tests/JsonDocument/ElementProxy.cpp | 297 + .../extras/tests/JsonDocument/MemberProxy.cpp | 432 + .../extras/tests/JsonDocument/add.cpp | 176 + .../extras/tests/JsonDocument/assignment.cpp | 135 + .../extras/tests/JsonDocument/cast.cpp | 18 + .../extras/tests/JsonDocument/clear.cpp | 48 + .../extras/tests/JsonDocument/compare.cpp | 29 + .../extras/tests/JsonDocument/constructor.cpp | 148 + .../extras/tests/JsonDocument/isNull.cpp | 39 + .../extras/tests/JsonDocument/issue1120.cpp | 52 + .../extras/tests/JsonDocument/nesting.cpp | 30 + .../extras/tests/JsonDocument/overflowed.cpp | 96 + .../extras/tests/JsonDocument/remove.cpp | 85 + .../extras/tests/JsonDocument/set.cpp | 104 + .../extras/tests/JsonDocument/shrinkToFit.cpp | 184 + .../extras/tests/JsonDocument/size.cpp | 28 + .../extras/tests/JsonDocument/subscript.cpp | 167 + .../extras/tests/JsonDocument/swap.cpp | 25 + .../extras/tests/JsonObject/CMakeLists.txt | 25 + .../extras/tests/JsonObject/clear.cpp | 25 + .../extras/tests/JsonObject/compare.cpp | 512 + .../extras/tests/JsonObject/equals.cpp | 59 + .../extras/tests/JsonObject/isNull.cpp | 32 + .../extras/tests/JsonObject/iterator.cpp | 36 + .../extras/tests/JsonObject/nesting.cpp | 35 + .../extras/tests/JsonObject/remove.cpp | 89 + .../extras/tests/JsonObject/set.cpp | 142 + .../extras/tests/JsonObject/size.cpp | 39 + .../extras/tests/JsonObject/std_string.cpp | 61 + .../extras/tests/JsonObject/subscript.cpp | 267 + .../extras/tests/JsonObject/unbound.cpp | 27 + .../tests/JsonObjectConst/CMakeLists.txt | 19 + .../extras/tests/JsonObjectConst/equals.cpp | 65 + .../extras/tests/JsonObjectConst/isNull.cpp | 32 + .../extras/tests/JsonObjectConst/iterator.cpp | 39 + .../extras/tests/JsonObjectConst/nesting.cpp | 35 + .../extras/tests/JsonObjectConst/size.cpp | 22 + .../tests/JsonObjectConst/subscript.cpp | 46 + .../tests/JsonSerializer/CMakeLists.txt | 22 + .../tests/JsonSerializer/CustomWriter.cpp | 51 + .../extras/tests/JsonSerializer/JsonArray.cpp | 105 + .../tests/JsonSerializer/JsonArrayPretty.cpp | 75 + .../tests/JsonSerializer/JsonObject.cpp | 119 + .../tests/JsonSerializer/JsonObjectPretty.cpp | 77 + .../tests/JsonSerializer/JsonVariant.cpp | 132 + .../extras/tests/JsonSerializer/misc.cpp | 36 + .../tests/JsonSerializer/std_stream.cpp | 66 + .../tests/JsonSerializer/std_string.cpp | 58 + .../extras/tests/JsonVariant/CMakeLists.txt | 33 + .../extras/tests/JsonVariant/add.cpp | 128 + .../extras/tests/JsonVariant/as.cpp | 327 + .../extras/tests/JsonVariant/clear.cpp | 40 + .../extras/tests/JsonVariant/compare.cpp | 352 + .../extras/tests/JsonVariant/converters.cpp | 142 + .../extras/tests/JsonVariant/copy.cpp | 142 + .../extras/tests/JsonVariant/is.cpp | 164 + .../extras/tests/JsonVariant/isnull.cpp | 72 + .../extras/tests/JsonVariant/misc.cpp | 60 + .../extras/tests/JsonVariant/nesting.cpp | 31 + .../extras/tests/JsonVariant/nullptr.cpp | 43 + .../extras/tests/JsonVariant/or.cpp | 159 + .../extras/tests/JsonVariant/overflow.cpp | 72 + .../extras/tests/JsonVariant/remove.cpp | 128 + .../extras/tests/JsonVariant/set.cpp | 407 + .../extras/tests/JsonVariant/size.cpp | 36 + .../tests/JsonVariant/stl_containers.cpp | 138 + .../extras/tests/JsonVariant/subscript.cpp | 159 + .../extras/tests/JsonVariant/types.cpp | 168 + .../extras/tests/JsonVariant/unbound.cpp | 80 + .../tests/JsonVariantConst/CMakeLists.txt | 19 + .../extras/tests/JsonVariantConst/as.cpp | 42 + .../extras/tests/JsonVariantConst/is.cpp | 162 + .../extras/tests/JsonVariantConst/isnull.cpp | 21 + .../extras/tests/JsonVariantConst/nesting.cpp | 31 + .../extras/tests/JsonVariantConst/size.cpp | 36 + .../tests/JsonVariantConst/subscript.cpp | 104 + .../extras/tests/Misc/CMakeLists.txt | 31 + .../extras/tests/Misc/JsonString.cpp | 103 + .../extras/tests/Misc/NoArduinoHeader.cpp | 20 + .../ArduinoJson/extras/tests/Misc/Readers.cpp | 227 + .../extras/tests/Misc/StringAdapters.cpp | 226 + .../extras/tests/Misc/StringWriter.cpp | 157 + .../extras/tests/Misc/TypeTraits.cpp | 236 + .../ArduinoJson/extras/tests/Misc/Utf16.cpp | 68 + .../ArduinoJson/extras/tests/Misc/Utf8.cpp | 59 + .../extras/tests/Misc/arithmeticCompare.cpp | 97 + .../extras/tests/Misc/conflicts.cpp | 67 + .../extras/tests/Misc/custom_string.hpp | 11 + .../extras/tests/Misc/issue1967.cpp | 13 + .../extras/tests/Misc/issue2129.cpp | 55 + .../extras/tests/Misc/issue2166.cpp | 22 + .../extras/tests/Misc/printable.cpp | 192 + .../extras/tests/Misc/unsigned_char.cpp | 248 + .../ArduinoJson/extras/tests/Misc/version.cpp | 18 + .../extras/tests/Misc/weird_strcmp.hpp | 31 + .../tests/MixedConfiguration/CMakeLists.txt | 34 + .../MixedConfiguration/decode_unicode_0.cpp | 12 + .../MixedConfiguration/decode_unicode_1.cpp | 11 + .../MixedConfiguration/enable_alignment_0.cpp | 41 + .../MixedConfiguration/enable_alignment_1.cpp | 40 + .../MixedConfiguration/enable_comments_0.cpp | 54 + .../MixedConfiguration/enable_comments_1.cpp | 411 + .../MixedConfiguration/enable_infinity_0.cpp | 35 + .../MixedConfiguration/enable_infinity_1.cpp | 39 + .../tests/MixedConfiguration/enable_nan_0.cpp | 25 + .../tests/MixedConfiguration/enable_nan_1.cpp | 31 + .../MixedConfiguration/enable_progmem_1.cpp | 191 + .../tests/MixedConfiguration/issue1707.cpp | 17 + .../string_length_size_1.cpp | 131 + .../string_length_size_2.cpp | 140 + .../string_length_size_4.cpp | 146 + .../tests/MixedConfiguration/use_double_0.cpp | 67 + .../tests/MixedConfiguration/use_double_1.cpp | 17 + .../MixedConfiguration/use_long_long_0.cpp | 38 + .../MixedConfiguration/use_long_long_1.cpp | 17 + .../tests/MsgPackDeserializer/CMakeLists.txt | 22 + .../MsgPackDeserializer/deserializeArray.cpp | 104 + .../MsgPackDeserializer/deserializeObject.cpp | 130 + .../deserializeVariant.cpp | 395 + .../MsgPackDeserializer/destination_types.cpp | 109 + .../MsgPackDeserializer/doubleToFloat.cpp | 25 + .../tests/MsgPackDeserializer/errors.cpp | 242 + .../tests/MsgPackDeserializer/filter.cpp | 1628 ++ .../tests/MsgPackDeserializer/input_types.cpp | 96 + .../MsgPackDeserializer/nestingLimit.cpp | 87 + .../tests/MsgPackSerializer/CMakeLists.txt | 19 + .../MsgPackSerializer/destination_types.cpp | 59 + .../tests/MsgPackSerializer/measure.cpp | 14 + .../extras/tests/MsgPackSerializer/misc.cpp | 46 + .../MsgPackSerializer/serializeArray.cpp | 64 + .../MsgPackSerializer/serializeObject.cpp | 85 + .../MsgPackSerializer/serializeVariant.cpp | 214 + .../extras/tests/Numbers/CMakeLists.txt | 19 + .../extras/tests/Numbers/convertNumber.cpp | 131 + .../extras/tests/Numbers/decomposeFloat.cpp | 42 + .../extras/tests/Numbers/parseDouble.cpp | 96 + .../extras/tests/Numbers/parseFloat.cpp | 87 + .../extras/tests/Numbers/parseInteger.cpp | 68 + .../extras/tests/Numbers/parseNumber.cpp | 63 + .../tests/ResourceManager/CMakeLists.txt | 26 + .../tests/ResourceManager/StringBuffer.cpp | 50 + .../tests/ResourceManager/StringBuilder.cpp | 184 + .../tests/ResourceManager/allocVariant.cpp | 92 + .../extras/tests/ResourceManager/clear.cpp | 30 + .../tests/ResourceManager/saveString.cpp | 70 + .../tests/ResourceManager/shrinkToFit.cpp | 57 + .../extras/tests/ResourceManager/size.cpp | 31 + .../extras/tests/ResourceManager/swap.cpp | 96 + .../extras/tests/TextFormatter/CMakeLists.txt | 18 + .../extras/tests/TextFormatter/writeFloat.cpp | 119 + .../tests/TextFormatter/writeInteger.cpp | 55 + .../tests/TextFormatter/writeString.cpp | 57 + .../extras/tests/catch/.clang-format | 2 + .../extras/tests/catch/CMakeLists.txt | 21 + .../ArduinoJson/extras/tests/catch/catch.cpp | 6 + .../ArduinoJson/extras/tests/catch/catch.hpp | 17976 ++++++++++++++++ .../lib/ArduinoJson/idf_component.yml | 13 + Raumtermostat/lib/ArduinoJson/keywords.txt | 32 + Raumtermostat/lib/ArduinoJson/library.json | 23 + .../lib/ArduinoJson/library.properties | 11 + .../lib/ArduinoJson/src/ArduinoJson.h | 17 + .../lib/ArduinoJson/src/ArduinoJson.hpp | 56 + .../src/ArduinoJson/Array/ArrayData.hpp | 66 + .../src/ArduinoJson/Array/ArrayImpl.hpp | 79 + .../src/ArduinoJson/Array/ElementProxy.hpp | 75 + .../src/ArduinoJson/Array/JsonArray.hpp | 219 + .../src/ArduinoJson/Array/JsonArrayConst.hpp | 133 + .../ArduinoJson/Array/JsonArrayIterator.hpp | 96 + .../src/ArduinoJson/Array/Utilities.hpp | 112 + .../ArduinoJson/Collection/CollectionData.hpp | 122 + .../ArduinoJson/Collection/CollectionImpl.hpp | 137 + .../src/ArduinoJson/Configuration.hpp | 285 + .../Deserialization/DeserializationError.hpp | 106 + .../DeserializationOptions.hpp | 35 + .../ArduinoJson/Deserialization/Filter.hpp | 77 + .../Deserialization/NestingLimit.hpp | 32 + .../ArduinoJson/Deserialization/Reader.hpp | 74 + .../Readers/ArduinoStreamReader.hpp | 30 + .../Readers/ArduinoStringReader.hpp | 18 + .../Deserialization/Readers/FlashReader.hpp | 56 + .../Readers/IteratorReader.hpp | 42 + .../Deserialization/Readers/RamReader.hpp | 49 + .../Readers/StdStreamReader.hpp | 29 + .../Deserialization/Readers/VariantReader.hpp | 19 + .../Deserialization/deserialize.hpp | 79 + .../src/ArduinoJson/Document/JsonDocument.hpp | 426 + .../src/ArduinoJson/Json/EscapeSequence.hpp | 40 + .../src/ArduinoJson/Json/JsonDeserializer.hpp | 720 + .../src/ArduinoJson/Json/JsonSerializer.hpp | 165 + .../src/ArduinoJson/Json/Latch.hpp | 56 + .../ArduinoJson/Json/PrettyJsonSerializer.hpp | 110 + .../src/ArduinoJson/Json/TextFormatter.hpp | 177 + .../src/ArduinoJson/Json/Utf16.hpp | 67 + .../ArduinoJson/src/ArduinoJson/Json/Utf8.hpp | 46 + .../src/ArduinoJson/Memory/Alignment.hpp | 60 + .../src/ArduinoJson/Memory/Allocator.hpp | 49 + .../src/ArduinoJson/Memory/MemoryPool.hpp | 110 + .../src/ArduinoJson/Memory/MemoryPoolList.hpp | 214 + .../ArduinoJson/Memory/ResourceManager.hpp | 131 + .../Memory/ResourceManagerImpl.hpp | 52 + .../src/ArduinoJson/Memory/StringBuffer.hpp | 79 + .../src/ArduinoJson/Memory/StringBuilder.hpp | 88 + .../src/ArduinoJson/Memory/StringNode.hpp | 75 + .../src/ArduinoJson/Memory/StringPool.hpp | 102 + .../src/ArduinoJson/Misc/SerializedValue.hpp | 71 + .../src/ArduinoJson/MsgPack/MsgPackBinary.hpp | 97 + .../MsgPack/MsgPackDeserializer.hpp | 487 + .../ArduinoJson/MsgPack/MsgPackExtension.hpp | 120 + .../ArduinoJson/MsgPack/MsgPackSerializer.hpp | 244 + .../src/ArduinoJson/MsgPack/endianness.hpp | 46 + .../src/ArduinoJson/MsgPack/ieee754.hpp | 18 + .../ArduinoJson/src/ArduinoJson/Namespace.hpp | 42 + .../src/ArduinoJson/Numbers/FloatParts.hpp | 95 + .../src/ArduinoJson/Numbers/FloatTraits.hpp | 212 + .../src/ArduinoJson/Numbers/JsonFloat.hpp | 18 + .../src/ArduinoJson/Numbers/JsonInteger.hpp | 28 + .../ArduinoJson/Numbers/arithmeticCompare.hpp | 116 + .../src/ArduinoJson/Numbers/convertNumber.hpp | 145 + .../src/ArduinoJson/Numbers/parseNumber.hpp | 238 + .../src/ArduinoJson/Object/JsonObject.hpp | 245 + .../ArduinoJson/Object/JsonObjectConst.hpp | 166 + .../ArduinoJson/Object/JsonObjectIterator.hpp | 83 + .../src/ArduinoJson/Object/JsonPair.hpp | 70 + .../src/ArduinoJson/Object/MemberProxy.hpp | 77 + .../src/ArduinoJson/Object/ObjectData.hpp | 70 + .../src/ArduinoJson/Object/ObjectImpl.hpp | 92 + .../src/ArduinoJson/Polyfills/alias_cast.hpp | 30 + .../src/ArduinoJson/Polyfills/assert.hpp | 14 + .../src/ArduinoJson/Polyfills/attributes.hpp | 45 + .../src/ArduinoJson/Polyfills/ctype.hpp | 21 + .../src/ArduinoJson/Polyfills/integer.hpp | 34 + .../src/ArduinoJson/Polyfills/limits.hpp | 45 + .../src/ArduinoJson/Polyfills/math.hpp | 27 + .../src/ArduinoJson/Polyfills/mpl/max.hpp | 27 + .../src/ArduinoJson/Polyfills/pgmspace.hpp | 144 + .../Polyfills/pgmspace_generic.hpp | 67 + .../ArduinoJson/Polyfills/preprocessor.hpp | 33 + .../src/ArduinoJson/Polyfills/type_traits.hpp | 27 + .../Polyfills/type_traits/conditional.hpp | 25 + .../Polyfills/type_traits/decay.hpp | 33 + .../Polyfills/type_traits/declval.hpp | 14 + .../Polyfills/type_traits/enable_if.hpp | 23 + .../Polyfills/type_traits/function_traits.hpp | 27 + .../type_traits/integral_constant.hpp | 22 + .../Polyfills/type_traits/is_array.hpp | 22 + .../Polyfills/type_traits/is_base_of.hpp | 27 + .../Polyfills/type_traits/is_class.hpp | 23 + .../Polyfills/type_traits/is_const.hpp | 18 + .../Polyfills/type_traits/is_convertible.hpp | 46 + .../Polyfills/type_traits/is_enum.hpp | 22 + .../type_traits/is_floating_point.hpp | 19 + .../Polyfills/type_traits/is_integral.hpp | 32 + .../Polyfills/type_traits/is_pointer.hpp | 17 + .../Polyfills/type_traits/is_same.hpp | 18 + .../Polyfills/type_traits/is_signed.hpp | 26 + .../Polyfills/type_traits/is_unsigned.hpp | 24 + .../Polyfills/type_traits/make_unsigned.hpp | 44 + .../Polyfills/type_traits/remove_const.hpp | 24 + .../Polyfills/type_traits/remove_cv.hpp | 31 + .../type_traits/remove_reference.hpp | 24 + .../Polyfills/type_traits/type_identity.hpp | 16 + .../Polyfills/type_traits/void_t.hpp | 20 + .../src/ArduinoJson/Polyfills/utility.hpp | 33 + .../Serialization/CountingDecorator.hpp | 33 + .../src/ArduinoJson/Serialization/Writer.hpp | 47 + .../Writers/ArduinoStringWriter.hpp | 55 + .../Serialization/Writers/DummyWriter.hpp | 22 + .../Serialization/Writers/PrintWriter.hpp | 29 + .../Writers/StaticStringWriter.hpp | 36 + .../Serialization/Writers/StdStreamWriter.hpp | 32 + .../Serialization/Writers/StdStringWriter.hpp | 42 + .../src/ArduinoJson/Serialization/measure.hpp | 20 + .../ArduinoJson/Serialization/serialize.hpp | 50 + .../Strings/Adapters/FlashString.hpp | 93 + .../Strings/Adapters/RamString.hpp | 118 + .../Strings/Adapters/StringObject.hpp | 48 + .../src/ArduinoJson/Strings/IsString.hpp | 19 + .../src/ArduinoJson/Strings/JsonString.hpp | 100 + .../src/ArduinoJson/Strings/StringAdapter.hpp | 47 + .../ArduinoJson/Strings/StringAdapters.hpp | 72 + .../src/ArduinoJson/Strings/StringTraits.hpp | 73 + .../src/ArduinoJson/Variant/Converter.hpp | 23 + .../src/ArduinoJson/Variant/ConverterImpl.hpp | 406 + .../src/ArduinoJson/Variant/JsonVariant.hpp | 78 + .../ArduinoJson/Variant/JsonVariantConst.hpp | 197 + .../ArduinoJson/Variant/JsonVariantCopier.hpp | 34 + .../Variant/JsonVariantVisitor.hpp | 61 + .../ArduinoJson/Variant/VariantAttorney.hpp | 35 + .../ArduinoJson/Variant/VariantCompare.hpp | 211 + .../ArduinoJson/Variant/VariantContent.hpp | 82 + .../src/ArduinoJson/Variant/VariantData.hpp | 601 + .../Variant/VariantDataVisitor.hpp | 24 + .../src/ArduinoJson/Variant/VariantImpl.hpp | 146 + .../ArduinoJson/Variant/VariantOperators.hpp | 188 + .../ArduinoJson/Variant/VariantRefBase.hpp | 313 + .../Variant/VariantRefBaseImpl.hpp | 175 + .../src/ArduinoJson/Variant/VariantTag.hpp | 16 + .../src/ArduinoJson/Variant/VariantTo.hpp | 34 + .../src/ArduinoJson/compatibility.hpp | 144 + .../ArduinoJson/src/ArduinoJson/version.hpp | 11 + .../lib/ArduinoJson/src/CMakeLists.txt | 91 + Raumtermostat/lib/AsyncTCP/.clang-format | 246 + Raumtermostat/lib/AsyncTCP/.codespellrc | 8 + Raumtermostat/lib/AsyncTCP/.editorconfig | 60 + Raumtermostat/lib/AsyncTCP/.gitignore | 6 + Raumtermostat/lib/AsyncTCP/.gitpod.Dockerfile | 2 + Raumtermostat/lib/AsyncTCP/.gitpod.yml | 9 + .../lib/AsyncTCP/.pre-commit-config.yaml | 42 + Raumtermostat/lib/AsyncTCP/CMakeLists.txt | 15 + Raumtermostat/lib/AsyncTCP/CODE_OF_CONDUCT.md | 129 + Raumtermostat/lib/AsyncTCP/Kconfig.projbuild | 30 + Raumtermostat/lib/AsyncTCP/LICENSE | 165 + Raumtermostat/lib/AsyncTCP/README.md | 55 + .../lib/AsyncTCP/arduino-cli-dev.yaml | 25 + Raumtermostat/lib/AsyncTCP/arduino-cli.yaml | 25 + Raumtermostat/lib/AsyncTCP/component.mk | 3 + .../AsyncTCP/examples/AsyncSend/AsyncSend.ino | 168 + .../lib/AsyncTCP/examples/Client/Client.ino | 87 + .../examples/FetchWebsite/FetchWebsite.ino | 111 + Raumtermostat/lib/AsyncTCP/idf_component.yml | 32 + .../client/CMakeLists.txt | 8 + .../idf_component_examples/client/README.md | 1 + .../client/main/CMakeLists.txt | 2 + .../client/main/idf_component.yml | 6 + .../client/main/main.cpp | 80 + .../client/sdkconfig.defaults | 12 + Raumtermostat/lib/AsyncTCP/library.json | 31 + Raumtermostat/lib/AsyncTCP/library.properties | 11 + Raumtermostat/lib/AsyncTCP/platformio.ini | 45 + .../lib/AsyncTCP/pre-commit.requirements.txt | 1 + Raumtermostat/lib/AsyncTCP/src/AsyncTCP.cpp | 1682 ++ Raumtermostat/lib/AsyncTCP/src/AsyncTCP.h | 335 + .../lib/AsyncTCP/src/AsyncTCPVersion.h | 40 + .../lib/ESPAsyncWebServer/.clang-format | 246 + .../lib/ESPAsyncWebServer/.codespellrc | 8 + .../lib/ESPAsyncWebServer/.editorconfig | 60 + .../lib/ESPAsyncWebServer/.gitignore | 5 + .../lib/ESPAsyncWebServer/.gitpod.Dockerfile | 2 + .../lib/ESPAsyncWebServer/.gitpod.yml | 9 + .../ESPAsyncWebServer/.pre-commit-config.yaml | 42 + .../lib/ESPAsyncWebServer/CMakeLists.txt | 9 + .../lib/ESPAsyncWebServer/CODE_OF_CONDUCT.md | 129 + Raumtermostat/lib/ESPAsyncWebServer/LICENSE | 165 + Raumtermostat/lib/ESPAsyncWebServer/README.md | 141 + .../lib/ESPAsyncWebServer/data/README.md | 48 + .../lib/ESPAsyncWebServer/docs/logo.png | Bin 0 -> 490217 bytes .../lib/ESPAsyncWebServer/docs/logo.webp | Bin 0 -> 133742 bytes .../docs/perf-c10-asynctcpsock.png | Bin 0 -> 317493 bytes .../lib/ESPAsyncWebServer/docs/perf-c10.png | Bin 0 -> 302299 bytes .../AsyncResponseStream.ino | 47 + .../ESPAsyncWebServer/examples/Auth/Auth.ino | 157 + .../ESPAsyncWebServer/examples/CORS/CORS.ino | 60 + .../examples/CaptivePortal/CaptivePortal.ino | 60 + .../CatchAllHandler/CatchAllHandler.ino | 133 + .../examples/ChunkResponse/ChunkResponse.ino | 140 + .../ChunkRetryResponse/ChunkRetryResponse.ino | 216 + .../examples/EndBegin/EndBegin.ino | 49 + .../examples/Filters/Filters.ino | 136 + .../examples/FlashResponse/FlashResponse.ino | 107 + .../HeaderManipulation/HeaderManipulation.ino | 88 + .../examples/Headers/Headers.ino | 69 + .../ESPAsyncWebServer/examples/Json/Json.ino | 90 + .../examples/Logging/Logging.ino | 49 + .../examples/MessagePack/MessagePack.ino | 88 + .../examples/Middleware/Middleware.ino | 82 + .../examples/Params/Params.ino | 122 + .../PartitionDownloader.ino | 130 + .../examples/PerfTests/PerfTests.ino | 243 + .../examples/RateLimit/RateLimit.ino | 64 + .../examples/Redirect/Redirect.ino | 48 + .../RequestContinuation.ino | 91 + .../RequestContinuationComplete.ino | 165 + .../ResumableDownload/ResumableDownload.ino | 61 + .../examples/Rewrite/Rewrite.ino | 52 + .../ServerSentEvents/ServerSentEvents.ino | 105 + .../ServerSentEvents_PR156.ino | 141 + .../examples/ServerState/ServerState.ino | 66 + .../SkipServerMiddleware.ino | 73 + .../SlowChunkResponse/SlowChunkResponse.ino | 152 + .../examples/StaticFile/StaticFile.ino | 144 + .../examples/Templates/Templates.ino | 99 + .../examples/Upload/Upload.ino | 171 + .../examples/WebSocket/WebSocket.ino | 115 + .../examples/WebSocketEasy/WebSocketEasy.ino | 124 + .../lib/ESPAsyncWebServer/idf_component.yml | 37 + .../catchall/CMakeLists.txt | 8 + .../idf_component_examples/catchall/README.md | 1 + .../catchall/main/CMakeLists.txt | 2 + .../catchall/main/idf_component.yml | 6 + .../catchall/main/main.cpp | 125 + .../catchall/sdkconfig.defaults | 12 + .../serversentevents/CMakeLists.txt | 8 + .../serversentevents/README.md | 1 + .../serversentevents/main/CMakeLists.txt | 2 + .../serversentevents/main/idf_component.yml | 6 + .../serversentevents/main/main.cpp | 95 + .../serversentevents/sdkconfig.defaults | 12 + .../websocket/CMakeLists.txt | 8 + .../websocket/README.md | 1 + .../websocket/main/CMakeLists.txt | 2 + .../websocket/main/idf_component.yml | 6 + .../websocket/main/main.cpp | 102 + .../websocket/sdkconfig.defaults | 12 + .../lib/ESPAsyncWebServer/library.json | 33 + .../lib/ESPAsyncWebServer/library.properties | 11 + .../lib/ESPAsyncWebServer/partitions-4MB.csv | 7 + .../IncreaseMaxSockets/.gitignore | 11 + .../IncreaseMaxSockets/platformio.ini | 26 + .../IncreaseMaxSockets/src/main.cpp | 142 + .../lib/ESPAsyncWebServer/platformio.ini | 155 + .../pre-commit.requirements.txt | 1 + .../src/AsyncEventSource.cpp | 507 + .../ESPAsyncWebServer/src/AsyncEventSource.h | 320 + .../lib/ESPAsyncWebServer/src/AsyncJson.cpp | 167 + .../lib/ESPAsyncWebServer/src/AsyncJson.h | 119 + .../src/AsyncMessagePack.cpp | 119 + .../ESPAsyncWebServer/src/AsyncMessagePack.h | 126 + .../ESPAsyncWebServer/src/AsyncWebHeader.cpp | 32 + .../src/AsyncWebServerVersion.h | 40 + .../ESPAsyncWebServer/src/AsyncWebSocket.cpp | 1364 ++ .../ESPAsyncWebServer/src/AsyncWebSocket.h | 499 + .../src/BackPort_SHA1Builder.cpp | 284 + .../src/BackPort_SHA1Builder.h | 44 + .../lib/ESPAsyncWebServer/src/ChunkPrint.cpp | 18 + .../lib/ESPAsyncWebServer/src/ChunkPrint.h | 23 + .../ESPAsyncWebServer/src/ESPAsyncWebServer.h | 1217 ++ .../lib/ESPAsyncWebServer/src/Middleware.cpp | 287 + .../src/WebAuthentication.cpp | 247 + .../ESPAsyncWebServer/src/WebAuthentication.h | 23 + .../ESPAsyncWebServer/src/WebHandlerImpl.h | 93 + .../lib/ESPAsyncWebServer/src/WebHandlers.cpp | 326 + .../lib/ESPAsyncWebServer/src/WebRequest.cpp | 1185 + .../ESPAsyncWebServer/src/WebResponseImpl.h | 180 + .../ESPAsyncWebServer/src/WebResponses.cpp | 859 + .../lib/ESPAsyncWebServer/src/WebServer.cpp | 187 + .../lib/ESPAsyncWebServer/src/literals.h | 193 + Raumtermostat/lib/WiFiManager/WiFiManager.h | 6 +- Raumtermostat/platformio.ini | 8 +- Raumtermostat/src/MQTT.cpp | 419 +- Raumtermostat/src/MQTT.h | 50 +- Raumtermostat/src/lv_conf.h | 4 +- Raumtermostat/src/main.cpp | 30 +- Raumtermostat/src/settings.cpp | 60 + Raumtermostat/src/settings.h | 35 + Raumtermostat/src/tahoma.cpp | 121 + Raumtermostat/src/tahoma.h | 39 + Raumtermostat/src/ui/actions.cpp | 68 +- Raumtermostat/src/ui/actions.h | 33 +- Raumtermostat/src/ui/screens.c | 28 +- Raumtermostat/src/ui/ui.cpp | 41 +- Raumtermostat/src/ui/ui.h | 4 +- Raumtermostat/src/ui/vars.cpp | 1 + Raumtermostat/src/ui/vars.h | 48 +- 614 files changed, 77666 insertions(+), 288 deletions(-) create mode 100644 CAD/UPgehaeuse v37_top.step create mode 100644 Raumtermostat/lib/ArduinoJson/.clang-format create mode 100644 Raumtermostat/lib/ArduinoJson/.gitattributes create mode 100644 Raumtermostat/lib/ArduinoJson/.gitignore create mode 100644 Raumtermostat/lib/ArduinoJson/.mbedignore create mode 100644 Raumtermostat/lib/ArduinoJson/.prettierignore create mode 100644 Raumtermostat/lib/ArduinoJson/.vscode/settings.json create mode 100644 Raumtermostat/lib/ArduinoJson/ArduinoJson.h create mode 100644 Raumtermostat/lib/ArduinoJson/CHANGELOG.md create mode 100644 Raumtermostat/lib/ArduinoJson/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/CONTRIBUTING.md create mode 100644 Raumtermostat/lib/ArduinoJson/LICENSE.txt create mode 100644 Raumtermostat/lib/ArduinoJson/README.md create mode 100644 Raumtermostat/lib/ArduinoJson/SUPPORT.md create mode 100644 Raumtermostat/lib/ArduinoJson/appveyor.yml create mode 100644 Raumtermostat/lib/ArduinoJson/component.mk create mode 100644 Raumtermostat/lib/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino create mode 100644 Raumtermostat/lib/ArduinoJson/examples/JsonFilterExample/JsonFilterExample.ino create mode 100644 Raumtermostat/lib/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino create mode 100644 Raumtermostat/lib/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino create mode 100644 Raumtermostat/lib/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino create mode 100644 Raumtermostat/lib/ArduinoJson/examples/JsonServer/JsonServer.ino create mode 100644 Raumtermostat/lib/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino create mode 100644 Raumtermostat/lib/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino create mode 100644 Raumtermostat/lib/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino create mode 100644 Raumtermostat/lib/ArduinoJson/examples/StringExample/StringExample.ino create mode 100644 Raumtermostat/lib/ArduinoJson/extras/ArduinoJsonConfig.cmake.in create mode 100644 Raumtermostat/lib/ArduinoJson/extras/CompileOptions.cmake create mode 100644 Raumtermostat/lib/ArduinoJson/extras/ci/espidf/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/component.mk create mode 100644 Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/main.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/ci/particle.sh create mode 100644 Raumtermostat/lib/ArduinoJson/extras/conf_test/avr.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/conf_test/esp8266.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/conf_test/x64.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/conf_test/x86.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/Makefile create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_corpus/.gitignore create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_fuzzer.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_corpus/.gitignore create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array16 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array32 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/false create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixarray create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_negative create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_positive create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixmap create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixstr create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float32 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float64 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int16 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int32 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int64 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int8 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map16 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map32 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/nil create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str16 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str32 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str8 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/true create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint16 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint32 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint64 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint8 create mode 100644 Raumtermostat/lib/ArduinoJson/extras/fuzzing/reproducer.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/particle/project.properties create mode 100644 Raumtermostat/lib/ArduinoJson/extras/particle/src/smocktest.ino create mode 100644 Raumtermostat/lib/ArduinoJson/extras/scripts/build-single-header.sh create mode 100644 Raumtermostat/lib/ArduinoJson/extras/scripts/extract_changes.awk create mode 100644 Raumtermostat/lib/ArduinoJson/extras/scripts/get-release-page.sh create mode 100644 Raumtermostat/lib/ArduinoJson/extras/scripts/publish-particle-library.sh create mode 100644 Raumtermostat/lib/ArduinoJson/extras/scripts/publish.sh create mode 100644 Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/publish.sh create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/.clang-tidy create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Cpp17/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Cpp17/string_view.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Cpp20/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Cpp20/smoke_test.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/BasicJsonDocument.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/DynamicJsonDocument.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/StaticJsonDocument.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/add.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/containsKey.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/createNestedArray.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/createNestedObject.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/macros.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/memoryUsage.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/shallowCopy.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/Issue978.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/assign_char.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/deserialize_object.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/read_long_long.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/variant_as_char.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/write_long_long.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Allocators.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Arduino.h create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/CustomReader.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Literals.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/Print.h create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/Stream.h create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/String.h create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/avr/pgmspace.h create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/openweathermap.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/add.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/clear.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/compare.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/copyArray.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/equals.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/isNull.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/iterator.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/nesting.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/remove.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/size.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/subscript.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/unbound.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/equals.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/isNull.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/iterator.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/nesting.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/size.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/subscript.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/array.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/destination_types.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/errors.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/filter.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/number.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/object.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/string.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/ElementProxy.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/MemberProxy.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/add.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/assignment.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/cast.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/clear.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/compare.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/constructor.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/isNull.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/issue1120.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/nesting.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/overflowed.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/remove.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/set.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/size.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/subscript.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/swap.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/clear.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/compare.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/equals.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/isNull.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/iterator.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/nesting.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/remove.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/set.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/size.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/std_string.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/subscript.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/unbound.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/equals.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/isNull.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/iterator.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/nesting.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/size.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/subscript.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/misc.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/add.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/as.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/clear.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/compare.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/converters.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/copy.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/is.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/isnull.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/misc.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/nesting.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/nullptr.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/or.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/overflow.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/remove.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/set.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/size.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/stl_containers.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/subscript.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/types.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/unbound.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/as.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/is.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/isnull.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/nesting.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/size.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/subscript.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/JsonString.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/NoArduinoHeader.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Readers.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/StringAdapters.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/StringWriter.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/TypeTraits.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Utf16.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Utf8.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/arithmeticCompare.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/conflicts.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/custom_string.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue1967.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue2129.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue2166.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/printable.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/unsigned_char.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/version.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Misc/weird_strcmp.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_0.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_1.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/issue1707.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_1.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_2.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_4.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_0.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_1.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/destination_types.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/errors.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/filter.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/convertNumber.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/decomposeFloat.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseDouble.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseFloat.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseInteger.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseNumber.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/StringBuffer.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/StringBuilder.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/allocVariant.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/clear.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/saveString.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/shrinkToFit.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/size.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/swap.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeInteger.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeString.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/catch/.clang-format create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/catch/CMakeLists.txt create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/catch/catch.cpp create mode 100644 Raumtermostat/lib/ArduinoJson/extras/tests/catch/catch.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/idf_component.yml create mode 100644 Raumtermostat/lib/ArduinoJson/keywords.txt create mode 100644 Raumtermostat/lib/ArduinoJson/library.json create mode 100644 Raumtermostat/lib/ArduinoJson/library.properties create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson.h create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Array/ArrayData.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Array/JsonArray.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayConst.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayIterator.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Configuration.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationOptions.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/Filter.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Json/Latch.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Memory/Allocator.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Memory/MemoryPoolList.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Memory/ResourceManager.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Memory/ResourceManagerImpl.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Memory/StringBuffer.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Memory/StringBuilder.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Memory/StringNode.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Memory/StringPool.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackBinary.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackExtension.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/MsgPack/endianness.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Namespace.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Numbers/JsonFloat.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Numbers/JsonInteger.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Numbers/arithmeticCompare.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Object/JsonObject.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectConst.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectIterator.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Object/JsonPair.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Object/ObjectData.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/integer.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace_generic.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/preprocessor.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/decay.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/declval.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/function_traits.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_class.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_enum.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_pointer.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_cv.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/void_t.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Serialization/CountingDecorator.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/FlashString.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/RamString.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/StringObject.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Strings/IsString.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Strings/JsonString.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapter.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Strings/StringTraits.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/Converter.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/ConverterImpl.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariant.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantConst.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantCopier.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantVisitor.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAttorney.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantCompare.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantDataVisitor.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantOperators.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRefBase.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTag.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/compatibility.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/ArduinoJson/version.hpp create mode 100644 Raumtermostat/lib/ArduinoJson/src/CMakeLists.txt create mode 100644 Raumtermostat/lib/AsyncTCP/.clang-format create mode 100644 Raumtermostat/lib/AsyncTCP/.codespellrc create mode 100644 Raumtermostat/lib/AsyncTCP/.editorconfig create mode 100644 Raumtermostat/lib/AsyncTCP/.gitignore create mode 100644 Raumtermostat/lib/AsyncTCP/.gitpod.Dockerfile create mode 100644 Raumtermostat/lib/AsyncTCP/.gitpod.yml create mode 100644 Raumtermostat/lib/AsyncTCP/.pre-commit-config.yaml create mode 100644 Raumtermostat/lib/AsyncTCP/CMakeLists.txt create mode 100644 Raumtermostat/lib/AsyncTCP/CODE_OF_CONDUCT.md create mode 100644 Raumtermostat/lib/AsyncTCP/Kconfig.projbuild create mode 100644 Raumtermostat/lib/AsyncTCP/LICENSE create mode 100644 Raumtermostat/lib/AsyncTCP/README.md create mode 100644 Raumtermostat/lib/AsyncTCP/arduino-cli-dev.yaml create mode 100644 Raumtermostat/lib/AsyncTCP/arduino-cli.yaml create mode 100644 Raumtermostat/lib/AsyncTCP/component.mk create mode 100644 Raumtermostat/lib/AsyncTCP/examples/AsyncSend/AsyncSend.ino create mode 100644 Raumtermostat/lib/AsyncTCP/examples/Client/Client.ino create mode 100644 Raumtermostat/lib/AsyncTCP/examples/FetchWebsite/FetchWebsite.ino create mode 100644 Raumtermostat/lib/AsyncTCP/idf_component.yml create mode 100644 Raumtermostat/lib/AsyncTCP/idf_component_examples/client/CMakeLists.txt create mode 100644 Raumtermostat/lib/AsyncTCP/idf_component_examples/client/README.md create mode 100644 Raumtermostat/lib/AsyncTCP/idf_component_examples/client/main/CMakeLists.txt create mode 100644 Raumtermostat/lib/AsyncTCP/idf_component_examples/client/main/idf_component.yml create mode 100644 Raumtermostat/lib/AsyncTCP/idf_component_examples/client/main/main.cpp create mode 100644 Raumtermostat/lib/AsyncTCP/idf_component_examples/client/sdkconfig.defaults create mode 100644 Raumtermostat/lib/AsyncTCP/library.json create mode 100644 Raumtermostat/lib/AsyncTCP/library.properties create mode 100644 Raumtermostat/lib/AsyncTCP/platformio.ini create mode 100644 Raumtermostat/lib/AsyncTCP/pre-commit.requirements.txt create mode 100644 Raumtermostat/lib/AsyncTCP/src/AsyncTCP.cpp create mode 100644 Raumtermostat/lib/AsyncTCP/src/AsyncTCP.h create mode 100644 Raumtermostat/lib/AsyncTCP/src/AsyncTCPVersion.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/.clang-format create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/.codespellrc create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/.editorconfig create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/.gitignore create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/.gitpod.Dockerfile create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/.gitpod.yml create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/.pre-commit-config.yaml create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/CMakeLists.txt create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/CODE_OF_CONDUCT.md create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/LICENSE create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/README.md create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/data/README.md create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/docs/logo.png create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/docs/logo.webp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/docs/perf-c10-asynctcpsock.png create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/docs/perf-c10.png create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/AsyncResponseStream/AsyncResponseStream.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Auth/Auth.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/CORS/CORS.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/CaptivePortal/CaptivePortal.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/CatchAllHandler/CatchAllHandler.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/ChunkResponse/ChunkResponse.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/ChunkRetryResponse/ChunkRetryResponse.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/EndBegin/EndBegin.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Filters/Filters.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/FlashResponse/FlashResponse.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/HeaderManipulation/HeaderManipulation.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Headers/Headers.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Json/Json.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Logging/Logging.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/MessagePack/MessagePack.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Middleware/Middleware.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Params/Params.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/PartitionDownloader/PartitionDownloader.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/PerfTests/PerfTests.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/RateLimit/RateLimit.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Redirect/Redirect.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/RequestContinuation/RequestContinuation.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/RequestContinuationComplete/RequestContinuationComplete.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/ResumableDownload/ResumableDownload.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Rewrite/Rewrite.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/ServerSentEvents/ServerSentEvents.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/ServerSentEvents_PR156/ServerSentEvents_PR156.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/ServerState/ServerState.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/SkipServerMiddleware/SkipServerMiddleware.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/SlowChunkResponse/SlowChunkResponse.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/StaticFile/StaticFile.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Templates/Templates.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/Upload/Upload.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/WebSocket/WebSocket.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/examples/WebSocketEasy/WebSocketEasy.ino create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component.yml create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/catchall/CMakeLists.txt create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/catchall/README.md create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/catchall/main/CMakeLists.txt create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/catchall/main/idf_component.yml create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/catchall/main/main.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/catchall/sdkconfig.defaults create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/serversentevents/CMakeLists.txt create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/serversentevents/README.md create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/serversentevents/main/CMakeLists.txt create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/serversentevents/main/idf_component.yml create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/serversentevents/main/main.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/serversentevents/sdkconfig.defaults create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/websocket/CMakeLists.txt create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/websocket/README.md create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/websocket/main/CMakeLists.txt create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/websocket/main/idf_component.yml create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/websocket/main/main.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/idf_component_examples/websocket/sdkconfig.defaults create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/library.json create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/library.properties create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/partitions-4MB.csv create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/pioarduino_examples/IncreaseMaxSockets/.gitignore create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/pioarduino_examples/IncreaseMaxSockets/platformio.ini create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/pioarduino_examples/IncreaseMaxSockets/src/main.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/platformio.ini create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/pre-commit.requirements.txt create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/AsyncEventSource.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/AsyncEventSource.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/AsyncJson.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/AsyncJson.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/AsyncMessagePack.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/AsyncMessagePack.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/AsyncWebHeader.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/AsyncWebServerVersion.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/AsyncWebSocket.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/AsyncWebSocket.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/BackPort_SHA1Builder.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/BackPort_SHA1Builder.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/ChunkPrint.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/ChunkPrint.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/ESPAsyncWebServer.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/Middleware.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/WebAuthentication.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/WebAuthentication.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/WebHandlerImpl.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/WebHandlers.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/WebRequest.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/WebResponseImpl.h create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/WebResponses.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/WebServer.cpp create mode 100644 Raumtermostat/lib/ESPAsyncWebServer/src/literals.h create mode 100644 Raumtermostat/src/settings.cpp create mode 100644 Raumtermostat/src/settings.h create mode 100644 Raumtermostat/src/tahoma.cpp create mode 100644 Raumtermostat/src/tahoma.h diff --git a/CAD/UPgehaeuse v37_top.step b/CAD/UPgehaeuse v37_top.step new file mode 100644 index 0000000..240f821 --- /dev/null +++ b/CAD/UPgehaeuse v37_top.step @@ -0,0 +1,3921 @@ +ISO-10303-21; +HEADER; +/* Generated by software containing ST-Developer + * from STEP Tools, Inc. (www.steptools.com) + */ + +FILE_DESCRIPTION( +/* description */ (''), +/* implementation_level */ '2;1'); + +FILE_NAME( +/* name */ 'UPgehaeuse v37_top.step', +/* time_stamp */ '2025-04-27T18:52:28+02:00', +/* author */ (''), +/* organization */ (''), +/* preprocessor_version */ 'ST-DEVELOPER v20.1', +/* originating_system */ 'Autodesk Translation Framework v14.4.0.0', +/* authorisation */ ''); + +FILE_SCHEMA (('AUTOMOTIVE_DESIGN { 1 0 10303 214 3 1 1 }')); +ENDSEC; + +DATA; +#10=MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION('',(#13),#3713); +#11=SHAPE_REPRESENTATION_RELATIONSHIP('SRR','None',#3719,#12); +#12=ADVANCED_BREP_SHAPE_REPRESENTATION('',(#14),#3712); +#13=STYLED_ITEM('',(#3728),#14); +#14=MANIFOLD_SOLID_BREP('K\X\F6rper7',#2263); +#15=SPHERICAL_SURFACE('',#2396,3.); +#16=SPHERICAL_SURFACE('',#2401,3.); +#17=SPHERICAL_SURFACE('',#2407,3.); +#18=SPHERICAL_SURFACE('',#2412,3.); +#19=( +BOUNDED_SURFACE() +B_SPLINE_SURFACE(2,2,((#3133,#3134,#3135),(#3136,#3137,#3138),(#3139,#3140, +#3141)),.UNSPECIFIED.,.F.,.F.,.F.) +B_SPLINE_SURFACE_WITH_KNOTS((3,3),(3,3),(-1.5707963267949,1.64716488237054E-15), +(-0.785398163397454,0.785398163397454),.UNSPECIFIED.) +GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_SURFACE(((1.,0.707106781186544,1.),(0.707106781186539, +0.499999999999991,0.707106781186539),(1.,0.707106781186544,1.))) +REPRESENTATION_ITEM('') +SURFACE() +); +#20=( +BOUNDED_SURFACE() +B_SPLINE_SURFACE(2,2,((#3155,#3156,#3157),(#3158,#3159,#3160),(#3161,#3162, +#3163)),.UNSPECIFIED.,.F.,.F.,.F.) +B_SPLINE_SURFACE_WITH_KNOTS((3,3),(3,3),(-1.5707963267949,1.3664283380003E-16), +(-3.14159265358979,-1.57079632679488),.UNSPECIFIED.) +GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_SURFACE(((1.,0.707106781186542,1.),(0.707106781186547, +0.499999999999996,0.707106781186547),(1.,0.707106781186542,1.))) +REPRESENTATION_ITEM('') +SURFACE() +); +#21=( +BOUNDED_SURFACE() +B_SPLINE_SURFACE(2,2,((#3167,#3168,#3169),(#3170,#3171,#3172),(#3173,#3174, +#3175)),.UNSPECIFIED.,.F.,.F.,.F.) +B_SPLINE_SURFACE_WITH_KNOTS((3,3),(3,3),(-1.57079632679489,2.86720598243791E-28), +(1.57079632679496,3.14159265358987),.UNSPECIFIED.) +GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_SURFACE(((1.,0.707106781186542,1.),(0.707106781186536, +0.499999999999988,0.707106781186536),(1.,0.707106781186542,1.))) +REPRESENTATION_ITEM('') +SURFACE() +); +#22=( +BOUNDED_SURFACE() +B_SPLINE_SURFACE(2,2,((#3187,#3188,#3189),(#3190,#3191,#3192),(#3193,#3194, +#3195)),.UNSPECIFIED.,.F.,.F.,.F.) +B_SPLINE_SURFACE_WITH_KNOTS((3,3),(3,3),(-1.57079632679489,-5.46134472845317E-29), +(-3.14159265358979,-1.57079632679487),.UNSPECIFIED.) +GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_SURFACE(((1.,0.707106781186541,1.),(0.707106781186536, +0.499999999999987,0.707106781186536),(1.,0.707106781186541,1.))) +REPRESENTATION_ITEM('') +SURFACE() +); +#23=CYLINDRICAL_SURFACE('',#2290,18.6); +#24=CYLINDRICAL_SURFACE('',#2292,20.0000002980232); +#25=CYLINDRICAL_SURFACE('',#2297,1.); +#26=CYLINDRICAL_SURFACE('',#2299,1.); +#27=CYLINDRICAL_SURFACE('',#2305,1.); +#28=CYLINDRICAL_SURFACE('',#2307,1.); +#29=CYLINDRICAL_SURFACE('',#2311,1.4); +#30=CYLINDRICAL_SURFACE('',#2314,1.4); +#31=CYLINDRICAL_SURFACE('',#2392,1.4); +#32=CYLINDRICAL_SURFACE('',#2393,1.4); +#33=CYLINDRICAL_SURFACE('',#2400,3.); +#34=CYLINDRICAL_SURFACE('',#2405,3.); +#35=CYLINDRICAL_SURFACE('',#2406,3.); +#36=CYLINDRICAL_SURFACE('',#2411,3.); +#37=CYLINDRICAL_SURFACE('',#2416,3.); +#38=CYLINDRICAL_SURFACE('',#2417,3.); +#39=CYLINDRICAL_SURFACE('',#2418,3.); +#40=CYLINDRICAL_SURFACE('',#2419,3.); +#41=FACE_BOUND('',#804,.T.); +#42=FACE_BOUND('',#820,.T.); +#43=FACE_BOUND('',#821,.T.); +#44=FACE_BOUND('',#822,.T.); +#45=FACE_BOUND('',#823,.T.); +#46=FACE_BOUND('',#824,.T.); +#47=FACE_BOUND('',#825,.T.); +#48=FACE_BOUND('',#826,.T.); +#49=FACE_BOUND('',#827,.T.); +#50=FACE_BOUND('',#879,.T.); +#51=FACE_BOUND('',#880,.T.); +#52=FACE_BOUND('',#881,.T.); +#53=FACE_BOUND('',#882,.T.); +#54=FACE_BOUND('',#883,.T.); +#55=FACE_BOUND('',#884,.T.); +#56=FACE_BOUND('',#885,.T.); +#57=FACE_BOUND('',#886,.T.); +#58=FACE_BOUND('',#907,.T.); +#59=FACE_BOUND('',#911,.T.); +#60=FACE_BOUND('',#912,.T.); +#61=FACE_BOUND('',#913,.T.); +#62=FACE_BOUND('',#914,.T.); +#63=FACE_BOUND('',#915,.T.); +#64=FACE_BOUND('',#916,.T.); +#65=FACE_BOUND('',#917,.T.); +#66=FACE_BOUND('',#918,.T.); +#67=FACE_BOUND('',#933,.T.); +#68=FACE_BOUND('',#934,.T.); +#69=FACE_BOUND('',#935,.T.); +#70=FACE_BOUND('',#936,.T.); +#71=FACE_BOUND('',#937,.T.); +#72=FACE_BOUND('',#938,.T.); +#73=FACE_BOUND('',#939,.T.); +#74=FACE_BOUND('',#940,.T.); +#75=ELLIPSE('',#2279,18.9550720265167,10.9437159370186); +#76=ELLIPSE('',#2288,18.9550720265168,10.9437159370182); +#77=CONICAL_SURFACE('',#2274,21.3500002980232,0.872664625997166); +#78=CONICAL_SURFACE('',#2276,21.3500002980232,0.872664625997166); +#79=CONICAL_SURFACE('',#2286,19.1,0.523598775598298); +#80=( +BOUNDED_CURVE() +B_SPLINE_CURVE(2,(#3055,#3056,#3057),.UNSPECIFIED.,.F.,.F.) +B_SPLINE_CURVE_WITH_KNOTS((3,3),(0.200266357787137,0.335269373165059), + .UNSPECIFIED.) +CURVE() +GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.00296559876126,1.00327746332896,1.00266212520911)) +REPRESENTATION_ITEM('') +); +#81=( +BOUNDED_CURVE() +B_SPLINE_CURVE(2,(#3065,#3066,#3067),.UNSPECIFIED.,.F.,.F.) +B_SPLINE_CURVE_WITH_KNOTS((3,3),(0.,0.0187215000922019),.UNSPECIFIED.) +CURVE() +GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.,1.00022259545382,1.00042938275288)) +REPRESENTATION_ITEM('') +); +#82=( +BOUNDED_CURVE() +B_SPLINE_CURVE(2,(#3075,#3076,#3077),.UNSPECIFIED.,.F.,.F.) +B_SPLINE_CURVE_WITH_KNOTS((3,3),(0.508515343507125,0.52723684359933), + .UNSPECIFIED.) +CURVE() +GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.00042938275287,1.00022259545381,1.)) +REPRESENTATION_ITEM('') +); +#83=( +BOUNDED_CURVE() +B_SPLINE_CURVE(2,(#3085,#3086,#3087),.UNSPECIFIED.,.F.,.F.) +B_SPLINE_CURVE_WITH_KNOTS((3,3),(0.156079854471486,0.291082869849409), + .UNSPECIFIED.) +CURVE() +GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.00266212520912,1.00327746332897,1.00296559876127)) +REPRESENTATION_ITEM('') +); +#84=( +BOUNDED_CURVE() +B_SPLINE_CURVE(2,(#3091,#3092,#3093),.UNSPECIFIED.,.F.,.F.) +B_SPLINE_CURVE_WITH_KNOTS((3,3),(0.0314477381718919,0.155663893290068), + .UNSPECIFIED.) +CURVE() +GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.00010232091573,1.00025324034468,1.)) +REPRESENTATION_ITEM('') +); +#85=( +BOUNDED_CURVE() +B_SPLINE_CURVE(2,(#3096,#3097,#3098),.UNSPECIFIED.,.F.,.F.) +B_SPLINE_CURVE_WITH_KNOTS((3,3),(0.,0.124216155345635),.UNSPECIFIED.) +CURVE() +GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.,1.00025323983676,1.00010232070977)) +REPRESENTATION_ITEM('') +); +#86=LINE('',#3053,#342); +#87=LINE('',#3059,#343); +#88=LINE('',#3061,#344); +#89=LINE('',#3063,#345); +#90=LINE('',#3068,#346); +#91=LINE('',#3072,#347); +#92=LINE('',#3079,#348); +#93=LINE('',#3081,#349); +#94=LINE('',#3083,#350); +#95=LINE('',#3088,#351); +#96=LINE('',#3104,#352); +#97=LINE('',#3110,#353); +#98=LINE('',#3114,#354); +#99=LINE('',#3118,#355); +#100=LINE('',#3121,#356); +#101=LINE('',#3124,#357); +#102=LINE('',#3150,#358); +#103=LINE('',#3154,#359); +#104=LINE('',#3182,#360); +#105=LINE('',#3186,#361); +#106=LINE('',#3199,#362); +#107=LINE('',#3201,#363); +#108=LINE('',#3202,#364); +#109=LINE('',#3205,#365); +#110=LINE('',#3209,#366); +#111=LINE('',#3211,#367); +#112=LINE('',#3213,#368); +#113=LINE('',#3215,#369); +#114=LINE('',#3217,#370); +#115=LINE('',#3218,#371); +#116=LINE('',#3221,#372); +#117=LINE('',#3223,#373); +#118=LINE('',#3225,#374); +#119=LINE('',#3226,#375); +#120=LINE('',#3229,#376); +#121=LINE('',#3231,#377); +#122=LINE('',#3233,#378); +#123=LINE('',#3234,#379); +#124=LINE('',#3237,#380); +#125=LINE('',#3239,#381); +#126=LINE('',#3241,#382); +#127=LINE('',#3242,#383); +#128=LINE('',#3245,#384); +#129=LINE('',#3247,#385); +#130=LINE('',#3249,#386); +#131=LINE('',#3250,#387); +#132=LINE('',#3253,#388); +#133=LINE('',#3255,#389); +#134=LINE('',#3257,#390); +#135=LINE('',#3258,#391); +#136=LINE('',#3261,#392); +#137=LINE('',#3263,#393); +#138=LINE('',#3265,#394); +#139=LINE('',#3266,#395); +#140=LINE('',#3269,#396); +#141=LINE('',#3271,#397); +#142=LINE('',#3273,#398); +#143=LINE('',#3274,#399); +#144=LINE('',#3277,#400); +#145=LINE('',#3279,#401); +#146=LINE('',#3281,#402); +#147=LINE('',#3282,#403); +#148=LINE('',#3285,#404); +#149=LINE('',#3289,#405); +#150=LINE('',#3291,#406); +#151=LINE('',#3292,#407); +#152=LINE('',#3295,#408); +#153=LINE('',#3296,#409); +#154=LINE('',#3299,#410); +#155=LINE('',#3301,#411); +#156=LINE('',#3302,#412); +#157=LINE('',#3306,#413); +#158=LINE('',#3308,#414); +#159=LINE('',#3310,#415); +#160=LINE('',#3311,#416); +#161=LINE('',#3314,#417); +#162=LINE('',#3316,#418); +#163=LINE('',#3317,#419); +#164=LINE('',#3320,#420); +#165=LINE('',#3322,#421); +#166=LINE('',#3323,#422); +#167=LINE('',#3325,#423); +#168=LINE('',#3326,#424); +#169=LINE('',#3330,#425); +#170=LINE('',#3332,#426); +#171=LINE('',#3334,#427); +#172=LINE('',#3335,#428); +#173=LINE('',#3338,#429); +#174=LINE('',#3340,#430); +#175=LINE('',#3341,#431); +#176=LINE('',#3344,#432); +#177=LINE('',#3346,#433); +#178=LINE('',#3347,#434); +#179=LINE('',#3349,#435); +#180=LINE('',#3350,#436); +#181=LINE('',#3354,#437); +#182=LINE('',#3356,#438); +#183=LINE('',#3358,#439); +#184=LINE('',#3359,#440); +#185=LINE('',#3362,#441); +#186=LINE('',#3364,#442); +#187=LINE('',#3365,#443); +#188=LINE('',#3368,#444); +#189=LINE('',#3370,#445); +#190=LINE('',#3371,#446); +#191=LINE('',#3373,#447); +#192=LINE('',#3374,#448); +#193=LINE('',#3378,#449); +#194=LINE('',#3380,#450); +#195=LINE('',#3382,#451); +#196=LINE('',#3383,#452); +#197=LINE('',#3386,#453); +#198=LINE('',#3388,#454); +#199=LINE('',#3389,#455); +#200=LINE('',#3392,#456); +#201=LINE('',#3394,#457); +#202=LINE('',#3395,#458); +#203=LINE('',#3397,#459); +#204=LINE('',#3398,#460); +#205=LINE('',#3402,#461); +#206=LINE('',#3404,#462); +#207=LINE('',#3406,#463); +#208=LINE('',#3407,#464); +#209=LINE('',#3410,#465); +#210=LINE('',#3412,#466); +#211=LINE('',#3413,#467); +#212=LINE('',#3416,#468); +#213=LINE('',#3418,#469); +#214=LINE('',#3419,#470); +#215=LINE('',#3421,#471); +#216=LINE('',#3422,#472); +#217=LINE('',#3426,#473); +#218=LINE('',#3428,#474); +#219=LINE('',#3430,#475); +#220=LINE('',#3431,#476); +#221=LINE('',#3434,#477); +#222=LINE('',#3436,#478); +#223=LINE('',#3437,#479); +#224=LINE('',#3440,#480); +#225=LINE('',#3442,#481); +#226=LINE('',#3443,#482); +#227=LINE('',#3445,#483); +#228=LINE('',#3446,#484); +#229=LINE('',#3450,#485); +#230=LINE('',#3452,#486); +#231=LINE('',#3454,#487); +#232=LINE('',#3455,#488); +#233=LINE('',#3458,#489); +#234=LINE('',#3460,#490); +#235=LINE('',#3461,#491); +#236=LINE('',#3464,#492); +#237=LINE('',#3466,#493); +#238=LINE('',#3467,#494); +#239=LINE('',#3469,#495); +#240=LINE('',#3470,#496); +#241=LINE('',#3474,#497); +#242=LINE('',#3476,#498); +#243=LINE('',#3478,#499); +#244=LINE('',#3479,#500); +#245=LINE('',#3482,#501); +#246=LINE('',#3484,#502); +#247=LINE('',#3485,#503); +#248=LINE('',#3488,#504); +#249=LINE('',#3490,#505); +#250=LINE('',#3491,#506); +#251=LINE('',#3493,#507); +#252=LINE('',#3494,#508); +#253=LINE('',#3498,#509); +#254=LINE('',#3499,#510); +#255=LINE('',#3500,#511); +#256=LINE('',#3503,#512); +#257=LINE('',#3504,#513); +#258=LINE('',#3507,#514); +#259=LINE('',#3508,#515); +#260=LINE('',#3510,#516); +#261=LINE('',#3514,#517); +#262=LINE('',#3515,#518); +#263=LINE('',#3516,#519); +#264=LINE('',#3519,#520); +#265=LINE('',#3520,#521); +#266=LINE('',#3523,#522); +#267=LINE('',#3524,#523); +#268=LINE('',#3526,#524); +#269=LINE('',#3530,#525); +#270=LINE('',#3531,#526); +#271=LINE('',#3532,#527); +#272=LINE('',#3535,#528); +#273=LINE('',#3536,#529); +#274=LINE('',#3539,#530); +#275=LINE('',#3540,#531); +#276=LINE('',#3542,#532); +#277=LINE('',#3545,#533); +#278=LINE('',#3546,#534); +#279=LINE('',#3548,#535); +#280=LINE('',#3552,#536); +#281=LINE('',#3554,#537); +#282=LINE('',#3556,#538); +#283=LINE('',#3558,#539); +#284=LINE('',#3560,#540); +#285=LINE('',#3562,#541); +#286=LINE('',#3564,#542); +#287=LINE('',#3565,#543); +#288=LINE('',#3568,#544); +#289=LINE('',#3570,#545); +#290=LINE('',#3572,#546); +#291=LINE('',#3573,#547); +#292=LINE('',#3576,#548); +#293=LINE('',#3578,#549); +#294=LINE('',#3580,#550); +#295=LINE('',#3581,#551); +#296=LINE('',#3584,#552); +#297=LINE('',#3586,#553); +#298=LINE('',#3588,#554); +#299=LINE('',#3589,#555); +#300=LINE('',#3591,#556); +#301=LINE('',#3593,#557); +#302=LINE('',#3594,#558); +#303=LINE('',#3596,#559); +#304=LINE('',#3598,#560); +#305=LINE('',#3601,#561); +#306=LINE('',#3602,#562); +#307=LINE('',#3604,#563); +#308=LINE('',#3605,#564); +#309=LINE('',#3607,#565); +#310=LINE('',#3609,#566); +#311=LINE('',#3612,#567); +#312=LINE('',#3613,#568); +#313=LINE('',#3615,#569); +#314=LINE('',#3617,#570); +#315=LINE('',#3620,#571); +#316=LINE('',#3621,#572); +#317=LINE('',#3623,#573); +#318=LINE('',#3625,#574); +#319=LINE('',#3628,#575); +#320=LINE('',#3630,#576); +#321=LINE('',#3635,#577); +#322=LINE('',#3639,#578); +#323=LINE('',#3643,#579); +#324=LINE('',#3646,#580); +#325=LINE('',#3650,#581); +#326=LINE('',#3655,#582); +#327=LINE('',#3657,#583); +#328=LINE('',#3659,#584); +#329=LINE('',#3660,#585); +#330=LINE('',#3662,#586); +#331=LINE('',#3664,#587); +#332=LINE('',#3665,#588); +#333=LINE('',#3675,#589); +#334=LINE('',#3676,#590); +#335=LINE('',#3684,#591); +#336=LINE('',#3685,#592); +#337=LINE('',#3687,#593); +#338=LINE('',#3694,#594); +#339=LINE('',#3701,#595); +#340=LINE('',#3703,#596); +#341=LINE('',#3706,#597); +#342=VECTOR('',#2437,10.); +#343=VECTOR('',#2438,10.); +#344=VECTOR('',#2439,10.); +#345=VECTOR('',#2440,10.); +#346=VECTOR('',#2441,10.); +#347=VECTOR('',#2446,10.); +#348=VECTOR('',#2449,10.); +#349=VECTOR('',#2450,10.); +#350=VECTOR('',#2451,10.); +#351=VECTOR('',#2452,10.); +#352=VECTOR('',#2465,10.); +#353=VECTOR('',#2470,1.); +#354=VECTOR('',#2473,1.); +#355=VECTOR('',#2476,1.); +#356=VECTOR('',#2479,1.); +#357=VECTOR('',#2482,10.); +#358=VECTOR('',#2509,1.); +#359=VECTOR('',#2514,1.); +#360=VECTOR('',#2527,1.); +#361=VECTOR('',#2532,1.); +#362=VECTOR('',#2537,10.); +#363=VECTOR('',#2538,10.); +#364=VECTOR('',#2539,10.); +#365=VECTOR('',#2542,10.); +#366=VECTOR('',#2547,10.); +#367=VECTOR('',#2548,10.); +#368=VECTOR('',#2549,10.); +#369=VECTOR('',#2550,10.); +#370=VECTOR('',#2551,10.); +#371=VECTOR('',#2552,10.); +#372=VECTOR('',#2553,10.); +#373=VECTOR('',#2554,10.); +#374=VECTOR('',#2555,10.); +#375=VECTOR('',#2556,10.); +#376=VECTOR('',#2557,10.); +#377=VECTOR('',#2558,10.); +#378=VECTOR('',#2559,10.); +#379=VECTOR('',#2560,10.); +#380=VECTOR('',#2561,10.); +#381=VECTOR('',#2562,10.); +#382=VECTOR('',#2563,10.); +#383=VECTOR('',#2564,10.); +#384=VECTOR('',#2565,10.); +#385=VECTOR('',#2566,10.); +#386=VECTOR('',#2567,10.); +#387=VECTOR('',#2568,10.); +#388=VECTOR('',#2569,10.); +#389=VECTOR('',#2570,10.); +#390=VECTOR('',#2571,10.); +#391=VECTOR('',#2572,10.); +#392=VECTOR('',#2573,10.); +#393=VECTOR('',#2574,10.); +#394=VECTOR('',#2575,10.); +#395=VECTOR('',#2576,10.); +#396=VECTOR('',#2577,10.); +#397=VECTOR('',#2578,10.); +#398=VECTOR('',#2579,10.); +#399=VECTOR('',#2580,10.); +#400=VECTOR('',#2581,10.); +#401=VECTOR('',#2582,10.); +#402=VECTOR('',#2583,10.); +#403=VECTOR('',#2584,10.); +#404=VECTOR('',#2587,10.); +#405=VECTOR('',#2592,10.); +#406=VECTOR('',#2593,10.); +#407=VECTOR('',#2594,10.); +#408=VECTOR('',#2597,10.); +#409=VECTOR('',#2598,10.); +#410=VECTOR('',#2601,10.); +#411=VECTOR('',#2602,10.); +#412=VECTOR('',#2603,10.); +#413=VECTOR('',#2606,10.); +#414=VECTOR('',#2607,10.); +#415=VECTOR('',#2608,10.); +#416=VECTOR('',#2609,10.); +#417=VECTOR('',#2612,10.); +#418=VECTOR('',#2613,10.); +#419=VECTOR('',#2614,10.); +#420=VECTOR('',#2617,10.); +#421=VECTOR('',#2618,10.); +#422=VECTOR('',#2619,10.); +#423=VECTOR('',#2622,10.); +#424=VECTOR('',#2623,10.); +#425=VECTOR('',#2626,10.); +#426=VECTOR('',#2627,10.); +#427=VECTOR('',#2628,10.); +#428=VECTOR('',#2629,10.); +#429=VECTOR('',#2632,10.); +#430=VECTOR('',#2633,10.); +#431=VECTOR('',#2634,10.); +#432=VECTOR('',#2637,10.); +#433=VECTOR('',#2638,10.); +#434=VECTOR('',#2639,10.); +#435=VECTOR('',#2642,10.); +#436=VECTOR('',#2643,10.); +#437=VECTOR('',#2646,10.); +#438=VECTOR('',#2647,10.); +#439=VECTOR('',#2648,10.); +#440=VECTOR('',#2649,10.); +#441=VECTOR('',#2652,10.); +#442=VECTOR('',#2653,10.); +#443=VECTOR('',#2654,10.); +#444=VECTOR('',#2657,10.); +#445=VECTOR('',#2658,10.); +#446=VECTOR('',#2659,10.); +#447=VECTOR('',#2662,10.); +#448=VECTOR('',#2663,10.); +#449=VECTOR('',#2666,10.); +#450=VECTOR('',#2667,10.); +#451=VECTOR('',#2668,10.); +#452=VECTOR('',#2669,10.); +#453=VECTOR('',#2672,10.); +#454=VECTOR('',#2673,10.); +#455=VECTOR('',#2674,10.); +#456=VECTOR('',#2677,10.); +#457=VECTOR('',#2678,10.); +#458=VECTOR('',#2679,10.); +#459=VECTOR('',#2682,10.); +#460=VECTOR('',#2683,10.); +#461=VECTOR('',#2686,10.); +#462=VECTOR('',#2687,10.); +#463=VECTOR('',#2688,10.); +#464=VECTOR('',#2689,10.); +#465=VECTOR('',#2692,10.); +#466=VECTOR('',#2693,10.); +#467=VECTOR('',#2694,10.); +#468=VECTOR('',#2697,10.); +#469=VECTOR('',#2698,10.); +#470=VECTOR('',#2699,10.); +#471=VECTOR('',#2702,10.); +#472=VECTOR('',#2703,10.); +#473=VECTOR('',#2706,10.); +#474=VECTOR('',#2707,10.); +#475=VECTOR('',#2708,10.); +#476=VECTOR('',#2709,10.); +#477=VECTOR('',#2712,10.); +#478=VECTOR('',#2713,10.); +#479=VECTOR('',#2714,10.); +#480=VECTOR('',#2717,10.); +#481=VECTOR('',#2718,10.); +#482=VECTOR('',#2719,10.); +#483=VECTOR('',#2722,10.); +#484=VECTOR('',#2723,10.); +#485=VECTOR('',#2726,10.); +#486=VECTOR('',#2727,10.); +#487=VECTOR('',#2728,10.); +#488=VECTOR('',#2729,10.); +#489=VECTOR('',#2732,10.); +#490=VECTOR('',#2733,10.); +#491=VECTOR('',#2734,10.); +#492=VECTOR('',#2737,10.); +#493=VECTOR('',#2738,10.); +#494=VECTOR('',#2739,10.); +#495=VECTOR('',#2742,10.); +#496=VECTOR('',#2743,10.); +#497=VECTOR('',#2746,10.); +#498=VECTOR('',#2747,10.); +#499=VECTOR('',#2748,10.); +#500=VECTOR('',#2749,10.); +#501=VECTOR('',#2752,10.); +#502=VECTOR('',#2753,10.); +#503=VECTOR('',#2754,10.); +#504=VECTOR('',#2757,10.); +#505=VECTOR('',#2758,10.); +#506=VECTOR('',#2759,10.); +#507=VECTOR('',#2762,10.); +#508=VECTOR('',#2763,10.); +#509=VECTOR('',#2766,10.); +#510=VECTOR('',#2767,10.); +#511=VECTOR('',#2768,10.); +#512=VECTOR('',#2771,10.); +#513=VECTOR('',#2772,10.); +#514=VECTOR('',#2775,10.); +#515=VECTOR('',#2776,10.); +#516=VECTOR('',#2779,10.); +#517=VECTOR('',#2782,10.); +#518=VECTOR('',#2783,10.); +#519=VECTOR('',#2784,10.); +#520=VECTOR('',#2787,10.); +#521=VECTOR('',#2788,10.); +#522=VECTOR('',#2791,10.); +#523=VECTOR('',#2792,10.); +#524=VECTOR('',#2795,10.); +#525=VECTOR('',#2798,10.); +#526=VECTOR('',#2799,10.); +#527=VECTOR('',#2800,10.); +#528=VECTOR('',#2803,10.); +#529=VECTOR('',#2804,10.); +#530=VECTOR('',#2807,10.); +#531=VECTOR('',#2808,10.); +#532=VECTOR('',#2811,10.); +#533=VECTOR('',#2814,10.); +#534=VECTOR('',#2815,10.); +#535=VECTOR('',#2818,10.); +#536=VECTOR('',#2821,10.); +#537=VECTOR('',#2822,10.); +#538=VECTOR('',#2823,10.); +#539=VECTOR('',#2824,10.); +#540=VECTOR('',#2825,10.); +#541=VECTOR('',#2826,10.); +#542=VECTOR('',#2827,10.); +#543=VECTOR('',#2828,10.); +#544=VECTOR('',#2829,10.); +#545=VECTOR('',#2830,10.); +#546=VECTOR('',#2831,10.); +#547=VECTOR('',#2832,10.); +#548=VECTOR('',#2833,10.); +#549=VECTOR('',#2834,10.); +#550=VECTOR('',#2835,10.); +#551=VECTOR('',#2836,10.); +#552=VECTOR('',#2837,10.); +#553=VECTOR('',#2838,10.); +#554=VECTOR('',#2839,10.); +#555=VECTOR('',#2840,10.); +#556=VECTOR('',#2841,10.); +#557=VECTOR('',#2842,10.); +#558=VECTOR('',#2843,10.); +#559=VECTOR('',#2846,10.); +#560=VECTOR('',#2849,10.); +#561=VECTOR('',#2854,10.); +#562=VECTOR('',#2855,10.); +#563=VECTOR('',#2858,10.); +#564=VECTOR('',#2859,10.); +#565=VECTOR('',#2862,10.); +#566=VECTOR('',#2865,10.); +#567=VECTOR('',#2870,10.); +#568=VECTOR('',#2871,10.); +#569=VECTOR('',#2874,10.); +#570=VECTOR('',#2877,10.); +#571=VECTOR('',#2882,10.); +#572=VECTOR('',#2883,10.); +#573=VECTOR('',#2886,10.); +#574=VECTOR('',#2889,10.); +#575=VECTOR('',#2894,10.); +#576=VECTOR('',#2897,10.); +#577=VECTOR('',#2902,10.); +#578=VECTOR('',#2905,10.); +#579=VECTOR('',#2908,10.); +#580=VECTOR('',#2911,10.); +#581=VECTOR('',#2914,10.); +#582=VECTOR('',#2919,10.); +#583=VECTOR('',#2920,10.); +#584=VECTOR('',#2921,10.); +#585=VECTOR('',#2922,10.); +#586=VECTOR('',#2925,10.); +#587=VECTOR('',#2928,10.); +#588=VECTOR('',#2929,10.); +#589=VECTOR('',#2944,10.); +#590=VECTOR('',#2945,10.); +#591=VECTOR('',#2956,10.); +#592=VECTOR('',#2957,10.); +#593=VECTOR('',#2960,10.); +#594=VECTOR('',#2971,10.); +#595=VECTOR('',#2982,10.); +#596=VECTOR('',#2985,10.); +#597=VECTOR('',#2990,10.); +#598=PLANE('',#2270); +#599=PLANE('',#2271); +#600=PLANE('',#2273); +#601=PLANE('',#2278); +#602=PLANE('',#2280); +#603=PLANE('',#2289); +#604=PLANE('',#2310); +#605=PLANE('',#2313); +#606=PLANE('',#2316); +#607=PLANE('',#2317); +#608=PLANE('',#2318); +#609=PLANE('',#2319); +#610=PLANE('',#2320); +#611=PLANE('',#2321); +#612=PLANE('',#2322); +#613=PLANE('',#2323); +#614=PLANE('',#2324); +#615=PLANE('',#2325); +#616=PLANE('',#2326); +#617=PLANE('',#2327); +#618=PLANE('',#2328); +#619=PLANE('',#2329); +#620=PLANE('',#2330); +#621=PLANE('',#2331); +#622=PLANE('',#2332); +#623=PLANE('',#2333); +#624=PLANE('',#2334); +#625=PLANE('',#2335); +#626=PLANE('',#2336); +#627=PLANE('',#2337); +#628=PLANE('',#2338); +#629=PLANE('',#2339); +#630=PLANE('',#2340); +#631=PLANE('',#2341); +#632=PLANE('',#2342); +#633=PLANE('',#2343); +#634=PLANE('',#2344); +#635=PLANE('',#2345); +#636=PLANE('',#2346); +#637=PLANE('',#2347); +#638=PLANE('',#2348); +#639=PLANE('',#2349); +#640=PLANE('',#2350); +#641=PLANE('',#2351); +#642=PLANE('',#2352); +#643=PLANE('',#2353); +#644=PLANE('',#2354); +#645=PLANE('',#2355); +#646=PLANE('',#2356); +#647=PLANE('',#2357); +#648=PLANE('',#2358); +#649=PLANE('',#2359); +#650=PLANE('',#2360); +#651=PLANE('',#2361); +#652=PLANE('',#2362); +#653=PLANE('',#2363); +#654=PLANE('',#2364); +#655=PLANE('',#2365); +#656=PLANE('',#2366); +#657=PLANE('',#2367); +#658=PLANE('',#2368); +#659=PLANE('',#2369); +#660=PLANE('',#2370); +#661=PLANE('',#2371); +#662=PLANE('',#2372); +#663=PLANE('',#2373); +#664=PLANE('',#2374); +#665=PLANE('',#2375); +#666=PLANE('',#2376); +#667=PLANE('',#2377); +#668=PLANE('',#2378); +#669=PLANE('',#2379); +#670=PLANE('',#2380); +#671=PLANE('',#2381); +#672=PLANE('',#2382); +#673=PLANE('',#2383); +#674=PLANE('',#2384); +#675=PLANE('',#2391); +#676=PLANE('',#2394); +#677=PLANE('',#2395); +#678=PLANE('',#2420); +#679=PLANE('',#2421); +#680=PLANE('',#2422); +#681=FACE_OUTER_BOUND('',#795,.T.); +#682=FACE_OUTER_BOUND('',#796,.T.); +#683=FACE_OUTER_BOUND('',#797,.T.); +#684=FACE_OUTER_BOUND('',#798,.T.); +#685=FACE_OUTER_BOUND('',#799,.T.); +#686=FACE_OUTER_BOUND('',#800,.T.); +#687=FACE_OUTER_BOUND('',#801,.T.); +#688=FACE_OUTER_BOUND('',#802,.T.); +#689=FACE_OUTER_BOUND('',#803,.T.); +#690=FACE_OUTER_BOUND('',#805,.T.); +#691=FACE_OUTER_BOUND('',#806,.T.); +#692=FACE_OUTER_BOUND('',#807,.T.); +#693=FACE_OUTER_BOUND('',#808,.T.); +#694=FACE_OUTER_BOUND('',#809,.T.); +#695=FACE_OUTER_BOUND('',#810,.T.); +#696=FACE_OUTER_BOUND('',#811,.T.); +#697=FACE_OUTER_BOUND('',#812,.T.); +#698=FACE_OUTER_BOUND('',#813,.T.); +#699=FACE_OUTER_BOUND('',#814,.T.); +#700=FACE_OUTER_BOUND('',#815,.T.); +#701=FACE_OUTER_BOUND('',#816,.T.); +#702=FACE_OUTER_BOUND('',#817,.T.); +#703=FACE_OUTER_BOUND('',#818,.T.); +#704=FACE_OUTER_BOUND('',#819,.T.); +#705=FACE_OUTER_BOUND('',#828,.T.); +#706=FACE_OUTER_BOUND('',#829,.T.); +#707=FACE_OUTER_BOUND('',#830,.T.); +#708=FACE_OUTER_BOUND('',#831,.T.); +#709=FACE_OUTER_BOUND('',#832,.T.); +#710=FACE_OUTER_BOUND('',#833,.T.); +#711=FACE_OUTER_BOUND('',#834,.T.); +#712=FACE_OUTER_BOUND('',#835,.T.); +#713=FACE_OUTER_BOUND('',#836,.T.); +#714=FACE_OUTER_BOUND('',#837,.T.); +#715=FACE_OUTER_BOUND('',#838,.T.); +#716=FACE_OUTER_BOUND('',#839,.T.); +#717=FACE_OUTER_BOUND('',#840,.T.); +#718=FACE_OUTER_BOUND('',#841,.T.); +#719=FACE_OUTER_BOUND('',#842,.T.); +#720=FACE_OUTER_BOUND('',#843,.T.); +#721=FACE_OUTER_BOUND('',#844,.T.); +#722=FACE_OUTER_BOUND('',#845,.T.); +#723=FACE_OUTER_BOUND('',#846,.T.); +#724=FACE_OUTER_BOUND('',#847,.T.); +#725=FACE_OUTER_BOUND('',#848,.T.); +#726=FACE_OUTER_BOUND('',#849,.T.); +#727=FACE_OUTER_BOUND('',#850,.T.); +#728=FACE_OUTER_BOUND('',#851,.T.); +#729=FACE_OUTER_BOUND('',#852,.T.); +#730=FACE_OUTER_BOUND('',#853,.T.); +#731=FACE_OUTER_BOUND('',#854,.T.); +#732=FACE_OUTER_BOUND('',#855,.T.); +#733=FACE_OUTER_BOUND('',#856,.T.); +#734=FACE_OUTER_BOUND('',#857,.T.); +#735=FACE_OUTER_BOUND('',#858,.T.); +#736=FACE_OUTER_BOUND('',#859,.T.); +#737=FACE_OUTER_BOUND('',#860,.T.); +#738=FACE_OUTER_BOUND('',#861,.T.); +#739=FACE_OUTER_BOUND('',#862,.T.); +#740=FACE_OUTER_BOUND('',#863,.T.); +#741=FACE_OUTER_BOUND('',#864,.T.); +#742=FACE_OUTER_BOUND('',#865,.T.); +#743=FACE_OUTER_BOUND('',#866,.T.); +#744=FACE_OUTER_BOUND('',#867,.T.); +#745=FACE_OUTER_BOUND('',#868,.T.); +#746=FACE_OUTER_BOUND('',#869,.T.); +#747=FACE_OUTER_BOUND('',#870,.T.); +#748=FACE_OUTER_BOUND('',#871,.T.); +#749=FACE_OUTER_BOUND('',#872,.T.); +#750=FACE_OUTER_BOUND('',#873,.T.); +#751=FACE_OUTER_BOUND('',#874,.T.); +#752=FACE_OUTER_BOUND('',#875,.T.); +#753=FACE_OUTER_BOUND('',#876,.T.); +#754=FACE_OUTER_BOUND('',#877,.T.); +#755=FACE_OUTER_BOUND('',#878,.T.); +#756=FACE_OUTER_BOUND('',#887,.T.); +#757=FACE_OUTER_BOUND('',#888,.T.); +#758=FACE_OUTER_BOUND('',#889,.T.); +#759=FACE_OUTER_BOUND('',#890,.T.); +#760=FACE_OUTER_BOUND('',#891,.T.); +#761=FACE_OUTER_BOUND('',#892,.T.); +#762=FACE_OUTER_BOUND('',#893,.T.); +#763=FACE_OUTER_BOUND('',#894,.T.); +#764=FACE_OUTER_BOUND('',#895,.T.); +#765=FACE_OUTER_BOUND('',#896,.T.); +#766=FACE_OUTER_BOUND('',#897,.T.); +#767=FACE_OUTER_BOUND('',#898,.T.); +#768=FACE_OUTER_BOUND('',#899,.T.); +#769=FACE_OUTER_BOUND('',#900,.T.); +#770=FACE_OUTER_BOUND('',#901,.T.); +#771=FACE_OUTER_BOUND('',#902,.T.); +#772=FACE_OUTER_BOUND('',#903,.T.); +#773=FACE_OUTER_BOUND('',#904,.T.); +#774=FACE_OUTER_BOUND('',#905,.T.); +#775=FACE_OUTER_BOUND('',#906,.T.); +#776=FACE_OUTER_BOUND('',#908,.T.); +#777=FACE_OUTER_BOUND('',#909,.T.); +#778=FACE_OUTER_BOUND('',#910,.T.); +#779=FACE_OUTER_BOUND('',#919,.T.); +#780=FACE_OUTER_BOUND('',#920,.T.); +#781=FACE_OUTER_BOUND('',#921,.T.); +#782=FACE_OUTER_BOUND('',#922,.T.); +#783=FACE_OUTER_BOUND('',#923,.T.); +#784=FACE_OUTER_BOUND('',#924,.T.); +#785=FACE_OUTER_BOUND('',#925,.T.); +#786=FACE_OUTER_BOUND('',#926,.T.); +#787=FACE_OUTER_BOUND('',#927,.T.); +#788=FACE_OUTER_BOUND('',#928,.T.); +#789=FACE_OUTER_BOUND('',#929,.T.); +#790=FACE_OUTER_BOUND('',#930,.T.); +#791=FACE_OUTER_BOUND('',#931,.T.); +#792=FACE_OUTER_BOUND('',#932,.T.); +#793=FACE_OUTER_BOUND('',#941,.T.); +#794=FACE_OUTER_BOUND('',#942,.T.); +#795=EDGE_LOOP('',(#1515,#1516,#1517,#1518,#1519,#1520)); +#796=EDGE_LOOP('',(#1521,#1522,#1523,#1524)); +#797=EDGE_LOOP('',(#1525,#1526,#1527,#1528,#1529,#1530,#1531,#1532,#1533)); +#798=EDGE_LOOP('',(#1534,#1535,#1536,#1537)); +#799=EDGE_LOOP('',(#1538,#1539,#1540,#1541,#1542,#1543,#1544,#1545,#1546)); +#800=EDGE_LOOP('',(#1547,#1548,#1549,#1550)); +#801=EDGE_LOOP('',(#1551,#1552,#1553,#1554)); +#802=EDGE_LOOP('',(#1555,#1556,#1557,#1558,#1559)); +#803=EDGE_LOOP('',(#1560,#1561,#1562,#1563,#1564,#1565,#1566,#1567)); +#804=EDGE_LOOP('',(#1568,#1569,#1570,#1571)); +#805=EDGE_LOOP('',(#1572,#1573,#1574,#1575,#1576,#1577)); +#806=EDGE_LOOP('',(#1578,#1579,#1580,#1581,#1582)); +#807=EDGE_LOOP('',(#1583,#1584,#1585,#1586)); +#808=EDGE_LOOP('',(#1587,#1588,#1589,#1590)); +#809=EDGE_LOOP('',(#1591,#1592,#1593,#1594)); +#810=EDGE_LOOP('',(#1595,#1596,#1597,#1598)); +#811=EDGE_LOOP('',(#1599,#1600,#1601,#1602)); +#812=EDGE_LOOP('',(#1603,#1604,#1605,#1606)); +#813=EDGE_LOOP('',(#1607,#1608,#1609,#1610)); +#814=EDGE_LOOP('',(#1611,#1612,#1613,#1614)); +#815=EDGE_LOOP('',(#1615,#1616,#1617,#1618)); +#816=EDGE_LOOP('',(#1619,#1620,#1621,#1622)); +#817=EDGE_LOOP('',(#1623,#1624,#1625,#1626)); +#818=EDGE_LOOP('',(#1627,#1628,#1629,#1630)); +#819=EDGE_LOOP('',(#1631,#1632,#1633,#1634,#1635,#1636,#1637,#1638)); +#820=EDGE_LOOP('',(#1639,#1640,#1641,#1642)); +#821=EDGE_LOOP('',(#1643,#1644,#1645,#1646)); +#822=EDGE_LOOP('',(#1647,#1648,#1649,#1650)); +#823=EDGE_LOOP('',(#1651,#1652,#1653,#1654)); +#824=EDGE_LOOP('',(#1655,#1656,#1657,#1658)); +#825=EDGE_LOOP('',(#1659,#1660,#1661,#1662)); +#826=EDGE_LOOP('',(#1663,#1664,#1665,#1666)); +#827=EDGE_LOOP('',(#1667,#1668,#1669,#1670)); +#828=EDGE_LOOP('',(#1671,#1672,#1673,#1674)); +#829=EDGE_LOOP('',(#1675,#1676,#1677,#1678)); +#830=EDGE_LOOP('',(#1679,#1680,#1681,#1682)); +#831=EDGE_LOOP('',(#1683,#1684,#1685,#1686)); +#832=EDGE_LOOP('',(#1687,#1688,#1689,#1690)); +#833=EDGE_LOOP('',(#1691,#1692,#1693,#1694)); +#834=EDGE_LOOP('',(#1695,#1696,#1697,#1698)); +#835=EDGE_LOOP('',(#1699,#1700,#1701,#1702)); +#836=EDGE_LOOP('',(#1703,#1704,#1705,#1706)); +#837=EDGE_LOOP('',(#1707,#1708,#1709,#1710)); +#838=EDGE_LOOP('',(#1711,#1712,#1713,#1714)); +#839=EDGE_LOOP('',(#1715,#1716,#1717,#1718)); +#840=EDGE_LOOP('',(#1719,#1720,#1721,#1722)); +#841=EDGE_LOOP('',(#1723,#1724,#1725,#1726)); +#842=EDGE_LOOP('',(#1727,#1728,#1729,#1730)); +#843=EDGE_LOOP('',(#1731,#1732,#1733,#1734)); +#844=EDGE_LOOP('',(#1735,#1736,#1737,#1738)); +#845=EDGE_LOOP('',(#1739,#1740,#1741,#1742)); +#846=EDGE_LOOP('',(#1743,#1744,#1745,#1746)); +#847=EDGE_LOOP('',(#1747,#1748,#1749,#1750)); +#848=EDGE_LOOP('',(#1751,#1752,#1753,#1754)); +#849=EDGE_LOOP('',(#1755,#1756,#1757,#1758)); +#850=EDGE_LOOP('',(#1759,#1760,#1761,#1762)); +#851=EDGE_LOOP('',(#1763,#1764,#1765,#1766)); +#852=EDGE_LOOP('',(#1767,#1768,#1769,#1770)); +#853=EDGE_LOOP('',(#1771,#1772,#1773,#1774)); +#854=EDGE_LOOP('',(#1775,#1776,#1777,#1778)); +#855=EDGE_LOOP('',(#1779,#1780,#1781,#1782)); +#856=EDGE_LOOP('',(#1783,#1784,#1785,#1786)); +#857=EDGE_LOOP('',(#1787,#1788,#1789,#1790)); +#858=EDGE_LOOP('',(#1791,#1792,#1793,#1794)); +#859=EDGE_LOOP('',(#1795,#1796,#1797,#1798)); +#860=EDGE_LOOP('',(#1799,#1800,#1801,#1802)); +#861=EDGE_LOOP('',(#1803,#1804,#1805,#1806)); +#862=EDGE_LOOP('',(#1807,#1808,#1809,#1810)); +#863=EDGE_LOOP('',(#1811,#1812,#1813,#1814)); +#864=EDGE_LOOP('',(#1815,#1816,#1817,#1818)); +#865=EDGE_LOOP('',(#1819,#1820,#1821,#1822)); +#866=EDGE_LOOP('',(#1823,#1824,#1825,#1826)); +#867=EDGE_LOOP('',(#1827,#1828,#1829,#1830)); +#868=EDGE_LOOP('',(#1831,#1832,#1833,#1834)); +#869=EDGE_LOOP('',(#1835,#1836,#1837,#1838)); +#870=EDGE_LOOP('',(#1839,#1840,#1841,#1842)); +#871=EDGE_LOOP('',(#1843,#1844,#1845,#1846)); +#872=EDGE_LOOP('',(#1847,#1848,#1849,#1850)); +#873=EDGE_LOOP('',(#1851,#1852,#1853,#1854)); +#874=EDGE_LOOP('',(#1855,#1856,#1857,#1858)); +#875=EDGE_LOOP('',(#1859,#1860,#1861,#1862)); +#876=EDGE_LOOP('',(#1863,#1864,#1865,#1866)); +#877=EDGE_LOOP('',(#1867,#1868,#1869,#1870)); +#878=EDGE_LOOP('',(#1871,#1872,#1873,#1874,#1875,#1876,#1877,#1878)); +#879=EDGE_LOOP('',(#1879,#1880,#1881,#1882)); +#880=EDGE_LOOP('',(#1883,#1884,#1885,#1886)); +#881=EDGE_LOOP('',(#1887,#1888,#1889,#1890)); +#882=EDGE_LOOP('',(#1891,#1892,#1893,#1894)); +#883=EDGE_LOOP('',(#1895,#1896,#1897,#1898)); +#884=EDGE_LOOP('',(#1899,#1900,#1901,#1902)); +#885=EDGE_LOOP('',(#1903,#1904,#1905,#1906)); +#886=EDGE_LOOP('',(#1907,#1908,#1909,#1910)); +#887=EDGE_LOOP('',(#1911,#1912,#1913,#1914)); +#888=EDGE_LOOP('',(#1915,#1916,#1917,#1918)); +#889=EDGE_LOOP('',(#1919,#1920,#1921,#1922)); +#890=EDGE_LOOP('',(#1923,#1924,#1925,#1926)); +#891=EDGE_LOOP('',(#1927,#1928,#1929,#1930)); +#892=EDGE_LOOP('',(#1931,#1932,#1933,#1934)); +#893=EDGE_LOOP('',(#1935,#1936,#1937,#1938)); +#894=EDGE_LOOP('',(#1939,#1940,#1941,#1942)); +#895=EDGE_LOOP('',(#1943,#1944,#1945,#1946)); +#896=EDGE_LOOP('',(#1947,#1948,#1949,#1950)); +#897=EDGE_LOOP('',(#1951,#1952,#1953,#1954)); +#898=EDGE_LOOP('',(#1955,#1956,#1957,#1958)); +#899=EDGE_LOOP('',(#1959,#1960,#1961,#1962)); +#900=EDGE_LOOP('',(#1963,#1964,#1965,#1966)); +#901=EDGE_LOOP('',(#1967,#1968,#1969,#1970)); +#902=EDGE_LOOP('',(#1971,#1972,#1973,#1974)); +#903=EDGE_LOOP('',(#1975,#1976,#1977,#1978)); +#904=EDGE_LOOP('',(#1979,#1980,#1981,#1982)); +#905=EDGE_LOOP('',(#1983,#1984,#1985,#1986,#1987,#1988,#1989,#1990,#1991, +#1992,#1993,#1994,#1995,#1996,#1997,#1998,#1999,#2000,#2001,#2002)); +#906=EDGE_LOOP('',(#2003,#2004,#2005,#2006)); +#907=EDGE_LOOP('',(#2007,#2008,#2009,#2010)); +#908=EDGE_LOOP('',(#2011,#2012,#2013,#2014)); +#909=EDGE_LOOP('',(#2015,#2016,#2017,#2018)); +#910=EDGE_LOOP('',(#2019,#2020,#2021,#2022)); +#911=EDGE_LOOP('',(#2023,#2024,#2025,#2026)); +#912=EDGE_LOOP('',(#2027,#2028,#2029,#2030)); +#913=EDGE_LOOP('',(#2031,#2032,#2033,#2034)); +#914=EDGE_LOOP('',(#2035,#2036,#2037,#2038)); +#915=EDGE_LOOP('',(#2039,#2040,#2041,#2042)); +#916=EDGE_LOOP('',(#2043,#2044,#2045,#2046)); +#917=EDGE_LOOP('',(#2047,#2048,#2049,#2050)); +#918=EDGE_LOOP('',(#2051,#2052,#2053,#2054)); +#919=EDGE_LOOP('',(#2055,#2056,#2057,#2058)); +#920=EDGE_LOOP('',(#2059,#2060,#2061)); +#921=EDGE_LOOP('',(#2062,#2063,#2064,#2065)); +#922=EDGE_LOOP('',(#2066,#2067,#2068)); +#923=EDGE_LOOP('',(#2069,#2070,#2071,#2072)); +#924=EDGE_LOOP('',(#2073,#2074,#2075,#2076)); +#925=EDGE_LOOP('',(#2077,#2078,#2079)); +#926=EDGE_LOOP('',(#2080,#2081,#2082,#2083)); +#927=EDGE_LOOP('',(#2084,#2085,#2086)); +#928=EDGE_LOOP('',(#2087,#2088,#2089,#2090)); +#929=EDGE_LOOP('',(#2091,#2092,#2093,#2094)); +#930=EDGE_LOOP('',(#2095,#2096,#2097,#2098)); +#931=EDGE_LOOP('',(#2099,#2100,#2101,#2102)); +#932=EDGE_LOOP('',(#2103,#2104,#2105,#2106)); +#933=EDGE_LOOP('',(#2107,#2108,#2109,#2110)); +#934=EDGE_LOOP('',(#2111,#2112,#2113,#2114)); +#935=EDGE_LOOP('',(#2115,#2116,#2117,#2118)); +#936=EDGE_LOOP('',(#2119,#2120,#2121,#2122)); +#937=EDGE_LOOP('',(#2123,#2124,#2125,#2126)); +#938=EDGE_LOOP('',(#2127,#2128,#2129,#2130)); +#939=EDGE_LOOP('',(#2131,#2132,#2133,#2134)); +#940=EDGE_LOOP('',(#2135,#2136,#2137,#2138)); +#941=EDGE_LOOP('',(#2139,#2140,#2141,#2142)); +#942=EDGE_LOOP('',(#2143,#2144,#2145,#2146)); +#943=CIRCLE('',#2266,21.7441885942753); +#944=CIRCLE('',#2267,20.9794700163437); +#945=CIRCLE('',#2269,20.6); +#946=CIRCLE('',#2272,20.078142394316); +#947=CIRCLE('',#2275,22.7000002980232); +#948=CIRCLE('',#2277,20.0000002980232); +#949=CIRCLE('',#2281,0.399999999999996); +#950=CIRCLE('',#2282,0.399999999999997); +#951=CIRCLE('',#2283,0.4); +#952=CIRCLE('',#2284,0.4); +#953=CIRCLE('',#2285,19.6); +#954=CIRCLE('',#2287,18.6); +#955=CIRCLE('',#2291,18.6); +#956=CIRCLE('',#2293,20.0000002980232); +#957=CIRCLE('',#2294,1.); +#958=CIRCLE('',#2295,1.); +#959=CIRCLE('',#2296,1.4); +#960=CIRCLE('',#2298,1.); +#961=CIRCLE('',#2300,1.); +#962=CIRCLE('',#2301,0.999999999999996); +#963=CIRCLE('',#2302,1.4); +#964=CIRCLE('',#2303,1.); +#965=CIRCLE('',#2304,1.4); +#966=CIRCLE('',#2306,1.); +#967=CIRCLE('',#2308,1.); +#968=CIRCLE('',#2309,1.4); +#969=CIRCLE('',#2312,1.4); +#970=CIRCLE('',#2315,1.4); +#971=CIRCLE('',#2385,3.); +#972=CIRCLE('',#2386,3.); +#973=CIRCLE('',#2387,3.); +#974=CIRCLE('',#2388,3.); +#975=CIRCLE('',#2389,1.4); +#976=CIRCLE('',#2390,1.4); +#977=CIRCLE('',#2397,3.); +#978=CIRCLE('',#2398,3.); +#979=CIRCLE('',#2399,3.); +#980=CIRCLE('',#2402,3.); +#981=CIRCLE('',#2403,3.); +#982=CIRCLE('',#2404,3.); +#983=CIRCLE('',#2408,3.); +#984=CIRCLE('',#2409,3.); +#985=CIRCLE('',#2410,3.); +#986=CIRCLE('',#2413,3.); +#987=CIRCLE('',#2414,3.); +#988=CIRCLE('',#2415,3.); +#989=B_SPLINE_CURVE_WITH_KNOTS('',3,(#3001,#3002,#3003,#3004,#3005,#3006), + .UNSPECIFIED.,.F.,.F.,(4,2,4),(0.881830205640386,0.902587652747061,0.909670011618016), + .UNSPECIFIED.); +#990=B_SPLINE_CURVE_WITH_KNOTS('',3,(#3010,#3011,#3012,#3013,#3014,#3015), + .UNSPECIFIED.,.F.,.F.,(4,2,4),(1.33461622889849,1.35033889705778,1.36252816783717), + .UNSPECIFIED.); +#991=B_SPLINE_CURVE_WITH_KNOTS('',3,(#3017,#3018,#3019,#3020,#3021,#3022), + .UNSPECIFIED.,.F.,.F.,(4,2,4),(1.02528623221023,1.1316216056609,1.15404934120925), + .UNSPECIFIED.); +#992=B_SPLINE_CURVE_WITH_KNOTS('',3,(#3025,#3026,#3027,#3028,#3029,#3030), + .UNSPECIFIED.,.F.,.F.,(4,2,4),(0.739401669805833,0.76182940549966,0.868164778950325), + .UNSPECIFIED.); +#993=B_SPLINE_CURVE_WITH_KNOTS('',3,(#3033,#3034,#3035,#3036,#3037,#3038, +#3039,#3040),.UNSPECIFIED.,.F.,.F.,(4,2,2,4),(0.264116071710462,0.297269445384733, +0.321458793987964,0.337621357531989),.UNSPECIFIED.); +#994=B_SPLINE_CURVE_WITH_KNOTS('',3,(#3043,#3044,#3045,#3046,#3047,#3048, +#3049,#3050),.UNSPECIFIED.,.F.,.F.,(4,2,2,4),(0.363339100574014,0.379501664118038, +0.403691012721269,0.436844386395541),.UNSPECIFIED.); +#995=VERTEX_POINT('',#2999); +#996=VERTEX_POINT('',#3000); +#997=VERTEX_POINT('',#3007); +#998=VERTEX_POINT('',#3009); +#999=VERTEX_POINT('',#3016); +#1000=VERTEX_POINT('',#3023); +#1001=VERTEX_POINT('',#3032); +#1002=VERTEX_POINT('',#3041); +#1003=VERTEX_POINT('',#3052); +#1004=VERTEX_POINT('',#3054); +#1005=VERTEX_POINT('',#3058); +#1006=VERTEX_POINT('',#3060); +#1007=VERTEX_POINT('',#3062); +#1008=VERTEX_POINT('',#3064); +#1009=VERTEX_POINT('',#3070); +#1010=VERTEX_POINT('',#3074); +#1011=VERTEX_POINT('',#3078); +#1012=VERTEX_POINT('',#3080); +#1013=VERTEX_POINT('',#3082); +#1014=VERTEX_POINT('',#3084); +#1015=VERTEX_POINT('',#3090); +#1016=VERTEX_POINT('',#3094); +#1017=VERTEX_POINT('',#3102); +#1018=VERTEX_POINT('',#3106); +#1019=VERTEX_POINT('',#3107); +#1020=VERTEX_POINT('',#3109); +#1021=VERTEX_POINT('',#3111); +#1022=VERTEX_POINT('',#3113); +#1023=VERTEX_POINT('',#3115); +#1024=VERTEX_POINT('',#3117); +#1025=VERTEX_POINT('',#3119); +#1026=VERTEX_POINT('',#3122); +#1027=VERTEX_POINT('',#3142); +#1028=VERTEX_POINT('',#3144); +#1029=VERTEX_POINT('',#3148); +#1030=VERTEX_POINT('',#3152); +#1031=VERTEX_POINT('',#3164); +#1032=VERTEX_POINT('',#3176); +#1033=VERTEX_POINT('',#3180); +#1034=VERTEX_POINT('',#3184); +#1035=VERTEX_POINT('',#3198); +#1036=VERTEX_POINT('',#3200); +#1037=VERTEX_POINT('',#3204); +#1038=VERTEX_POINT('',#3208); +#1039=VERTEX_POINT('',#3210); +#1040=VERTEX_POINT('',#3212); +#1041=VERTEX_POINT('',#3214); +#1042=VERTEX_POINT('',#3216); +#1043=VERTEX_POINT('',#3219); +#1044=VERTEX_POINT('',#3220); +#1045=VERTEX_POINT('',#3222); +#1046=VERTEX_POINT('',#3224); +#1047=VERTEX_POINT('',#3227); +#1048=VERTEX_POINT('',#3228); +#1049=VERTEX_POINT('',#3230); +#1050=VERTEX_POINT('',#3232); +#1051=VERTEX_POINT('',#3235); +#1052=VERTEX_POINT('',#3236); +#1053=VERTEX_POINT('',#3238); +#1054=VERTEX_POINT('',#3240); +#1055=VERTEX_POINT('',#3243); +#1056=VERTEX_POINT('',#3244); +#1057=VERTEX_POINT('',#3246); +#1058=VERTEX_POINT('',#3248); +#1059=VERTEX_POINT('',#3251); +#1060=VERTEX_POINT('',#3252); +#1061=VERTEX_POINT('',#3254); +#1062=VERTEX_POINT('',#3256); +#1063=VERTEX_POINT('',#3259); +#1064=VERTEX_POINT('',#3260); +#1065=VERTEX_POINT('',#3262); +#1066=VERTEX_POINT('',#3264); +#1067=VERTEX_POINT('',#3267); +#1068=VERTEX_POINT('',#3268); +#1069=VERTEX_POINT('',#3270); +#1070=VERTEX_POINT('',#3272); +#1071=VERTEX_POINT('',#3275); +#1072=VERTEX_POINT('',#3276); +#1073=VERTEX_POINT('',#3278); +#1074=VERTEX_POINT('',#3280); +#1075=VERTEX_POINT('',#3284); +#1076=VERTEX_POINT('',#3288); +#1077=VERTEX_POINT('',#3290); +#1078=VERTEX_POINT('',#3294); +#1079=VERTEX_POINT('',#3298); +#1080=VERTEX_POINT('',#3300); +#1081=VERTEX_POINT('',#3304); +#1082=VERTEX_POINT('',#3305); +#1083=VERTEX_POINT('',#3307); +#1084=VERTEX_POINT('',#3309); +#1085=VERTEX_POINT('',#3313); +#1086=VERTEX_POINT('',#3315); +#1087=VERTEX_POINT('',#3319); +#1088=VERTEX_POINT('',#3321); +#1089=VERTEX_POINT('',#3328); +#1090=VERTEX_POINT('',#3329); +#1091=VERTEX_POINT('',#3331); +#1092=VERTEX_POINT('',#3333); +#1093=VERTEX_POINT('',#3337); +#1094=VERTEX_POINT('',#3339); +#1095=VERTEX_POINT('',#3343); +#1096=VERTEX_POINT('',#3345); +#1097=VERTEX_POINT('',#3352); +#1098=VERTEX_POINT('',#3353); +#1099=VERTEX_POINT('',#3355); +#1100=VERTEX_POINT('',#3357); +#1101=VERTEX_POINT('',#3361); +#1102=VERTEX_POINT('',#3363); +#1103=VERTEX_POINT('',#3367); +#1104=VERTEX_POINT('',#3369); +#1105=VERTEX_POINT('',#3376); +#1106=VERTEX_POINT('',#3377); +#1107=VERTEX_POINT('',#3379); +#1108=VERTEX_POINT('',#3381); +#1109=VERTEX_POINT('',#3385); +#1110=VERTEX_POINT('',#3387); +#1111=VERTEX_POINT('',#3391); +#1112=VERTEX_POINT('',#3393); +#1113=VERTEX_POINT('',#3400); +#1114=VERTEX_POINT('',#3401); +#1115=VERTEX_POINT('',#3403); +#1116=VERTEX_POINT('',#3405); +#1117=VERTEX_POINT('',#3409); +#1118=VERTEX_POINT('',#3411); +#1119=VERTEX_POINT('',#3415); +#1120=VERTEX_POINT('',#3417); +#1121=VERTEX_POINT('',#3424); +#1122=VERTEX_POINT('',#3425); +#1123=VERTEX_POINT('',#3427); +#1124=VERTEX_POINT('',#3429); +#1125=VERTEX_POINT('',#3433); +#1126=VERTEX_POINT('',#3435); +#1127=VERTEX_POINT('',#3439); +#1128=VERTEX_POINT('',#3441); +#1129=VERTEX_POINT('',#3448); +#1130=VERTEX_POINT('',#3449); +#1131=VERTEX_POINT('',#3451); +#1132=VERTEX_POINT('',#3453); +#1133=VERTEX_POINT('',#3457); +#1134=VERTEX_POINT('',#3459); +#1135=VERTEX_POINT('',#3463); +#1136=VERTEX_POINT('',#3465); +#1137=VERTEX_POINT('',#3472); +#1138=VERTEX_POINT('',#3473); +#1139=VERTEX_POINT('',#3475); +#1140=VERTEX_POINT('',#3477); +#1141=VERTEX_POINT('',#3481); +#1142=VERTEX_POINT('',#3483); +#1143=VERTEX_POINT('',#3487); +#1144=VERTEX_POINT('',#3489); +#1145=VERTEX_POINT('',#3496); +#1146=VERTEX_POINT('',#3497); +#1147=VERTEX_POINT('',#3502); +#1148=VERTEX_POINT('',#3506); +#1149=VERTEX_POINT('',#3512); +#1150=VERTEX_POINT('',#3513); +#1151=VERTEX_POINT('',#3518); +#1152=VERTEX_POINT('',#3522); +#1153=VERTEX_POINT('',#3528); +#1154=VERTEX_POINT('',#3529); +#1155=VERTEX_POINT('',#3534); +#1156=VERTEX_POINT('',#3538); +#1157=VERTEX_POINT('',#3544); +#1158=VERTEX_POINT('',#3550); +#1159=VERTEX_POINT('',#3551); +#1160=VERTEX_POINT('',#3553); +#1161=VERTEX_POINT('',#3555); +#1162=VERTEX_POINT('',#3557); +#1163=VERTEX_POINT('',#3559); +#1164=VERTEX_POINT('',#3561); +#1165=VERTEX_POINT('',#3563); +#1166=VERTEX_POINT('',#3566); +#1167=VERTEX_POINT('',#3567); +#1168=VERTEX_POINT('',#3569); +#1169=VERTEX_POINT('',#3571); +#1170=VERTEX_POINT('',#3574); +#1171=VERTEX_POINT('',#3575); +#1172=VERTEX_POINT('',#3577); +#1173=VERTEX_POINT('',#3579); +#1174=VERTEX_POINT('',#3582); +#1175=VERTEX_POINT('',#3583); +#1176=VERTEX_POINT('',#3585); +#1177=VERTEX_POINT('',#3587); +#1178=VERTEX_POINT('',#3590); +#1179=VERTEX_POINT('',#3592); +#1180=VERTEX_POINT('',#3632); +#1181=VERTEX_POINT('',#3634); +#1182=VERTEX_POINT('',#3636); +#1183=VERTEX_POINT('',#3638); +#1184=VERTEX_POINT('',#3640); +#1185=VERTEX_POINT('',#3642); +#1186=VERTEX_POINT('',#3645); +#1187=VERTEX_POINT('',#3647); +#1188=VERTEX_POINT('',#3649); +#1189=VERTEX_POINT('',#3653); +#1190=VERTEX_POINT('',#3654); +#1191=VERTEX_POINT('',#3656); +#1192=VERTEX_POINT('',#3658); +#1193=VERTEX_POINT('',#3669); +#1194=VERTEX_POINT('',#3671); +#1195=VERTEX_POINT('',#3678); +#1196=VERTEX_POINT('',#3680); +#1197=VERTEX_POINT('',#3689); +#1198=VERTEX_POINT('',#3697); +#1199=EDGE_CURVE('',#995,#996,#989,.F.); +#1200=EDGE_CURVE('',#996,#997,#943,.T.); +#1201=EDGE_CURVE('',#998,#997,#990,.T.); +#1202=EDGE_CURVE('',#999,#998,#991,.T.); +#1203=EDGE_CURVE('',#999,#1000,#944,.T.); +#1204=EDGE_CURVE('',#1000,#995,#992,.F.); +#1205=EDGE_CURVE('',#1001,#999,#993,.T.); +#1206=EDGE_CURVE('',#1001,#1002,#945,.T.); +#1207=EDGE_CURVE('',#1000,#1002,#994,.T.); +#1208=EDGE_CURVE('',#1003,#998,#86,.T.); +#1209=EDGE_CURVE('',#1004,#1003,#80,.T.); +#1210=EDGE_CURVE('',#1005,#1004,#87,.T.); +#1211=EDGE_CURVE('',#1006,#1005,#88,.T.); +#1212=EDGE_CURVE('',#1006,#1007,#89,.T.); +#1213=EDGE_CURVE('',#1008,#1007,#81,.F.); +#1214=EDGE_CURVE('',#1001,#1008,#90,.F.); +#1215=EDGE_CURVE('',#1009,#1008,#946,.T.); +#1216=EDGE_CURVE('',#1009,#1002,#91,.F.); +#1217=EDGE_CURVE('',#1010,#1009,#82,.F.); +#1218=EDGE_CURVE('',#1010,#1011,#92,.T.); +#1219=EDGE_CURVE('',#1012,#1011,#93,.T.); +#1220=EDGE_CURVE('',#1013,#1012,#94,.T.); +#1221=EDGE_CURVE('',#1014,#1013,#83,.T.); +#1222=EDGE_CURVE('',#995,#1014,#95,.T.); +#1223=EDGE_CURVE('',#1015,#996,#84,.F.); +#1224=EDGE_CURVE('',#1015,#1016,#947,.T.); +#1225=EDGE_CURVE('',#997,#1016,#85,.F.); +#1226=EDGE_CURVE('',#1007,#1010,#948,.T.); +#1227=EDGE_CURVE('',#1014,#1017,#75,.T.); +#1228=EDGE_CURVE('',#1017,#1015,#96,.T.); +#1229=EDGE_CURVE('',#1018,#1019,#949,.T.); +#1230=EDGE_CURVE('',#1020,#1018,#97,.T.); +#1231=EDGE_CURVE('',#1021,#1020,#950,.T.); +#1232=EDGE_CURVE('',#1022,#1021,#98,.T.); +#1233=EDGE_CURVE('',#1023,#1022,#951,.T.); +#1234=EDGE_CURVE('',#1024,#1023,#99,.T.); +#1235=EDGE_CURVE('',#1025,#1024,#952,.T.); +#1236=EDGE_CURVE('',#1019,#1025,#100,.T.); +#1237=EDGE_CURVE('',#1026,#1017,#953,.T.); +#1238=EDGE_CURVE('',#1016,#1026,#101,.T.); +#1239=EDGE_CURVE('',#1013,#1004,#954,.T.); +#1240=EDGE_CURVE('',#1026,#1003,#76,.T.); +#1241=EDGE_CURVE('',#1005,#1012,#955,.T.); +#1242=EDGE_CURVE('',#1011,#1006,#956,.T.); +#1243=EDGE_CURVE('',#1027,#1018,#957,.T.); +#1244=EDGE_CURVE('',#1019,#1028,#958,.T.); +#1245=EDGE_CURVE('',#1028,#1027,#959,.T.); +#1246=EDGE_CURVE('',#1029,#1020,#960,.T.); +#1247=EDGE_CURVE('',#1027,#1029,#102,.T.); +#1248=EDGE_CURVE('',#1025,#1030,#961,.T.); +#1249=EDGE_CURVE('',#1030,#1028,#103,.T.); +#1250=EDGE_CURVE('',#1031,#1021,#962,.T.); +#1251=EDGE_CURVE('',#1029,#1031,#963,.T.); +#1252=EDGE_CURVE('',#1024,#1032,#964,.T.); +#1253=EDGE_CURVE('',#1032,#1030,#965,.T.); +#1254=EDGE_CURVE('',#1033,#1022,#966,.T.); +#1255=EDGE_CURVE('',#1031,#1033,#104,.T.); +#1256=EDGE_CURVE('',#1023,#1034,#967,.T.); +#1257=EDGE_CURVE('',#1034,#1032,#105,.T.); +#1258=EDGE_CURVE('',#1033,#1034,#968,.T.); +#1259=EDGE_CURVE('',#1031,#1035,#106,.T.); +#1260=EDGE_CURVE('',#1036,#1035,#107,.T.); +#1261=EDGE_CURVE('',#1036,#1033,#108,.T.); +#1262=EDGE_CURVE('',#1037,#1029,#109,.T.); +#1263=EDGE_CURVE('',#1035,#1037,#969,.T.); +#1264=EDGE_CURVE('',#1027,#1038,#110,.T.); +#1265=EDGE_CURVE('',#1039,#1038,#111,.T.); +#1266=EDGE_CURVE('',#1039,#1040,#112,.T.); +#1267=EDGE_CURVE('',#1040,#1041,#113,.T.); +#1268=EDGE_CURVE('',#1041,#1042,#114,.T.); +#1269=EDGE_CURVE('',#1037,#1042,#115,.T.); +#1270=EDGE_CURVE('',#1043,#1044,#116,.T.); +#1271=EDGE_CURVE('',#1044,#1045,#117,.T.); +#1272=EDGE_CURVE('',#1045,#1046,#118,.T.); +#1273=EDGE_CURVE('',#1046,#1043,#119,.T.); +#1274=EDGE_CURVE('',#1047,#1048,#120,.T.); +#1275=EDGE_CURVE('',#1048,#1049,#121,.T.); +#1276=EDGE_CURVE('',#1049,#1050,#122,.T.); +#1277=EDGE_CURVE('',#1050,#1047,#123,.T.); +#1278=EDGE_CURVE('',#1051,#1052,#124,.T.); +#1279=EDGE_CURVE('',#1052,#1053,#125,.T.); +#1280=EDGE_CURVE('',#1053,#1054,#126,.T.); +#1281=EDGE_CURVE('',#1054,#1051,#127,.T.); +#1282=EDGE_CURVE('',#1055,#1056,#128,.T.); +#1283=EDGE_CURVE('',#1055,#1057,#129,.T.); +#1284=EDGE_CURVE('',#1057,#1058,#130,.T.); +#1285=EDGE_CURVE('',#1058,#1056,#131,.T.); +#1286=EDGE_CURVE('',#1059,#1060,#132,.T.); +#1287=EDGE_CURVE('',#1060,#1061,#133,.T.); +#1288=EDGE_CURVE('',#1061,#1062,#134,.T.); +#1289=EDGE_CURVE('',#1062,#1059,#135,.T.); +#1290=EDGE_CURVE('',#1063,#1064,#136,.T.); +#1291=EDGE_CURVE('',#1064,#1065,#137,.T.); +#1292=EDGE_CURVE('',#1065,#1066,#138,.T.); +#1293=EDGE_CURVE('',#1066,#1063,#139,.T.); +#1294=EDGE_CURVE('',#1067,#1068,#140,.T.); +#1295=EDGE_CURVE('',#1068,#1069,#141,.T.); +#1296=EDGE_CURVE('',#1069,#1070,#142,.T.); +#1297=EDGE_CURVE('',#1070,#1067,#143,.T.); +#1298=EDGE_CURVE('',#1071,#1072,#144,.T.); +#1299=EDGE_CURVE('',#1072,#1073,#145,.T.); +#1300=EDGE_CURVE('',#1073,#1074,#146,.T.); +#1301=EDGE_CURVE('',#1071,#1074,#147,.T.); +#1302=EDGE_CURVE('',#1075,#1028,#148,.T.); +#1303=EDGE_CURVE('',#1038,#1075,#970,.T.); +#1304=EDGE_CURVE('',#1076,#1056,#149,.T.); +#1305=EDGE_CURVE('',#1077,#1076,#150,.T.); +#1306=EDGE_CURVE('',#1055,#1077,#151,.T.); +#1307=EDGE_CURVE('',#1078,#1077,#152,.T.); +#1308=EDGE_CURVE('',#1057,#1078,#153,.T.); +#1309=EDGE_CURVE('',#1079,#1074,#154,.T.); +#1310=EDGE_CURVE('',#1080,#1079,#155,.T.); +#1311=EDGE_CURVE('',#1071,#1080,#156,.T.); +#1312=EDGE_CURVE('',#1081,#1082,#157,.T.); +#1313=EDGE_CURVE('',#1083,#1081,#158,.T.); +#1314=EDGE_CURVE('',#1084,#1083,#159,.T.); +#1315=EDGE_CURVE('',#1082,#1084,#160,.T.); +#1316=EDGE_CURVE('',#1082,#1085,#161,.T.); +#1317=EDGE_CURVE('',#1086,#1084,#162,.T.); +#1318=EDGE_CURVE('',#1085,#1086,#163,.T.); +#1319=EDGE_CURVE('',#1085,#1087,#164,.T.); +#1320=EDGE_CURVE('',#1088,#1086,#165,.T.); +#1321=EDGE_CURVE('',#1087,#1088,#166,.T.); +#1322=EDGE_CURVE('',#1087,#1081,#167,.T.); +#1323=EDGE_CURVE('',#1083,#1088,#168,.T.); +#1324=EDGE_CURVE('',#1089,#1090,#169,.T.); +#1325=EDGE_CURVE('',#1091,#1089,#170,.T.); +#1326=EDGE_CURVE('',#1092,#1091,#171,.T.); +#1327=EDGE_CURVE('',#1090,#1092,#172,.T.); +#1328=EDGE_CURVE('',#1090,#1093,#173,.T.); +#1329=EDGE_CURVE('',#1094,#1092,#174,.T.); +#1330=EDGE_CURVE('',#1093,#1094,#175,.T.); +#1331=EDGE_CURVE('',#1093,#1095,#176,.T.); +#1332=EDGE_CURVE('',#1096,#1094,#177,.T.); +#1333=EDGE_CURVE('',#1095,#1096,#178,.T.); +#1334=EDGE_CURVE('',#1095,#1089,#179,.T.); +#1335=EDGE_CURVE('',#1091,#1096,#180,.T.); +#1336=EDGE_CURVE('',#1097,#1098,#181,.T.); +#1337=EDGE_CURVE('',#1099,#1097,#182,.T.); +#1338=EDGE_CURVE('',#1100,#1099,#183,.T.); +#1339=EDGE_CURVE('',#1098,#1100,#184,.T.); +#1340=EDGE_CURVE('',#1098,#1101,#185,.T.); +#1341=EDGE_CURVE('',#1102,#1100,#186,.T.); +#1342=EDGE_CURVE('',#1101,#1102,#187,.T.); +#1343=EDGE_CURVE('',#1101,#1103,#188,.T.); +#1344=EDGE_CURVE('',#1104,#1102,#189,.T.); +#1345=EDGE_CURVE('',#1103,#1104,#190,.T.); +#1346=EDGE_CURVE('',#1103,#1097,#191,.T.); +#1347=EDGE_CURVE('',#1099,#1104,#192,.T.); +#1348=EDGE_CURVE('',#1105,#1106,#193,.T.); +#1349=EDGE_CURVE('',#1107,#1105,#194,.T.); +#1350=EDGE_CURVE('',#1108,#1107,#195,.T.); +#1351=EDGE_CURVE('',#1106,#1108,#196,.T.); +#1352=EDGE_CURVE('',#1106,#1109,#197,.T.); +#1353=EDGE_CURVE('',#1110,#1108,#198,.T.); +#1354=EDGE_CURVE('',#1109,#1110,#199,.T.); +#1355=EDGE_CURVE('',#1109,#1111,#200,.T.); +#1356=EDGE_CURVE('',#1112,#1110,#201,.T.); +#1357=EDGE_CURVE('',#1111,#1112,#202,.T.); +#1358=EDGE_CURVE('',#1111,#1105,#203,.T.); +#1359=EDGE_CURVE('',#1107,#1112,#204,.T.); +#1360=EDGE_CURVE('',#1113,#1114,#205,.T.); +#1361=EDGE_CURVE('',#1115,#1113,#206,.T.); +#1362=EDGE_CURVE('',#1116,#1115,#207,.T.); +#1363=EDGE_CURVE('',#1114,#1116,#208,.T.); +#1364=EDGE_CURVE('',#1114,#1117,#209,.T.); +#1365=EDGE_CURVE('',#1118,#1116,#210,.T.); +#1366=EDGE_CURVE('',#1117,#1118,#211,.T.); +#1367=EDGE_CURVE('',#1117,#1119,#212,.T.); +#1368=EDGE_CURVE('',#1120,#1118,#213,.T.); +#1369=EDGE_CURVE('',#1119,#1120,#214,.T.); +#1370=EDGE_CURVE('',#1119,#1113,#215,.T.); +#1371=EDGE_CURVE('',#1115,#1120,#216,.T.); +#1372=EDGE_CURVE('',#1121,#1122,#217,.T.); +#1373=EDGE_CURVE('',#1123,#1121,#218,.T.); +#1374=EDGE_CURVE('',#1124,#1123,#219,.T.); +#1375=EDGE_CURVE('',#1122,#1124,#220,.T.); +#1376=EDGE_CURVE('',#1122,#1125,#221,.T.); +#1377=EDGE_CURVE('',#1126,#1124,#222,.T.); +#1378=EDGE_CURVE('',#1125,#1126,#223,.T.); +#1379=EDGE_CURVE('',#1125,#1127,#224,.T.); +#1380=EDGE_CURVE('',#1128,#1126,#225,.T.); +#1381=EDGE_CURVE('',#1127,#1128,#226,.T.); +#1382=EDGE_CURVE('',#1127,#1121,#227,.T.); +#1383=EDGE_CURVE('',#1123,#1128,#228,.T.); +#1384=EDGE_CURVE('',#1129,#1130,#229,.T.); +#1385=EDGE_CURVE('',#1131,#1129,#230,.T.); +#1386=EDGE_CURVE('',#1132,#1131,#231,.T.); +#1387=EDGE_CURVE('',#1130,#1132,#232,.T.); +#1388=EDGE_CURVE('',#1130,#1133,#233,.T.); +#1389=EDGE_CURVE('',#1134,#1132,#234,.T.); +#1390=EDGE_CURVE('',#1133,#1134,#235,.T.); +#1391=EDGE_CURVE('',#1133,#1135,#236,.T.); +#1392=EDGE_CURVE('',#1136,#1134,#237,.T.); +#1393=EDGE_CURVE('',#1135,#1136,#238,.T.); +#1394=EDGE_CURVE('',#1135,#1129,#239,.T.); +#1395=EDGE_CURVE('',#1131,#1136,#240,.T.); +#1396=EDGE_CURVE('',#1137,#1138,#241,.T.); +#1397=EDGE_CURVE('',#1139,#1137,#242,.T.); +#1398=EDGE_CURVE('',#1140,#1139,#243,.T.); +#1399=EDGE_CURVE('',#1138,#1140,#244,.T.); +#1400=EDGE_CURVE('',#1138,#1141,#245,.T.); +#1401=EDGE_CURVE('',#1142,#1140,#246,.T.); +#1402=EDGE_CURVE('',#1141,#1142,#247,.T.); +#1403=EDGE_CURVE('',#1141,#1143,#248,.T.); +#1404=EDGE_CURVE('',#1144,#1142,#249,.T.); +#1405=EDGE_CURVE('',#1143,#1144,#250,.T.); +#1406=EDGE_CURVE('',#1143,#1137,#251,.T.); +#1407=EDGE_CURVE('',#1139,#1144,#252,.T.); +#1408=EDGE_CURVE('',#1145,#1146,#253,.T.); +#1409=EDGE_CURVE('',#1145,#1070,#254,.T.); +#1410=EDGE_CURVE('',#1069,#1146,#255,.T.); +#1411=EDGE_CURVE('',#1146,#1147,#256,.T.); +#1412=EDGE_CURVE('',#1068,#1147,#257,.T.); +#1413=EDGE_CURVE('',#1147,#1148,#258,.T.); +#1414=EDGE_CURVE('',#1067,#1148,#259,.T.); +#1415=EDGE_CURVE('',#1148,#1145,#260,.T.); +#1416=EDGE_CURVE('',#1149,#1150,#261,.T.); +#1417=EDGE_CURVE('',#1149,#1066,#262,.T.); +#1418=EDGE_CURVE('',#1065,#1150,#263,.T.); +#1419=EDGE_CURVE('',#1150,#1151,#264,.T.); +#1420=EDGE_CURVE('',#1064,#1151,#265,.T.); +#1421=EDGE_CURVE('',#1151,#1152,#266,.T.); +#1422=EDGE_CURVE('',#1063,#1152,#267,.T.); +#1423=EDGE_CURVE('',#1152,#1149,#268,.T.); +#1424=EDGE_CURVE('',#1153,#1154,#269,.T.); +#1425=EDGE_CURVE('',#1153,#1062,#270,.T.); +#1426=EDGE_CURVE('',#1061,#1154,#271,.T.); +#1427=EDGE_CURVE('',#1154,#1155,#272,.T.); +#1428=EDGE_CURVE('',#1060,#1155,#273,.T.); +#1429=EDGE_CURVE('',#1155,#1156,#274,.T.); +#1430=EDGE_CURVE('',#1059,#1156,#275,.T.); +#1431=EDGE_CURVE('',#1156,#1153,#276,.T.); +#1432=EDGE_CURVE('',#1157,#1078,#277,.T.); +#1433=EDGE_CURVE('',#1157,#1058,#278,.T.); +#1434=EDGE_CURVE('',#1076,#1157,#279,.T.); +#1435=EDGE_CURVE('',#1158,#1159,#280,.T.); +#1436=EDGE_CURVE('',#1159,#1160,#281,.T.); +#1437=EDGE_CURVE('',#1161,#1160,#282,.T.); +#1438=EDGE_CURVE('',#1162,#1161,#283,.T.); +#1439=EDGE_CURVE('',#1163,#1162,#284,.T.); +#1440=EDGE_CURVE('',#1164,#1163,#285,.T.); +#1441=EDGE_CURVE('',#1165,#1164,#286,.T.); +#1442=EDGE_CURVE('',#1165,#1158,#287,.T.); +#1443=EDGE_CURVE('',#1166,#1167,#288,.T.); +#1444=EDGE_CURVE('',#1167,#1168,#289,.T.); +#1445=EDGE_CURVE('',#1168,#1169,#290,.T.); +#1446=EDGE_CURVE('',#1169,#1166,#291,.T.); +#1447=EDGE_CURVE('',#1170,#1171,#292,.T.); +#1448=EDGE_CURVE('',#1171,#1172,#293,.T.); +#1449=EDGE_CURVE('',#1172,#1173,#294,.T.); +#1450=EDGE_CURVE('',#1173,#1170,#295,.T.); +#1451=EDGE_CURVE('',#1174,#1175,#296,.T.); +#1452=EDGE_CURVE('',#1175,#1176,#297,.T.); +#1453=EDGE_CURVE('',#1176,#1177,#298,.T.); +#1454=EDGE_CURVE('',#1177,#1174,#299,.T.); +#1455=EDGE_CURVE('',#1079,#1178,#300,.T.); +#1456=EDGE_CURVE('',#1178,#1179,#301,.T.); +#1457=EDGE_CURVE('',#1179,#1080,#302,.T.); +#1458=EDGE_CURVE('',#1072,#1179,#303,.T.); +#1459=EDGE_CURVE('',#1178,#1073,#304,.T.); +#1460=EDGE_CURVE('',#1158,#1041,#305,.T.); +#1461=EDGE_CURVE('',#1159,#1040,#306,.T.); +#1462=EDGE_CURVE('',#1176,#1046,#307,.T.); +#1463=EDGE_CURVE('',#1045,#1177,#308,.T.); +#1464=EDGE_CURVE('',#1044,#1174,#309,.T.); +#1465=EDGE_CURVE('',#1043,#1175,#310,.T.); +#1466=EDGE_CURVE('',#1172,#1050,#311,.T.); +#1467=EDGE_CURVE('',#1049,#1173,#312,.T.); +#1468=EDGE_CURVE('',#1048,#1170,#313,.T.); +#1469=EDGE_CURVE('',#1047,#1171,#314,.T.); +#1470=EDGE_CURVE('',#1168,#1054,#315,.T.); +#1471=EDGE_CURVE('',#1053,#1169,#316,.T.); +#1472=EDGE_CURVE('',#1052,#1166,#317,.T.); +#1473=EDGE_CURVE('',#1051,#1167,#318,.T.); +#1474=EDGE_CURVE('',#1042,#1165,#319,.T.); +#1475=EDGE_CURVE('',#1160,#1039,#320,.T.); +#1476=EDGE_CURVE('',#1180,#1164,#971,.T.); +#1477=EDGE_CURVE('',#1180,#1181,#321,.T.); +#1478=EDGE_CURVE('',#1182,#1181,#972,.T.); +#1479=EDGE_CURVE('',#1182,#1183,#322,.T.); +#1480=EDGE_CURVE('',#1184,#1183,#973,.T.); +#1481=EDGE_CURVE('',#1184,#1185,#323,.T.); +#1482=EDGE_CURVE('',#1161,#1185,#974,.T.); +#1483=EDGE_CURVE('',#1075,#1186,#324,.T.); +#1484=EDGE_CURVE('',#1186,#1187,#975,.T.); +#1485=EDGE_CURVE('',#1187,#1188,#325,.T.); +#1486=EDGE_CURVE('',#1188,#1036,#976,.T.); +#1487=EDGE_CURVE('',#1189,#1190,#326,.T.); +#1488=EDGE_CURVE('',#1191,#1189,#327,.T.); +#1489=EDGE_CURVE('',#1192,#1191,#328,.T.); +#1490=EDGE_CURVE('',#1190,#1192,#329,.T.); +#1491=EDGE_CURVE('',#1034,#1188,#330,.T.); +#1492=EDGE_CURVE('',#1187,#1032,#331,.T.); +#1493=EDGE_CURVE('',#1030,#1186,#332,.T.); +#1494=EDGE_CURVE('',#1193,#1189,#977,.F.); +#1495=EDGE_CURVE('',#1194,#1193,#978,.F.); +#1496=EDGE_CURVE('',#1189,#1194,#979,.F.); +#1497=EDGE_CURVE('',#1181,#1194,#333,.T.); +#1498=EDGE_CURVE('',#1193,#1182,#334,.T.); +#1499=EDGE_CURVE('',#1195,#1190,#980,.F.); +#1500=EDGE_CURVE('',#1196,#1195,#981,.F.); +#1501=EDGE_CURVE('',#1190,#1196,#982,.F.); +#1502=EDGE_CURVE('',#1183,#1196,#335,.T.); +#1503=EDGE_CURVE('',#1195,#1184,#336,.T.); +#1504=EDGE_CURVE('',#1196,#1193,#337,.T.); +#1505=EDGE_CURVE('',#1197,#1191,#983,.F.); +#1506=EDGE_CURVE('',#1163,#1197,#984,.F.); +#1507=EDGE_CURVE('',#1191,#1163,#985,.F.); +#1508=EDGE_CURVE('',#1197,#1180,#338,.T.); +#1509=EDGE_CURVE('',#1162,#1192,#986,.F.); +#1510=EDGE_CURVE('',#1198,#1162,#987,.F.); +#1511=EDGE_CURVE('',#1192,#1198,#988,.F.); +#1512=EDGE_CURVE('',#1185,#1198,#339,.T.); +#1513=EDGE_CURVE('',#1198,#1195,#340,.T.); +#1514=EDGE_CURVE('',#1194,#1197,#341,.T.); +#1515=ORIENTED_EDGE('',*,*,#1199,.T.); +#1516=ORIENTED_EDGE('',*,*,#1200,.T.); +#1517=ORIENTED_EDGE('',*,*,#1201,.F.); +#1518=ORIENTED_EDGE('',*,*,#1202,.F.); +#1519=ORIENTED_EDGE('',*,*,#1203,.T.); +#1520=ORIENTED_EDGE('',*,*,#1204,.T.); +#1521=ORIENTED_EDGE('',*,*,#1203,.F.); +#1522=ORIENTED_EDGE('',*,*,#1205,.F.); +#1523=ORIENTED_EDGE('',*,*,#1206,.T.); +#1524=ORIENTED_EDGE('',*,*,#1207,.F.); +#1525=ORIENTED_EDGE('',*,*,#1205,.T.); +#1526=ORIENTED_EDGE('',*,*,#1202,.T.); +#1527=ORIENTED_EDGE('',*,*,#1208,.F.); +#1528=ORIENTED_EDGE('',*,*,#1209,.F.); +#1529=ORIENTED_EDGE('',*,*,#1210,.F.); +#1530=ORIENTED_EDGE('',*,*,#1211,.F.); +#1531=ORIENTED_EDGE('',*,*,#1212,.T.); +#1532=ORIENTED_EDGE('',*,*,#1213,.F.); +#1533=ORIENTED_EDGE('',*,*,#1214,.F.); +#1534=ORIENTED_EDGE('',*,*,#1206,.F.); +#1535=ORIENTED_EDGE('',*,*,#1214,.T.); +#1536=ORIENTED_EDGE('',*,*,#1215,.F.); +#1537=ORIENTED_EDGE('',*,*,#1216,.T.); +#1538=ORIENTED_EDGE('',*,*,#1207,.T.); +#1539=ORIENTED_EDGE('',*,*,#1216,.F.); +#1540=ORIENTED_EDGE('',*,*,#1217,.F.); +#1541=ORIENTED_EDGE('',*,*,#1218,.T.); +#1542=ORIENTED_EDGE('',*,*,#1219,.F.); +#1543=ORIENTED_EDGE('',*,*,#1220,.F.); +#1544=ORIENTED_EDGE('',*,*,#1221,.F.); +#1545=ORIENTED_EDGE('',*,*,#1222,.F.); +#1546=ORIENTED_EDGE('',*,*,#1204,.F.); +#1547=ORIENTED_EDGE('',*,*,#1200,.F.); +#1548=ORIENTED_EDGE('',*,*,#1223,.F.); +#1549=ORIENTED_EDGE('',*,*,#1224,.T.); +#1550=ORIENTED_EDGE('',*,*,#1225,.F.); +#1551=ORIENTED_EDGE('',*,*,#1215,.T.); +#1552=ORIENTED_EDGE('',*,*,#1213,.T.); +#1553=ORIENTED_EDGE('',*,*,#1226,.T.); +#1554=ORIENTED_EDGE('',*,*,#1217,.T.); +#1555=ORIENTED_EDGE('',*,*,#1227,.T.); +#1556=ORIENTED_EDGE('',*,*,#1228,.T.); +#1557=ORIENTED_EDGE('',*,*,#1223,.T.); +#1558=ORIENTED_EDGE('',*,*,#1199,.F.); +#1559=ORIENTED_EDGE('',*,*,#1222,.T.); +#1560=ORIENTED_EDGE('',*,*,#1229,.F.); +#1561=ORIENTED_EDGE('',*,*,#1230,.F.); +#1562=ORIENTED_EDGE('',*,*,#1231,.F.); +#1563=ORIENTED_EDGE('',*,*,#1232,.F.); +#1564=ORIENTED_EDGE('',*,*,#1233,.F.); +#1565=ORIENTED_EDGE('',*,*,#1234,.F.); +#1566=ORIENTED_EDGE('',*,*,#1235,.F.); +#1567=ORIENTED_EDGE('',*,*,#1236,.F.); +#1568=ORIENTED_EDGE('',*,*,#1224,.F.); +#1569=ORIENTED_EDGE('',*,*,#1228,.F.); +#1570=ORIENTED_EDGE('',*,*,#1237,.F.); +#1571=ORIENTED_EDGE('',*,*,#1238,.F.); +#1572=ORIENTED_EDGE('',*,*,#1227,.F.); +#1573=ORIENTED_EDGE('',*,*,#1221,.T.); +#1574=ORIENTED_EDGE('',*,*,#1239,.T.); +#1575=ORIENTED_EDGE('',*,*,#1209,.T.); +#1576=ORIENTED_EDGE('',*,*,#1240,.F.); +#1577=ORIENTED_EDGE('',*,*,#1237,.T.); +#1578=ORIENTED_EDGE('',*,*,#1240,.T.); +#1579=ORIENTED_EDGE('',*,*,#1208,.T.); +#1580=ORIENTED_EDGE('',*,*,#1201,.T.); +#1581=ORIENTED_EDGE('',*,*,#1225,.T.); +#1582=ORIENTED_EDGE('',*,*,#1238,.T.); +#1583=ORIENTED_EDGE('',*,*,#1239,.F.); +#1584=ORIENTED_EDGE('',*,*,#1220,.T.); +#1585=ORIENTED_EDGE('',*,*,#1241,.F.); +#1586=ORIENTED_EDGE('',*,*,#1210,.T.); +#1587=ORIENTED_EDGE('',*,*,#1226,.F.); +#1588=ORIENTED_EDGE('',*,*,#1212,.F.); +#1589=ORIENTED_EDGE('',*,*,#1242,.F.); +#1590=ORIENTED_EDGE('',*,*,#1218,.F.); +#1591=ORIENTED_EDGE('',*,*,#1243,.T.); +#1592=ORIENTED_EDGE('',*,*,#1229,.T.); +#1593=ORIENTED_EDGE('',*,*,#1244,.T.); +#1594=ORIENTED_EDGE('',*,*,#1245,.T.); +#1595=ORIENTED_EDGE('',*,*,#1246,.T.); +#1596=ORIENTED_EDGE('',*,*,#1230,.T.); +#1597=ORIENTED_EDGE('',*,*,#1243,.F.); +#1598=ORIENTED_EDGE('',*,*,#1247,.T.); +#1599=ORIENTED_EDGE('',*,*,#1248,.T.); +#1600=ORIENTED_EDGE('',*,*,#1249,.T.); +#1601=ORIENTED_EDGE('',*,*,#1244,.F.); +#1602=ORIENTED_EDGE('',*,*,#1236,.T.); +#1603=ORIENTED_EDGE('',*,*,#1250,.T.); +#1604=ORIENTED_EDGE('',*,*,#1231,.T.); +#1605=ORIENTED_EDGE('',*,*,#1246,.F.); +#1606=ORIENTED_EDGE('',*,*,#1251,.T.); +#1607=ORIENTED_EDGE('',*,*,#1252,.T.); +#1608=ORIENTED_EDGE('',*,*,#1253,.T.); +#1609=ORIENTED_EDGE('',*,*,#1248,.F.); +#1610=ORIENTED_EDGE('',*,*,#1235,.T.); +#1611=ORIENTED_EDGE('',*,*,#1254,.T.); +#1612=ORIENTED_EDGE('',*,*,#1232,.T.); +#1613=ORIENTED_EDGE('',*,*,#1250,.F.); +#1614=ORIENTED_EDGE('',*,*,#1255,.T.); +#1615=ORIENTED_EDGE('',*,*,#1256,.T.); +#1616=ORIENTED_EDGE('',*,*,#1257,.T.); +#1617=ORIENTED_EDGE('',*,*,#1252,.F.); +#1618=ORIENTED_EDGE('',*,*,#1234,.T.); +#1619=ORIENTED_EDGE('',*,*,#1256,.F.); +#1620=ORIENTED_EDGE('',*,*,#1233,.T.); +#1621=ORIENTED_EDGE('',*,*,#1254,.F.); +#1622=ORIENTED_EDGE('',*,*,#1258,.T.); +#1623=ORIENTED_EDGE('',*,*,#1255,.F.); +#1624=ORIENTED_EDGE('',*,*,#1259,.T.); +#1625=ORIENTED_EDGE('',*,*,#1260,.F.); +#1626=ORIENTED_EDGE('',*,*,#1261,.T.); +#1627=ORIENTED_EDGE('',*,*,#1251,.F.); +#1628=ORIENTED_EDGE('',*,*,#1262,.F.); +#1629=ORIENTED_EDGE('',*,*,#1263,.F.); +#1630=ORIENTED_EDGE('',*,*,#1259,.F.); +#1631=ORIENTED_EDGE('',*,*,#1247,.F.); +#1632=ORIENTED_EDGE('',*,*,#1264,.T.); +#1633=ORIENTED_EDGE('',*,*,#1265,.F.); +#1634=ORIENTED_EDGE('',*,*,#1266,.T.); +#1635=ORIENTED_EDGE('',*,*,#1267,.T.); +#1636=ORIENTED_EDGE('',*,*,#1268,.T.); +#1637=ORIENTED_EDGE('',*,*,#1269,.F.); +#1638=ORIENTED_EDGE('',*,*,#1262,.T.); +#1639=ORIENTED_EDGE('',*,*,#1270,.T.); +#1640=ORIENTED_EDGE('',*,*,#1271,.T.); +#1641=ORIENTED_EDGE('',*,*,#1272,.T.); +#1642=ORIENTED_EDGE('',*,*,#1273,.T.); +#1643=ORIENTED_EDGE('',*,*,#1274,.T.); +#1644=ORIENTED_EDGE('',*,*,#1275,.T.); +#1645=ORIENTED_EDGE('',*,*,#1276,.T.); +#1646=ORIENTED_EDGE('',*,*,#1277,.T.); +#1647=ORIENTED_EDGE('',*,*,#1278,.T.); +#1648=ORIENTED_EDGE('',*,*,#1279,.T.); +#1649=ORIENTED_EDGE('',*,*,#1280,.T.); +#1650=ORIENTED_EDGE('',*,*,#1281,.T.); +#1651=ORIENTED_EDGE('',*,*,#1282,.F.); +#1652=ORIENTED_EDGE('',*,*,#1283,.T.); +#1653=ORIENTED_EDGE('',*,*,#1284,.T.); +#1654=ORIENTED_EDGE('',*,*,#1285,.T.); +#1655=ORIENTED_EDGE('',*,*,#1286,.T.); +#1656=ORIENTED_EDGE('',*,*,#1287,.T.); +#1657=ORIENTED_EDGE('',*,*,#1288,.T.); +#1658=ORIENTED_EDGE('',*,*,#1289,.T.); +#1659=ORIENTED_EDGE('',*,*,#1290,.T.); +#1660=ORIENTED_EDGE('',*,*,#1291,.T.); +#1661=ORIENTED_EDGE('',*,*,#1292,.T.); +#1662=ORIENTED_EDGE('',*,*,#1293,.T.); +#1663=ORIENTED_EDGE('',*,*,#1294,.T.); +#1664=ORIENTED_EDGE('',*,*,#1295,.T.); +#1665=ORIENTED_EDGE('',*,*,#1296,.T.); +#1666=ORIENTED_EDGE('',*,*,#1297,.T.); +#1667=ORIENTED_EDGE('',*,*,#1298,.T.); +#1668=ORIENTED_EDGE('',*,*,#1299,.T.); +#1669=ORIENTED_EDGE('',*,*,#1300,.T.); +#1670=ORIENTED_EDGE('',*,*,#1301,.F.); +#1671=ORIENTED_EDGE('',*,*,#1245,.F.); +#1672=ORIENTED_EDGE('',*,*,#1302,.F.); +#1673=ORIENTED_EDGE('',*,*,#1303,.F.); +#1674=ORIENTED_EDGE('',*,*,#1264,.F.); +#1675=ORIENTED_EDGE('',*,*,#1282,.T.); +#1676=ORIENTED_EDGE('',*,*,#1304,.F.); +#1677=ORIENTED_EDGE('',*,*,#1305,.F.); +#1678=ORIENTED_EDGE('',*,*,#1306,.F.); +#1679=ORIENTED_EDGE('',*,*,#1306,.T.); +#1680=ORIENTED_EDGE('',*,*,#1307,.F.); +#1681=ORIENTED_EDGE('',*,*,#1308,.F.); +#1682=ORIENTED_EDGE('',*,*,#1283,.F.); +#1683=ORIENTED_EDGE('',*,*,#1301,.T.); +#1684=ORIENTED_EDGE('',*,*,#1309,.F.); +#1685=ORIENTED_EDGE('',*,*,#1310,.F.); +#1686=ORIENTED_EDGE('',*,*,#1311,.F.); +#1687=ORIENTED_EDGE('',*,*,#1312,.F.); +#1688=ORIENTED_EDGE('',*,*,#1313,.F.); +#1689=ORIENTED_EDGE('',*,*,#1314,.F.); +#1690=ORIENTED_EDGE('',*,*,#1315,.F.); +#1691=ORIENTED_EDGE('',*,*,#1316,.F.); +#1692=ORIENTED_EDGE('',*,*,#1315,.T.); +#1693=ORIENTED_EDGE('',*,*,#1317,.F.); +#1694=ORIENTED_EDGE('',*,*,#1318,.F.); +#1695=ORIENTED_EDGE('',*,*,#1319,.F.); +#1696=ORIENTED_EDGE('',*,*,#1318,.T.); +#1697=ORIENTED_EDGE('',*,*,#1320,.F.); +#1698=ORIENTED_EDGE('',*,*,#1321,.F.); +#1699=ORIENTED_EDGE('',*,*,#1322,.F.); +#1700=ORIENTED_EDGE('',*,*,#1321,.T.); +#1701=ORIENTED_EDGE('',*,*,#1323,.F.); +#1702=ORIENTED_EDGE('',*,*,#1313,.T.); +#1703=ORIENTED_EDGE('',*,*,#1324,.F.); +#1704=ORIENTED_EDGE('',*,*,#1325,.F.); +#1705=ORIENTED_EDGE('',*,*,#1326,.F.); +#1706=ORIENTED_EDGE('',*,*,#1327,.F.); +#1707=ORIENTED_EDGE('',*,*,#1328,.F.); +#1708=ORIENTED_EDGE('',*,*,#1327,.T.); +#1709=ORIENTED_EDGE('',*,*,#1329,.F.); +#1710=ORIENTED_EDGE('',*,*,#1330,.F.); +#1711=ORIENTED_EDGE('',*,*,#1331,.F.); +#1712=ORIENTED_EDGE('',*,*,#1330,.T.); +#1713=ORIENTED_EDGE('',*,*,#1332,.F.); +#1714=ORIENTED_EDGE('',*,*,#1333,.F.); +#1715=ORIENTED_EDGE('',*,*,#1334,.F.); +#1716=ORIENTED_EDGE('',*,*,#1333,.T.); +#1717=ORIENTED_EDGE('',*,*,#1335,.F.); +#1718=ORIENTED_EDGE('',*,*,#1325,.T.); +#1719=ORIENTED_EDGE('',*,*,#1336,.F.); +#1720=ORIENTED_EDGE('',*,*,#1337,.F.); +#1721=ORIENTED_EDGE('',*,*,#1338,.F.); +#1722=ORIENTED_EDGE('',*,*,#1339,.F.); +#1723=ORIENTED_EDGE('',*,*,#1340,.F.); +#1724=ORIENTED_EDGE('',*,*,#1339,.T.); +#1725=ORIENTED_EDGE('',*,*,#1341,.F.); +#1726=ORIENTED_EDGE('',*,*,#1342,.F.); +#1727=ORIENTED_EDGE('',*,*,#1343,.F.); +#1728=ORIENTED_EDGE('',*,*,#1342,.T.); +#1729=ORIENTED_EDGE('',*,*,#1344,.F.); +#1730=ORIENTED_EDGE('',*,*,#1345,.F.); +#1731=ORIENTED_EDGE('',*,*,#1346,.F.); +#1732=ORIENTED_EDGE('',*,*,#1345,.T.); +#1733=ORIENTED_EDGE('',*,*,#1347,.F.); +#1734=ORIENTED_EDGE('',*,*,#1337,.T.); +#1735=ORIENTED_EDGE('',*,*,#1348,.F.); +#1736=ORIENTED_EDGE('',*,*,#1349,.F.); +#1737=ORIENTED_EDGE('',*,*,#1350,.F.); +#1738=ORIENTED_EDGE('',*,*,#1351,.F.); +#1739=ORIENTED_EDGE('',*,*,#1352,.F.); +#1740=ORIENTED_EDGE('',*,*,#1351,.T.); +#1741=ORIENTED_EDGE('',*,*,#1353,.F.); +#1742=ORIENTED_EDGE('',*,*,#1354,.F.); +#1743=ORIENTED_EDGE('',*,*,#1355,.F.); +#1744=ORIENTED_EDGE('',*,*,#1354,.T.); +#1745=ORIENTED_EDGE('',*,*,#1356,.F.); +#1746=ORIENTED_EDGE('',*,*,#1357,.F.); +#1747=ORIENTED_EDGE('',*,*,#1358,.F.); +#1748=ORIENTED_EDGE('',*,*,#1357,.T.); +#1749=ORIENTED_EDGE('',*,*,#1359,.F.); +#1750=ORIENTED_EDGE('',*,*,#1349,.T.); +#1751=ORIENTED_EDGE('',*,*,#1360,.F.); +#1752=ORIENTED_EDGE('',*,*,#1361,.F.); +#1753=ORIENTED_EDGE('',*,*,#1362,.F.); +#1754=ORIENTED_EDGE('',*,*,#1363,.F.); +#1755=ORIENTED_EDGE('',*,*,#1364,.F.); +#1756=ORIENTED_EDGE('',*,*,#1363,.T.); +#1757=ORIENTED_EDGE('',*,*,#1365,.F.); +#1758=ORIENTED_EDGE('',*,*,#1366,.F.); +#1759=ORIENTED_EDGE('',*,*,#1367,.F.); +#1760=ORIENTED_EDGE('',*,*,#1366,.T.); +#1761=ORIENTED_EDGE('',*,*,#1368,.F.); +#1762=ORIENTED_EDGE('',*,*,#1369,.F.); +#1763=ORIENTED_EDGE('',*,*,#1370,.F.); +#1764=ORIENTED_EDGE('',*,*,#1369,.T.); +#1765=ORIENTED_EDGE('',*,*,#1371,.F.); +#1766=ORIENTED_EDGE('',*,*,#1361,.T.); +#1767=ORIENTED_EDGE('',*,*,#1372,.F.); +#1768=ORIENTED_EDGE('',*,*,#1373,.F.); +#1769=ORIENTED_EDGE('',*,*,#1374,.F.); +#1770=ORIENTED_EDGE('',*,*,#1375,.F.); +#1771=ORIENTED_EDGE('',*,*,#1376,.F.); +#1772=ORIENTED_EDGE('',*,*,#1375,.T.); +#1773=ORIENTED_EDGE('',*,*,#1377,.F.); +#1774=ORIENTED_EDGE('',*,*,#1378,.F.); +#1775=ORIENTED_EDGE('',*,*,#1379,.F.); +#1776=ORIENTED_EDGE('',*,*,#1378,.T.); +#1777=ORIENTED_EDGE('',*,*,#1380,.F.); +#1778=ORIENTED_EDGE('',*,*,#1381,.F.); +#1779=ORIENTED_EDGE('',*,*,#1382,.F.); +#1780=ORIENTED_EDGE('',*,*,#1381,.T.); +#1781=ORIENTED_EDGE('',*,*,#1383,.F.); +#1782=ORIENTED_EDGE('',*,*,#1373,.T.); +#1783=ORIENTED_EDGE('',*,*,#1384,.F.); +#1784=ORIENTED_EDGE('',*,*,#1385,.F.); +#1785=ORIENTED_EDGE('',*,*,#1386,.F.); +#1786=ORIENTED_EDGE('',*,*,#1387,.F.); +#1787=ORIENTED_EDGE('',*,*,#1388,.F.); +#1788=ORIENTED_EDGE('',*,*,#1387,.T.); +#1789=ORIENTED_EDGE('',*,*,#1389,.F.); +#1790=ORIENTED_EDGE('',*,*,#1390,.F.); +#1791=ORIENTED_EDGE('',*,*,#1391,.F.); +#1792=ORIENTED_EDGE('',*,*,#1390,.T.); +#1793=ORIENTED_EDGE('',*,*,#1392,.F.); +#1794=ORIENTED_EDGE('',*,*,#1393,.F.); +#1795=ORIENTED_EDGE('',*,*,#1394,.F.); +#1796=ORIENTED_EDGE('',*,*,#1393,.T.); +#1797=ORIENTED_EDGE('',*,*,#1395,.F.); +#1798=ORIENTED_EDGE('',*,*,#1385,.T.); +#1799=ORIENTED_EDGE('',*,*,#1396,.F.); +#1800=ORIENTED_EDGE('',*,*,#1397,.F.); +#1801=ORIENTED_EDGE('',*,*,#1398,.F.); +#1802=ORIENTED_EDGE('',*,*,#1399,.F.); +#1803=ORIENTED_EDGE('',*,*,#1400,.F.); +#1804=ORIENTED_EDGE('',*,*,#1399,.T.); +#1805=ORIENTED_EDGE('',*,*,#1401,.F.); +#1806=ORIENTED_EDGE('',*,*,#1402,.F.); +#1807=ORIENTED_EDGE('',*,*,#1403,.F.); +#1808=ORIENTED_EDGE('',*,*,#1402,.T.); +#1809=ORIENTED_EDGE('',*,*,#1404,.F.); +#1810=ORIENTED_EDGE('',*,*,#1405,.F.); +#1811=ORIENTED_EDGE('',*,*,#1406,.F.); +#1812=ORIENTED_EDGE('',*,*,#1405,.T.); +#1813=ORIENTED_EDGE('',*,*,#1407,.F.); +#1814=ORIENTED_EDGE('',*,*,#1397,.T.); +#1815=ORIENTED_EDGE('',*,*,#1408,.F.); +#1816=ORIENTED_EDGE('',*,*,#1409,.T.); +#1817=ORIENTED_EDGE('',*,*,#1296,.F.); +#1818=ORIENTED_EDGE('',*,*,#1410,.T.); +#1819=ORIENTED_EDGE('',*,*,#1411,.F.); +#1820=ORIENTED_EDGE('',*,*,#1410,.F.); +#1821=ORIENTED_EDGE('',*,*,#1295,.F.); +#1822=ORIENTED_EDGE('',*,*,#1412,.T.); +#1823=ORIENTED_EDGE('',*,*,#1413,.F.); +#1824=ORIENTED_EDGE('',*,*,#1412,.F.); +#1825=ORIENTED_EDGE('',*,*,#1294,.F.); +#1826=ORIENTED_EDGE('',*,*,#1414,.T.); +#1827=ORIENTED_EDGE('',*,*,#1415,.F.); +#1828=ORIENTED_EDGE('',*,*,#1414,.F.); +#1829=ORIENTED_EDGE('',*,*,#1297,.F.); +#1830=ORIENTED_EDGE('',*,*,#1409,.F.); +#1831=ORIENTED_EDGE('',*,*,#1416,.F.); +#1832=ORIENTED_EDGE('',*,*,#1417,.T.); +#1833=ORIENTED_EDGE('',*,*,#1292,.F.); +#1834=ORIENTED_EDGE('',*,*,#1418,.T.); +#1835=ORIENTED_EDGE('',*,*,#1419,.F.); +#1836=ORIENTED_EDGE('',*,*,#1418,.F.); +#1837=ORIENTED_EDGE('',*,*,#1291,.F.); +#1838=ORIENTED_EDGE('',*,*,#1420,.T.); +#1839=ORIENTED_EDGE('',*,*,#1421,.F.); +#1840=ORIENTED_EDGE('',*,*,#1420,.F.); +#1841=ORIENTED_EDGE('',*,*,#1290,.F.); +#1842=ORIENTED_EDGE('',*,*,#1422,.T.); +#1843=ORIENTED_EDGE('',*,*,#1423,.F.); +#1844=ORIENTED_EDGE('',*,*,#1422,.F.); +#1845=ORIENTED_EDGE('',*,*,#1293,.F.); +#1846=ORIENTED_EDGE('',*,*,#1417,.F.); +#1847=ORIENTED_EDGE('',*,*,#1424,.F.); +#1848=ORIENTED_EDGE('',*,*,#1425,.T.); +#1849=ORIENTED_EDGE('',*,*,#1288,.F.); +#1850=ORIENTED_EDGE('',*,*,#1426,.T.); +#1851=ORIENTED_EDGE('',*,*,#1427,.F.); +#1852=ORIENTED_EDGE('',*,*,#1426,.F.); +#1853=ORIENTED_EDGE('',*,*,#1287,.F.); +#1854=ORIENTED_EDGE('',*,*,#1428,.T.); +#1855=ORIENTED_EDGE('',*,*,#1429,.F.); +#1856=ORIENTED_EDGE('',*,*,#1428,.F.); +#1857=ORIENTED_EDGE('',*,*,#1286,.F.); +#1858=ORIENTED_EDGE('',*,*,#1430,.T.); +#1859=ORIENTED_EDGE('',*,*,#1431,.F.); +#1860=ORIENTED_EDGE('',*,*,#1430,.F.); +#1861=ORIENTED_EDGE('',*,*,#1289,.F.); +#1862=ORIENTED_EDGE('',*,*,#1425,.F.); +#1863=ORIENTED_EDGE('',*,*,#1432,.F.); +#1864=ORIENTED_EDGE('',*,*,#1433,.T.); +#1865=ORIENTED_EDGE('',*,*,#1284,.F.); +#1866=ORIENTED_EDGE('',*,*,#1308,.T.); +#1867=ORIENTED_EDGE('',*,*,#1304,.T.); +#1868=ORIENTED_EDGE('',*,*,#1285,.F.); +#1869=ORIENTED_EDGE('',*,*,#1433,.F.); +#1870=ORIENTED_EDGE('',*,*,#1434,.F.); +#1871=ORIENTED_EDGE('',*,*,#1435,.T.); +#1872=ORIENTED_EDGE('',*,*,#1436,.T.); +#1873=ORIENTED_EDGE('',*,*,#1437,.F.); +#1874=ORIENTED_EDGE('',*,*,#1438,.F.); +#1875=ORIENTED_EDGE('',*,*,#1439,.F.); +#1876=ORIENTED_EDGE('',*,*,#1440,.F.); +#1877=ORIENTED_EDGE('',*,*,#1441,.F.); +#1878=ORIENTED_EDGE('',*,*,#1442,.T.); +#1879=ORIENTED_EDGE('',*,*,#1434,.T.); +#1880=ORIENTED_EDGE('',*,*,#1432,.T.); +#1881=ORIENTED_EDGE('',*,*,#1307,.T.); +#1882=ORIENTED_EDGE('',*,*,#1305,.T.); +#1883=ORIENTED_EDGE('',*,*,#1413,.T.); +#1884=ORIENTED_EDGE('',*,*,#1415,.T.); +#1885=ORIENTED_EDGE('',*,*,#1408,.T.); +#1886=ORIENTED_EDGE('',*,*,#1411,.T.); +#1887=ORIENTED_EDGE('',*,*,#1421,.T.); +#1888=ORIENTED_EDGE('',*,*,#1423,.T.); +#1889=ORIENTED_EDGE('',*,*,#1416,.T.); +#1890=ORIENTED_EDGE('',*,*,#1419,.T.); +#1891=ORIENTED_EDGE('',*,*,#1429,.T.); +#1892=ORIENTED_EDGE('',*,*,#1431,.T.); +#1893=ORIENTED_EDGE('',*,*,#1424,.T.); +#1894=ORIENTED_EDGE('',*,*,#1427,.T.); +#1895=ORIENTED_EDGE('',*,*,#1443,.T.); +#1896=ORIENTED_EDGE('',*,*,#1444,.T.); +#1897=ORIENTED_EDGE('',*,*,#1445,.T.); +#1898=ORIENTED_EDGE('',*,*,#1446,.T.); +#1899=ORIENTED_EDGE('',*,*,#1447,.T.); +#1900=ORIENTED_EDGE('',*,*,#1448,.T.); +#1901=ORIENTED_EDGE('',*,*,#1449,.T.); +#1902=ORIENTED_EDGE('',*,*,#1450,.T.); +#1903=ORIENTED_EDGE('',*,*,#1451,.T.); +#1904=ORIENTED_EDGE('',*,*,#1452,.T.); +#1905=ORIENTED_EDGE('',*,*,#1453,.T.); +#1906=ORIENTED_EDGE('',*,*,#1454,.T.); +#1907=ORIENTED_EDGE('',*,*,#1310,.T.); +#1908=ORIENTED_EDGE('',*,*,#1455,.T.); +#1909=ORIENTED_EDGE('',*,*,#1456,.T.); +#1910=ORIENTED_EDGE('',*,*,#1457,.T.); +#1911=ORIENTED_EDGE('',*,*,#1311,.T.); +#1912=ORIENTED_EDGE('',*,*,#1457,.F.); +#1913=ORIENTED_EDGE('',*,*,#1458,.F.); +#1914=ORIENTED_EDGE('',*,*,#1298,.F.); +#1915=ORIENTED_EDGE('',*,*,#1456,.F.); +#1916=ORIENTED_EDGE('',*,*,#1459,.T.); +#1917=ORIENTED_EDGE('',*,*,#1299,.F.); +#1918=ORIENTED_EDGE('',*,*,#1458,.T.); +#1919=ORIENTED_EDGE('',*,*,#1309,.T.); +#1920=ORIENTED_EDGE('',*,*,#1300,.F.); +#1921=ORIENTED_EDGE('',*,*,#1459,.F.); +#1922=ORIENTED_EDGE('',*,*,#1455,.F.); +#1923=ORIENTED_EDGE('',*,*,#1435,.F.); +#1924=ORIENTED_EDGE('',*,*,#1460,.T.); +#1925=ORIENTED_EDGE('',*,*,#1267,.F.); +#1926=ORIENTED_EDGE('',*,*,#1461,.F.); +#1927=ORIENTED_EDGE('',*,*,#1453,.F.); +#1928=ORIENTED_EDGE('',*,*,#1462,.T.); +#1929=ORIENTED_EDGE('',*,*,#1272,.F.); +#1930=ORIENTED_EDGE('',*,*,#1463,.T.); +#1931=ORIENTED_EDGE('',*,*,#1454,.F.); +#1932=ORIENTED_EDGE('',*,*,#1463,.F.); +#1933=ORIENTED_EDGE('',*,*,#1271,.F.); +#1934=ORIENTED_EDGE('',*,*,#1464,.T.); +#1935=ORIENTED_EDGE('',*,*,#1451,.F.); +#1936=ORIENTED_EDGE('',*,*,#1464,.F.); +#1937=ORIENTED_EDGE('',*,*,#1270,.F.); +#1938=ORIENTED_EDGE('',*,*,#1465,.T.); +#1939=ORIENTED_EDGE('',*,*,#1452,.F.); +#1940=ORIENTED_EDGE('',*,*,#1465,.F.); +#1941=ORIENTED_EDGE('',*,*,#1273,.F.); +#1942=ORIENTED_EDGE('',*,*,#1462,.F.); +#1943=ORIENTED_EDGE('',*,*,#1449,.F.); +#1944=ORIENTED_EDGE('',*,*,#1466,.T.); +#1945=ORIENTED_EDGE('',*,*,#1276,.F.); +#1946=ORIENTED_EDGE('',*,*,#1467,.T.); +#1947=ORIENTED_EDGE('',*,*,#1450,.F.); +#1948=ORIENTED_EDGE('',*,*,#1467,.F.); +#1949=ORIENTED_EDGE('',*,*,#1275,.F.); +#1950=ORIENTED_EDGE('',*,*,#1468,.T.); +#1951=ORIENTED_EDGE('',*,*,#1447,.F.); +#1952=ORIENTED_EDGE('',*,*,#1468,.F.); +#1953=ORIENTED_EDGE('',*,*,#1274,.F.); +#1954=ORIENTED_EDGE('',*,*,#1469,.T.); +#1955=ORIENTED_EDGE('',*,*,#1448,.F.); +#1956=ORIENTED_EDGE('',*,*,#1469,.F.); +#1957=ORIENTED_EDGE('',*,*,#1277,.F.); +#1958=ORIENTED_EDGE('',*,*,#1466,.F.); +#1959=ORIENTED_EDGE('',*,*,#1445,.F.); +#1960=ORIENTED_EDGE('',*,*,#1470,.T.); +#1961=ORIENTED_EDGE('',*,*,#1280,.F.); +#1962=ORIENTED_EDGE('',*,*,#1471,.T.); +#1963=ORIENTED_EDGE('',*,*,#1446,.F.); +#1964=ORIENTED_EDGE('',*,*,#1471,.F.); +#1965=ORIENTED_EDGE('',*,*,#1279,.F.); +#1966=ORIENTED_EDGE('',*,*,#1472,.T.); +#1967=ORIENTED_EDGE('',*,*,#1443,.F.); +#1968=ORIENTED_EDGE('',*,*,#1472,.F.); +#1969=ORIENTED_EDGE('',*,*,#1278,.F.); +#1970=ORIENTED_EDGE('',*,*,#1473,.T.); +#1971=ORIENTED_EDGE('',*,*,#1444,.F.); +#1972=ORIENTED_EDGE('',*,*,#1473,.F.); +#1973=ORIENTED_EDGE('',*,*,#1281,.F.); +#1974=ORIENTED_EDGE('',*,*,#1470,.F.); +#1975=ORIENTED_EDGE('',*,*,#1268,.F.); +#1976=ORIENTED_EDGE('',*,*,#1460,.F.); +#1977=ORIENTED_EDGE('',*,*,#1442,.F.); +#1978=ORIENTED_EDGE('',*,*,#1474,.F.); +#1979=ORIENTED_EDGE('',*,*,#1266,.F.); +#1980=ORIENTED_EDGE('',*,*,#1475,.F.); +#1981=ORIENTED_EDGE('',*,*,#1436,.F.); +#1982=ORIENTED_EDGE('',*,*,#1461,.T.); +#1983=ORIENTED_EDGE('',*,*,#1474,.T.); +#1984=ORIENTED_EDGE('',*,*,#1441,.T.); +#1985=ORIENTED_EDGE('',*,*,#1476,.F.); +#1986=ORIENTED_EDGE('',*,*,#1477,.T.); +#1987=ORIENTED_EDGE('',*,*,#1478,.F.); +#1988=ORIENTED_EDGE('',*,*,#1479,.T.); +#1989=ORIENTED_EDGE('',*,*,#1480,.F.); +#1990=ORIENTED_EDGE('',*,*,#1481,.T.); +#1991=ORIENTED_EDGE('',*,*,#1482,.F.); +#1992=ORIENTED_EDGE('',*,*,#1437,.T.); +#1993=ORIENTED_EDGE('',*,*,#1475,.T.); +#1994=ORIENTED_EDGE('',*,*,#1265,.T.); +#1995=ORIENTED_EDGE('',*,*,#1303,.T.); +#1996=ORIENTED_EDGE('',*,*,#1483,.T.); +#1997=ORIENTED_EDGE('',*,*,#1484,.T.); +#1998=ORIENTED_EDGE('',*,*,#1485,.T.); +#1999=ORIENTED_EDGE('',*,*,#1486,.T.); +#2000=ORIENTED_EDGE('',*,*,#1260,.T.); +#2001=ORIENTED_EDGE('',*,*,#1263,.T.); +#2002=ORIENTED_EDGE('',*,*,#1269,.T.); +#2003=ORIENTED_EDGE('',*,*,#1487,.F.); +#2004=ORIENTED_EDGE('',*,*,#1488,.F.); +#2005=ORIENTED_EDGE('',*,*,#1489,.F.); +#2006=ORIENTED_EDGE('',*,*,#1490,.F.); +#2007=ORIENTED_EDGE('',*,*,#1219,.T.); +#2008=ORIENTED_EDGE('',*,*,#1242,.T.); +#2009=ORIENTED_EDGE('',*,*,#1211,.T.); +#2010=ORIENTED_EDGE('',*,*,#1241,.T.); +#2011=ORIENTED_EDGE('',*,*,#1258,.F.); +#2012=ORIENTED_EDGE('',*,*,#1261,.F.); +#2013=ORIENTED_EDGE('',*,*,#1486,.F.); +#2014=ORIENTED_EDGE('',*,*,#1491,.F.); +#2015=ORIENTED_EDGE('',*,*,#1253,.F.); +#2016=ORIENTED_EDGE('',*,*,#1492,.F.); +#2017=ORIENTED_EDGE('',*,*,#1484,.F.); +#2018=ORIENTED_EDGE('',*,*,#1493,.F.); +#2019=ORIENTED_EDGE('',*,*,#1257,.F.); +#2020=ORIENTED_EDGE('',*,*,#1491,.T.); +#2021=ORIENTED_EDGE('',*,*,#1485,.F.); +#2022=ORIENTED_EDGE('',*,*,#1492,.T.); +#2023=ORIENTED_EDGE('',*,*,#1319,.T.); +#2024=ORIENTED_EDGE('',*,*,#1322,.T.); +#2025=ORIENTED_EDGE('',*,*,#1312,.T.); +#2026=ORIENTED_EDGE('',*,*,#1316,.T.); +#2027=ORIENTED_EDGE('',*,*,#1331,.T.); +#2028=ORIENTED_EDGE('',*,*,#1334,.T.); +#2029=ORIENTED_EDGE('',*,*,#1324,.T.); +#2030=ORIENTED_EDGE('',*,*,#1328,.T.); +#2031=ORIENTED_EDGE('',*,*,#1343,.T.); +#2032=ORIENTED_EDGE('',*,*,#1346,.T.); +#2033=ORIENTED_EDGE('',*,*,#1336,.T.); +#2034=ORIENTED_EDGE('',*,*,#1340,.T.); +#2035=ORIENTED_EDGE('',*,*,#1355,.T.); +#2036=ORIENTED_EDGE('',*,*,#1358,.T.); +#2037=ORIENTED_EDGE('',*,*,#1348,.T.); +#2038=ORIENTED_EDGE('',*,*,#1352,.T.); +#2039=ORIENTED_EDGE('',*,*,#1367,.T.); +#2040=ORIENTED_EDGE('',*,*,#1370,.T.); +#2041=ORIENTED_EDGE('',*,*,#1360,.T.); +#2042=ORIENTED_EDGE('',*,*,#1364,.T.); +#2043=ORIENTED_EDGE('',*,*,#1379,.T.); +#2044=ORIENTED_EDGE('',*,*,#1382,.T.); +#2045=ORIENTED_EDGE('',*,*,#1372,.T.); +#2046=ORIENTED_EDGE('',*,*,#1376,.T.); +#2047=ORIENTED_EDGE('',*,*,#1391,.T.); +#2048=ORIENTED_EDGE('',*,*,#1394,.T.); +#2049=ORIENTED_EDGE('',*,*,#1384,.T.); +#2050=ORIENTED_EDGE('',*,*,#1388,.T.); +#2051=ORIENTED_EDGE('',*,*,#1403,.T.); +#2052=ORIENTED_EDGE('',*,*,#1406,.T.); +#2053=ORIENTED_EDGE('',*,*,#1396,.T.); +#2054=ORIENTED_EDGE('',*,*,#1400,.T.); +#2055=ORIENTED_EDGE('',*,*,#1249,.F.); +#2056=ORIENTED_EDGE('',*,*,#1493,.T.); +#2057=ORIENTED_EDGE('',*,*,#1483,.F.); +#2058=ORIENTED_EDGE('',*,*,#1302,.T.); +#2059=ORIENTED_EDGE('',*,*,#1494,.F.); +#2060=ORIENTED_EDGE('',*,*,#1495,.F.); +#2061=ORIENTED_EDGE('',*,*,#1496,.F.); +#2062=ORIENTED_EDGE('',*,*,#1478,.T.); +#2063=ORIENTED_EDGE('',*,*,#1497,.T.); +#2064=ORIENTED_EDGE('',*,*,#1495,.T.); +#2065=ORIENTED_EDGE('',*,*,#1498,.T.); +#2066=ORIENTED_EDGE('',*,*,#1499,.F.); +#2067=ORIENTED_EDGE('',*,*,#1500,.F.); +#2068=ORIENTED_EDGE('',*,*,#1501,.F.); +#2069=ORIENTED_EDGE('',*,*,#1480,.T.); +#2070=ORIENTED_EDGE('',*,*,#1502,.T.); +#2071=ORIENTED_EDGE('',*,*,#1500,.T.); +#2072=ORIENTED_EDGE('',*,*,#1503,.T.); +#2073=ORIENTED_EDGE('',*,*,#1494,.T.); +#2074=ORIENTED_EDGE('',*,*,#1487,.T.); +#2075=ORIENTED_EDGE('',*,*,#1501,.T.); +#2076=ORIENTED_EDGE('',*,*,#1504,.T.); +#2077=ORIENTED_EDGE('',*,*,#1505,.F.); +#2078=ORIENTED_EDGE('',*,*,#1506,.F.); +#2079=ORIENTED_EDGE('',*,*,#1507,.F.); +#2080=ORIENTED_EDGE('',*,*,#1476,.T.); +#2081=ORIENTED_EDGE('',*,*,#1440,.T.); +#2082=ORIENTED_EDGE('',*,*,#1506,.T.); +#2083=ORIENTED_EDGE('',*,*,#1508,.T.); +#2084=ORIENTED_EDGE('',*,*,#1509,.F.); +#2085=ORIENTED_EDGE('',*,*,#1510,.F.); +#2086=ORIENTED_EDGE('',*,*,#1511,.F.); +#2087=ORIENTED_EDGE('',*,*,#1482,.T.); +#2088=ORIENTED_EDGE('',*,*,#1512,.T.); +#2089=ORIENTED_EDGE('',*,*,#1510,.T.); +#2090=ORIENTED_EDGE('',*,*,#1438,.T.); +#2091=ORIENTED_EDGE('',*,*,#1499,.T.); +#2092=ORIENTED_EDGE('',*,*,#1490,.T.); +#2093=ORIENTED_EDGE('',*,*,#1511,.T.); +#2094=ORIENTED_EDGE('',*,*,#1513,.T.); +#2095=ORIENTED_EDGE('',*,*,#1509,.T.); +#2096=ORIENTED_EDGE('',*,*,#1489,.T.); +#2097=ORIENTED_EDGE('',*,*,#1507,.T.); +#2098=ORIENTED_EDGE('',*,*,#1439,.T.); +#2099=ORIENTED_EDGE('',*,*,#1505,.T.); +#2100=ORIENTED_EDGE('',*,*,#1488,.T.); +#2101=ORIENTED_EDGE('',*,*,#1496,.T.); +#2102=ORIENTED_EDGE('',*,*,#1514,.T.); +#2103=ORIENTED_EDGE('',*,*,#1498,.F.); +#2104=ORIENTED_EDGE('',*,*,#1504,.F.); +#2105=ORIENTED_EDGE('',*,*,#1502,.F.); +#2106=ORIENTED_EDGE('',*,*,#1479,.F.); +#2107=ORIENTED_EDGE('',*,*,#1320,.T.); +#2108=ORIENTED_EDGE('',*,*,#1317,.T.); +#2109=ORIENTED_EDGE('',*,*,#1314,.T.); +#2110=ORIENTED_EDGE('',*,*,#1323,.T.); +#2111=ORIENTED_EDGE('',*,*,#1332,.T.); +#2112=ORIENTED_EDGE('',*,*,#1329,.T.); +#2113=ORIENTED_EDGE('',*,*,#1326,.T.); +#2114=ORIENTED_EDGE('',*,*,#1335,.T.); +#2115=ORIENTED_EDGE('',*,*,#1344,.T.); +#2116=ORIENTED_EDGE('',*,*,#1341,.T.); +#2117=ORIENTED_EDGE('',*,*,#1338,.T.); +#2118=ORIENTED_EDGE('',*,*,#1347,.T.); +#2119=ORIENTED_EDGE('',*,*,#1356,.T.); +#2120=ORIENTED_EDGE('',*,*,#1353,.T.); +#2121=ORIENTED_EDGE('',*,*,#1350,.T.); +#2122=ORIENTED_EDGE('',*,*,#1359,.T.); +#2123=ORIENTED_EDGE('',*,*,#1368,.T.); +#2124=ORIENTED_EDGE('',*,*,#1365,.T.); +#2125=ORIENTED_EDGE('',*,*,#1362,.T.); +#2126=ORIENTED_EDGE('',*,*,#1371,.T.); +#2127=ORIENTED_EDGE('',*,*,#1380,.T.); +#2128=ORIENTED_EDGE('',*,*,#1377,.T.); +#2129=ORIENTED_EDGE('',*,*,#1374,.T.); +#2130=ORIENTED_EDGE('',*,*,#1383,.T.); +#2131=ORIENTED_EDGE('',*,*,#1392,.T.); +#2132=ORIENTED_EDGE('',*,*,#1389,.T.); +#2133=ORIENTED_EDGE('',*,*,#1386,.T.); +#2134=ORIENTED_EDGE('',*,*,#1395,.T.); +#2135=ORIENTED_EDGE('',*,*,#1404,.T.); +#2136=ORIENTED_EDGE('',*,*,#1401,.T.); +#2137=ORIENTED_EDGE('',*,*,#1398,.T.); +#2138=ORIENTED_EDGE('',*,*,#1407,.T.); +#2139=ORIENTED_EDGE('',*,*,#1503,.F.); +#2140=ORIENTED_EDGE('',*,*,#1513,.F.); +#2141=ORIENTED_EDGE('',*,*,#1512,.F.); +#2142=ORIENTED_EDGE('',*,*,#1481,.F.); +#2143=ORIENTED_EDGE('',*,*,#1497,.F.); +#2144=ORIENTED_EDGE('',*,*,#1477,.F.); +#2145=ORIENTED_EDGE('',*,*,#1508,.F.); +#2146=ORIENTED_EDGE('',*,*,#1514,.F.); +#2147=TOROIDAL_SURFACE('',#2265,23.3511576184917,2.5); +#2148=TOROIDAL_SURFACE('',#2268,20.6,0.4); +#2149=ADVANCED_FACE('',(#681),#2147,.T.); +#2150=ADVANCED_FACE('',(#682),#2148,.F.); +#2151=ADVANCED_FACE('',(#683),#598,.F.); +#2152=ADVANCED_FACE('',(#684),#599,.F.); +#2153=ADVANCED_FACE('',(#685),#600,.F.); +#2154=ADVANCED_FACE('',(#686),#77,.F.); +#2155=ADVANCED_FACE('',(#687),#78,.F.); +#2156=ADVANCED_FACE('',(#688),#601,.T.); +#2157=ADVANCED_FACE('',(#689,#41),#602,.F.); +#2158=ADVANCED_FACE('',(#690),#79,.F.); +#2159=ADVANCED_FACE('',(#691),#603,.T.); +#2160=ADVANCED_FACE('',(#692),#23,.F.); +#2161=ADVANCED_FACE('',(#693),#24,.F.); +#2162=ADVANCED_FACE('',(#694),#19,.T.); +#2163=ADVANCED_FACE('',(#695),#25,.F.); +#2164=ADVANCED_FACE('',(#696),#26,.F.); +#2165=ADVANCED_FACE('',(#697),#20,.T.); +#2166=ADVANCED_FACE('',(#698),#21,.T.); +#2167=ADVANCED_FACE('',(#699),#27,.F.); +#2168=ADVANCED_FACE('',(#700),#28,.F.); +#2169=ADVANCED_FACE('',(#701),#22,.T.); +#2170=ADVANCED_FACE('',(#702),#604,.F.); +#2171=ADVANCED_FACE('',(#703),#29,.F.); +#2172=ADVANCED_FACE('',(#704,#42,#43,#44,#45,#46,#47,#48,#49),#605,.F.); +#2173=ADVANCED_FACE('',(#705),#30,.F.); +#2174=ADVANCED_FACE('',(#706),#606,.T.); +#2175=ADVANCED_FACE('',(#707),#607,.F.); +#2176=ADVANCED_FACE('',(#708),#608,.T.); +#2177=ADVANCED_FACE('',(#709),#609,.T.); +#2178=ADVANCED_FACE('',(#710),#610,.T.); +#2179=ADVANCED_FACE('',(#711),#611,.T.); +#2180=ADVANCED_FACE('',(#712),#612,.T.); +#2181=ADVANCED_FACE('',(#713),#613,.T.); +#2182=ADVANCED_FACE('',(#714),#614,.T.); +#2183=ADVANCED_FACE('',(#715),#615,.T.); +#2184=ADVANCED_FACE('',(#716),#616,.T.); +#2185=ADVANCED_FACE('',(#717),#617,.T.); +#2186=ADVANCED_FACE('',(#718),#618,.T.); +#2187=ADVANCED_FACE('',(#719),#619,.T.); +#2188=ADVANCED_FACE('',(#720),#620,.T.); +#2189=ADVANCED_FACE('',(#721),#621,.T.); +#2190=ADVANCED_FACE('',(#722),#622,.T.); +#2191=ADVANCED_FACE('',(#723),#623,.T.); +#2192=ADVANCED_FACE('',(#724),#624,.T.); +#2193=ADVANCED_FACE('',(#725),#625,.T.); +#2194=ADVANCED_FACE('',(#726),#626,.T.); +#2195=ADVANCED_FACE('',(#727),#627,.T.); +#2196=ADVANCED_FACE('',(#728),#628,.T.); +#2197=ADVANCED_FACE('',(#729),#629,.T.); +#2198=ADVANCED_FACE('',(#730),#630,.T.); +#2199=ADVANCED_FACE('',(#731),#631,.T.); +#2200=ADVANCED_FACE('',(#732),#632,.T.); +#2201=ADVANCED_FACE('',(#733),#633,.T.); +#2202=ADVANCED_FACE('',(#734),#634,.T.); +#2203=ADVANCED_FACE('',(#735),#635,.T.); +#2204=ADVANCED_FACE('',(#736),#636,.T.); +#2205=ADVANCED_FACE('',(#737),#637,.T.); +#2206=ADVANCED_FACE('',(#738),#638,.T.); +#2207=ADVANCED_FACE('',(#739),#639,.T.); +#2208=ADVANCED_FACE('',(#740),#640,.T.); +#2209=ADVANCED_FACE('',(#741),#641,.F.); +#2210=ADVANCED_FACE('',(#742),#642,.F.); +#2211=ADVANCED_FACE('',(#743),#643,.F.); +#2212=ADVANCED_FACE('',(#744),#644,.F.); +#2213=ADVANCED_FACE('',(#745),#645,.F.); +#2214=ADVANCED_FACE('',(#746),#646,.F.); +#2215=ADVANCED_FACE('',(#747),#647,.F.); +#2216=ADVANCED_FACE('',(#748),#648,.F.); +#2217=ADVANCED_FACE('',(#749),#649,.F.); +#2218=ADVANCED_FACE('',(#750),#650,.F.); +#2219=ADVANCED_FACE('',(#751),#651,.F.); +#2220=ADVANCED_FACE('',(#752),#652,.F.); +#2221=ADVANCED_FACE('',(#753),#653,.F.); +#2222=ADVANCED_FACE('',(#754),#654,.F.); +#2223=ADVANCED_FACE('',(#755,#50,#51,#52,#53,#54,#55,#56,#57),#655,.T.); +#2224=ADVANCED_FACE('',(#756),#656,.F.); +#2225=ADVANCED_FACE('',(#757),#657,.F.); +#2226=ADVANCED_FACE('',(#758),#658,.F.); +#2227=ADVANCED_FACE('',(#759),#659,.F.); +#2228=ADVANCED_FACE('',(#760),#660,.F.); +#2229=ADVANCED_FACE('',(#761),#661,.F.); +#2230=ADVANCED_FACE('',(#762),#662,.F.); +#2231=ADVANCED_FACE('',(#763),#663,.F.); +#2232=ADVANCED_FACE('',(#764),#664,.F.); +#2233=ADVANCED_FACE('',(#765),#665,.F.); +#2234=ADVANCED_FACE('',(#766),#666,.F.); +#2235=ADVANCED_FACE('',(#767),#667,.F.); +#2236=ADVANCED_FACE('',(#768),#668,.F.); +#2237=ADVANCED_FACE('',(#769),#669,.F.); +#2238=ADVANCED_FACE('',(#770),#670,.F.); +#2239=ADVANCED_FACE('',(#771),#671,.F.); +#2240=ADVANCED_FACE('',(#772),#672,.F.); +#2241=ADVANCED_FACE('',(#773),#673,.F.); +#2242=ADVANCED_FACE('',(#774),#674,.F.); +#2243=ADVANCED_FACE('',(#775,#58),#675,.T.); +#2244=ADVANCED_FACE('',(#776),#31,.F.); +#2245=ADVANCED_FACE('',(#777),#32,.F.); +#2246=ADVANCED_FACE('',(#778,#59,#60,#61,#62,#63,#64,#65,#66),#676,.F.); +#2247=ADVANCED_FACE('',(#779),#677,.F.); +#2248=ADVANCED_FACE('',(#780),#15,.T.); +#2249=ADVANCED_FACE('',(#781),#33,.T.); +#2250=ADVANCED_FACE('',(#782),#16,.T.); +#2251=ADVANCED_FACE('',(#783),#34,.T.); +#2252=ADVANCED_FACE('',(#784),#35,.T.); +#2253=ADVANCED_FACE('',(#785),#17,.T.); +#2254=ADVANCED_FACE('',(#786),#36,.T.); +#2255=ADVANCED_FACE('',(#787),#18,.T.); +#2256=ADVANCED_FACE('',(#788),#37,.T.); +#2257=ADVANCED_FACE('',(#789),#38,.T.); +#2258=ADVANCED_FACE('',(#790),#39,.T.); +#2259=ADVANCED_FACE('',(#791),#40,.T.); +#2260=ADVANCED_FACE('',(#792,#67,#68,#69,#70,#71,#72,#73,#74),#678,.T.); +#2261=ADVANCED_FACE('',(#793),#679,.T.); +#2262=ADVANCED_FACE('',(#794),#680,.T.); +#2263=CLOSED_SHELL('',(#2149,#2150,#2151,#2152,#2153,#2154,#2155,#2156, +#2157,#2158,#2159,#2160,#2161,#2162,#2163,#2164,#2165,#2166,#2167,#2168, +#2169,#2170,#2171,#2172,#2173,#2174,#2175,#2176,#2177,#2178,#2179,#2180, +#2181,#2182,#2183,#2184,#2185,#2186,#2187,#2188,#2189,#2190,#2191,#2192, +#2193,#2194,#2195,#2196,#2197,#2198,#2199,#2200,#2201,#2202,#2203,#2204, +#2205,#2206,#2207,#2208,#2209,#2210,#2211,#2212,#2213,#2214,#2215,#2216, +#2217,#2218,#2219,#2220,#2221,#2222,#2223,#2224,#2225,#2226,#2227,#2228, +#2229,#2230,#2231,#2232,#2233,#2234,#2235,#2236,#2237,#2238,#2239,#2240, +#2241,#2242,#2243,#2244,#2245,#2246,#2247,#2248,#2249,#2250,#2251,#2252, +#2253,#2254,#2255,#2256,#2257,#2258,#2259,#2260,#2261,#2262)); +#2264=AXIS2_PLACEMENT_3D('',#2997,#2423,#2424); +#2265=AXIS2_PLACEMENT_3D('',#2998,#2425,#2426); +#2266=AXIS2_PLACEMENT_3D('',#3008,#2427,#2428); +#2267=AXIS2_PLACEMENT_3D('',#3024,#2429,#2430); +#2268=AXIS2_PLACEMENT_3D('',#3031,#2431,#2432); +#2269=AXIS2_PLACEMENT_3D('',#3042,#2433,#2434); +#2270=AXIS2_PLACEMENT_3D('',#3051,#2435,#2436); +#2271=AXIS2_PLACEMENT_3D('',#3069,#2442,#2443); +#2272=AXIS2_PLACEMENT_3D('',#3071,#2444,#2445); +#2273=AXIS2_PLACEMENT_3D('',#3073,#2447,#2448); +#2274=AXIS2_PLACEMENT_3D('',#3089,#2453,#2454); +#2275=AXIS2_PLACEMENT_3D('',#3095,#2455,#2456); +#2276=AXIS2_PLACEMENT_3D('',#3099,#2457,#2458); +#2277=AXIS2_PLACEMENT_3D('',#3100,#2459,#2460); +#2278=AXIS2_PLACEMENT_3D('',#3101,#2461,#2462); +#2279=AXIS2_PLACEMENT_3D('',#3103,#2463,#2464); +#2280=AXIS2_PLACEMENT_3D('',#3105,#2466,#2467); +#2281=AXIS2_PLACEMENT_3D('',#3108,#2468,#2469); +#2282=AXIS2_PLACEMENT_3D('',#3112,#2471,#2472); +#2283=AXIS2_PLACEMENT_3D('',#3116,#2474,#2475); +#2284=AXIS2_PLACEMENT_3D('',#3120,#2477,#2478); +#2285=AXIS2_PLACEMENT_3D('',#3123,#2480,#2481); +#2286=AXIS2_PLACEMENT_3D('',#3125,#2483,#2484); +#2287=AXIS2_PLACEMENT_3D('',#3126,#2485,#2486); +#2288=AXIS2_PLACEMENT_3D('',#3127,#2487,#2488); +#2289=AXIS2_PLACEMENT_3D('',#3128,#2489,#2490); +#2290=AXIS2_PLACEMENT_3D('',#3129,#2491,#2492); +#2291=AXIS2_PLACEMENT_3D('',#3130,#2493,#2494); +#2292=AXIS2_PLACEMENT_3D('',#3131,#2495,#2496); +#2293=AXIS2_PLACEMENT_3D('',#3132,#2497,#2498); +#2294=AXIS2_PLACEMENT_3D('',#3143,#2499,#2500); +#2295=AXIS2_PLACEMENT_3D('',#3145,#2501,#2502); +#2296=AXIS2_PLACEMENT_3D('',#3146,#2503,#2504); +#2297=AXIS2_PLACEMENT_3D('',#3147,#2505,#2506); +#2298=AXIS2_PLACEMENT_3D('',#3149,#2507,#2508); +#2299=AXIS2_PLACEMENT_3D('',#3151,#2510,#2511); +#2300=AXIS2_PLACEMENT_3D('',#3153,#2512,#2513); +#2301=AXIS2_PLACEMENT_3D('',#3165,#2515,#2516); +#2302=AXIS2_PLACEMENT_3D('',#3166,#2517,#2518); +#2303=AXIS2_PLACEMENT_3D('',#3177,#2519,#2520); +#2304=AXIS2_PLACEMENT_3D('',#3178,#2521,#2522); +#2305=AXIS2_PLACEMENT_3D('',#3179,#2523,#2524); +#2306=AXIS2_PLACEMENT_3D('',#3181,#2525,#2526); +#2307=AXIS2_PLACEMENT_3D('',#3183,#2528,#2529); +#2308=AXIS2_PLACEMENT_3D('',#3185,#2530,#2531); +#2309=AXIS2_PLACEMENT_3D('',#3196,#2533,#2534); +#2310=AXIS2_PLACEMENT_3D('',#3197,#2535,#2536); +#2311=AXIS2_PLACEMENT_3D('',#3203,#2540,#2541); +#2312=AXIS2_PLACEMENT_3D('',#3206,#2543,#2544); +#2313=AXIS2_PLACEMENT_3D('',#3207,#2545,#2546); +#2314=AXIS2_PLACEMENT_3D('',#3283,#2585,#2586); +#2315=AXIS2_PLACEMENT_3D('',#3286,#2588,#2589); +#2316=AXIS2_PLACEMENT_3D('',#3287,#2590,#2591); +#2317=AXIS2_PLACEMENT_3D('',#3293,#2595,#2596); +#2318=AXIS2_PLACEMENT_3D('',#3297,#2599,#2600); +#2319=AXIS2_PLACEMENT_3D('',#3303,#2604,#2605); +#2320=AXIS2_PLACEMENT_3D('',#3312,#2610,#2611); +#2321=AXIS2_PLACEMENT_3D('',#3318,#2615,#2616); +#2322=AXIS2_PLACEMENT_3D('',#3324,#2620,#2621); +#2323=AXIS2_PLACEMENT_3D('',#3327,#2624,#2625); +#2324=AXIS2_PLACEMENT_3D('',#3336,#2630,#2631); +#2325=AXIS2_PLACEMENT_3D('',#3342,#2635,#2636); +#2326=AXIS2_PLACEMENT_3D('',#3348,#2640,#2641); +#2327=AXIS2_PLACEMENT_3D('',#3351,#2644,#2645); +#2328=AXIS2_PLACEMENT_3D('',#3360,#2650,#2651); +#2329=AXIS2_PLACEMENT_3D('',#3366,#2655,#2656); +#2330=AXIS2_PLACEMENT_3D('',#3372,#2660,#2661); +#2331=AXIS2_PLACEMENT_3D('',#3375,#2664,#2665); +#2332=AXIS2_PLACEMENT_3D('',#3384,#2670,#2671); +#2333=AXIS2_PLACEMENT_3D('',#3390,#2675,#2676); +#2334=AXIS2_PLACEMENT_3D('',#3396,#2680,#2681); +#2335=AXIS2_PLACEMENT_3D('',#3399,#2684,#2685); +#2336=AXIS2_PLACEMENT_3D('',#3408,#2690,#2691); +#2337=AXIS2_PLACEMENT_3D('',#3414,#2695,#2696); +#2338=AXIS2_PLACEMENT_3D('',#3420,#2700,#2701); +#2339=AXIS2_PLACEMENT_3D('',#3423,#2704,#2705); +#2340=AXIS2_PLACEMENT_3D('',#3432,#2710,#2711); +#2341=AXIS2_PLACEMENT_3D('',#3438,#2715,#2716); +#2342=AXIS2_PLACEMENT_3D('',#3444,#2720,#2721); +#2343=AXIS2_PLACEMENT_3D('',#3447,#2724,#2725); +#2344=AXIS2_PLACEMENT_3D('',#3456,#2730,#2731); +#2345=AXIS2_PLACEMENT_3D('',#3462,#2735,#2736); +#2346=AXIS2_PLACEMENT_3D('',#3468,#2740,#2741); +#2347=AXIS2_PLACEMENT_3D('',#3471,#2744,#2745); +#2348=AXIS2_PLACEMENT_3D('',#3480,#2750,#2751); +#2349=AXIS2_PLACEMENT_3D('',#3486,#2755,#2756); +#2350=AXIS2_PLACEMENT_3D('',#3492,#2760,#2761); +#2351=AXIS2_PLACEMENT_3D('',#3495,#2764,#2765); +#2352=AXIS2_PLACEMENT_3D('',#3501,#2769,#2770); +#2353=AXIS2_PLACEMENT_3D('',#3505,#2773,#2774); +#2354=AXIS2_PLACEMENT_3D('',#3509,#2777,#2778); +#2355=AXIS2_PLACEMENT_3D('',#3511,#2780,#2781); +#2356=AXIS2_PLACEMENT_3D('',#3517,#2785,#2786); +#2357=AXIS2_PLACEMENT_3D('',#3521,#2789,#2790); +#2358=AXIS2_PLACEMENT_3D('',#3525,#2793,#2794); +#2359=AXIS2_PLACEMENT_3D('',#3527,#2796,#2797); +#2360=AXIS2_PLACEMENT_3D('',#3533,#2801,#2802); +#2361=AXIS2_PLACEMENT_3D('',#3537,#2805,#2806); +#2362=AXIS2_PLACEMENT_3D('',#3541,#2809,#2810); +#2363=AXIS2_PLACEMENT_3D('',#3543,#2812,#2813); +#2364=AXIS2_PLACEMENT_3D('',#3547,#2816,#2817); +#2365=AXIS2_PLACEMENT_3D('',#3549,#2819,#2820); +#2366=AXIS2_PLACEMENT_3D('',#3595,#2844,#2845); +#2367=AXIS2_PLACEMENT_3D('',#3597,#2847,#2848); +#2368=AXIS2_PLACEMENT_3D('',#3599,#2850,#2851); +#2369=AXIS2_PLACEMENT_3D('',#3600,#2852,#2853); +#2370=AXIS2_PLACEMENT_3D('',#3603,#2856,#2857); +#2371=AXIS2_PLACEMENT_3D('',#3606,#2860,#2861); +#2372=AXIS2_PLACEMENT_3D('',#3608,#2863,#2864); +#2373=AXIS2_PLACEMENT_3D('',#3610,#2866,#2867); +#2374=AXIS2_PLACEMENT_3D('',#3611,#2868,#2869); +#2375=AXIS2_PLACEMENT_3D('',#3614,#2872,#2873); +#2376=AXIS2_PLACEMENT_3D('',#3616,#2875,#2876); +#2377=AXIS2_PLACEMENT_3D('',#3618,#2878,#2879); +#2378=AXIS2_PLACEMENT_3D('',#3619,#2880,#2881); +#2379=AXIS2_PLACEMENT_3D('',#3622,#2884,#2885); +#2380=AXIS2_PLACEMENT_3D('',#3624,#2887,#2888); +#2381=AXIS2_PLACEMENT_3D('',#3626,#2890,#2891); +#2382=AXIS2_PLACEMENT_3D('',#3627,#2892,#2893); +#2383=AXIS2_PLACEMENT_3D('',#3629,#2895,#2896); +#2384=AXIS2_PLACEMENT_3D('',#3631,#2898,#2899); +#2385=AXIS2_PLACEMENT_3D('',#3633,#2900,#2901); +#2386=AXIS2_PLACEMENT_3D('',#3637,#2903,#2904); +#2387=AXIS2_PLACEMENT_3D('',#3641,#2906,#2907); +#2388=AXIS2_PLACEMENT_3D('',#3644,#2909,#2910); +#2389=AXIS2_PLACEMENT_3D('',#3648,#2912,#2913); +#2390=AXIS2_PLACEMENT_3D('',#3651,#2915,#2916); +#2391=AXIS2_PLACEMENT_3D('',#3652,#2917,#2918); +#2392=AXIS2_PLACEMENT_3D('',#3661,#2923,#2924); +#2393=AXIS2_PLACEMENT_3D('',#3663,#2926,#2927); +#2394=AXIS2_PLACEMENT_3D('',#3666,#2930,#2931); +#2395=AXIS2_PLACEMENT_3D('',#3667,#2932,#2933); +#2396=AXIS2_PLACEMENT_3D('',#3668,#2934,#2935); +#2397=AXIS2_PLACEMENT_3D('',#3670,#2936,#2937); +#2398=AXIS2_PLACEMENT_3D('',#3672,#2938,#2939); +#2399=AXIS2_PLACEMENT_3D('',#3673,#2940,#2941); +#2400=AXIS2_PLACEMENT_3D('',#3674,#2942,#2943); +#2401=AXIS2_PLACEMENT_3D('',#3677,#2946,#2947); +#2402=AXIS2_PLACEMENT_3D('',#3679,#2948,#2949); +#2403=AXIS2_PLACEMENT_3D('',#3681,#2950,#2951); +#2404=AXIS2_PLACEMENT_3D('',#3682,#2952,#2953); +#2405=AXIS2_PLACEMENT_3D('',#3683,#2954,#2955); +#2406=AXIS2_PLACEMENT_3D('',#3686,#2958,#2959); +#2407=AXIS2_PLACEMENT_3D('',#3688,#2961,#2962); +#2408=AXIS2_PLACEMENT_3D('',#3690,#2963,#2964); +#2409=AXIS2_PLACEMENT_3D('',#3691,#2965,#2966); +#2410=AXIS2_PLACEMENT_3D('',#3692,#2967,#2968); +#2411=AXIS2_PLACEMENT_3D('',#3693,#2969,#2970); +#2412=AXIS2_PLACEMENT_3D('',#3695,#2972,#2973); +#2413=AXIS2_PLACEMENT_3D('',#3696,#2974,#2975); +#2414=AXIS2_PLACEMENT_3D('',#3698,#2976,#2977); +#2415=AXIS2_PLACEMENT_3D('',#3699,#2978,#2979); +#2416=AXIS2_PLACEMENT_3D('',#3700,#2980,#2981); +#2417=AXIS2_PLACEMENT_3D('',#3702,#2983,#2984); +#2418=AXIS2_PLACEMENT_3D('',#3704,#2986,#2987); +#2419=AXIS2_PLACEMENT_3D('',#3705,#2988,#2989); +#2420=AXIS2_PLACEMENT_3D('',#3707,#2991,#2992); +#2421=AXIS2_PLACEMENT_3D('',#3708,#2993,#2994); +#2422=AXIS2_PLACEMENT_3D('',#3709,#2995,#2996); +#2423=DIRECTION('axis',(0.,0.,1.)); +#2424=DIRECTION('refdir',(1.,0.,0.)); +#2425=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2426=DIRECTION('ref_axis',(7.11686973505322E-15,3.02345071300414E-15,-1.)); +#2427=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2428=DIRECTION('ref_axis',(-3.44169137633798E-15,-3.07626734120933E-15, +1.)); +#2429=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2430=DIRECTION('ref_axis',(-3.44169137633798E-15,-3.07594582971185E-15, +1.)); +#2431=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2432=DIRECTION('ref_axis',(0.,3.04518315325757E-15,-1.)); +#2433=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2434=DIRECTION('ref_axis',(-1.60812264967664E-16,3.07446376050043E-15, +-1.)); +#2435=DIRECTION('center_axis',(0.832126130809788,1.23142923561691E-15,-0.554586424665743)); +#2436=DIRECTION('ref_axis',(-0.554586424665743,1.84769117963454E-15,-0.832126130809788)); +#2437=DIRECTION('',(-0.554586424665743,2.55834163334014E-15,-0.832126130809788)); +#2438=DIRECTION('',(0.,-1.,-2.39124959150033E-15)); +#2439=DIRECTION('',(0.554586424665743,-2.55834163334014E-15,0.832126130809788)); +#2440=DIRECTION('',(0.,-1.,-2.22044604925031E-15)); +#2441=DIRECTION('',(-0.554586424665744,2.55834163334013E-15,-0.832126130809787)); +#2442=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2443=DIRECTION('ref_axis',(0.,-3.07446376050043E-15,1.)); +#2444=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2445=DIRECTION('ref_axis',(1.,0.,0.)); +#2446=DIRECTION('',(-0.554586424665742,-2.55834163334014E-15,0.832126130809788)); +#2447=DIRECTION('center_axis',(-0.832126130809788,1.23142923561691E-15, +-0.554586424665743)); +#2448=DIRECTION('ref_axis',(-0.554586424665743,-1.84769117963454E-15,0.832126130809788)); +#2449=DIRECTION('',(0.,1.,2.22044604925031E-15)); +#2450=DIRECTION('',(0.554586424665743,2.55834163334014E-15,-0.832126130809788)); +#2451=DIRECTION('',(0.,1.,2.39124959150033E-15)); +#2452=DIRECTION('',(-0.554586424665743,-2.55834163334014E-15,0.832126130809788)); +#2453=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2454=DIRECTION('ref_axis',(1.,0.,0.)); +#2455=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2456=DIRECTION('ref_axis',(1.,0.,0.)); +#2457=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2458=DIRECTION('ref_axis',(1.,0.,0.)); +#2459=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2460=DIRECTION('ref_axis',(1.,0.,0.)); +#2461=DIRECTION('center_axis',(0.588402029898124,-0.70710678118655,0.392151821635147)); +#2462=DIRECTION('ref_axis',(0.554586424665741,0.,-0.832126130809789)); +#2463=DIRECTION('center_axis',(-0.588402029898124,0.70710678118655,-0.392151821635147)); +#2464=DIRECTION('ref_axis',(0.58840202989813,0.707106781186546,0.392151821635145)); +#2465=DIRECTION('',(0.554586424665743,2.55834163334014E-15,-0.832126130809788)); +#2466=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2467=DIRECTION('ref_axis',(0.,-3.07446376050043E-15,1.)); +#2468=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2469=DIRECTION('ref_axis',(0.707106781186546,-2.08166817117219E-15,0.707106781186549)); +#2470=DIRECTION('',(-1.,0.,0.)); +#2471=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2472=DIRECTION('ref_axis',(1.11022302462516E-14,-3.12250225675827E-15, +1.)); +#2473=DIRECTION('',(0.,3.07446376050043E-15,-1.)); +#2474=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2475=DIRECTION('ref_axis',(-1.,0.,1.4518301091252E-14)); +#2476=DIRECTION('',(1.,0.,0.)); +#2477=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2478=DIRECTION('ref_axis',(1.,0.,-6.31973106325089E-14)); +#2479=DIRECTION('',(0.,-3.07446376050043E-15,1.)); +#2480=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2481=DIRECTION('ref_axis',(1.,0.,0.)); +#2482=DIRECTION('',(0.554586424665743,-2.55834163334014E-15,0.832126130809788)); +#2483=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2484=DIRECTION('ref_axis',(-1.96005385927235E-15,-3.07446376050043E-15, +1.)); +#2485=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2486=DIRECTION('ref_axis',(1.,0.,0.)); +#2487=DIRECTION('center_axis',(0.588402029898125,0.707106781186549,-0.392151821635147)); +#2488=DIRECTION('ref_axis',(-0.588402029898125,0.707106781186546,0.392151821635151)); +#2489=DIRECTION('center_axis',(-0.588402029898125,-0.707106781186549,0.392151821635147)); +#2490=DIRECTION('ref_axis',(0.554586424665741,0.,0.832126130809789)); +#2491=DIRECTION('center_axis',(0.,1.,2.39124959150033E-15)); +#2492=DIRECTION('ref_axis',(-1.83697019872103E-16,-2.39124959150033E-15, +1.)); +#2493=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2494=DIRECTION('ref_axis',(1.,0.,0.)); +#2495=DIRECTION('center_axis',(0.,1.,2.22044604925031E-15)); +#2496=DIRECTION('ref_axis',(1.,0.,0.)); +#2497=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2498=DIRECTION('ref_axis',(1.,0.,0.)); +#2499=DIRECTION('center_axis',(1.,-4.44089209850062E-15,-1.97215226305253E-29)); +#2500=DIRECTION('ref_axis',(0.,4.44089209850062E-15,-1.)); +#2501=DIRECTION('center_axis',(0.,0.,1.)); +#2502=DIRECTION('ref_axis',(4.44089209850062E-15,1.,0.)); +#2503=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2504=DIRECTION('ref_axis',(0.707106781186548,-2.17397417356215E-15,0.707106781186548)); +#2505=DIRECTION('center_axis',(1.,0.,0.)); +#2506=DIRECTION('ref_axis',(0.,4.44089209850062E-15,-1.)); +#2507=DIRECTION('center_axis',(1.,-4.44089209850064E-15,4.4408920985006E-15)); +#2508=DIRECTION('ref_axis',(4.44089209850062E-15,4.44089209850062E-15,-1.)); +#2509=DIRECTION('',(1.,0.,0.)); +#2510=DIRECTION('center_axis',(0.,-3.07446376050043E-15,1.)); +#2511=DIRECTION('ref_axis',(0.,1.,3.07445854798999E-15)); +#2512=DIRECTION('center_axis',(-2.66453525910037E-14,2.66453525910037E-14, +1.)); +#2513=DIRECTION('ref_axis',(0.,1.,-2.66453525910037E-14)); +#2514=DIRECTION('',(0.,3.07446376050043E-15,-1.)); +#2515=DIRECTION('center_axis',(0.,-4.44089209850062E-15,1.)); +#2516=DIRECTION('ref_axis',(1.,0.,0.)); +#2517=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2518=DIRECTION('ref_axis',(9.51619735392993E-15,-3.07446376050043E-15, +1.)); +#2519=DIRECTION('center_axis',(1.,0.,0.)); +#2520=DIRECTION('ref_axis',(0.,1.,4.44089209850062E-15)); +#2521=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2522=DIRECTION('ref_axis',(1.,2.04800427316994E-28,-6.66133814775095E-14)); +#2523=DIRECTION('center_axis',(0.,-3.07446376050043E-15,1.)); +#2524=DIRECTION('ref_axis',(1.,0.,0.)); +#2525=DIRECTION('center_axis',(-4.44089209850062E-15,-8.88178419700124E-15, +1.)); +#2526=DIRECTION('ref_axis',(1.,0.,4.44089209850062E-15)); +#2527=DIRECTION('',(0.,-3.07446376050043E-15,1.)); +#2528=DIRECTION('center_axis',(1.,0.,0.)); +#2529=DIRECTION('ref_axis',(0.,1.,4.44089209850062E-15)); +#2530=DIRECTION('center_axis',(1.,2.2204460492503E-14,2.22044604925032E-14)); +#2531=DIRECTION('ref_axis',(-2.22044604925031E-14,1.,4.44089209850062E-15)); +#2532=DIRECTION('',(-1.,0.,0.)); +#2533=DIRECTION('center_axis',(0.,-1.,-3.07446376050043E-15)); +#2534=DIRECTION('ref_axis',(-1.,-3.90096052032369E-29,1.26882631385732E-14)); +#2535=DIRECTION('center_axis',(1.,0.,0.)); +#2536=DIRECTION('ref_axis',(0.,3.17206578464331E-15,-1.)); +#2537=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2538=DIRECTION('',(0.,3.17206578464331E-15,-1.)); +#2539=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2540=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2541=DIRECTION('ref_axis',(0.707106781186546,2.09345661157836E-15,-0.707106781186549)); +#2542=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2543=DIRECTION('center_axis',(0.,1.,3.17206578464331E-15)); +#2544=DIRECTION('ref_axis',(0.707106781186546,2.09345661157836E-15,-0.707106781186549)); +#2545=DIRECTION('center_axis',(0.,3.07446376050043E-15,-1.)); +#2546=DIRECTION('ref_axis',(-1.,0.,0.)); +#2547=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2548=DIRECTION('',(-1.,0.,0.)); +#2549=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2550=DIRECTION('',(1.,0.,0.)); +#2551=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2552=DIRECTION('',(-1.,0.,0.)); +#2553=DIRECTION('',(-1.,0.,0.)); +#2554=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2555=DIRECTION('',(1.,0.,0.)); +#2556=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2557=DIRECTION('',(-1.,0.,0.)); +#2558=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2559=DIRECTION('',(1.,0.,0.)); +#2560=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2561=DIRECTION('',(-1.,0.,0.)); +#2562=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2563=DIRECTION('',(1.,0.,0.)); +#2564=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2565=DIRECTION('',(1.,-4.01112834703283E-15,-1.23320687416684E-29)); +#2566=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2567=DIRECTION('',(1.,0.,0.)); +#2568=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2569=DIRECTION('',(-1.,0.,0.)); +#2570=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2571=DIRECTION('',(1.,0.,0.)); +#2572=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2573=DIRECTION('',(-1.,0.,0.)); +#2574=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2575=DIRECTION('',(1.,0.,0.)); +#2576=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2577=DIRECTION('',(-1.,0.,0.)); +#2578=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2579=DIRECTION('',(1.,0.,0.)); +#2580=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2581=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2582=DIRECTION('',(1.,0.,0.)); +#2583=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2584=DIRECTION('',(1.,-4.01112834703283E-15,-1.23320687416684E-29)); +#2585=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2586=DIRECTION('ref_axis',(-0.707106781186546,2.09345661157836E-15,-0.707106781186549)); +#2587=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2588=DIRECTION('center_axis',(0.,1.,3.17206578464331E-15)); +#2589=DIRECTION('ref_axis',(-0.707106781186546,2.09345661157836E-15,-0.707106781186549)); +#2590=DIRECTION('center_axis',(4.01112834703283E-15,1.,0.)); +#2591=DIRECTION('ref_axis',(-1.,4.01112834703283E-15,2.54738248460542E-32)); +#2592=DIRECTION('',(0.,0.,1.)); +#2593=DIRECTION('',(1.,-4.01112834703283E-15,-2.54738248460542E-32)); +#2594=DIRECTION('',(0.,0.,-1.)); +#2595=DIRECTION('center_axis',(-1.,0.,0.)); +#2596=DIRECTION('ref_axis',(0.,-1.,0.)); +#2597=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2598=DIRECTION('',(0.,0.,-1.)); +#2599=DIRECTION('center_axis',(4.01112834703283E-15,1.,0.)); +#2600=DIRECTION('ref_axis',(-1.,4.01112834703283E-15,2.54738248460542E-32)); +#2601=DIRECTION('',(0.,0.,1.)); +#2602=DIRECTION('',(1.,-4.01112834703283E-15,-2.54738248460542E-32)); +#2603=DIRECTION('',(0.,0.,-1.)); +#2604=DIRECTION('center_axis',(0.,-1.,0.)); +#2605=DIRECTION('ref_axis',(-1.,0.,0.)); +#2606=DIRECTION('',(-1.,0.,0.)); +#2607=DIRECTION('',(0.,0.,-1.)); +#2608=DIRECTION('',(1.,0.,0.)); +#2609=DIRECTION('',(0.,0.,1.)); +#2610=DIRECTION('center_axis',(1.,0.,0.)); +#2611=DIRECTION('ref_axis',(0.,-1.,0.)); +#2612=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2613=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2614=DIRECTION('',(0.,0.,1.)); +#2615=DIRECTION('center_axis',(0.,1.,0.)); +#2616=DIRECTION('ref_axis',(1.,0.,0.)); +#2617=DIRECTION('',(1.,0.,0.)); +#2618=DIRECTION('',(-1.,0.,0.)); +#2619=DIRECTION('',(0.,0.,1.)); +#2620=DIRECTION('center_axis',(-1.,6.34413156928661E-16,0.)); +#2621=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2622=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2623=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2624=DIRECTION('center_axis',(0.,-1.,0.)); +#2625=DIRECTION('ref_axis',(-1.,0.,0.)); +#2626=DIRECTION('',(-1.,0.,0.)); +#2627=DIRECTION('',(0.,0.,-1.)); +#2628=DIRECTION('',(1.,0.,0.)); +#2629=DIRECTION('',(0.,0.,1.)); +#2630=DIRECTION('center_axis',(1.,0.,0.)); +#2631=DIRECTION('ref_axis',(0.,-1.,0.)); +#2632=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2633=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2634=DIRECTION('',(0.,0.,1.)); +#2635=DIRECTION('center_axis',(0.,1.,0.)); +#2636=DIRECTION('ref_axis',(1.,0.,0.)); +#2637=DIRECTION('',(1.,0.,0.)); +#2638=DIRECTION('',(-1.,0.,0.)); +#2639=DIRECTION('',(0.,0.,1.)); +#2640=DIRECTION('center_axis',(-1.,6.34413156928661E-16,0.)); +#2641=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2642=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2643=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2644=DIRECTION('center_axis',(0.,-1.,0.)); +#2645=DIRECTION('ref_axis',(-1.,0.,0.)); +#2646=DIRECTION('',(-1.,0.,0.)); +#2647=DIRECTION('',(0.,0.,-1.)); +#2648=DIRECTION('',(1.,0.,0.)); +#2649=DIRECTION('',(0.,0.,1.)); +#2650=DIRECTION('center_axis',(1.,0.,0.)); +#2651=DIRECTION('ref_axis',(0.,-1.,0.)); +#2652=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2653=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2654=DIRECTION('',(0.,0.,1.)); +#2655=DIRECTION('center_axis',(0.,1.,0.)); +#2656=DIRECTION('ref_axis',(1.,0.,0.)); +#2657=DIRECTION('',(1.,0.,0.)); +#2658=DIRECTION('',(-1.,0.,0.)); +#2659=DIRECTION('',(0.,0.,1.)); +#2660=DIRECTION('center_axis',(-1.,6.34413156928661E-16,0.)); +#2661=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2662=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2663=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2664=DIRECTION('center_axis',(0.,-1.,0.)); +#2665=DIRECTION('ref_axis',(-1.,0.,0.)); +#2666=DIRECTION('',(-1.,0.,0.)); +#2667=DIRECTION('',(0.,0.,-1.)); +#2668=DIRECTION('',(1.,0.,0.)); +#2669=DIRECTION('',(0.,0.,1.)); +#2670=DIRECTION('center_axis',(1.,0.,0.)); +#2671=DIRECTION('ref_axis',(0.,-1.,0.)); +#2672=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2673=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2674=DIRECTION('',(0.,0.,1.)); +#2675=DIRECTION('center_axis',(0.,1.,0.)); +#2676=DIRECTION('ref_axis',(1.,0.,0.)); +#2677=DIRECTION('',(1.,0.,0.)); +#2678=DIRECTION('',(-1.,0.,0.)); +#2679=DIRECTION('',(0.,0.,1.)); +#2680=DIRECTION('center_axis',(-1.,6.34413156928661E-16,0.)); +#2681=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2682=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2683=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2684=DIRECTION('center_axis',(0.,-1.,0.)); +#2685=DIRECTION('ref_axis',(-1.,0.,0.)); +#2686=DIRECTION('',(-1.,0.,0.)); +#2687=DIRECTION('',(0.,0.,-1.)); +#2688=DIRECTION('',(1.,0.,0.)); +#2689=DIRECTION('',(0.,0.,1.)); +#2690=DIRECTION('center_axis',(1.,0.,0.)); +#2691=DIRECTION('ref_axis',(0.,-1.,0.)); +#2692=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2693=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2694=DIRECTION('',(0.,0.,1.)); +#2695=DIRECTION('center_axis',(0.,1.,0.)); +#2696=DIRECTION('ref_axis',(1.,0.,0.)); +#2697=DIRECTION('',(1.,0.,0.)); +#2698=DIRECTION('',(-1.,0.,0.)); +#2699=DIRECTION('',(0.,0.,1.)); +#2700=DIRECTION('center_axis',(-1.,6.34413156928661E-16,0.)); +#2701=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2702=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2703=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2704=DIRECTION('center_axis',(0.,-1.,0.)); +#2705=DIRECTION('ref_axis',(-1.,0.,0.)); +#2706=DIRECTION('',(-1.,0.,0.)); +#2707=DIRECTION('',(0.,0.,-1.)); +#2708=DIRECTION('',(1.,0.,0.)); +#2709=DIRECTION('',(0.,0.,1.)); +#2710=DIRECTION('center_axis',(1.,0.,0.)); +#2711=DIRECTION('ref_axis',(0.,-1.,0.)); +#2712=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2713=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2714=DIRECTION('',(0.,0.,1.)); +#2715=DIRECTION('center_axis',(0.,1.,0.)); +#2716=DIRECTION('ref_axis',(1.,0.,0.)); +#2717=DIRECTION('',(1.,0.,0.)); +#2718=DIRECTION('',(-1.,0.,0.)); +#2719=DIRECTION('',(0.,0.,1.)); +#2720=DIRECTION('center_axis',(-1.,6.34413156928661E-16,0.)); +#2721=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2722=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2723=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2724=DIRECTION('center_axis',(0.,-1.,0.)); +#2725=DIRECTION('ref_axis',(-1.,0.,0.)); +#2726=DIRECTION('',(-1.,0.,0.)); +#2727=DIRECTION('',(0.,0.,-1.)); +#2728=DIRECTION('',(1.,0.,0.)); +#2729=DIRECTION('',(0.,0.,1.)); +#2730=DIRECTION('center_axis',(1.,0.,0.)); +#2731=DIRECTION('ref_axis',(0.,-1.,0.)); +#2732=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2733=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2734=DIRECTION('',(0.,0.,1.)); +#2735=DIRECTION('center_axis',(0.,1.,0.)); +#2736=DIRECTION('ref_axis',(1.,0.,0.)); +#2737=DIRECTION('',(1.,0.,0.)); +#2738=DIRECTION('',(-1.,0.,0.)); +#2739=DIRECTION('',(0.,0.,1.)); +#2740=DIRECTION('center_axis',(-1.,6.34413156928661E-16,0.)); +#2741=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2742=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2743=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2744=DIRECTION('center_axis',(0.,-1.,0.)); +#2745=DIRECTION('ref_axis',(-1.,0.,0.)); +#2746=DIRECTION('',(-1.,0.,0.)); +#2747=DIRECTION('',(0.,0.,-1.)); +#2748=DIRECTION('',(1.,0.,0.)); +#2749=DIRECTION('',(0.,0.,1.)); +#2750=DIRECTION('center_axis',(1.,0.,0.)); +#2751=DIRECTION('ref_axis',(0.,-1.,0.)); +#2752=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2753=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2754=DIRECTION('',(0.,0.,1.)); +#2755=DIRECTION('center_axis',(0.,1.,0.)); +#2756=DIRECTION('ref_axis',(1.,0.,0.)); +#2757=DIRECTION('',(1.,0.,0.)); +#2758=DIRECTION('',(-1.,0.,0.)); +#2759=DIRECTION('',(0.,0.,1.)); +#2760=DIRECTION('center_axis',(-1.,6.34413156928661E-16,0.)); +#2761=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2762=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2763=DIRECTION('',(-6.34413156928661E-16,-1.,-3.07446376050043E-15)); +#2764=DIRECTION('center_axis',(0.,1.,0.)); +#2765=DIRECTION('ref_axis',(-1.,0.,0.)); +#2766=DIRECTION('',(-1.,0.,0.)); +#2767=DIRECTION('',(0.,0.,1.)); +#2768=DIRECTION('',(0.,0.,-1.)); +#2769=DIRECTION('center_axis',(-1.,0.,0.)); +#2770=DIRECTION('ref_axis',(0.,-1.,0.)); +#2771=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2772=DIRECTION('',(0.,0.,-1.)); +#2773=DIRECTION('center_axis',(0.,-1.,0.)); +#2774=DIRECTION('ref_axis',(1.,0.,0.)); +#2775=DIRECTION('',(1.,0.,0.)); +#2776=DIRECTION('',(0.,0.,-1.)); +#2777=DIRECTION('center_axis',(1.,-6.34413156928661E-16,0.)); +#2778=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2779=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2780=DIRECTION('center_axis',(0.,1.,0.)); +#2781=DIRECTION('ref_axis',(-1.,0.,0.)); +#2782=DIRECTION('',(-1.,0.,0.)); +#2783=DIRECTION('',(0.,0.,1.)); +#2784=DIRECTION('',(0.,0.,-1.)); +#2785=DIRECTION('center_axis',(-1.,0.,0.)); +#2786=DIRECTION('ref_axis',(0.,-1.,0.)); +#2787=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2788=DIRECTION('',(0.,0.,-1.)); +#2789=DIRECTION('center_axis',(0.,-1.,0.)); +#2790=DIRECTION('ref_axis',(1.,0.,0.)); +#2791=DIRECTION('',(1.,0.,0.)); +#2792=DIRECTION('',(0.,0.,-1.)); +#2793=DIRECTION('center_axis',(1.,-6.34413156928661E-16,0.)); +#2794=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2795=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2796=DIRECTION('center_axis',(0.,1.,0.)); +#2797=DIRECTION('ref_axis',(-1.,0.,0.)); +#2798=DIRECTION('',(-1.,0.,0.)); +#2799=DIRECTION('',(0.,0.,1.)); +#2800=DIRECTION('',(0.,0.,-1.)); +#2801=DIRECTION('center_axis',(-1.,0.,0.)); +#2802=DIRECTION('ref_axis',(0.,-1.,0.)); +#2803=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2804=DIRECTION('',(0.,0.,-1.)); +#2805=DIRECTION('center_axis',(0.,-1.,0.)); +#2806=DIRECTION('ref_axis',(1.,0.,0.)); +#2807=DIRECTION('',(1.,0.,0.)); +#2808=DIRECTION('',(0.,0.,-1.)); +#2809=DIRECTION('center_axis',(1.,-6.34413156928661E-16,0.)); +#2810=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2811=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2812=DIRECTION('center_axis',(0.,1.,0.)); +#2813=DIRECTION('ref_axis',(-1.,0.,0.)); +#2814=DIRECTION('',(-1.,0.,0.)); +#2815=DIRECTION('',(0.,0.,1.)); +#2816=DIRECTION('center_axis',(1.,-6.34413156928661E-16,0.)); +#2817=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2818=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2819=DIRECTION('center_axis',(0.,3.07446376050043E-15,-1.)); +#2820=DIRECTION('ref_axis',(-1.,0.,0.)); +#2821=DIRECTION('',(-1.,0.,0.)); +#2822=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2823=DIRECTION('',(1.,0.,0.)); +#2824=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2825=DIRECTION('',(-1.,0.,0.)); +#2826=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2827=DIRECTION('',(1.,0.,0.)); +#2828=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2829=DIRECTION('',(1.,0.,0.)); +#2830=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2831=DIRECTION('',(-1.,0.,0.)); +#2832=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2833=DIRECTION('',(1.,0.,0.)); +#2834=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2835=DIRECTION('',(-1.,0.,0.)); +#2836=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2837=DIRECTION('',(1.,0.,0.)); +#2838=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2839=DIRECTION('',(-1.,0.,0.)); +#2840=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2841=DIRECTION('',(6.34413156928661E-16,1.,3.07446376050043E-15)); +#2842=DIRECTION('',(-1.,0.,0.)); +#2843=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2844=DIRECTION('center_axis',(-1.,0.,0.)); +#2845=DIRECTION('ref_axis',(0.,-1.,0.)); +#2846=DIRECTION('',(0.,0.,-1.)); +#2847=DIRECTION('center_axis',(0.,1.,0.)); +#2848=DIRECTION('ref_axis',(-1.,0.,0.)); +#2849=DIRECTION('',(0.,0.,1.)); +#2850=DIRECTION('center_axis',(1.,-6.34413156928661E-16,0.)); +#2851=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2852=DIRECTION('center_axis',(0.,1.,0.)); +#2853=DIRECTION('ref_axis',(-1.,0.,0.)); +#2854=DIRECTION('',(0.,0.,1.)); +#2855=DIRECTION('',(0.,0.,1.)); +#2856=DIRECTION('center_axis',(0.,1.,0.)); +#2857=DIRECTION('ref_axis',(-1.,0.,0.)); +#2858=DIRECTION('',(0.,0.,1.)); +#2859=DIRECTION('',(0.,0.,-1.)); +#2860=DIRECTION('center_axis',(-1.,0.,0.)); +#2861=DIRECTION('ref_axis',(0.,-1.,0.)); +#2862=DIRECTION('',(0.,0.,-1.)); +#2863=DIRECTION('center_axis',(0.,-1.,0.)); +#2864=DIRECTION('ref_axis',(1.,0.,0.)); +#2865=DIRECTION('',(0.,0.,-1.)); +#2866=DIRECTION('center_axis',(1.,-6.34413156928661E-16,0.)); +#2867=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2868=DIRECTION('center_axis',(0.,1.,0.)); +#2869=DIRECTION('ref_axis',(-1.,0.,0.)); +#2870=DIRECTION('',(0.,0.,1.)); +#2871=DIRECTION('',(0.,0.,-1.)); +#2872=DIRECTION('center_axis',(-1.,0.,0.)); +#2873=DIRECTION('ref_axis',(0.,-1.,0.)); +#2874=DIRECTION('',(0.,0.,-1.)); +#2875=DIRECTION('center_axis',(0.,-1.,0.)); +#2876=DIRECTION('ref_axis',(1.,0.,0.)); +#2877=DIRECTION('',(0.,0.,-1.)); +#2878=DIRECTION('center_axis',(1.,-6.34413156928661E-16,0.)); +#2879=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2880=DIRECTION('center_axis',(0.,1.,0.)); +#2881=DIRECTION('ref_axis',(-1.,0.,0.)); +#2882=DIRECTION('',(0.,0.,1.)); +#2883=DIRECTION('',(0.,0.,-1.)); +#2884=DIRECTION('center_axis',(-1.,0.,0.)); +#2885=DIRECTION('ref_axis',(0.,-1.,0.)); +#2886=DIRECTION('',(0.,0.,-1.)); +#2887=DIRECTION('center_axis',(0.,-1.,0.)); +#2888=DIRECTION('ref_axis',(1.,0.,0.)); +#2889=DIRECTION('',(0.,0.,-1.)); +#2890=DIRECTION('center_axis',(1.,-6.34413156928661E-16,0.)); +#2891=DIRECTION('ref_axis',(6.34413156928661E-16,1.,0.)); +#2892=DIRECTION('center_axis',(1.,0.,0.)); +#2893=DIRECTION('ref_axis',(0.,1.,0.)); +#2894=DIRECTION('',(0.,3.17206578464331E-15,-1.)); +#2895=DIRECTION('center_axis',(-1.,0.,0.)); +#2896=DIRECTION('ref_axis',(0.,-1.,0.)); +#2897=DIRECTION('',(0.,-3.17206578464331E-15,1.)); +#2898=DIRECTION('center_axis',(0.,1.,3.17206578464331E-15)); +#2899=DIRECTION('ref_axis',(-1.,0.,0.)); +#2900=DIRECTION('center_axis',(0.,1.,3.17206578464331E-15)); +#2901=DIRECTION('ref_axis',(0.707106781186546,2.09345661157836E-15,-0.707106781186549)); +#2902=DIRECTION('',(0.,-3.17206578464331E-15,1.)); +#2903=DIRECTION('center_axis',(0.,1.,3.17206578464331E-15)); +#2904=DIRECTION('ref_axis',(0.707106781186546,-2.09345661157836E-15,0.707106781186549)); +#2905=DIRECTION('',(-1.,0.,0.)); +#2906=DIRECTION('center_axis',(0.,1.,3.17206578464331E-15)); +#2907=DIRECTION('ref_axis',(-0.707106781186546,-2.09345661157836E-15,0.707106781186549)); +#2908=DIRECTION('',(0.,3.17206578464331E-15,-1.)); +#2909=DIRECTION('center_axis',(0.,1.,3.17206578464331E-15)); +#2910=DIRECTION('ref_axis',(-0.707106781186546,2.09345661157836E-15,-0.707106781186549)); +#2911=DIRECTION('',(0.,-3.17206578464331E-15,1.)); +#2912=DIRECTION('center_axis',(0.,1.,3.17206578464331E-15)); +#2913=DIRECTION('ref_axis',(-0.707106781186546,-2.09345661157836E-15,0.707106781186549)); +#2914=DIRECTION('',(1.,0.,0.)); +#2915=DIRECTION('center_axis',(0.,1.,3.17206578464331E-15)); +#2916=DIRECTION('ref_axis',(0.707106781186546,-2.09345661157836E-15,0.707106781186549)); +#2917=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2918=DIRECTION('ref_axis',(0.,-3.07446376050043E-15,1.)); +#2919=DIRECTION('',(-1.,0.,0.)); +#2920=DIRECTION('',(0.,-3.07446376050043E-15,1.)); +#2921=DIRECTION('',(1.,0.,0.)); +#2922=DIRECTION('',(0.,3.07446376050043E-15,-1.)); +#2923=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2924=DIRECTION('ref_axis',(0.707106781186546,-2.09345661157836E-15,0.707106781186549)); +#2925=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2926=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2927=DIRECTION('ref_axis',(-0.707106781186546,-2.09345661157836E-15,0.707106781186549)); +#2928=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2929=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2930=DIRECTION('center_axis',(0.,-3.07446376050043E-15,1.)); +#2931=DIRECTION('ref_axis',(1.,0.,0.)); +#2932=DIRECTION('center_axis',(-1.,0.,0.)); +#2933=DIRECTION('ref_axis',(0.,-3.17206578464331E-15,1.)); +#2934=DIRECTION('center_axis',(0.408248290463861,-0.816496580927727,0.408248290463863)); +#2935=DIRECTION('ref_axis',(0.577350269189625,0.577350269189624,0.577350269189628)); +#2936=DIRECTION('center_axis',(1.,0.,0.)); +#2937=DIRECTION('ref_axis',(0.,-2.96059473233375E-15,1.)); +#2938=DIRECTION('center_axis',(0.,1.,2.96059473233375E-15)); +#2939=DIRECTION('ref_axis',(1.,0.,0.)); +#2940=DIRECTION('center_axis',(0.,-2.96059473233375E-15,1.)); +#2941=DIRECTION('ref_axis',(0.,1.,2.96059473233375E-15)); +#2942=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2943=DIRECTION('ref_axis',(0.707106781186546,-2.09345661157836E-15,0.707106781186549)); +#2944=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2945=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2946=DIRECTION('center_axis',(-0.40824829046386,-0.816496580927728,0.408248290463863)); +#2947=DIRECTION('ref_axis',(-0.577350269189625,0.577350269189625,0.577350269189628)); +#2948=DIRECTION('center_axis',(0.,-5.9211894646675E-15,1.)); +#2949=DIRECTION('ref_axis',(-1.,0.,0.)); +#2950=DIRECTION('center_axis',(0.,1.,2.96059473233375E-15)); +#2951=DIRECTION('ref_axis',(0.,-2.96059473233375E-15,1.)); +#2952=DIRECTION('center_axis',(-1.,0.,0.)); +#2953=DIRECTION('ref_axis',(0.,1.,2.96059473233375E-15)); +#2954=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2955=DIRECTION('ref_axis',(-0.707106781186546,-2.09345661157836E-15,0.707106781186549)); +#2956=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2957=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2958=DIRECTION('center_axis',(1.,0.,0.)); +#2959=DIRECTION('ref_axis',(0.,0.707106781186544,0.707106781186551)); +#2960=DIRECTION('',(1.,0.,0.)); +#2961=DIRECTION('center_axis',(-0.816496580927727,0.408248290463863,-0.408248290463862)); +#2962=DIRECTION('ref_axis',(0.577350269189625,0.577350269189628,-0.577350269189625)); +#2963=DIRECTION('center_axis',(0.,2.96059473233375E-15,-1.)); +#2964=DIRECTION('ref_axis',(1.,0.,0.)); +#2965=DIRECTION('center_axis',(0.,1.,2.96059473233375E-15)); +#2966=DIRECTION('ref_axis',(0.,2.96059473233375E-15,-1.)); +#2967=DIRECTION('center_axis',(1.,0.,0.)); +#2968=DIRECTION('ref_axis',(0.,1.,2.96059473233375E-15)); +#2969=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2970=DIRECTION('ref_axis',(0.707106781186546,2.09345661157836E-15,-0.707106781186549)); +#2971=DIRECTION('',(0.,-1.,-3.07446376050043E-15)); +#2972=DIRECTION('center_axis',(-0.816496580927727,-0.408248290463863,0.408248290463861)); +#2973=DIRECTION('ref_axis',(-0.577350269189625,0.577350269189628,-0.577350269189624)); +#2974=DIRECTION('center_axis',(-1.,0.,0.)); +#2975=DIRECTION('ref_axis',(0.,2.96059473233375E-15,-1.)); +#2976=DIRECTION('center_axis',(0.,1.,2.96059473233375E-15)); +#2977=DIRECTION('ref_axis',(-1.,0.,0.)); +#2978=DIRECTION('center_axis',(0.,2.96059473233375E-15,-1.)); +#2979=DIRECTION('ref_axis',(0.,1.,2.96059473233375E-15)); +#2980=DIRECTION('center_axis',(0.,1.,3.07446376050043E-15)); +#2981=DIRECTION('ref_axis',(-0.707106781186546,2.09345661157836E-15,-0.707106781186549)); +#2982=DIRECTION('',(0.,1.,3.07446376050043E-15)); +#2983=DIRECTION('center_axis',(0.,-3.07446376050043E-15,1.)); +#2984=DIRECTION('ref_axis',(-0.707106781186547,0.707106781186547,2.09345661157837E-15)); +#2985=DIRECTION('',(0.,-3.07446376050043E-15,1.)); +#2986=DIRECTION('center_axis',(-1.,0.,0.)); +#2987=DIRECTION('ref_axis',(0.,0.707106781186549,-0.707106781186546)); +#2988=DIRECTION('center_axis',(0.,3.07446376050043E-15,-1.)); +#2989=DIRECTION('ref_axis',(0.707106781186547,0.707106781186547,2.09345661157837E-15)); +#2990=DIRECTION('',(0.,3.07446376050043E-15,-1.)); +#2991=DIRECTION('center_axis',(0.,-3.07446376050043E-15,1.)); +#2992=DIRECTION('ref_axis',(1.,0.,0.)); +#2993=DIRECTION('center_axis',(-1.,0.,0.)); +#2994=DIRECTION('ref_axis',(0.,-3.17206578464331E-15,1.)); +#2995=DIRECTION('center_axis',(1.,0.,0.)); +#2996=DIRECTION('ref_axis',(0.,3.17206578464331E-15,-1.)); +#2997=CARTESIAN_POINT('',(0.,0.,0.)); +#2998=CARTESIAN_POINT('Origin',(0.,30.2131992149848,-2.26143543054822E-14)); +#2999=CARTESIAN_POINT('',(-7.55706432297809,28.4960668599787,-20.1646003837895)); +#3000=CARTESIAN_POINT('',(-7.67499593264185,28.2980881071873,-20.3446350436017)); +#3001=CARTESIAN_POINT('Ctrl Pts',(-7.67499593264173,28.2980881071874,-20.3446350436018)); +#3002=CARTESIAN_POINT('Ctrl Pts',(-7.65216585519305,28.346524501603,-20.2915524416972)); +#3003=CARTESIAN_POINT('Ctrl Pts',(-7.62265056867575,28.3977293657224,-20.2435086711233)); +#3004=CARTESIAN_POINT('Ctrl Pts',(-7.58084661590394,28.4617083016016,-20.1908698521617)); +#3005=CARTESIAN_POINT('Ctrl Pts',(-7.56933860768377,28.4786634528929,-20.1775643751259)); +#3006=CARTESIAN_POINT('Ctrl Pts',(-7.55706432276309,28.4960668597638,-20.1646003837053)); +#3007=CARTESIAN_POINT('',(7.67499593264192,28.2980881071873,-20.3446350436017)); +#3008=CARTESIAN_POINT('Origin',(0.,28.2980881071873,-2.85022940037373E-14)); +#3009=CARTESIAN_POINT('',(7.55706432236277,28.4960668621062,-20.1646003827946)); +#3010=CARTESIAN_POINT('Ctrl Pts',(7.55706432162878,28.4960668613721,-20.1646003825072)); +#3011=CARTESIAN_POINT('Ctrl Pts',(7.58516430379042,28.456224587489,-20.1942793355414)); +#3012=CARTESIAN_POINT('Ctrl Pts',(7.61009251543766,28.4174172442563,-20.2268512235705)); +#3013=CARTESIAN_POINT('Ctrl Pts',(7.64654016472564,28.3547479842758,-20.2851653422778)); +#3014=CARTESIAN_POINT('Ctrl Pts',(7.66171651731653,28.3262617741294,-20.3137588488618)); +#3015=CARTESIAN_POINT('Ctrl Pts',(7.67499593264174,28.2980881071873,-20.3446350436018)); +#3016=CARTESIAN_POINT('',(8.09743567276466,29.4225678737009,-19.3538031841847)); +#3017=CARTESIAN_POINT('Ctrl Pts',(8.09743567276513,29.4225678737004,-19.353803184184)); +#3018=CARTESIAN_POINT('Ctrl Pts',(7.99551900273937,29.1173923817332,-19.5067234875337)); +#3019=CARTESIAN_POINT('Ctrl Pts',(7.8244625157671,28.8261022132625,-19.7633842464767)); +#3020=CARTESIAN_POINT('Ctrl Pts',(7.62960567626942,28.5795843843267,-20.0557561126123)); +#3021=CARTESIAN_POINT('Ctrl Pts',(7.59400503982818,28.5372698875173,-20.1091728904825)); +#3022=CARTESIAN_POINT('Ctrl Pts',(7.55706432424967,28.4960668602317,-20.1646003826759)); +#3023=CARTESIAN_POINT('',(-8.09743567276466,29.4225678737009,-19.3538031841847)); +#3024=CARTESIAN_POINT('Origin',(0.,29.4225678737027,-2.50451217121697E-14)); +#3025=CARTESIAN_POINT('Ctrl Pts',(-7.55706432353067,28.4960668594297,-20.1646003837547)); +#3026=CARTESIAN_POINT('Ctrl Pts',(-7.59400503936623,28.5372698869684,-20.1091728911757)); +#3027=CARTESIAN_POINT('Ctrl Pts',(-7.62960567604927,28.5795843840482,-20.0557561129426)); +#3028=CARTESIAN_POINT('Ctrl Pts',(-7.82446251576709,28.8261022132625,-19.7633842464767)); +#3029=CARTESIAN_POINT('Ctrl Pts',(-7.99551900273937,29.1173923817332,-19.5067234875337)); +#3030=CARTESIAN_POINT('Ctrl Pts',(-8.09743567276513,29.4225678737004,-19.353803184184)); +#3031=CARTESIAN_POINT('Origin',(0.,29.2960668590976,-2.54340444972396E-14)); +#3032=CARTESIAN_POINT('',(8.48586095694149,29.6960668590976,-18.7709926167866)); +#3033=CARTESIAN_POINT('Ctrl Pts',(8.4858609569414,29.6960668590977,-18.7709926167866)); +#3034=CARTESIAN_POINT('Ctrl Pts',(8.42457292036933,29.6960668590977,-18.8629519119828)); +#3035=CARTESIAN_POINT('Ctrl Pts',(8.35155514698585,29.680206710429,-18.9725110258443)); +#3036=CARTESIAN_POINT('Ctrl Pts',(8.24963456602572,29.6276595770131,-19.1254371973338)); +#3037=CARTESIAN_POINT('Ctrl Pts',(8.20017103460083,29.5901476122684,-19.1996544792401)); +#3038=CARTESIAN_POINT('Ctrl Pts',(8.13892619399752,29.513359343186,-19.2915489612841)); +#3039=CARTESIAN_POINT('Ctrl Pts',(8.11300556294568,29.4691897746577,-19.3304414286544)); +#3040=CARTESIAN_POINT('Ctrl Pts',(8.09743567276513,29.4225678737004,-19.353803184184)); +#3041=CARTESIAN_POINT('',(-8.4858609569415,29.6960668590976,-18.7709926167866)); +#3042=CARTESIAN_POINT('Origin',(0.,29.6960668590976,-2.42042589930396E-14)); +#3043=CARTESIAN_POINT('Ctrl Pts',(-8.09743567276513,29.4225678737004,-19.353803184184)); +#3044=CARTESIAN_POINT('Ctrl Pts',(-8.11300556294568,29.4691897746577,-19.3304414286544)); +#3045=CARTESIAN_POINT('Ctrl Pts',(-8.13892619399752,29.513359343186,-19.2915489612841)); +#3046=CARTESIAN_POINT('Ctrl Pts',(-8.20017103460082,29.5901476122684,-19.1996544792401)); +#3047=CARTESIAN_POINT('Ctrl Pts',(-8.24963456602572,29.6276595770131,-19.1254371973339)); +#3048=CARTESIAN_POINT('Ctrl Pts',(-8.35155514698584,29.680206710429,-18.9725110258443)); +#3049=CARTESIAN_POINT('Ctrl Pts',(-8.42457292036933,29.6960668590977,-18.8629519119828)); +#3050=CARTESIAN_POINT('Ctrl Pts',(-8.4858609569414,29.6960668590977,-18.7709926167866)); +#3051=CARTESIAN_POINT('Origin',(11.,28.4960668590976,-14.9986666074021)); +#3052=CARTESIAN_POINT('',(10.3657643850207,28.4960668590976,-15.9503019248958)); +#3053=CARTESIAN_POINT('',(12.7692488543901,28.4960668590976,-12.3440069580416)); +#3054=CARTESIAN_POINT('',(11.,29.2281176666665,-14.9986666074021)); +#3055=CARTESIAN_POINT('Ctrl Pts',(11.,29.2281176666665,-14.9986666074021)); +#3056=CARTESIAN_POINT('Ctrl Pts',(10.686444667693,28.892197637442,-15.4691389699823)); +#3057=CARTESIAN_POINT('Ctrl Pts',(10.3657643850207,28.4960668590976,-15.9503019248958)); +#3058=CARTESIAN_POINT('',(11.,30.0960668590976,-14.9986666074021)); +#3059=CARTESIAN_POINT('',(11.,28.4960668590976,-14.9986666074021)); +#3060=CARTESIAN_POINT('',(9.14016124577631,30.0960668590976,-17.7892513704803)); +#3061=CARTESIAN_POINT('',(12.7692488543901,30.0960668590976,-12.3440069580416)); +#3062=CARTESIAN_POINT('',(9.14016124577631,29.7616358632763,-17.7892513704803)); +#3063=CARTESIAN_POINT('',(9.14016124577631,28.4960668590976,-17.7892513704803)); +#3064=CARTESIAN_POINT('',(9.05167000040201,29.6960668590976,-17.9220275697324)); +#3065=CARTESIAN_POINT('Ctrl Pts',(9.14016124577633,29.7616358632763,-17.7892513704803)); +#3066=CARTESIAN_POINT('Ctrl Pts',(9.0960018907023,29.7291178862732,-17.8555100303437)); +#3067=CARTESIAN_POINT('Ctrl Pts',(9.05167000040202,29.6960668590977,-17.9220275697323)); +#3068=CARTESIAN_POINT('',(8.18909445037432,29.6960668590976,-19.2162742787251)); +#3069=CARTESIAN_POINT('Origin',(1.11022302462516E-15,29.6960668590976,-18.475150962448)); +#3070=CARTESIAN_POINT('',(-9.051670000402,29.6960668590976,-17.9220275697324)); +#3071=CARTESIAN_POINT('Origin',(0.,29.6960668590976,6.58654368904537E-14)); +#3072=CARTESIAN_POINT('',(-7.04465802301675,29.6960668590976,-20.9334375807818)); +#3073=CARTESIAN_POINT('Origin',(-9.14016124577631,28.4960668590976,-17.7892513704803)); +#3074=CARTESIAN_POINT('',(-9.14016124577631,29.7616358632763,-17.7892513704803)); +#3075=CARTESIAN_POINT('Ctrl Pts',(-9.05167000040201,29.6960668590977,-17.9220275697323)); +#3076=CARTESIAN_POINT('Ctrl Pts',(-9.09600189070229,29.7291178862732,-17.8555100303437)); +#3077=CARTESIAN_POINT('Ctrl Pts',(-9.14016124577633,29.7616358632763,-17.7892513704803)); +#3078=CARTESIAN_POINT('',(-9.14016124577631,30.0960668590976,-17.7892513704803)); +#3079=CARTESIAN_POINT('',(-9.14016124577631,28.4960668590976,-17.7892513704803)); +#3080=CARTESIAN_POINT('',(-11.,30.0960668590976,-14.9986666074021)); +#3081=CARTESIAN_POINT('',(-11.8393824346523,30.0960668590976,-13.739219879982)); +#3082=CARTESIAN_POINT('',(-11.,29.2281176666665,-14.9986666074021)); +#3083=CARTESIAN_POINT('',(-11.,28.4960668590976,-14.9986666074021)); +#3084=CARTESIAN_POINT('',(-10.3657643850207,28.4960668590976,-15.9503019248958)); +#3085=CARTESIAN_POINT('Ctrl Pts',(-10.3657643850207,28.4960668590976,-15.9503019248958)); +#3086=CARTESIAN_POINT('Ctrl Pts',(-10.686444667693,28.892197637442,-15.4691389699823)); +#3087=CARTESIAN_POINT('Ctrl Pts',(-11.,29.2281176666665,-14.9986666074021)); +#3088=CARTESIAN_POINT('',(-11.8393824346523,28.4960668590976,-13.739219879982)); +#3089=CARTESIAN_POINT('Origin',(0.,28.6288513611869,6.25843215174829E-14)); +#3090=CARTESIAN_POINT('',(-8.05306142128311,27.4960668590976,-21.223529755328)); +#3091=CARTESIAN_POINT('Ctrl Pts',(-7.67499593264184,28.2980881071873,-20.3446350436017)); +#3092=CARTESIAN_POINT('Ctrl Pts',(-7.86019691489289,27.9051648749886,-20.7752490016695)); +#3093=CARTESIAN_POINT('Ctrl Pts',(-8.05306142128313,27.4960668590976,-21.223529755328)); +#3094=CARTESIAN_POINT('',(8.0530614212831,27.4960668590976,-21.223529755328)); +#3095=CARTESIAN_POINT('Origin',(0.,27.4960668590976,5.91016166173528E-14)); +#3096=CARTESIAN_POINT('Ctrl Pts',(8.05306142128312,27.4960668590976,-21.223529755328)); +#3097=CARTESIAN_POINT('Ctrl Pts',(7.86019691631279,27.9051648719762,-20.7752490049707)); +#3098=CARTESIAN_POINT('Ctrl Pts',(7.67499593264191,28.2980881071873,-20.3446350436016)); +#3099=CARTESIAN_POINT('Origin',(0.,28.6288513611869,6.25843215174829E-14)); +#3100=CARTESIAN_POINT('Origin',(0.,29.7616358632762,6.60670264176131E-14)); +#3101=CARTESIAN_POINT('Origin',(-12.2554455000572,27.9960668590976,-14.0165130923149)); +#3102=CARTESIAN_POINT('',(-11.7353539590347,27.4960668590976,-15.6984543014962)); +#3103=CARTESIAN_POINT('Origin',(-6.43930467196995,38.229135436113,-4.29159814015919)); +#3104=CARTESIAN_POINT('',(-12.671508565462,27.4960668590976,-14.2938063046477)); +#3105=CARTESIAN_POINT('Origin',(-0.000172182089066553,27.4960668590976, +0.000228172293332351)); +#3106=CARTESIAN_POINT('',(-28.5001721820891,27.4960668590976,-28.8997718277067)); +#3107=CARTESIAN_POINT('',(-28.9001721820891,27.4960668590976,-28.4997718277067)); +#3108=CARTESIAN_POINT('Origin',(-28.5001721820891,27.4960668590976,-28.4997718277067)); +#3109=CARTESIAN_POINT('',(28.4998278179109,27.4960668590976,-28.8997718277067)); +#3110=CARTESIAN_POINT('',(31.4998278179109,27.4960668590976,-28.8997718277067)); +#3111=CARTESIAN_POINT('',(28.8998278179109,27.4960668590976,-28.4997718277067)); +#3112=CARTESIAN_POINT('Origin',(28.4998278179109,27.4960668590976,-28.4997718277067)); +#3113=CARTESIAN_POINT('',(28.8998278179109,27.4960668590975,28.5002281722933)); +#3114=CARTESIAN_POINT('',(28.8998278179109,27.4960668590975,31.5002281722933)); +#3115=CARTESIAN_POINT('',(28.4998278179109,27.4960668590975,28.9002281722933)); +#3116=CARTESIAN_POINT('Origin',(28.4998278179109,27.4960668590975,28.5002281722933)); +#3117=CARTESIAN_POINT('',(-28.5001721820891,27.4960668590975,28.9002281722933)); +#3118=CARTESIAN_POINT('',(-0.000172182089066553,27.4960668590975,28.9002281722933)); +#3119=CARTESIAN_POINT('',(-28.9001721820891,27.4960668590975,28.5002281722933)); +#3120=CARTESIAN_POINT('Origin',(-28.5001721820891,27.4960668590975,28.5002281722933)); +#3121=CARTESIAN_POINT('',(-28.9001721820891,27.4960668590976,0.000228172293332351)); +#3122=CARTESIAN_POINT('',(11.7353539590347,27.4960668590976,-15.6984543014962)); +#3123=CARTESIAN_POINT('Origin',(0.,27.4960668590976,6.44982755746238E-14)); +#3124=CARTESIAN_POINT('',(13.6013749851999,27.4960668590976,-12.8985933827073)); +#3125=CARTESIAN_POINT('Origin',(0.,28.362092262882,6.71608392942319E-14)); +#3126=CARTESIAN_POINT('Origin',(0.,29.2281176666664,6.98234030138399E-14)); +#3127=CARTESIAN_POINT('Origin',(6.43930467196995,38.229135436113,-4.29159814015919)); +#3128=CARTESIAN_POINT('Origin',(13.185311919795,27.9960668590976,-12.6213001703745)); +#3129=CARTESIAN_POINT('Origin',(0.,28.4960668590976,6.80728868192833E-14)); +#3130=CARTESIAN_POINT('Origin',(0.,30.0960668590976,7.18988861656839E-14)); +#3131=CARTESIAN_POINT('Origin',(0.,28.4960668590976,6.32568987222309E-14)); +#3132=CARTESIAN_POINT('Origin',(0.,30.0960668590976,6.68096124010314E-14)); +#3133=CARTESIAN_POINT('Ctrl Pts',(-28.9001721820891,27.4960668590976,-28.4997718277067)); +#3134=CARTESIAN_POINT('Ctrl Pts',(-28.9001721820891,27.4960668590976,-28.8997718277067)); +#3135=CARTESIAN_POINT('Ctrl Pts',(-28.5001721820891,27.4960668590976,-28.8997718277067)); +#3136=CARTESIAN_POINT('Ctrl Pts',(-29.9001721820891,27.4960668590977,-28.4997718277067)); +#3137=CARTESIAN_POINT('Ctrl Pts',(-29.9001721820891,27.4960668590977,-29.8997718277067)); +#3138=CARTESIAN_POINT('Ctrl Pts',(-28.5001721820891,27.4960668590977,-29.8997718277067)); +#3139=CARTESIAN_POINT('Ctrl Pts',(-29.9001721820891,26.4960668590976,-28.4997718277067)); +#3140=CARTESIAN_POINT('Ctrl Pts',(-29.9001721820891,26.4960668590976,-29.8997718277067)); +#3141=CARTESIAN_POINT('Ctrl Pts',(-28.5001721820891,26.4960668590976,-29.8997718277067)); +#3142=CARTESIAN_POINT('',(-28.5001721820891,26.4960668590976,-29.8997718277067)); +#3143=CARTESIAN_POINT('Origin',(-28.5001721820891,26.4960668590976,-28.8997718277067)); +#3144=CARTESIAN_POINT('',(-29.9001721820891,26.4960668590976,-28.4997718277067)); +#3145=CARTESIAN_POINT('Origin',(-28.9001721820891,26.4960668590976,-28.4997718277067)); +#3146=CARTESIAN_POINT('Origin',(-28.5001721820891,26.4960668590976,-28.4997718277067)); +#3147=CARTESIAN_POINT('Origin',(31.4998278179109,26.4960668590976,-28.8997718277067)); +#3148=CARTESIAN_POINT('',(28.4998278179109,26.4960668590976,-29.8997718277067)); +#3149=CARTESIAN_POINT('Origin',(28.4998278179109,26.4960668590976,-28.8997718277067)); +#3150=CARTESIAN_POINT('',(31.4998278179109,26.4960668590976,-29.8997718277067)); +#3151=CARTESIAN_POINT('Origin',(-28.9001721820891,26.4960668590976,0.000228172293329276)); +#3152=CARTESIAN_POINT('',(-29.9001721820891,26.4960668590975,28.5002281722933)); +#3153=CARTESIAN_POINT('Origin',(-28.9001721820891,26.4960668590975,28.5002281722934)); +#3154=CARTESIAN_POINT('',(-29.9001721820891,26.4960668590976,0.000228172293329276)); +#3155=CARTESIAN_POINT('Ctrl Pts',(28.4998278179109,27.4960668590976,-28.8997718277067)); +#3156=CARTESIAN_POINT('Ctrl Pts',(28.8998278179109,27.4960668590976,-28.8997718277067)); +#3157=CARTESIAN_POINT('Ctrl Pts',(28.8998278179109,27.4960668590976,-28.4997718277067)); +#3158=CARTESIAN_POINT('Ctrl Pts',(28.4998278179109,27.4960668590977,-29.8997718277067)); +#3159=CARTESIAN_POINT('Ctrl Pts',(29.8998278179109,27.4960668590977,-29.8997718277067)); +#3160=CARTESIAN_POINT('Ctrl Pts',(29.8998278179109,27.4960668590976,-28.4997718277067)); +#3161=CARTESIAN_POINT('Ctrl Pts',(28.4998278179109,26.4960668590976,-29.8997718277067)); +#3162=CARTESIAN_POINT('Ctrl Pts',(29.8998278179109,26.4960668590976,-29.8997718277067)); +#3163=CARTESIAN_POINT('Ctrl Pts',(29.8998278179109,26.4960668590976,-28.4997718277067)); +#3164=CARTESIAN_POINT('',(29.8998278179109,26.4960668590976,-28.4997718277067)); +#3165=CARTESIAN_POINT('Origin',(28.8998278179109,26.4960668590976,-28.4997718277067)); +#3166=CARTESIAN_POINT('Origin',(28.4998278179109,26.4960668590976,-28.4997718277067)); +#3167=CARTESIAN_POINT('Ctrl Pts',(-28.500172182089,27.4960668590975,28.9002281722933)); +#3168=CARTESIAN_POINT('Ctrl Pts',(-28.9001721820891,27.4960668590975,28.9002281722934)); +#3169=CARTESIAN_POINT('Ctrl Pts',(-28.9001721820891,27.4960668590975,28.5002281722934)); +#3170=CARTESIAN_POINT('Ctrl Pts',(-28.500172182089,27.4960668590975,29.9002281722933)); +#3171=CARTESIAN_POINT('Ctrl Pts',(-29.900172182089,27.4960668590975,29.9002281722934)); +#3172=CARTESIAN_POINT('Ctrl Pts',(-29.9001721820891,27.4960668590975,28.5002281722934)); +#3173=CARTESIAN_POINT('Ctrl Pts',(-28.500172182089,26.4960668590975,29.9002281722933)); +#3174=CARTESIAN_POINT('Ctrl Pts',(-29.900172182089,26.4960668590975,29.9002281722934)); +#3175=CARTESIAN_POINT('Ctrl Pts',(-29.9001721820891,26.4960668590975,28.5002281722934)); +#3176=CARTESIAN_POINT('',(-28.5001721820891,26.4960668590975,29.9002281722933)); +#3177=CARTESIAN_POINT('Origin',(-28.5001721820891,26.4960668590975,28.9002281722933)); +#3178=CARTESIAN_POINT('Origin',(-28.5001721820891,26.4960668590975,28.5002281722933)); +#3179=CARTESIAN_POINT('Origin',(28.8998278179109,26.4960668590975,31.5002281722933)); +#3180=CARTESIAN_POINT('',(29.8998278179109,26.4960668590975,28.5002281722933)); +#3181=CARTESIAN_POINT('Origin',(28.8998278179109,26.4960668590975,28.5002281722933)); +#3182=CARTESIAN_POINT('',(29.8998278179109,26.4960668590975,31.5002281722933)); +#3183=CARTESIAN_POINT('Origin',(-0.000172182089066553,26.4960668590975, +28.9002281722933)); +#3184=CARTESIAN_POINT('',(28.4998278179109,26.4960668590975,29.9002281722933)); +#3185=CARTESIAN_POINT('Origin',(28.499827817911,26.4960668590975,28.9002281722933)); +#3186=CARTESIAN_POINT('',(-0.000172182089066553,26.4960668590975,29.9002281722933)); +#3187=CARTESIAN_POINT('Ctrl Pts',(28.8998278179109,27.4960668590975,28.5002281722933)); +#3188=CARTESIAN_POINT('Ctrl Pts',(28.8998278179109,27.4960668590975,28.9002281722933)); +#3189=CARTESIAN_POINT('Ctrl Pts',(28.4998278179109,27.4960668590975,28.9002281722933)); +#3190=CARTESIAN_POINT('Ctrl Pts',(29.8998278179109,27.4960668590975,28.5002281722933)); +#3191=CARTESIAN_POINT('Ctrl Pts',(29.899827817911,27.4960668590975,29.9002281722933)); +#3192=CARTESIAN_POINT('Ctrl Pts',(28.499827817911,27.4960668590975,29.9002281722933)); +#3193=CARTESIAN_POINT('Ctrl Pts',(29.8998278179109,26.4960668590975,28.5002281722933)); +#3194=CARTESIAN_POINT('Ctrl Pts',(29.899827817911,26.4960668590975,29.9002281722933)); +#3195=CARTESIAN_POINT('Ctrl Pts',(28.499827817911,26.4960668590975,29.9002281722933)); +#3196=CARTESIAN_POINT('Origin',(28.4998278179109,26.4960668590975,28.5002281722933)); +#3197=CARTESIAN_POINT('Origin',(29.8998278179109,17.0960668590975,31.5002281722933)); +#3198=CARTESIAN_POINT('',(29.8998278179109,17.0960668590976,-28.4997718277067)); +#3199=CARTESIAN_POINT('',(29.8998278179109,17.0960668590976,-28.4997718277067)); +#3200=CARTESIAN_POINT('',(29.8998278179109,17.0960668590975,28.5002281722933)); +#3201=CARTESIAN_POINT('',(29.8998278179109,17.0960668590975,15.7502281722933)); +#3202=CARTESIAN_POINT('',(29.8998278179109,17.0960668590975,28.5002281722933)); +#3203=CARTESIAN_POINT('Origin',(28.4998278179109,17.0960668590976,-28.4997718277067)); +#3204=CARTESIAN_POINT('',(28.4998278179109,17.0960668590977,-29.8997718277067)); +#3205=CARTESIAN_POINT('',(28.4998278179109,17.0960668590977,-29.8997718277067)); +#3206=CARTESIAN_POINT('Origin',(28.4998278179109,17.0960668590976,-28.4997718277067)); +#3207=CARTESIAN_POINT('Origin',(31.4998278179109,17.0960668590977,-29.8997718277067)); +#3208=CARTESIAN_POINT('',(-28.5001721820891,17.0960668590977,-29.8997718277067)); +#3209=CARTESIAN_POINT('',(-28.5001721820891,17.0960668590977,-29.8997718277067)); +#3210=CARTESIAN_POINT('',(-4.95017200000001,17.0960668590976,-29.8997718277067)); +#3211=CARTESIAN_POINT('',(15.7498278179109,17.0960668590977,-29.8997718277067)); +#3212=CARTESIAN_POINT('',(-4.95017200000001,20.5960668590976,-29.8997718277067)); +#3213=CARTESIAN_POINT('',(-4.95017200000001,18.8460668590976,-29.8997718277067)); +#3214=CARTESIAN_POINT('',(5.04982799999999,20.5960668590976,-29.8997718277067)); +#3215=CARTESIAN_POINT('',(18.2748279089555,20.5960668590976,-29.8997718277067)); +#3216=CARTESIAN_POINT('',(5.04982799999999,17.0960668590976,-29.8997718277067)); +#3217=CARTESIAN_POINT('',(5.04982799999999,17.0960668590976,-29.8997718277067)); +#3218=CARTESIAN_POINT('',(15.7498278179109,17.0960668590977,-29.8997718277067)); +#3219=CARTESIAN_POINT('',(-10.2858864678034,19.0960668590975,-29.8997718277067)); +#3220=CARTESIAN_POINT('',(-11.7858864678034,19.0960668590975,-29.8997718277067)); +#3221=CARTESIAN_POINT('',(9.85697067505379,19.0960668590975,-29.8997718277067)); +#3222=CARTESIAN_POINT('',(-11.7858864678034,26.0960668590975,-29.8997718277067)); +#3223=CARTESIAN_POINT('',(-11.7858864678034,21.5960668590976,-29.8997718277067)); +#3224=CARTESIAN_POINT('',(-10.2858864678034,26.0960668590975,-29.8997718277067)); +#3225=CARTESIAN_POINT('',(10.6069706750538,26.0960668590975,-29.8997718277067)); +#3226=CARTESIAN_POINT('',(-10.2858864678034,18.0960668590976,-29.8997718277067)); +#3227=CARTESIAN_POINT('',(-17.6430293249462,19.0960668590975,-29.8997718277067)); +#3228=CARTESIAN_POINT('',(-19.1430293249462,19.0960668590975,-29.8997718277067)); +#3229=CARTESIAN_POINT('',(6.17839924648236,19.0960668590975,-29.8997718277067)); +#3230=CARTESIAN_POINT('',(-19.1430293249462,26.0960668590975,-29.8997718277067)); +#3231=CARTESIAN_POINT('',(-19.1430293249462,21.5960668590976,-29.8997718277067)); +#3232=CARTESIAN_POINT('',(-17.6430293249462,26.0960668590975,-29.8997718277067)); +#3233=CARTESIAN_POINT('',(6.92839924648236,26.0960668590975,-29.8997718277067)); +#3234=CARTESIAN_POINT('',(-17.6430293249462,18.0960668590976,-29.8997718277067)); +#3235=CARTESIAN_POINT('',(-25.0001721820891,19.0960668590975,-29.8997718277067)); +#3236=CARTESIAN_POINT('',(-26.5001721820891,19.0960668590975,-29.8997718277067)); +#3237=CARTESIAN_POINT('',(2.49982781791093,19.0960668590975,-29.8997718277067)); +#3238=CARTESIAN_POINT('',(-26.5001721820891,26.0960668590975,-29.8997718277067)); +#3239=CARTESIAN_POINT('',(-26.5001721820891,21.5960668590976,-29.8997718277067)); +#3240=CARTESIAN_POINT('',(-25.0001721820891,26.0960668590975,-29.8997718277067)); +#3241=CARTESIAN_POINT('',(3.24982781791094,26.0960668590975,-29.8997718277067)); +#3242=CARTESIAN_POINT('',(-25.0001721820891,18.0960668590976,-29.8997718277067)); +#3243=CARTESIAN_POINT('',(2.92839924648236,21.734082168266,-29.8997718277067)); +#3244=CARTESIAN_POINT('',(4.42839924648236,21.734082168266,-29.8997718277067)); +#3245=CARTESIAN_POINT('',(2.21411353219665,21.734082168266,-29.8997718277067)); +#3246=CARTESIAN_POINT('',(2.92839924648236,26.0960668590974,-29.8997718277067)); +#3247=CARTESIAN_POINT('',(2.92839924648236,21.5960668590975,-29.8997718277067)); +#3248=CARTESIAN_POINT('',(4.42839924648236,26.0960668590974,-29.8997718277067)); +#3249=CARTESIAN_POINT('',(17.9641135321966,26.0960668590974,-29.8997718277067)); +#3250=CARTESIAN_POINT('',(4.42839924648236,18.0960668590975,-29.8997718277067)); +#3251=CARTESIAN_POINT('',(11.7855421036252,19.0960668590974,-29.8997718277067)); +#3252=CARTESIAN_POINT('',(10.2855421036252,19.0960668590974,-29.8997718277067)); +#3253=CARTESIAN_POINT('',(20.8926849607681,19.0960668590974,-29.8997718277067)); +#3254=CARTESIAN_POINT('',(10.2855421036252,26.0960668590974,-29.8997718277067)); +#3255=CARTESIAN_POINT('',(10.2855421036252,21.5960668590975,-29.8997718277067)); +#3256=CARTESIAN_POINT('',(11.7855421036252,26.0960668590974,-29.8997718277067)); +#3257=CARTESIAN_POINT('',(21.6426849607681,26.0960668590974,-29.8997718277067)); +#3258=CARTESIAN_POINT('',(11.7855421036252,18.0960668590975,-29.8997718277067)); +#3259=CARTESIAN_POINT('',(19.1426849607681,19.0960668590973,-29.8997718277067)); +#3260=CARTESIAN_POINT('',(17.6426849607681,19.0960668590973,-29.8997718277067)); +#3261=CARTESIAN_POINT('',(24.5712563893395,19.0960668590973,-29.8997718277067)); +#3262=CARTESIAN_POINT('',(17.6426849607681,26.0960668590973,-29.8997718277067)); +#3263=CARTESIAN_POINT('',(17.6426849607681,21.5960668590975,-29.8997718277067)); +#3264=CARTESIAN_POINT('',(19.1426849607681,26.0960668590973,-29.8997718277067)); +#3265=CARTESIAN_POINT('',(25.3212563893395,26.0960668590973,-29.8997718277067)); +#3266=CARTESIAN_POINT('',(19.1426849607681,18.0960668590975,-29.8997718277067)); +#3267=CARTESIAN_POINT('',(26.4998278179109,19.0960668590973,-29.8997718277067)); +#3268=CARTESIAN_POINT('',(24.9998278179109,19.0960668590973,-29.8997718277067)); +#3269=CARTESIAN_POINT('',(28.2498278179109,19.0960668590973,-29.8997718277067)); +#3270=CARTESIAN_POINT('',(24.9998278179109,26.0960668590973,-29.8997718277067)); +#3271=CARTESIAN_POINT('',(24.9998278179109,21.5960668590975,-29.8997718277067)); +#3272=CARTESIAN_POINT('',(26.4998278179109,26.0960668590973,-29.8997718277067)); +#3273=CARTESIAN_POINT('',(28.9998278179109,26.0960668590973,-29.8997718277067)); +#3274=CARTESIAN_POINT('',(26.4998278179109,18.0960668590975,-29.8997718277067)); +#3275=CARTESIAN_POINT('',(-4.42874361066049,21.734082168266,-29.8997718277067)); +#3276=CARTESIAN_POINT('',(-4.4287436106605,26.0960668590974,-29.8997718277067)); +#3277=CARTESIAN_POINT('',(-4.4287436106605,21.5960668590975,-29.8997718277067)); +#3278=CARTESIAN_POINT('',(-2.92874361066049,26.0960668590974,-29.8997718277067)); +#3279=CARTESIAN_POINT('',(14.2855421036252,26.0960668590974,-29.8997718277067)); +#3280=CARTESIAN_POINT('',(-2.9287436106605,21.734082168266,-29.8997718277067)); +#3281=CARTESIAN_POINT('',(-2.9287436106605,18.0960668590976,-29.8997718277067)); +#3282=CARTESIAN_POINT('',(-1.46445789637478,21.734082168266,-29.8997718277067)); +#3283=CARTESIAN_POINT('Origin',(-28.5001721820891,17.0960668590976,-28.4997718277067)); +#3284=CARTESIAN_POINT('',(-29.9001721820891,17.0960668590976,-28.4997718277067)); +#3285=CARTESIAN_POINT('',(-29.9001721820891,17.0960668590976,-28.4997718277067)); +#3286=CARTESIAN_POINT('Origin',(-28.5001721820891,17.0960668590976,-28.4997718277067)); +#3287=CARTESIAN_POINT('Origin',(4.42839924648236,21.734082168266,-31.4997718277067)); +#3288=CARTESIAN_POINT('',(4.42839924648236,21.734082168266,-31.4997718277067)); +#3289=CARTESIAN_POINT('',(4.42839924648236,21.734082168266,-31.4997718277067)); +#3290=CARTESIAN_POINT('',(2.92839924648236,21.734082168266,-31.4997718277067)); +#3291=CARTESIAN_POINT('',(-4.42874361066049,21.734082168266,-31.4997718277067)); +#3292=CARTESIAN_POINT('',(2.92839924648236,21.734082168266,-31.4997718277067)); +#3293=CARTESIAN_POINT('Origin',(2.92839924648236,26.0960668590974,-31.4997718277067)); +#3294=CARTESIAN_POINT('',(2.92839924648236,26.0960668590974,-31.4997718277067)); +#3295=CARTESIAN_POINT('',(2.92839924648236,21.5960668590975,-31.4997718277067)); +#3296=CARTESIAN_POINT('',(2.92839924648236,26.0960668590974,-31.4997718277067)); +#3297=CARTESIAN_POINT('Origin',(-2.9287436106605,21.734082168266,-31.4997718277067)); +#3298=CARTESIAN_POINT('',(-2.9287436106605,21.734082168266,-31.4997718277067)); +#3299=CARTESIAN_POINT('',(-2.9287436106605,21.734082168266,-31.4997718277067)); +#3300=CARTESIAN_POINT('',(-4.42874361066049,21.734082168266,-31.4997718277067)); +#3301=CARTESIAN_POINT('',(-4.42874361066049,21.734082168266,-31.4997718277067)); +#3302=CARTESIAN_POINT('',(-4.4287436106605,21.734082168266,-31.4997718277067)); +#3303=CARTESIAN_POINT('Origin',(26.4998278179109,26.0960668590973,31.4997718277067)); +#3304=CARTESIAN_POINT('',(26.4998278179109,26.0960668590973,29.9002281722933)); +#3305=CARTESIAN_POINT('',(24.9998278179109,26.0960668590973,29.9002281722933)); +#3306=CARTESIAN_POINT('',(-2.50017218208907,26.0960668590973,29.9002281722933)); +#3307=CARTESIAN_POINT('',(26.4998278179109,26.0960668590973,31.5002281722933)); +#3308=CARTESIAN_POINT('',(26.4998278179109,26.0960668590973,31.4997718277067)); +#3309=CARTESIAN_POINT('',(24.9998278179109,26.0960668590973,31.5002281722933)); +#3310=CARTESIAN_POINT('',(-2.50017218208907,26.0960668590973,31.5002281722933)); +#3311=CARTESIAN_POINT('',(24.9998278179109,26.0960668590973,31.4997718277067)); +#3312=CARTESIAN_POINT('Origin',(24.9998278179109,26.0960668590973,31.4997718277067)); +#3313=CARTESIAN_POINT('',(24.9998278179109,19.0960668590973,29.9002281722933)); +#3314=CARTESIAN_POINT('',(24.9998278179109,21.5960668590974,29.9002281722933)); +#3315=CARTESIAN_POINT('',(24.9998278179109,19.0960668590973,31.5002281722933)); +#3316=CARTESIAN_POINT('',(24.9998278179109,21.5960668590974,31.5002281722933)); +#3317=CARTESIAN_POINT('',(24.9998278179109,19.0960668590973,31.4997718277067)); +#3318=CARTESIAN_POINT('Origin',(24.9998278179109,19.0960668590973,31.4997718277067)); +#3319=CARTESIAN_POINT('',(26.4998278179109,19.0960668590973,29.9002281722933)); +#3320=CARTESIAN_POINT('',(-3.25017218208907,19.0960668590973,29.9002281722933)); +#3321=CARTESIAN_POINT('',(26.4998278179109,19.0960668590973,31.5002281722933)); +#3322=CARTESIAN_POINT('',(-3.25017218208907,19.0960668590973,31.5002281722933)); +#3323=CARTESIAN_POINT('',(26.4998278179109,19.0960668590973,31.4997718277067)); +#3324=CARTESIAN_POINT('Origin',(26.4998278179109,19.0960668590973,31.4997718277067)); +#3325=CARTESIAN_POINT('',(26.4998278179109,18.0960668590974,29.9002281722933)); +#3326=CARTESIAN_POINT('',(26.4998278179109,18.0960668590974,31.5002281722933)); +#3327=CARTESIAN_POINT('Origin',(19.1426849607681,26.0960668590973,31.4997718277067)); +#3328=CARTESIAN_POINT('',(19.1426849607681,26.0960668590973,29.9002281722933)); +#3329=CARTESIAN_POINT('',(17.6426849607681,26.0960668590973,29.9002281722933)); +#3330=CARTESIAN_POINT('',(-6.1787436106605,26.0960668590973,29.9002281722933)); +#3331=CARTESIAN_POINT('',(19.1426849607681,26.0960668590973,31.5002281722933)); +#3332=CARTESIAN_POINT('',(19.1426849607681,26.0960668590973,31.4997718277067)); +#3333=CARTESIAN_POINT('',(17.6426849607681,26.0960668590973,31.5002281722933)); +#3334=CARTESIAN_POINT('',(-6.1787436106605,26.0960668590973,31.5002281722933)); +#3335=CARTESIAN_POINT('',(17.6426849607681,26.0960668590973,31.4997718277067)); +#3336=CARTESIAN_POINT('Origin',(17.6426849607681,26.0960668590973,31.4997718277067)); +#3337=CARTESIAN_POINT('',(17.6426849607681,19.0960668590973,29.9002281722933)); +#3338=CARTESIAN_POINT('',(17.6426849607681,21.5960668590974,29.9002281722933)); +#3339=CARTESIAN_POINT('',(17.6426849607681,19.0960668590973,31.5002281722933)); +#3340=CARTESIAN_POINT('',(17.6426849607681,21.5960668590974,31.5002281722933)); +#3341=CARTESIAN_POINT('',(17.6426849607681,19.0960668590973,31.4997718277067)); +#3342=CARTESIAN_POINT('Origin',(17.6426849607681,19.0960668590973,31.4997718277067)); +#3343=CARTESIAN_POINT('',(19.1426849607681,19.0960668590973,29.9002281722933)); +#3344=CARTESIAN_POINT('',(-6.9287436106605,19.0960668590973,29.9002281722933)); +#3345=CARTESIAN_POINT('',(19.1426849607681,19.0960668590973,31.5002281722933)); +#3346=CARTESIAN_POINT('',(-6.9287436106605,19.0960668590973,31.5002281722933)); +#3347=CARTESIAN_POINT('',(19.1426849607681,19.0960668590973,31.4997718277067)); +#3348=CARTESIAN_POINT('Origin',(19.1426849607681,19.0960668590973,31.4997718277067)); +#3349=CARTESIAN_POINT('',(19.1426849607681,18.0960668590974,29.9002281722933)); +#3350=CARTESIAN_POINT('',(19.1426849607681,18.0960668590974,31.5002281722933)); +#3351=CARTESIAN_POINT('Origin',(11.7855421036252,26.0960668590974,31.4997718277067)); +#3352=CARTESIAN_POINT('',(11.7855421036252,26.0960668590974,29.9002281722933)); +#3353=CARTESIAN_POINT('',(10.2855421036252,26.0960668590974,29.9002281722933)); +#3354=CARTESIAN_POINT('',(-9.85731503923192,26.0960668590974,29.9002281722933)); +#3355=CARTESIAN_POINT('',(11.7855421036252,26.0960668590974,31.5002281722933)); +#3356=CARTESIAN_POINT('',(11.7855421036252,26.0960668590974,31.4997718277067)); +#3357=CARTESIAN_POINT('',(10.2855421036252,26.0960668590974,31.5002281722933)); +#3358=CARTESIAN_POINT('',(-9.85731503923192,26.0960668590974,31.5002281722933)); +#3359=CARTESIAN_POINT('',(10.2855421036252,26.0960668590974,31.4997718277067)); +#3360=CARTESIAN_POINT('Origin',(10.2855421036252,26.0960668590974,31.4997718277067)); +#3361=CARTESIAN_POINT('',(10.2855421036252,19.0960668590974,29.9002281722933)); +#3362=CARTESIAN_POINT('',(10.2855421036252,21.5960668590974,29.9002281722933)); +#3363=CARTESIAN_POINT('',(10.2855421036252,19.0960668590974,31.5002281722933)); +#3364=CARTESIAN_POINT('',(10.2855421036252,21.5960668590974,31.5002281722933)); +#3365=CARTESIAN_POINT('',(10.2855421036252,19.0960668590974,31.4997718277067)); +#3366=CARTESIAN_POINT('Origin',(10.2855421036252,19.0960668590974,31.4997718277067)); +#3367=CARTESIAN_POINT('',(11.7855421036252,19.0960668590974,29.9002281722933)); +#3368=CARTESIAN_POINT('',(-10.6073150392319,19.0960668590974,29.9002281722933)); +#3369=CARTESIAN_POINT('',(11.7855421036252,19.0960668590974,31.5002281722933)); +#3370=CARTESIAN_POINT('',(-10.6073150392319,19.0960668590974,31.5002281722933)); +#3371=CARTESIAN_POINT('',(11.7855421036252,19.0960668590974,31.4997718277067)); +#3372=CARTESIAN_POINT('Origin',(11.7855421036252,19.0960668590974,31.4997718277067)); +#3373=CARTESIAN_POINT('',(11.7855421036252,18.0960668590974,29.9002281722933)); +#3374=CARTESIAN_POINT('',(11.7855421036252,18.0960668590974,31.5002281722933)); +#3375=CARTESIAN_POINT('Origin',(4.42839924648236,26.0960668590974,31.4997718277067)); +#3376=CARTESIAN_POINT('',(4.42839924648236,26.0960668590974,29.9002281722933)); +#3377=CARTESIAN_POINT('',(2.92839924648236,26.0960668590974,29.9002281722933)); +#3378=CARTESIAN_POINT('',(-13.5358864678034,26.0960668590974,29.9002281722933)); +#3379=CARTESIAN_POINT('',(4.42839924648236,26.0960668590974,31.5002281722933)); +#3380=CARTESIAN_POINT('',(4.42839924648236,26.0960668590974,31.4997718277067)); +#3381=CARTESIAN_POINT('',(2.92839924648236,26.0960668590974,31.5002281722933)); +#3382=CARTESIAN_POINT('',(-13.5358864678034,26.0960668590974,31.5002281722933)); +#3383=CARTESIAN_POINT('',(2.92839924648236,26.0960668590974,31.4997718277067)); +#3384=CARTESIAN_POINT('Origin',(2.92839924648236,26.0960668590974,31.4997718277067)); +#3385=CARTESIAN_POINT('',(2.92839924648236,19.0960668590974,29.9002281722933)); +#3386=CARTESIAN_POINT('',(2.92839924648236,21.5960668590974,29.9002281722933)); +#3387=CARTESIAN_POINT('',(2.92839924648236,19.0960668590974,31.5002281722933)); +#3388=CARTESIAN_POINT('',(2.92839924648236,21.5960668590974,31.5002281722933)); +#3389=CARTESIAN_POINT('',(2.92839924648236,19.0960668590974,31.4997718277067)); +#3390=CARTESIAN_POINT('Origin',(2.92839924648236,19.0960668590974,31.4997718277067)); +#3391=CARTESIAN_POINT('',(4.42839924648236,19.0960668590974,29.9002281722933)); +#3392=CARTESIAN_POINT('',(-14.2858864678034,19.0960668590974,29.9002281722933)); +#3393=CARTESIAN_POINT('',(4.42839924648236,19.0960668590974,31.5002281722933)); +#3394=CARTESIAN_POINT('',(-14.2858864678034,19.0960668590974,31.5002281722933)); +#3395=CARTESIAN_POINT('',(4.42839924648236,19.0960668590974,31.4997718277067)); +#3396=CARTESIAN_POINT('Origin',(4.42839924648236,19.0960668590974,31.4997718277067)); +#3397=CARTESIAN_POINT('',(4.42839924648236,18.0960668590974,29.9002281722933)); +#3398=CARTESIAN_POINT('',(4.42839924648236,18.0960668590974,31.5002281722933)); +#3399=CARTESIAN_POINT('Origin',(-2.92874361066049,26.0960668590974,31.4997718277067)); +#3400=CARTESIAN_POINT('',(-2.92874361066049,26.0960668590974,29.9002281722933)); +#3401=CARTESIAN_POINT('',(-4.4287436106605,26.0960668590974,29.9002281722933)); +#3402=CARTESIAN_POINT('',(-17.2144578963748,26.0960668590974,29.9002281722933)); +#3403=CARTESIAN_POINT('',(-2.92874361066049,26.0960668590974,31.5002281722933)); +#3404=CARTESIAN_POINT('',(-2.92874361066049,26.0960668590974,31.4997718277067)); +#3405=CARTESIAN_POINT('',(-4.4287436106605,26.0960668590974,31.5002281722933)); +#3406=CARTESIAN_POINT('',(-17.2144578963748,26.0960668590974,31.5002281722933)); +#3407=CARTESIAN_POINT('',(-4.4287436106605,26.0960668590974,31.4997718277067)); +#3408=CARTESIAN_POINT('Origin',(-4.4287436106605,26.0960668590974,31.4997718277067)); +#3409=CARTESIAN_POINT('',(-4.4287436106605,19.0960668590974,29.9002281722933)); +#3410=CARTESIAN_POINT('',(-4.4287436106605,21.5960668590975,29.9002281722933)); +#3411=CARTESIAN_POINT('',(-4.4287436106605,19.0960668590974,31.5002281722933)); +#3412=CARTESIAN_POINT('',(-4.4287436106605,21.5960668590974,31.5002281722933)); +#3413=CARTESIAN_POINT('',(-4.4287436106605,19.0960668590974,31.4997718277067)); +#3414=CARTESIAN_POINT('Origin',(-4.4287436106605,19.0960668590974,31.4997718277067)); +#3415=CARTESIAN_POINT('',(-2.9287436106605,19.0960668590974,29.9002281722933)); +#3416=CARTESIAN_POINT('',(-17.9644578963748,19.0960668590974,29.9002281722933)); +#3417=CARTESIAN_POINT('',(-2.9287436106605,19.0960668590974,31.5002281722933)); +#3418=CARTESIAN_POINT('',(-17.9644578963748,19.0960668590974,31.5002281722933)); +#3419=CARTESIAN_POINT('',(-2.9287436106605,19.0960668590974,31.4997718277067)); +#3420=CARTESIAN_POINT('Origin',(-2.9287436106605,19.0960668590974,31.4997718277067)); +#3421=CARTESIAN_POINT('',(-2.9287436106605,18.0960668590974,29.9002281722933)); +#3422=CARTESIAN_POINT('',(-2.9287436106605,18.0960668590974,31.5002281722933)); +#3423=CARTESIAN_POINT('Origin',(-10.2858864678034,26.0960668590975,31.4997718277067)); +#3424=CARTESIAN_POINT('',(-10.2858864678034,26.0960668590975,29.9002281722933)); +#3425=CARTESIAN_POINT('',(-11.7858864678034,26.0960668590975,29.9002281722933)); +#3426=CARTESIAN_POINT('',(-20.8930293249462,26.0960668590975,29.9002281722933)); +#3427=CARTESIAN_POINT('',(-10.2858864678034,26.0960668590975,31.5002281722933)); +#3428=CARTESIAN_POINT('',(-10.2858864678034,26.0960668590975,31.4997718277067)); +#3429=CARTESIAN_POINT('',(-11.7858864678034,26.0960668590975,31.5002281722933)); +#3430=CARTESIAN_POINT('',(-20.8930293249462,26.0960668590975,31.5002281722933)); +#3431=CARTESIAN_POINT('',(-11.7858864678034,26.0960668590975,31.4997718277067)); +#3432=CARTESIAN_POINT('Origin',(-11.7858864678034,26.0960668590975,31.4997718277067)); +#3433=CARTESIAN_POINT('',(-11.7858864678034,19.0960668590975,29.9002281722933)); +#3434=CARTESIAN_POINT('',(-11.7858864678034,21.5960668590975,29.9002281722933)); +#3435=CARTESIAN_POINT('',(-11.7858864678034,19.0960668590975,31.5002281722933)); +#3436=CARTESIAN_POINT('',(-11.7858864678034,21.5960668590975,31.5002281722933)); +#3437=CARTESIAN_POINT('',(-11.7858864678034,19.0960668590975,31.4997718277067)); +#3438=CARTESIAN_POINT('Origin',(-11.7858864678034,19.0960668590975,31.4997718277067)); +#3439=CARTESIAN_POINT('',(-10.2858864678034,19.0960668590975,29.9002281722933)); +#3440=CARTESIAN_POINT('',(-21.6430293249462,19.0960668590975,29.9002281722933)); +#3441=CARTESIAN_POINT('',(-10.2858864678034,19.0960668590975,31.5002281722933)); +#3442=CARTESIAN_POINT('',(-21.6430293249462,19.0960668590975,31.5002281722933)); +#3443=CARTESIAN_POINT('',(-10.2858864678034,19.0960668590975,31.4997718277067)); +#3444=CARTESIAN_POINT('Origin',(-10.2858864678034,19.0960668590975,31.4997718277067)); +#3445=CARTESIAN_POINT('',(-10.2858864678034,18.0960668590975,29.9002281722933)); +#3446=CARTESIAN_POINT('',(-10.2858864678034,18.0960668590975,31.5002281722933)); +#3447=CARTESIAN_POINT('Origin',(-17.6430293249462,26.0960668590975,31.4997718277067)); +#3448=CARTESIAN_POINT('',(-17.6430293249462,26.0960668590975,29.9002281722933)); +#3449=CARTESIAN_POINT('',(-19.1430293249462,26.0960668590975,29.9002281722933)); +#3450=CARTESIAN_POINT('',(-24.5716007535176,26.0960668590975,29.9002281722933)); +#3451=CARTESIAN_POINT('',(-17.6430293249462,26.0960668590975,31.5002281722933)); +#3452=CARTESIAN_POINT('',(-17.6430293249462,26.0960668590975,31.4997718277067)); +#3453=CARTESIAN_POINT('',(-19.1430293249462,26.0960668590975,31.5002281722933)); +#3454=CARTESIAN_POINT('',(-24.5716007535176,26.0960668590975,31.5002281722933)); +#3455=CARTESIAN_POINT('',(-19.1430293249462,26.0960668590975,31.4997718277067)); +#3456=CARTESIAN_POINT('Origin',(-19.1430293249462,26.0960668590975,31.4997718277067)); +#3457=CARTESIAN_POINT('',(-19.1430293249462,19.0960668590975,29.9002281722933)); +#3458=CARTESIAN_POINT('',(-19.1430293249462,21.5960668590975,29.9002281722933)); +#3459=CARTESIAN_POINT('',(-19.1430293249462,19.0960668590975,31.5002281722933)); +#3460=CARTESIAN_POINT('',(-19.1430293249462,21.5960668590975,31.5002281722933)); +#3461=CARTESIAN_POINT('',(-19.1430293249462,19.0960668590975,31.4997718277067)); +#3462=CARTESIAN_POINT('Origin',(-19.1430293249462,19.0960668590975,31.4997718277067)); +#3463=CARTESIAN_POINT('',(-17.6430293249462,19.0960668590975,29.9002281722933)); +#3464=CARTESIAN_POINT('',(-25.3216007535176,19.0960668590975,29.9002281722933)); +#3465=CARTESIAN_POINT('',(-17.6430293249462,19.0960668590975,31.5002281722933)); +#3466=CARTESIAN_POINT('',(-25.3216007535176,19.0960668590975,31.5002281722933)); +#3467=CARTESIAN_POINT('',(-17.6430293249462,19.0960668590975,31.4997718277067)); +#3468=CARTESIAN_POINT('Origin',(-17.6430293249462,19.0960668590975,31.4997718277067)); +#3469=CARTESIAN_POINT('',(-17.6430293249462,18.0960668590975,29.9002281722933)); +#3470=CARTESIAN_POINT('',(-17.6430293249462,18.0960668590975,31.5002281722933)); +#3471=CARTESIAN_POINT('Origin',(-25.0001721820891,26.0960668590975,31.4997718277067)); +#3472=CARTESIAN_POINT('',(-25.0001721820891,26.0960668590975,29.9002281722933)); +#3473=CARTESIAN_POINT('',(-26.5001721820891,26.0960668590975,29.9002281722933)); +#3474=CARTESIAN_POINT('',(-28.2501721820891,26.0960668590975,29.9002281722933)); +#3475=CARTESIAN_POINT('',(-25.0001721820891,26.0960668590975,31.5002281722933)); +#3476=CARTESIAN_POINT('',(-25.0001721820891,26.0960668590975,31.4997718277067)); +#3477=CARTESIAN_POINT('',(-26.5001721820891,26.0960668590975,31.5002281722933)); +#3478=CARTESIAN_POINT('',(-28.2501721820891,26.0960668590975,31.5002281722933)); +#3479=CARTESIAN_POINT('',(-26.5001721820891,26.0960668590975,31.4997718277067)); +#3480=CARTESIAN_POINT('Origin',(-26.5001721820891,26.0960668590975,31.4997718277067)); +#3481=CARTESIAN_POINT('',(-26.5001721820891,19.0960668590975,29.9002281722933)); +#3482=CARTESIAN_POINT('',(-26.5001721820891,21.5960668590975,29.9002281722933)); +#3483=CARTESIAN_POINT('',(-26.5001721820891,19.0960668590975,31.5002281722933)); +#3484=CARTESIAN_POINT('',(-26.5001721820891,21.5960668590975,31.5002281722933)); +#3485=CARTESIAN_POINT('',(-26.5001721820891,19.0960668590975,31.4997718277067)); +#3486=CARTESIAN_POINT('Origin',(-26.5001721820891,19.0960668590975,31.4997718277067)); +#3487=CARTESIAN_POINT('',(-25.0001721820891,19.0960668590975,29.9002281722933)); +#3488=CARTESIAN_POINT('',(-29.0001721820891,19.0960668590975,29.9002281722933)); +#3489=CARTESIAN_POINT('',(-25.0001721820891,19.0960668590975,31.5002281722933)); +#3490=CARTESIAN_POINT('',(-29.0001721820891,19.0960668590975,31.5002281722933)); +#3491=CARTESIAN_POINT('',(-25.0001721820891,19.0960668590975,31.4997718277067)); +#3492=CARTESIAN_POINT('Origin',(-25.0001721820891,19.0960668590975,31.4997718277067)); +#3493=CARTESIAN_POINT('',(-25.0001721820891,18.0960668590975,29.9002281722933)); +#3494=CARTESIAN_POINT('',(-25.0001721820891,18.0960668590975,31.5002281722933)); +#3495=CARTESIAN_POINT('Origin',(26.4998278179109,26.0960668590973,-31.4997718277067)); +#3496=CARTESIAN_POINT('',(26.4998278179109,26.0960668590973,-31.4997718277067)); +#3497=CARTESIAN_POINT('',(24.9998278179109,26.0960668590973,-31.4997718277067)); +#3498=CARTESIAN_POINT('',(28.9998278179109,26.0960668590973,-31.4997718277067)); +#3499=CARTESIAN_POINT('',(26.4998278179109,26.0960668590973,-31.4997718277067)); +#3500=CARTESIAN_POINT('',(24.9998278179109,26.0960668590973,-31.4997718277067)); +#3501=CARTESIAN_POINT('Origin',(24.9998278179109,26.0960668590973,-31.4997718277067)); +#3502=CARTESIAN_POINT('',(24.9998278179109,19.0960668590973,-31.4997718277067)); +#3503=CARTESIAN_POINT('',(24.9998278179109,21.5960668590975,-31.4997718277067)); +#3504=CARTESIAN_POINT('',(24.9998278179109,19.0960668590973,-31.4997718277067)); +#3505=CARTESIAN_POINT('Origin',(24.9998278179109,19.0960668590973,-31.4997718277067)); +#3506=CARTESIAN_POINT('',(26.4998278179109,19.0960668590973,-31.4997718277067)); +#3507=CARTESIAN_POINT('',(28.2498278179109,19.0960668590973,-31.4997718277067)); +#3508=CARTESIAN_POINT('',(26.4998278179109,19.0960668590973,-31.4997718277067)); +#3509=CARTESIAN_POINT('Origin',(26.4998278179109,19.0960668590973,-31.4997718277067)); +#3510=CARTESIAN_POINT('',(26.4998278179109,18.0960668590975,-31.4997718277067)); +#3511=CARTESIAN_POINT('Origin',(19.1426849607681,26.0960668590973,-31.4997718277067)); +#3512=CARTESIAN_POINT('',(19.1426849607681,26.0960668590973,-31.4997718277067)); +#3513=CARTESIAN_POINT('',(17.6426849607681,26.0960668590973,-31.4997718277067)); +#3514=CARTESIAN_POINT('',(25.3212563893395,26.0960668590973,-31.4997718277067)); +#3515=CARTESIAN_POINT('',(19.1426849607681,26.0960668590973,-31.4997718277067)); +#3516=CARTESIAN_POINT('',(17.6426849607681,26.0960668590973,-31.4997718277067)); +#3517=CARTESIAN_POINT('Origin',(17.6426849607681,26.0960668590973,-31.4997718277067)); +#3518=CARTESIAN_POINT('',(17.6426849607681,19.0960668590973,-31.4997718277067)); +#3519=CARTESIAN_POINT('',(17.6426849607681,21.5960668590975,-31.4997718277067)); +#3520=CARTESIAN_POINT('',(17.6426849607681,19.0960668590973,-31.4997718277067)); +#3521=CARTESIAN_POINT('Origin',(17.6426849607681,19.0960668590973,-31.4997718277067)); +#3522=CARTESIAN_POINT('',(19.1426849607681,19.0960668590973,-31.4997718277067)); +#3523=CARTESIAN_POINT('',(24.5712563893395,19.0960668590973,-31.4997718277067)); +#3524=CARTESIAN_POINT('',(19.1426849607681,19.0960668590973,-31.4997718277067)); +#3525=CARTESIAN_POINT('Origin',(19.1426849607681,19.0960668590973,-31.4997718277067)); +#3526=CARTESIAN_POINT('',(19.1426849607681,18.0960668590975,-31.4997718277067)); +#3527=CARTESIAN_POINT('Origin',(11.7855421036252,26.0960668590974,-31.4997718277067)); +#3528=CARTESIAN_POINT('',(11.7855421036252,26.0960668590974,-31.4997718277067)); +#3529=CARTESIAN_POINT('',(10.2855421036252,26.0960668590974,-31.4997718277067)); +#3530=CARTESIAN_POINT('',(21.6426849607681,26.0960668590974,-31.4997718277067)); +#3531=CARTESIAN_POINT('',(11.7855421036252,26.0960668590974,-31.4997718277067)); +#3532=CARTESIAN_POINT('',(10.2855421036252,26.0960668590974,-31.4997718277067)); +#3533=CARTESIAN_POINT('Origin',(10.2855421036252,26.0960668590974,-31.4997718277067)); +#3534=CARTESIAN_POINT('',(10.2855421036252,19.0960668590974,-31.4997718277067)); +#3535=CARTESIAN_POINT('',(10.2855421036252,21.5960668590975,-31.4997718277067)); +#3536=CARTESIAN_POINT('',(10.2855421036252,19.0960668590974,-31.4997718277067)); +#3537=CARTESIAN_POINT('Origin',(10.2855421036252,19.0960668590974,-31.4997718277067)); +#3538=CARTESIAN_POINT('',(11.7855421036252,19.0960668590974,-31.4997718277067)); +#3539=CARTESIAN_POINT('',(20.8926849607681,19.0960668590974,-31.4997718277067)); +#3540=CARTESIAN_POINT('',(11.7855421036252,19.0960668590974,-31.4997718277067)); +#3541=CARTESIAN_POINT('Origin',(11.7855421036252,19.0960668590974,-31.4997718277067)); +#3542=CARTESIAN_POINT('',(11.7855421036252,18.0960668590975,-31.4997718277067)); +#3543=CARTESIAN_POINT('Origin',(4.42839924648236,26.0960668590974,-31.4997718277067)); +#3544=CARTESIAN_POINT('',(4.42839924648236,26.0960668590974,-31.4997718277067)); +#3545=CARTESIAN_POINT('',(17.9641135321966,26.0960668590974,-31.4997718277067)); +#3546=CARTESIAN_POINT('',(4.42839924648236,26.0960668590974,-31.4997718277067)); +#3547=CARTESIAN_POINT('Origin',(4.42839924648236,19.0960668590974,-31.4997718277067)); +#3548=CARTESIAN_POINT('',(4.42839924648236,18.0960668590975,-31.4997718277067)); +#3549=CARTESIAN_POINT('Origin',(31.4998278179109,17.0960668590977,-31.4997718277067)); +#3550=CARTESIAN_POINT('',(5.04982799999999,20.5960668590976,-31.4997718277067)); +#3551=CARTESIAN_POINT('',(-4.95017200000001,20.5960668590976,-31.4997718277067)); +#3552=CARTESIAN_POINT('',(18.2748279089555,20.5960668590976,-31.4997718277067)); +#3553=CARTESIAN_POINT('',(-4.95017200000001,17.0960668590976,-31.4997718277067)); +#3554=CARTESIAN_POINT('',(-4.95017200000001,18.8460668590976,-31.4997718277067)); +#3555=CARTESIAN_POINT('',(-28.5001721820891,17.0960668590977,-31.4997718277067)); +#3556=CARTESIAN_POINT('',(-31.5001721820891,17.0960668590977,-31.4997718277067)); +#3557=CARTESIAN_POINT('',(-28.5001721820891,27.0960668590977,-31.4997718277067)); +#3558=CARTESIAN_POINT('',(-28.5001721820891,17.0960668590977,-31.4997718277067)); +#3559=CARTESIAN_POINT('',(28.4998278179109,27.0960668590977,-31.4997718277067)); +#3560=CARTESIAN_POINT('',(15.7498278179109,27.0960668590977,-31.4997718277067)); +#3561=CARTESIAN_POINT('',(28.4998278179109,17.0960668590977,-31.4997718277067)); +#3562=CARTESIAN_POINT('',(28.4998278179109,17.0960668590977,-31.4997718277067)); +#3563=CARTESIAN_POINT('',(5.04982799999999,17.0960668590976,-31.4997718277067)); +#3564=CARTESIAN_POINT('',(-31.5001721820891,17.0960668590977,-31.4997718277067)); +#3565=CARTESIAN_POINT('',(5.04982799999999,17.0960668590976,-31.4997718277067)); +#3566=CARTESIAN_POINT('',(-26.5001721820891,19.0960668590975,-31.4997718277067)); +#3567=CARTESIAN_POINT('',(-25.0001721820891,19.0960668590975,-31.4997718277067)); +#3568=CARTESIAN_POINT('',(2.49982781791093,19.0960668590975,-31.4997718277067)); +#3569=CARTESIAN_POINT('',(-25.0001721820891,26.0960668590975,-31.4997718277067)); +#3570=CARTESIAN_POINT('',(-25.0001721820891,18.0960668590976,-31.4997718277067)); +#3571=CARTESIAN_POINT('',(-26.5001721820891,26.0960668590975,-31.4997718277067)); +#3572=CARTESIAN_POINT('',(3.24982781791094,26.0960668590975,-31.4997718277067)); +#3573=CARTESIAN_POINT('',(-26.5001721820891,21.5960668590976,-31.4997718277067)); +#3574=CARTESIAN_POINT('',(-19.1430293249462,19.0960668590975,-31.4997718277067)); +#3575=CARTESIAN_POINT('',(-17.6430293249462,19.0960668590975,-31.4997718277067)); +#3576=CARTESIAN_POINT('',(6.17839924648236,19.0960668590975,-31.4997718277067)); +#3577=CARTESIAN_POINT('',(-17.6430293249462,26.0960668590975,-31.4997718277067)); +#3578=CARTESIAN_POINT('',(-17.6430293249462,18.0960668590976,-31.4997718277067)); +#3579=CARTESIAN_POINT('',(-19.1430293249462,26.0960668590975,-31.4997718277067)); +#3580=CARTESIAN_POINT('',(6.92839924648236,26.0960668590975,-31.4997718277067)); +#3581=CARTESIAN_POINT('',(-19.1430293249462,21.5960668590976,-31.4997718277067)); +#3582=CARTESIAN_POINT('',(-11.7858864678034,19.0960668590975,-31.4997718277067)); +#3583=CARTESIAN_POINT('',(-10.2858864678034,19.0960668590975,-31.4997718277067)); +#3584=CARTESIAN_POINT('',(9.85697067505379,19.0960668590975,-31.4997718277067)); +#3585=CARTESIAN_POINT('',(-10.2858864678034,26.0960668590975,-31.4997718277067)); +#3586=CARTESIAN_POINT('',(-10.2858864678034,18.0960668590976,-31.4997718277067)); +#3587=CARTESIAN_POINT('',(-11.7858864678034,26.0960668590975,-31.4997718277067)); +#3588=CARTESIAN_POINT('',(10.6069706750538,26.0960668590975,-31.4997718277067)); +#3589=CARTESIAN_POINT('',(-11.7858864678034,21.5960668590976,-31.4997718277067)); +#3590=CARTESIAN_POINT('',(-2.92874361066049,26.0960668590974,-31.4997718277067)); +#3591=CARTESIAN_POINT('',(-2.9287436106605,18.0960668590976,-31.4997718277067)); +#3592=CARTESIAN_POINT('',(-4.4287436106605,26.0960668590974,-31.4997718277067)); +#3593=CARTESIAN_POINT('',(14.2855421036252,26.0960668590974,-31.4997718277067)); +#3594=CARTESIAN_POINT('',(-4.4287436106605,21.5960668590975,-31.4997718277067)); +#3595=CARTESIAN_POINT('Origin',(-4.4287436106605,26.0960668590974,-31.4997718277067)); +#3596=CARTESIAN_POINT('',(-4.4287436106605,26.0960668590974,-31.4997718277067)); +#3597=CARTESIAN_POINT('Origin',(-2.92874361066049,26.0960668590974,-31.4997718277067)); +#3598=CARTESIAN_POINT('',(-2.92874361066049,26.0960668590974,-31.4997718277067)); +#3599=CARTESIAN_POINT('Origin',(-2.9287436106605,19.0960668590974,-31.4997718277067)); +#3600=CARTESIAN_POINT('Origin',(5.04982799999999,20.5960668590976,-31.4997718277067)); +#3601=CARTESIAN_POINT('',(5.04982799999999,20.5960668590976,-31.4997718277067)); +#3602=CARTESIAN_POINT('',(-4.95017200000001,20.5960668590976,-31.4997718277067)); +#3603=CARTESIAN_POINT('Origin',(-10.2858864678034,26.0960668590975,-31.4997718277067)); +#3604=CARTESIAN_POINT('',(-10.2858864678034,26.0960668590975,-31.4997718277067)); +#3605=CARTESIAN_POINT('',(-11.7858864678034,26.0960668590975,-31.4997718277067)); +#3606=CARTESIAN_POINT('Origin',(-11.7858864678034,26.0960668590975,-31.4997718277067)); +#3607=CARTESIAN_POINT('',(-11.7858864678034,19.0960668590975,-31.4997718277067)); +#3608=CARTESIAN_POINT('Origin',(-11.7858864678034,19.0960668590975,-31.4997718277067)); +#3609=CARTESIAN_POINT('',(-10.2858864678034,19.0960668590975,-31.4997718277067)); +#3610=CARTESIAN_POINT('Origin',(-10.2858864678034,19.0960668590975,-31.4997718277067)); +#3611=CARTESIAN_POINT('Origin',(-17.6430293249462,26.0960668590975,-31.4997718277067)); +#3612=CARTESIAN_POINT('',(-17.6430293249462,26.0960668590975,-31.4997718277067)); +#3613=CARTESIAN_POINT('',(-19.1430293249462,26.0960668590975,-31.4997718277067)); +#3614=CARTESIAN_POINT('Origin',(-19.1430293249462,26.0960668590975,-31.4997718277067)); +#3615=CARTESIAN_POINT('',(-19.1430293249462,19.0960668590975,-31.4997718277067)); +#3616=CARTESIAN_POINT('Origin',(-19.1430293249462,19.0960668590975,-31.4997718277067)); +#3617=CARTESIAN_POINT('',(-17.6430293249462,19.0960668590975,-31.4997718277067)); +#3618=CARTESIAN_POINT('Origin',(-17.6430293249462,19.0960668590975,-31.4997718277067)); +#3619=CARTESIAN_POINT('Origin',(-25.0001721820891,26.0960668590975,-31.4997718277067)); +#3620=CARTESIAN_POINT('',(-25.0001721820891,26.0960668590975,-31.4997718277067)); +#3621=CARTESIAN_POINT('',(-26.5001721820891,26.0960668590975,-31.4997718277067)); +#3622=CARTESIAN_POINT('Origin',(-26.5001721820891,26.0960668590975,-31.4997718277067)); +#3623=CARTESIAN_POINT('',(-26.5001721820891,19.0960668590975,-31.4997718277067)); +#3624=CARTESIAN_POINT('Origin',(-26.5001721820891,19.0960668590975,-31.4997718277067)); +#3625=CARTESIAN_POINT('',(-25.0001721820891,19.0960668590975,-31.4997718277067)); +#3626=CARTESIAN_POINT('Origin',(-25.0001721820891,19.0960668590975,-31.4997718277067)); +#3627=CARTESIAN_POINT('Origin',(5.04982799999999,17.0960668590976,-31.4997718277067)); +#3628=CARTESIAN_POINT('',(5.04982799999999,17.0960668590976,-15.7497718277067)); +#3629=CARTESIAN_POINT('Origin',(-4.95017200000001,20.5960668590976,-31.4997718277067)); +#3630=CARTESIAN_POINT('',(-4.95017200000001,17.0960668590976,-15.7497718277067)); +#3631=CARTESIAN_POINT('Origin',(-0.000172182089066553,17.0960668590976, +0.000228172293300461)); +#3632=CARTESIAN_POINT('',(31.4998278179109,17.0960668590976,-28.4997718277067)); +#3633=CARTESIAN_POINT('Origin',(28.4998278179109,17.0960668590976,-28.4997718277067)); +#3634=CARTESIAN_POINT('',(31.4998278179109,17.0960668590975,28.5002281722933)); +#3635=CARTESIAN_POINT('',(31.4998278179109,17.0960668590977,-31.4997718277067)); +#3636=CARTESIAN_POINT('',(28.4998278179109,17.0960668590975,31.5002281722933)); +#3637=CARTESIAN_POINT('Origin',(28.4998278179109,17.0960668590975,28.5002281722933)); +#3638=CARTESIAN_POINT('',(-28.5001721820891,17.0960668590975,31.5002281722933)); +#3639=CARTESIAN_POINT('',(31.4998278179109,17.0960668590975,31.5002281722933)); +#3640=CARTESIAN_POINT('',(-31.5001721820891,17.0960668590975,28.5002281722933)); +#3641=CARTESIAN_POINT('Origin',(-28.5001721820891,17.0960668590975,28.5002281722933)); +#3642=CARTESIAN_POINT('',(-31.5001721820891,17.0960668590976,-28.4997718277067)); +#3643=CARTESIAN_POINT('',(-31.5001721820891,17.0960668590975,31.5002281722933)); +#3644=CARTESIAN_POINT('Origin',(-28.5001721820891,17.0960668590976,-28.4997718277067)); +#3645=CARTESIAN_POINT('',(-29.9001721820891,17.0960668590975,28.5002281722933)); +#3646=CARTESIAN_POINT('',(-29.9001721820891,17.0960668590976,-15.7497718277067)); +#3647=CARTESIAN_POINT('',(-28.5001721820891,17.0960668590975,29.9002281722933)); +#3648=CARTESIAN_POINT('Origin',(-28.5001721820891,17.0960668590975,28.5002281722933)); +#3649=CARTESIAN_POINT('',(28.4998278179109,17.0960668590975,29.9002281722933)); +#3650=CARTESIAN_POINT('',(-15.7501721820891,17.0960668590975,29.9002281722933)); +#3651=CARTESIAN_POINT('Origin',(28.4998278179109,17.0960668590975,28.5002281722933)); +#3652=CARTESIAN_POINT('Origin',(-0.000172182089066553,30.0960668590976, +0.00022817229333949)); +#3653=CARTESIAN_POINT('',(28.4998278179109,30.0960668590975,28.5002281722933)); +#3654=CARTESIAN_POINT('',(-28.5001721820891,30.0960668590975,28.5002281722933)); +#3655=CARTESIAN_POINT('',(-15.7501721820891,30.0960668590975,28.5002281722933)); +#3656=CARTESIAN_POINT('',(28.4998278179109,30.0960668590976,-28.4997718277067)); +#3657=CARTESIAN_POINT('',(28.4998278179109,30.0960668590975,15.7502281722933)); +#3658=CARTESIAN_POINT('',(-28.5001721820891,30.0960668590976,-28.4997718277067)); +#3659=CARTESIAN_POINT('',(15.7498278179109,30.0960668590976,-28.4997718277067)); +#3660=CARTESIAN_POINT('',(-28.5001721820891,30.0960668590976,-15.7497718277067)); +#3661=CARTESIAN_POINT('Origin',(28.4998278179109,17.0960668590975,28.5002281722933)); +#3662=CARTESIAN_POINT('',(28.4998278179109,17.0960668590975,29.9002281722933)); +#3663=CARTESIAN_POINT('Origin',(-28.5001721820891,17.0960668590975,28.5002281722933)); +#3664=CARTESIAN_POINT('',(-28.5001721820891,17.0960668590975,29.9002281722933)); +#3665=CARTESIAN_POINT('',(-29.9001721820891,17.0960668590975,28.5002281722933)); +#3666=CARTESIAN_POINT('Origin',(-31.5001721820891,17.0960668590975,29.9002281722933)); +#3667=CARTESIAN_POINT('Origin',(-29.9001721820891,17.0960668590977,-31.4997718277067)); +#3668=CARTESIAN_POINT('Origin',(28.4998278179109,27.0960668590975,28.5002281722933)); +#3669=CARTESIAN_POINT('',(28.4998278179109,27.0960668590975,31.5002281722933)); +#3670=CARTESIAN_POINT('Origin',(28.4998278179109,27.0960668590975,28.5002281722933)); +#3671=CARTESIAN_POINT('',(31.4998278179109,27.0960668590975,28.5002281722933)); +#3672=CARTESIAN_POINT('Origin',(28.4998278179109,27.0960668590975,28.5002281722933)); +#3673=CARTESIAN_POINT('Origin',(28.4998278179109,27.0960668590975,28.5002281722933)); +#3674=CARTESIAN_POINT('Origin',(28.4998278179109,17.0960668590975,28.5002281722933)); +#3675=CARTESIAN_POINT('',(31.4998278179109,17.0960668590975,28.5002281722933)); +#3676=CARTESIAN_POINT('',(28.4998278179109,17.0960668590975,31.5002281722933)); +#3677=CARTESIAN_POINT('Origin',(-28.5001721820891,27.0960668590975,28.5002281722933)); +#3678=CARTESIAN_POINT('',(-31.5001721820891,27.0960668590975,28.5002281722933)); +#3679=CARTESIAN_POINT('Origin',(-28.5001721820891,27.0960668590975,28.5002281722933)); +#3680=CARTESIAN_POINT('',(-28.5001721820891,27.0960668590975,31.5002281722933)); +#3681=CARTESIAN_POINT('Origin',(-28.5001721820891,27.0960668590975,28.5002281722933)); +#3682=CARTESIAN_POINT('Origin',(-28.5001721820891,27.0960668590975,28.5002281722933)); +#3683=CARTESIAN_POINT('Origin',(-28.5001721820891,17.0960668590975,28.5002281722933)); +#3684=CARTESIAN_POINT('',(-28.5001721820891,17.0960668590975,31.5002281722933)); +#3685=CARTESIAN_POINT('',(-31.5001721820891,17.0960668590975,28.5002281722933)); +#3686=CARTESIAN_POINT('Origin',(-15.7501721820891,27.0960668590975,28.5002281722933)); +#3687=CARTESIAN_POINT('',(-15.7501721820891,27.0960668590975,31.5002281722933)); +#3688=CARTESIAN_POINT('Origin',(28.4998278179109,27.0960668590976,-28.4997718277067)); +#3689=CARTESIAN_POINT('',(31.4998278179109,27.0960668590976,-28.4997718277067)); +#3690=CARTESIAN_POINT('Origin',(28.4998278179109,27.0960668590976,-28.4997718277067)); +#3691=CARTESIAN_POINT('Origin',(28.4998278179109,27.0960668590976,-28.4997718277067)); +#3692=CARTESIAN_POINT('Origin',(28.4998278179109,27.0960668590976,-28.4997718277067)); +#3693=CARTESIAN_POINT('Origin',(28.4998278179109,17.0960668590976,-28.4997718277067)); +#3694=CARTESIAN_POINT('',(31.4998278179109,17.0960668590976,-28.4997718277067)); +#3695=CARTESIAN_POINT('Origin',(-28.5001721820891,27.0960668590976,-28.4997718277067)); +#3696=CARTESIAN_POINT('Origin',(-28.5001721820891,27.0960668590976,-28.4997718277067)); +#3697=CARTESIAN_POINT('',(-31.5001721820891,27.0960668590976,-28.4997718277067)); +#3698=CARTESIAN_POINT('Origin',(-28.5001721820891,27.0960668590976,-28.4997718277067)); +#3699=CARTESIAN_POINT('Origin',(-28.5001721820891,27.0960668590976,-28.4997718277067)); +#3700=CARTESIAN_POINT('Origin',(-28.5001721820891,17.0960668590976,-28.4997718277067)); +#3701=CARTESIAN_POINT('',(-31.5001721820891,17.0960668590976,-28.4997718277067)); +#3702=CARTESIAN_POINT('Origin',(-28.5001721820891,27.0960668590976,-15.7497718277067)); +#3703=CARTESIAN_POINT('',(-31.5001721820891,27.0960668590976,-15.7497718277067)); +#3704=CARTESIAN_POINT('Origin',(15.7498278179109,27.0960668590976,-28.4997718277067)); +#3705=CARTESIAN_POINT('Origin',(28.4998278179109,27.0960668590975,15.7502281722933)); +#3706=CARTESIAN_POINT('',(31.4998278179109,27.0960668590975,15.7502281722933)); +#3707=CARTESIAN_POINT('Origin',(-31.5001721820891,17.0960668590975,31.5002281722933)); +#3708=CARTESIAN_POINT('Origin',(-31.5001721820891,17.0960668590977,-31.4997718277067)); +#3709=CARTESIAN_POINT('Origin',(31.4998278179109,17.0960668590975,31.5002281722933)); +#3710=UNCERTAINTY_MEASURE_WITH_UNIT(LENGTH_MEASURE(0.01),#3714, +'DISTANCE_ACCURACY_VALUE', +'Maximum model space distance between geometric entities at asserted c +onnectivities'); +#3711=UNCERTAINTY_MEASURE_WITH_UNIT(LENGTH_MEASURE(0.01),#3714, +'DISTANCE_ACCURACY_VALUE', +'Maximum model space distance between geometric entities at asserted c +onnectivities'); +#3712=( +GEOMETRIC_REPRESENTATION_CONTEXT(3) +GLOBAL_UNCERTAINTY_ASSIGNED_CONTEXT((#3710)) +GLOBAL_UNIT_ASSIGNED_CONTEXT((#3714,#3715,#3716)) +REPRESENTATION_CONTEXT('','3D') +); +#3713=( +GEOMETRIC_REPRESENTATION_CONTEXT(3) +GLOBAL_UNCERTAINTY_ASSIGNED_CONTEXT((#3711)) +GLOBAL_UNIT_ASSIGNED_CONTEXT((#3714,#3715,#3716)) +REPRESENTATION_CONTEXT('','3D') +); +#3714=( +LENGTH_UNIT() +NAMED_UNIT(*) +SI_UNIT(.MILLI.,.METRE.) +); +#3715=( +NAMED_UNIT(*) +PLANE_ANGLE_UNIT() +SI_UNIT($,.RADIAN.) +); +#3716=( +NAMED_UNIT(*) +SI_UNIT($,.STERADIAN.) +SOLID_ANGLE_UNIT() +); +#3717=SHAPE_DEFINITION_REPRESENTATION(#3718,#3719); +#3718=PRODUCT_DEFINITION_SHAPE('',$,#3721); +#3719=SHAPE_REPRESENTATION('',(#2264),#3712); +#3720=PRODUCT_DEFINITION_CONTEXT('part definition',#3725,'design'); +#3721=PRODUCT_DEFINITION('UPgehaeuse','UPgehaeuse v38',#3722,#3720); +#3722=PRODUCT_DEFINITION_FORMATION('',$,#3727); +#3723=PRODUCT_RELATED_PRODUCT_CATEGORY('UPgehaeuse v38', +'UPgehaeuse v38',(#3727)); +#3724=APPLICATION_PROTOCOL_DEFINITION('international standard', +'automotive_design',2009,#3725); +#3725=APPLICATION_CONTEXT( +'Core Data for Automotive Mechanical Design Process'); +#3726=PRODUCT_CONTEXT('part definition',#3725,'mechanical'); +#3727=PRODUCT('UPgehaeuse','UPgehaeuse v38',$,(#3726)); +#3728=PRESENTATION_STYLE_ASSIGNMENT((#3730)); +#3729=PRESENTATION_STYLE_ASSIGNMENT((#3731)); +#3730=SURFACE_STYLE_USAGE(.BOTH.,#3732); +#3731=SURFACE_STYLE_USAGE(.BOTH.,#3733); +#3732=SURFACE_SIDE_STYLE('',(#3734)); +#3733=SURFACE_SIDE_STYLE('',(#3735)); +#3734=SURFACE_STYLE_FILL_AREA(#3736); +#3735=SURFACE_STYLE_FILL_AREA(#3737); +#3736=FILL_AREA_STYLE('Stahl - satiniert',(#3738)); +#3737=FILL_AREA_STYLE('Glas - Fenster',(#3739)); +#3738=FILL_AREA_STYLE_COLOUR('Stahl - satiniert',#3740); +#3739=FILL_AREA_STYLE_COLOUR('Glas - Fenster',#3741); +#3740=COLOUR_RGB('Stahl - satiniert',0.627450980392157,0.627450980392157, +0.627450980392157); +#3741=COLOUR_RGB('Glas - Fenster',0.423529411764706,0.768627450980392,0.854901960784314); +ENDSEC; +END-ISO-10303-21; diff --git a/CAD/UPgehaeuse_front.3mf b/CAD/UPgehaeuse_front.3mf index 652a4c4137a400e1c90afeac30876472e79a8f32..04f861ab7b3719889f243133a4550da10c4fc603 100644 GIT binary patch delta 127217 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⪚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 diff --git a/Raumtermostat/.vscode/settings.json b/Raumtermostat/.vscode/settings.json index 2197dbb..042d7bf 100644 --- a/Raumtermostat/.vscode/settings.json +++ b/Raumtermostat/.vscode/settings.json @@ -4,6 +4,71 @@ "string.h": "c", "system_error": "cpp", "random": "c", - "screens.h": "c" + "screens.h": "c", + "array": "cpp", + "atomic": "cpp", + "bit": "cpp", + "*.tcc": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "compare": "cpp", + "concepts": "cpp", + "condition_variable": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "list": "cpp", + "map": "cpp", + "string": "cpp", + "unordered_map": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "ratio": "cpp", + "regex": "cpp", + "string_view": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "initializer_list": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "numbers": "cpp", + "ostream": "cpp", + "semaphore": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "stop_token": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "cinttypes": "cpp", + "typeinfo": "cpp", + "format": "cpp", + "ui.h": "c", + "lvgl.h": "c", + "symbols.h": "c", + "arduino.h": "c", + "actions.h": "c", + "glbldata.h": "c" } } \ No newline at end of file diff --git a/Raumtermostat/lib/ArduinoJson/.clang-format b/Raumtermostat/lib/ArduinoJson/.clang-format new file mode 100644 index 0000000..0853a78 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/.clang-format @@ -0,0 +1,12 @@ +# http://clang.llvm.org/docs/ClangFormatStyleOptions.html + +BasedOnStyle: Google +Standard: c++11 +AllowShortFunctionsOnASingleLine: Empty +IncludeBlocks: Preserve +IndentPPDirectives: AfterHash +DerivePointerAlignment: false + +# Always break after if to get accurate coverage +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false diff --git a/Raumtermostat/lib/ArduinoJson/.gitattributes b/Raumtermostat/lib/ArduinoJson/.gitattributes new file mode 100644 index 0000000..efdba87 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/.gitattributes @@ -0,0 +1,2 @@ +* text=auto +*.sh text eol=lf diff --git a/Raumtermostat/lib/ArduinoJson/.gitignore b/Raumtermostat/lib/ArduinoJson/.gitignore new file mode 100644 index 0000000..b2b9c95 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/.gitignore @@ -0,0 +1,20 @@ +.DS_Store +/.idea +/build +/bin +/lib +/sftp-config.json +.tags +.tags_sorted_by_file +/extras/fuzzing/*_fuzzer +/extras/fuzzing/*_fuzzer.options +/extras/fuzzing/*_fuzzer_seed_corpus.zip +.vs/ +/out/ + +# Used by CI for Particle +/src/*.ino +/project.properties + +# Used by IDF +/dist/ diff --git a/Raumtermostat/lib/ArduinoJson/.mbedignore b/Raumtermostat/lib/ArduinoJson/.mbedignore new file mode 100644 index 0000000..c5da30d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/.mbedignore @@ -0,0 +1,4 @@ +.devcontainer/ +.github/ +examples/ +extras/ diff --git a/Raumtermostat/lib/ArduinoJson/.prettierignore b/Raumtermostat/lib/ArduinoJson/.prettierignore new file mode 100644 index 0000000..dd44972 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/.prettierignore @@ -0,0 +1 @@ +*.md diff --git a/Raumtermostat/lib/ArduinoJson/.vscode/settings.json b/Raumtermostat/lib/ArduinoJson/.vscode/settings.json new file mode 100644 index 0000000..350c400 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/.vscode/settings.json @@ -0,0 +1,17 @@ +{ + "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools", + "git.inputValidationLength": 80, + "git.inputValidationSubjectLength": 72, + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + "search.exclude": { + "/extras/tests/catch/*": true + }, + "C_Cpp.default.includePath": [ + "/src" + ], + "[cmake]": { + "editor.detectIndentation": false, + "editor.insertSpaces": false, + } +} diff --git a/Raumtermostat/lib/ArduinoJson/ArduinoJson.h b/Raumtermostat/lib/ArduinoJson/ArduinoJson.h new file mode 100644 index 0000000..a0caed7 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/ArduinoJson.h @@ -0,0 +1,5 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include "src/ArduinoJson.h" diff --git a/Raumtermostat/lib/ArduinoJson/CHANGELOG.md b/Raumtermostat/lib/ArduinoJson/CHANGELOG.md new file mode 100644 index 0000000..735ea56 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/CHANGELOG.md @@ -0,0 +1,245 @@ +ArduinoJson: change log +======================= + +v7.4.0 (2025-04-09) +------ + +* Optimize storage of tiny strings (up to 3 characters) +* Fix support for `const char[]` (issue #2166) + +v7.3.1 (2025-02-27) +------ + +* Fix conversion from static string to number +* Slightly reduce code size + +v7.3.0 (2024-12-29) +------ + +* Fix support for NUL characters in `deserializeJson()` +* Make `ElementProxy` and `MemberProxy` non-copyable +* Change string copy policy: only string literal are stored by pointer +* `JsonString` is now stored by copy, unless specified otherwise +* Replace undocumented `JsonString::Ownership` with `bool` +* Rename undocumented `JsonString::isLinked()` to `isStatic()` +* Move public facing SFINAEs to template declarations + +> ### BREAKING CHANGES +> +> In previous versions, `MemberProxy` (the class returned by `operator[]`) could lead to dangling pointers when used with a temporary string. +> To prevent this issue, `MemberProxy` and `ElementProxy` are now non-copyable. +> +> Your code is likely to be affected if you use `auto` to store the result of `operator[]`. For example, the following line won't compile anymore: +> +> ```cpp +> auto value = doc["key"]; +> ``` +> +> To fix the issue, you must append either `.as()` or `.to()`, depending on the situation. +> +> For example, if you are extracting values from a JSON document, you should update like this: +> +> ```diff +> - auto config = doc["config"]; +> + auto config = doc["config"].as(); +> const char* name = config["name"]; +> ``` +> +> However, if you are building a JSON document, you should update like this: +> +> ```diff +> - auto config = doc["config"]; +> + auto config = doc["config"].to(); +> config["name"] = "ArduinoJson"; +> ``` + +v7.2.1 (2024-11-15) +------ + +* Forbid `deserializeJson(JsonArray|JsonObject, ...)` (issue #2135) +* Fix VLA support in `JsonDocument::set()` +* Fix `operator[](variant)` ignoring NUL characters + +v7.2.0 (2024-09-18) +------ + +* Store object members with two slots: one for the key and one for the value +* Store 64-bit numbers (`double` and `long long`) in an additional slot +* Reduce the slot size (see table below) +* Improve message when user forgets third arg of `serializeJson()` et al. +* Set `ARDUINOJSON_USE_DOUBLE` to `0` by default on 8-bit architectures +* Deprecate `containsKey()` in favor of `doc["key"].is()` +* Add support for escape sequence `\'` (issue #2124) + +| Architecture | before | after | +|--------------|----------|----------| +| 8-bit | 8 bytes | 6 bytes | +| 32-bit | 16 bytes | 8 bytes | +| 64-bit | 24 bytes | 16 bytes | + +> ### BREAKING CHANGES +> +> After being on the death row for years, the `containsKey()` method has finally been deprecated. +> You should replace `doc.containsKey("key")` with `doc["key"].is()`, which not only checks that the key exists but also that the value is of the expected type. +> +> ```cpp +> // Before +> if (doc.containsKey("value")) { +> int value = doc["value"]; +> // ... +> } +> +> // After +> if (doc["value"].is()) { +> int value = doc["value"]; +> // ... +> } +> ``` + +v7.1.0 (2024-06-27) +------ + +* Add `ARDUINOJSON_STRING_LENGTH_SIZE` to the namespace name +* Add support for MsgPack binary (PR #2078 by @Sanae6) +* Add support for MsgPack extension +* Make string support even more generic (PR #2084 by @d-a-v) +* Optimize `deserializeMsgPack()` +* Allow using a `JsonVariant` as a key or index (issue #2080) + Note: works only for reading, not for writing +* Support `ElementProxy` and `MemberProxy` in `JsonDocument`'s constructor +* Don't add partial objects when allocation fails (issue #2081) +* Read MsgPack's 64-bit integers even if `ARDUINOJSON_USE_LONG_LONG` is `0` + (they are set to `null` if they don't fit in a `long`) + +v7.0.4 (2024-03-12) +------ + +* Make `JSON_STRING_SIZE(N)` return `N+1` to fix third-party code (issue #2054) + +v7.0.3 (2024-02-05) +------ + +* Improve error messages when using `char` or `char*` (issue #2043) +* Reduce stack consumption (issue #2046) +* Fix compatibility with GCC 4.8 (issue #2045) + +v7.0.2 (2024-01-19) +------ + +* Fix assertion `poolIndex < count_` after `JsonDocument::clear()` (issue #2034) + +v7.0.1 (2024-01-10) +------ + +* Fix "no matching function" with `JsonObjectConst::operator[]` (issue #2019) +* Remove unused files in the PlatformIO package +* Fix `volatile bool` serialized as `1` or `0` instead of `true` or `false` (issue #2029) + +v7.0.0 (2024-01-03) +------ + +* Remove `BasicJsonDocument` +* Remove `StaticJsonDocument` +* Add abstract `Allocator` class +* Merge `DynamicJsonDocument` with `JsonDocument` +* Remove `JSON_ARRAY_SIZE()`, `JSON_OBJECT_SIZE()`, and `JSON_STRING_SIZE()` +* Remove `ARDUINOJSON_ENABLE_STRING_DEDUPLICATION` (string deduplication cannot be disabled anymore) +* Remove `JsonDocument::capacity()` +* Store the strings in the heap +* Reference-count shared strings +* Always store `serialized("string")` by copy (#1915) +* Remove the zero-copy mode of `deserializeJson()` and `deserializeMsgPack()` +* Fix double lookup in `to()` +* Fix double call to `size()` in `serializeMsgPack()` +* Include `ARDUINOJSON_SLOT_OFFSET_SIZE` in the namespace name +* Remove `JsonVariant::shallowCopy()` +* `JsonDocument`'s capacity grows as needed, no need to pass it to the constructor anymore +* `JsonDocument`'s allocator is not monotonic anymore, removed values get recycled +* Show a link to the documentation when user passes an unsupported input type +* Remove `JsonDocument::memoryUsage()` +* Remove `JsonDocument::garbageCollect()` +* Add `deserializeJson(JsonVariant, ...)` and `deserializeMsgPack(JsonVariant, ...)` (#1226) +* Call `shrinkToFit()` in `deserializeJson()` and `deserializeMsgPack()` +* `serializeJson()` and `serializeMsgPack()` replace the content of `std::string` and `String` instead of appending to it +* Replace `add()` with `add()` (`add(T)` is still supported) +* Remove `createNestedArray()` and `createNestedObject()` (use `to()` and `to()` instead) + +> ### BREAKING CHANGES +> +> As every major release, ArduinoJson 7 introduces several breaking changes. +> I added some stubs so that most existing programs should compile, but I highty recommend you upgrade your code. +> +> #### `JsonDocument` +> +> In ArduinoJson 6, you could allocate the memory pool on the stack (with `StaticJsonDocument`) or in the heap (with `DynamicJsonDocument`). +> In ArduinoJson 7, the memory pool is always allocated in the heap, so `StaticJsonDocument` and `DynamicJsonDocument` have been merged into `JsonDocument`. +> +> In ArduinoJson 6, `JsonDocument` had a fixed capacity; in ArduinoJson 7, it has an elastic capacity that grows as needed. +> Therefore, you don't need to specify the capacity anymore, so the macros `JSON_ARRAY_SIZE()`, `JSON_OBJECT_SIZE()`, and `JSON_STRING_SIZE()` have been removed. +> +> ```c++ +> // ArduinoJson 6 +> StaticJsonDocument<256> doc; +> // or +> DynamicJsonDocument doc(256); +> +> // ArduinoJson 7 +> JsonDocument doc; +> ``` +> +> In ArduinoJson 7, `JsonDocument` reuses released memory, so `garbageCollect()` has been removed. +> `shrinkToFit()` is still available and releases the over-allocated memory. +> +> Due to a change in the implementation, it's not possible to store a pointer to a variant from another `JsonDocument`, so `shallowCopy()` has been removed. +> +> In ArduinoJson 6, the meaning of `memoryUsage()` was clear: it returned the number of bytes used in the memory pool. +> In ArduinoJson 7, the meaning of `memoryUsage()` would be ambiguous, so it has been removed. +> +> #### Custom allocators +> +> In ArduinoJson 6, you could specify a custom allocator class as a template parameter of `BasicJsonDocument`. +> In ArduinoJson 7, you must inherit from `ArduinoJson::Allocator` and pass a pointer to an instance of your class to the constructor of `JsonDocument`. +> +> ```c++ +> // ArduinoJson 6 +> class MyAllocator { +> // ... +> }; +> BasicJsonDocument doc(256); +> +> // ArduinoJson 7 +> class MyAllocator : public ArduinoJson::Allocator { +> // ... +> }; +> MyAllocator myAllocator; +> JsonDocument doc(&myAllocator); +> ``` +> +> #### `createNestedArray()` and `createNestedObject()` +> +> In ArduinoJson 6, you could create a nested array or object with `createNestedArray()` and `createNestedObject()`. +> In ArduinoJson 7, you must use `add()` or `to()` instead. +> +> For example, to create `[[],{}]`, you would write: +> +> ```c++ +> // ArduinoJson 6 +> arr.createNestedArray(); +> arr.createNestedObject(); +> +> // ArduinoJson 7 +> arr.add(); +> arr.add(); +> ``` +> +> And to create `{"array":[],"object":{}}`, you would write: +> +> ```c++ +> // ArduinoJson 6 +> obj.createNestedArray("array"); +> obj.createNestedObject("object"); +> +> // ArduinoJson 7 +> obj["array"].to(); +> obj["object"].to(); +> ``` diff --git a/Raumtermostat/lib/ArduinoJson/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/CMakeLists.txt new file mode 100644 index 0000000..b6e8814 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/CMakeLists.txt @@ -0,0 +1,25 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +cmake_minimum_required(VERSION 3.15) + +if(ESP_PLATFORM) + # Build ArduinoJson as an ESP-IDF component + idf_component_register(INCLUDE_DIRS src) + return() +endif() + +project(ArduinoJson VERSION 7.4.0) + +if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) + include(CTest) +endif() + +add_subdirectory(src) + +if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING) + include(extras/CompileOptions.cmake) + add_subdirectory(extras/tests) + add_subdirectory(extras/fuzzing) +endif() diff --git a/Raumtermostat/lib/ArduinoJson/CONTRIBUTING.md b/Raumtermostat/lib/ArduinoJson/CONTRIBUTING.md new file mode 100644 index 0000000..d32a04f --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/CONTRIBUTING.md @@ -0,0 +1,10 @@ +# Contribution to ArduinoJson + +First, thank you for taking the time to contribute to this project. + +You can submit changes via GitHub Pull Requests. + +Please: + +1. Update the test suite for any change of behavior +2. Use clang-format in "file" mode to format the code diff --git a/Raumtermostat/lib/ArduinoJson/LICENSE.txt b/Raumtermostat/lib/ArduinoJson/LICENSE.txt new file mode 100644 index 0000000..782b05d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/LICENSE.txt @@ -0,0 +1,10 @@ +The MIT License (MIT) +--------------------- + +Copyright © 2014-2025, Benoit BLANCHON + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Raumtermostat/lib/ArduinoJson/README.md b/Raumtermostat/lib/ArduinoJson/README.md new file mode 100644 index 0000000..ae2e79d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/README.md @@ -0,0 +1,158 @@ +

+ ArduinoJson +

+ +--- + +[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/bblanchon/ArduinoJson/ci.yml?branch=7.x&logo=github)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A7.x) +[![Continuous Integration](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/7.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x) +[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arduinojson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson) +[![Coveralls branch](https://img.shields.io/coveralls/github/bblanchon/ArduinoJson/7.x?logo=coveralls)](https://coveralls.io/github/bblanchon/ArduinoJson?branch=7.x) +[![GitHub stars](https://img.shields.io/github/stars/bblanchon/ArduinoJson?style=flat&logo=github&color=orange)](https://github.com/bblanchon/ArduinoJson/stargazers) +[![GitHub Sponsors](https://img.shields.io/github/sponsors/bblanchon?logo=github&color=orange)](https://github.com/sponsors/bblanchon) + +ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things). + +## Features + +* [JSON deserialization](https://arduinojson.org/v7/api/json/deserializejson/) + * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v7/api/config/decode_unicode/) + * [Optionally supports comments in the input](https://arduinojson.org/v7/api/config/enable_comments/) + * [Optionally filters the input to keep only desired values](https://arduinojson.org/v7/api/json/deserializejson/#filtering) + * Supports single quotes as a string delimiter + * Compatible with [NDJSON](http://ndjson.org/) and [JSON Lines](https://jsonlines.org/) +* [JSON serialization](https://arduinojson.org/v7/api/json/serializejson/) + * [Can write to a buffer or a stream](https://arduinojson.org/v7/api/json/serializejson/) + * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v7/api/json/serializejsonpretty/) +* [MessagePack serialization](https://arduinojson.org/v7/api/msgpack/serializemsgpack/) +* [MessagePack deserialization](https://arduinojson.org/v7/api/msgpack/deserializemsgpack/) +* Efficient + * [Twice smaller than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/) + * [Almost 10% faster than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/) + * [Consumes roughly 10% less RAM than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/) + * [Deduplicates strings](https://arduinojson.org/news/2020/08/01/version-6-16-0/) +* Versatile + * Supports [custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v7/how-to/use-external-ram-on-esp32/) + * Supports [`String`](https://arduinojson.org/v7/api/config/enable_arduino_string/), [`std::string`](https://arduinojson.org/v7/api/config/enable_std_string/), and [`std::string_view`](https://arduinojson.org/v7/api/config/enable_string_view/) + * Supports [`Stream`](https://arduinojson.org/v7/api/config/enable_arduino_stream/) and [`std::istream`/`std::ostream`](https://arduinojson.org/v7/api/config/enable_std_stream/) + * Supports [Flash strings](https://arduinojson.org/v7/api/config/enable_progmem/) + * Supports [custom readers](https://arduinojson.org/v7/api/json/deserializejson/#custom-reader) and [custom writers](https://arduinojson.org/v7/api/json/serializejson/#custom-writer) + * Supports [custom converters](https://arduinojson.org/news/2021/05/04/version-6-18-0/) +* Portable + * Usable on any C++ project (not limited to Arduino) + * Compatible with C++11, C++14 and C++17 + * Support for C++98/C++03 available on [ArduinoJson 6.20.x](https://github.com/bblanchon/ArduinoJson/tree/6.20.x) + * Zero warnings with `-Wall -Wextra -pedantic` and `/W4` + * [Header-only library](https://en.wikipedia.org/wiki/Header-only) + * Works with virtually any board + * Arduino boards: [Uno](https://amzn.to/38aL2ik), [Due](https://amzn.to/36YkWi2), [Micro](https://amzn.to/35WkdwG), [Nano](https://amzn.to/2QTvwRX), [Mega](https://amzn.to/36XWhuf), [Yun](https://amzn.to/30odURc), [Leonardo](https://amzn.to/36XWjlR)... + * Espressif chips: [ESP8266](https://amzn.to/36YluV8), [ESP32](https://amzn.to/2G4pRCB) + * Lolin (WeMos) boards: [D1 mini](https://amzn.to/2QUpz7q), [D1 Mini Pro](https://amzn.to/36UsGSs)... + * Teensy boards: [4.0](https://amzn.to/30ljXGq), [3.2](https://amzn.to/2FT0EuC), [2.0](https://amzn.to/2QXUMXj) + * Particle boards: [Argon](https://amzn.to/2FQHa9X), [Boron](https://amzn.to/36WgLUd), [Electron](https://amzn.to/30vEc4k), [Photon](https://amzn.to/387F9Cd)... + * Texas Instruments boards: [MSP430](https://amzn.to/30nJWgg)... + * Soft cores: [Nios II](https://en.wikipedia.org/wiki/Nios_II)... + * Tested on all major development environments + * [Arduino IDE](https://www.arduino.cc/en/Main/Software) + * [Atmel Studio](http://www.atmel.com/microsite/atmel-studio/) + * [Atollic TrueSTUDIO](https://atollic.com/truestudio/) + * [Energia](http://energia.nu/) + * [IAR Embedded Workbench](https://www.iar.com/iar-embedded-workbench/) + * [Keil uVision](http://www.keil.com/) + * [MPLAB X IDE](http://www.microchip.com/mplab/mplab-x-ide) + * [Particle](https://www.particle.io/) + * [PlatformIO](http://platformio.org/) + * [Sloeber plugin for Eclipse](https://eclipse.baeyens.it/) + * [Visual Micro](http://www.visualmicro.com/) + * [Visual Studio](https://www.visualstudio.com/) + * [Even works with online compilers like wandbox.org](https://wandbox.org/permlink/RlZSKy17DjJ6HcdN) + * [CMake friendly](https://arduinojson.org/v7/how-to/use-arduinojson-with-cmake/) +* Well designed + * [Elegant API](http://arduinojson.org/v7/example/) + * [Thread-safe](https://en.wikipedia.org/wiki/Thread_safety) + * Self-contained (no external dependency) + * `const` friendly + * [`for` friendly](https://arduinojson.org/v7/api/jsonobject/begin_end/) + * [TMP friendly](https://en.wikipedia.org/wiki/Template_metaprogramming) + * Handles [integer overflows](https://arduinojson.org/v7/api/jsonvariant/as/#integer-overflows) +* Well tested + * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=7.x) + * Continuously tested on + * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x) + * [GCC 4.8, 5, 6, 7, 8, 9, 10, 11, 12](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22) + * [Clang 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10, 11, 12, 13, 14, 15](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22) + * [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson) + * Passes all default checks of [clang-tidy](https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/) +* Well documented + * [Tutorials](https://arduinojson.org/v7/doc/deserialization/) + * [Examples](https://arduinojson.org/v7/example/) + * [How-tos](https://arduinojson.org/v7/example/) + * [FAQ](https://arduinojson.org/v7/faq/) + * [Troubleshooter](https://arduinojson.org/v7/troubleshooter/) + * [Book](https://arduinojson.org/book/) + * [Changelog](CHANGELOG.md) +* Vibrant user community + * Most popular of all Arduino libraries on [GitHub](https://github.com/search?o=desc&q=arduino+library&s=stars&type=Repositories) + * [Used in hundreds of projects](https://www.hackster.io/search?i=projects&q=arduinojson) + * [Responsive support](https://github.com/bblanchon/ArduinoJson/issues?q=is%3Aissue+is%3Aclosed) + +## Quickstart + +### Deserialization + +Here is a program that parses a JSON document with ArduinoJson. + +```c++ +const char* json = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}"; + +JsonDocument doc; +deserializeJson(doc, json); + +const char* sensor = doc["sensor"]; +long time = doc["time"]; +double latitude = doc["data"][0]; +double longitude = doc["data"][1]; +``` + +See the [tutorial on arduinojson.org](https://arduinojson.org/v7/doc/deserialization/) + +### Serialization + +Here is a program that generates a JSON document with ArduinoJson: + +```c++ +JsonDocument doc; + +doc["sensor"] = "gps"; +doc["time"] = 1351824120; +doc["data"][0] = 48.756080; +doc["data"][1] = 2.302038; + +serializeJson(doc, Serial); +// This prints: +// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]} +``` + +See the [tutorial on arduinojson.org](https://arduinojson.org/v7/doc/serialization/) + +## Sponsors + +ArduinoJson is thankful to its sponsors. Please give them a visit; they deserve it! + +

+ + Programming Electronics Academy + +

+

+ + 1technophile + + + LArkema + +

+ +If you run a commercial project that embeds ArduinoJson, think about [sponsoring the library's development](https://github.com/sponsors/bblanchon): it ensures the code that your products rely on stays actively maintained. It can also give your project some exposure to the makers' community. + +If you are an individual user and want to support the development (or give a sign of appreciation), consider purchasing the book [Mastering ArduinoJson](https://arduinojson.org/book/) ❤, or simply [cast a star](https://github.com/bblanchon/ArduinoJson/stargazers) ⭐. diff --git a/Raumtermostat/lib/ArduinoJson/SUPPORT.md b/Raumtermostat/lib/ArduinoJson/SUPPORT.md new file mode 100644 index 0000000..c47e1b1 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/SUPPORT.md @@ -0,0 +1,27 @@ +# ArduinoJson Support + +First off, thank you very much for using ArduinoJson. + +We'll be very happy to help you, but first please read the following. + +## Before asking for help + +1. Read the [FAQ](https://arduinojson.org/faq/?utm_source=github&utm_medium=support) +2. Search in the [API Reference](https://arduinojson.org/api/?utm_source=github&utm_medium=support) + +If you did not find the answer, please create a [new issue on GitHub](https://github.com/bblanchon/ArduinoJson/issues/new). + +It is OK to add a comment to a currently opened issue, but please avoid adding comments to a closed issue. + +## Before hitting the Submit button + +Please provide all the relevant information: + +* Good title +* Short description of the problem +* Target platform +* Compiler model and version +* [MVCE](https://stackoverflow.com/help/mcve) +* Compiler output + +Good questions get fast answers! diff --git a/Raumtermostat/lib/ArduinoJson/appveyor.yml b/Raumtermostat/lib/ArduinoJson/appveyor.yml new file mode 100644 index 0000000..8905212 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/appveyor.yml @@ -0,0 +1,28 @@ +version: 7.4.0.{build} +environment: + matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + CMAKE_GENERATOR: Visual Studio 17 2022 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CMAKE_GENERATOR: Visual Studio 16 2019 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + CMAKE_GENERATOR: Visual Studio 15 2017 + - CMAKE_GENERATOR: Ninja + MINGW32: i686-6.3.0-posix-dwarf-rt_v5-rev1 # MinGW-w64 6.3.0 i686 + - CMAKE_GENERATOR: Ninja + MINGW64: x86_64-6.3.0-posix-seh-rt_v5-rev1 # MinGW-w64 6.3.0 x86_64 + - CMAKE_GENERATOR: Ninja + MINGW64: x86_64-7.3.0-posix-seh-rt_v5-rev0 # MinGW-w64 7.3.0 x86_64 + - CMAKE_GENERATOR: Ninja + MINGW64: x86_64-8.1.0-posix-seh-rt_v6-rev0 # MinGW-w64 8.1.0 x86_64 +configuration: Debug +before_build: + - set PATH=%PATH:C:\Program Files\Git\usr\bin;=% # Workaround for CMake not wanting sh.exe on PATH for MinGW + - if defined MINGW set PATH=C:\%MINGW%\bin;%PATH% + - if defined MINGW32 set PATH=C:\mingw-w64\%MINGW32%\mingw32\bin;%PATH% + - if defined MINGW64 set PATH=C:\mingw-w64\%MINGW64%\mingw64\bin;%PATH% + - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%CMAKE_GENERATOR%" . +build_script: + - cmake --build . --config %CONFIGURATION% +test_script: + - ctest -C %CONFIGURATION% --output-on-failure . diff --git a/Raumtermostat/lib/ArduinoJson/component.mk b/Raumtermostat/lib/ArduinoJson/component.mk new file mode 100644 index 0000000..dc25d1c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/component.mk @@ -0,0 +1 @@ +COMPONENT_ADD_INCLUDEDIRS := src diff --git a/Raumtermostat/lib/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino b/Raumtermostat/lib/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino new file mode 100644 index 0000000..32ad3a5 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino @@ -0,0 +1,152 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to store your project configuration in a file. +// It uses the SD library but can be easily modified for any other file-system. +// +// The file contains a JSON document with the following content: +// { +// "hostname": "examples.com", +// "port": 2731 +// } +// +// To run this program, you need an SD card connected to the SPI bus as follows: +// * MOSI <-> pin 11 +// * MISO <-> pin 12 +// * CLK <-> pin 13 +// * CS <-> pin 4 +// +// https://arduinojson.org/v7/example/config/ + +#include +#include +#include + +// Our configuration structure. +struct Config { + char hostname[64]; + int port; +}; + +const char* filename = "/config.txt"; // <- SD library uses 8.3 filenames +Config config; // <- global configuration object + +// Loads the configuration from a file +void loadConfiguration(const char* filename, Config& config) { + // Open file for reading + File file = SD.open(filename); + + // Allocate a temporary JsonDocument + JsonDocument doc; + + // Deserialize the JSON document + DeserializationError error = deserializeJson(doc, file); + if (error) + Serial.println(F("Failed to read file, using default configuration")); + + // Copy values from the JsonDocument to the Config + config.port = doc["port"] | 2731; + strlcpy(config.hostname, // <- destination + doc["hostname"] | "example.com", // <- source + sizeof(config.hostname)); // <- destination's capacity + + // Close the file (Curiously, File's destructor doesn't close the file) + file.close(); +} + +// Saves the configuration to a file +void saveConfiguration(const char* filename, const Config& config) { + // Delete existing file, otherwise the configuration is appended to the file + SD.remove(filename); + + // Open file for writing + File file = SD.open(filename, FILE_WRITE); + if (!file) { + Serial.println(F("Failed to create file")); + return; + } + + // Allocate a temporary JsonDocument + JsonDocument doc; + + // Set the values in the document + doc["hostname"] = config.hostname; + doc["port"] = config.port; + + // Serialize JSON to file + if (serializeJson(doc, file) == 0) { + Serial.println(F("Failed to write to file")); + } + + // Close the file + file.close(); +} + +// Prints the content of a file to the Serial +void printFile(const char* filename) { + // Open file for reading + File file = SD.open(filename); + if (!file) { + Serial.println(F("Failed to read file")); + return; + } + + // Extract each characters by one by one + while (file.available()) { + Serial.print((char)file.read()); + } + Serial.println(); + + // Close the file + file.close(); +} + +void setup() { + // Initialize serial port + Serial.begin(9600); + while (!Serial) + continue; + + // Initialize SD library + const int chipSelect = 4; + while (!SD.begin(chipSelect)) { + Serial.println(F("Failed to initialize SD library")); + delay(1000); + } + + // Should load default config if run for the first time + Serial.println(F("Loading configuration...")); + loadConfiguration(filename, config); + + // Create configuration file + Serial.println(F("Saving configuration...")); + saveConfiguration(filename, config); + + // Dump config file + Serial.println(F("Print config file...")); + printFile(filename); +} + +void loop() { + // not used in this example +} + +// Performance issue? +// ------------------ +// +// File is an unbuffered stream, which is not optimal for ArduinoJson. +// See: https://arduinojson.org/v7/how-to/improve-speed/ + +// See also +// -------- +// +// https://arduinojson.org/ contains the documentation for all the functions +// used above. It also includes an FAQ that will help you solve any +// serialization or deserialization problem. +// +// The book "Mastering ArduinoJson" contains a case study of a project that has +// a complex configuration with nested members. +// Contrary to this example, the project in the book uses the SPIFFS filesystem. +// Learn more at https://arduinojson.org/book/ +// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤ diff --git a/Raumtermostat/lib/ArduinoJson/examples/JsonFilterExample/JsonFilterExample.ino b/Raumtermostat/lib/ArduinoJson/examples/JsonFilterExample/JsonFilterExample.ino new file mode 100644 index 0000000..16e49dd --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/examples/JsonFilterExample/JsonFilterExample.ino @@ -0,0 +1,64 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to use DeserializationOption::Filter +// +// https://arduinojson.org/v7/example/filter/ + +#include + +void setup() { + // Initialize serial port + Serial.begin(9600); + while (!Serial) + continue; + + // The huge input: an extract from OpenWeatherMap response + auto input_json = F( + "{\"cod\":\"200\",\"message\":0,\"list\":[{\"dt\":1581498000,\"main\":{" + "\"temp\":3.23,\"feels_like\":-3.63,\"temp_min\":3.23,\"temp_max\":4.62," + "\"pressure\":1014,\"sea_level\":1014,\"grnd_level\":1010,\"humidity\":" + "58,\"temp_kf\":-1.39},\"weather\":[{\"id\":800,\"main\":\"Clear\"," + "\"description\":\"clear " + "sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":0},\"wind\":{\"speed\":6." + "19,\"deg\":266},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 " + "09:00:00\"},{\"dt\":1581508800,\"main\":{\"temp\":6.09,\"feels_like\":-" + "1.07,\"temp_min\":6.09,\"temp_max\":7.13,\"pressure\":1015,\"sea_" + "level\":1015,\"grnd_level\":1011,\"humidity\":48,\"temp_kf\":-1.04}," + "\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear " + "sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":9},\"wind\":{\"speed\":6." + "64,\"deg\":268},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 " + "12:00:00\"}],\"city\":{\"id\":2643743,\"name\":\"London\",\"coord\":{" + "\"lat\":51.5085,\"lon\":-0.1257},\"country\":\"GB\",\"population\":" + "1000000,\"timezone\":0,\"sunrise\":1581492085,\"sunset\":1581527294}}"); + + // The filter: it contains "true" for each value we want to keep + JsonDocument filter; + filter["list"][0]["dt"] = true; + filter["list"][0]["main"]["temp"] = true; + + // Deserialize the document + JsonDocument doc; + deserializeJson(doc, input_json, DeserializationOption::Filter(filter)); + + // Print the result + serializeJsonPretty(doc, Serial); +} + +void loop() { + // not used in this example +} + +// See also +// -------- +// +// https://arduinojson.org/ contains the documentation for all the functions +// used above. It also includes an FAQ that will help you solve any +// deserialization problem. +// +// The book "Mastering ArduinoJson" contains a tutorial on deserialization. +// It begins with a simple example, like the one above, and then adds more +// features like deserializing directly from a file or an HTTP request. +// Learn more at https://arduinojson.org/book/ +// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤ diff --git a/Raumtermostat/lib/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino b/Raumtermostat/lib/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino new file mode 100644 index 0000000..55d9a81 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino @@ -0,0 +1,65 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to generate a JSON document with ArduinoJson. +// +// https://arduinojson.org/v7/example/generator/ + +#include + +void setup() { + // Initialize Serial port + Serial.begin(9600); + while (!Serial) + continue; + + // Allocate the JSON document + JsonDocument doc; + + // Add values in the document + doc["sensor"] = "gps"; + doc["time"] = 1351824120; + + // Add an array + JsonArray data = doc["data"].to(); + data.add(48.756080); + data.add(2.302038); + + // Generate the minified JSON and send it to the Serial port + serializeJson(doc, Serial); + // The above line prints: + // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]} + + // Start a new line + Serial.println(); + + // Generate the prettified JSON and send it to the Serial port + serializeJsonPretty(doc, Serial); + // The above line prints: + // { + // "sensor": "gps", + // "time": 1351824120, + // "data": [ + // 48.756080, + // 2.302038 + // ] + // } +} + +void loop() { + // not used in this example +} + +// See also +// -------- +// +// https://arduinojson.org/ contains the documentation for all the functions +// used above. It also includes an FAQ that will help you solve any +// serialization problem. +// +// The book "Mastering ArduinoJson" contains a tutorial on serialization. +// It begins with a simple example, like the one above, and then adds more +// features like serializing directly to a file or an HTTP request. +// Learn more at https://arduinojson.org/book/ +// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤ diff --git a/Raumtermostat/lib/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino b/Raumtermostat/lib/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino new file mode 100644 index 0000000..c2d3846 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino @@ -0,0 +1,125 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to parse a JSON document in an HTTP response. +// It uses the Ethernet library, but can be easily adapted for Wifi. +// +// It performs a GET resquest on https://arduinojson.org/example.json +// Here is the expected response: +// { +// "sensor": "gps", +// "time": 1351824120, +// "data": [ +// 48.756080, +// 2.302038 +// ] +// } +// +// https://arduinojson.org/v7/example/http-client/ + +#include +#include +#include + +void setup() { + // Initialize Serial port + Serial.begin(9600); + while (!Serial) + continue; + + // Initialize Ethernet library + byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED}; + if (!Ethernet.begin(mac)) { + Serial.println(F("Failed to configure Ethernet")); + return; + } + delay(1000); + + Serial.println(F("Connecting...")); + + // Connect to HTTP server + EthernetClient client; + client.setTimeout(10000); + if (!client.connect("arduinojson.org", 80)) { + Serial.println(F("Connection failed")); + return; + } + + Serial.println(F("Connected!")); + + // Send HTTP request + client.println(F("GET /example.json HTTP/1.0")); + client.println(F("Host: arduinojson.org")); + client.println(F("Connection: close")); + if (client.println() == 0) { + Serial.println(F("Failed to send request")); + client.stop(); + return; + } + + // Check HTTP status + char status[32] = {0}; + client.readBytesUntil('\r', status, sizeof(status)); + // It should be "HTTP/1.0 200 OK" or "HTTP/1.1 200 OK" + if (strcmp(status + 9, "200 OK") != 0) { + Serial.print(F("Unexpected response: ")); + Serial.println(status); + client.stop(); + return; + } + + // Skip HTTP headers + char endOfHeaders[] = "\r\n\r\n"; + if (!client.find(endOfHeaders)) { + Serial.println(F("Invalid response")); + client.stop(); + return; + } + + // Allocate the JSON document + JsonDocument doc; + + // Parse JSON object + DeserializationError error = deserializeJson(doc, client); + if (error) { + Serial.print(F("deserializeJson() failed: ")); + Serial.println(error.f_str()); + client.stop(); + return; + } + + // Extract values + Serial.println(F("Response:")); + Serial.println(doc["sensor"].as()); + Serial.println(doc["time"].as()); + Serial.println(doc["data"][0].as(), 6); + Serial.println(doc["data"][1].as(), 6); + + // Disconnect + client.stop(); +} + +void loop() { + // not used in this example +} + +// Performance issue? +// ------------------ +// +// EthernetClient is an unbuffered stream, which is not optimal for ArduinoJson. +// See: https://arduinojson.org/v7/how-to/improve-speed/ + +// See also +// -------- +// +// https://arduinojson.org/ contains the documentation for all the functions +// used above. It also includes an FAQ that will help you solve any +// serialization problem. +// +// The book "Mastering ArduinoJson" contains a tutorial on deserialization +// showing how to parse the response from GitHub's API. In the last chapter, +// it shows how to parse the huge documents from OpenWeatherMap +// and Reddit. +// Learn more at https://arduinojson.org/book/ +// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤ diff --git a/Raumtermostat/lib/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino b/Raumtermostat/lib/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino new file mode 100644 index 0000000..0c325eb --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino @@ -0,0 +1,65 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to deserialize a JSON document with ArduinoJson. +// +// https://arduinojson.org/v7/example/parser/ + +#include + +void setup() { + // Initialize serial port + Serial.begin(9600); + while (!Serial) + continue; + + // Allocate the JSON document + JsonDocument doc; + + // JSON input string. + const char* json = + "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}"; + + // Deserialize the JSON document + DeserializationError error = deserializeJson(doc, json); + + // Test if parsing succeeds + if (error) { + Serial.print(F("deserializeJson() failed: ")); + Serial.println(error.f_str()); + return; + } + + // Fetch the values + // + // Most of the time, you can rely on the implicit casts. + // In other case, you can do doc["time"].as(); + const char* sensor = doc["sensor"]; + long time = doc["time"]; + double latitude = doc["data"][0]; + double longitude = doc["data"][1]; + + // Print the values + Serial.println(sensor); + Serial.println(time); + Serial.println(latitude, 6); + Serial.println(longitude, 6); +} + +void loop() { + // not used in this example +} + +// See also +// -------- +// +// https://arduinojson.org/ contains the documentation for all the functions +// used above. It also includes an FAQ that will help you solve any +// deserialization problem. +// +// The book "Mastering ArduinoJson" contains a tutorial on deserialization. +// It begins with a simple example, like the one above, and then adds more +// features like deserializing directly from a file or an HTTP request. +// Learn more at https://arduinojson.org/book/ +// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤ diff --git a/Raumtermostat/lib/ArduinoJson/examples/JsonServer/JsonServer.ino b/Raumtermostat/lib/ArduinoJson/examples/JsonServer/JsonServer.ino new file mode 100644 index 0000000..51fdf3c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/examples/JsonServer/JsonServer.ino @@ -0,0 +1,118 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to implement an HTTP server that sends a JSON document +// in the response. +// It uses the Ethernet library but can be easily adapted for Wifi. +// +// The JSON document contains the values of the analog and digital pins. +// It looks like that: +// { +// "analog": [0, 76, 123, 158, 192, 205], +// "digital": [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0] +// } +// +// https://arduinojson.org/v7/example/http-server/ + +#include +#include +#include + +byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED}; +EthernetServer server(80); + +void setup() { + // Initialize serial port + Serial.begin(9600); + while (!Serial) + continue; + + // Initialize Ethernet libary + if (!Ethernet.begin(mac)) { + Serial.println(F("Failed to initialize Ethernet library")); + return; + } + + // Start to listen + server.begin(); + + Serial.println(F("Server is ready.")); + Serial.print(F("Please connect to http://")); + Serial.println(Ethernet.localIP()); +} + +void loop() { + // Wait for an incomming connection + EthernetClient client = server.available(); + + // Do we have a client? + if (!client) + return; + + Serial.println(F("New client")); + + // Read the request (we ignore the content in this example) + while (client.available()) + client.read(); + + // Allocate a temporary JsonDocument + JsonDocument doc; + + // Create the "analog" array + JsonArray analogValues = doc["analog"].to(); + for (int pin = 0; pin < 6; pin++) { + // Read the analog input + int value = analogRead(pin); + + // Add the value at the end of the array + analogValues.add(value); + } + + // Create the "digital" array + JsonArray digitalValues = doc["digital"].to(); + for (int pin = 0; pin < 14; pin++) { + // Read the digital input + int value = digitalRead(pin); + + // Add the value at the end of the array + digitalValues.add(value); + } + + Serial.print(F("Sending: ")); + serializeJson(doc, Serial); + Serial.println(); + + // Write response headers + client.println(F("HTTP/1.0 200 OK")); + client.println(F("Content-Type: application/json")); + client.println(F("Connection: close")); + client.print(F("Content-Length: ")); + client.println(measureJsonPretty(doc)); + client.println(); + + // Write JSON document + serializeJsonPretty(doc, client); + + // Disconnect + client.stop(); +} + +// Performance issue? +// ------------------ +// +// EthernetClient is an unbuffered stream, which is not optimal for ArduinoJson. +// See: https://arduinojson.org/v7/how-to/improve-speed/ + +// See also +// -------- +// +// https://arduinojson.org/ contains the documentation for all the functions +// used above. It also includes an FAQ that will help you solve any +// serialization problem. +// +// The book "Mastering ArduinoJson" contains a tutorial on serialization. +// It begins with a simple example, then adds more features like serializing +// directly to a file or an HTTP client. +// Learn more at https://arduinojson.org/book/ +// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤ diff --git a/Raumtermostat/lib/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino b/Raumtermostat/lib/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino new file mode 100644 index 0000000..d6ecb55 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino @@ -0,0 +1,106 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to send a JSON document to a UDP socket. +// At regular interval, it sends a UDP packet that contains the status of +// analog and digital pins. +// It looks like that: +// { +// "analog": [0, 76, 123, 158, 192, 205], +// "digital": [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0] +// } +// +// If you want to test this program, you need to be able to receive the UDP +// packets. +// For example, you can run netcat on your computer +// $ ncat -ulp 8888 +// See https://nmap.org/ncat/ +// +// https://arduinojson.org/v7/example/udp-beacon/ + +#include +#include +#include + +byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED}; +IPAddress remoteIp(192, 168, 0, 108); // <- EDIT!!!! +unsigned short remotePort = 8888; +unsigned short localPort = 8888; +EthernetUDP udp; + +void setup() { + // Initialize serial port + Serial.begin(9600); + while (!Serial) + continue; + + // Initialize Ethernet libary + if (!Ethernet.begin(mac)) { + Serial.println(F("Failed to initialize Ethernet library")); + return; + } + + // Enable UDP + udp.begin(localPort); +} + +void loop() { + // Allocate a temporary JsonDocument + JsonDocument doc; + + // Create the "analog" array + JsonArray analogValues = doc["analog"].to(); + for (int pin = 0; pin < 6; pin++) { + // Read the analog input + int value = analogRead(pin); + + // Add the value at the end of the array + analogValues.add(value); + } + + // Create the "digital" array + JsonArray digitalValues = doc["digital"].to(); + for (int pin = 0; pin < 14; pin++) { + // Read the digital input + int value = digitalRead(pin); + + // Add the value at the end of the array + digitalValues.add(value); + } + + // Log + Serial.print(F("Sending to ")); + Serial.print(remoteIp); + Serial.print(F(" on port ")); + Serial.println(remotePort); + serializeJson(doc, Serial); + + // Send UDP packet + udp.beginPacket(remoteIp, remotePort); + serializeJson(doc, udp); + udp.println(); + udp.endPacket(); + + // Wait + delay(10000); +} + +// Performance issue? +// ------------------ +// +// EthernetUDP is an unbuffered stream, which is not optimal for ArduinoJson. +// See: https://arduinojson.org/v7/how-to/improve-speed/ + +// See also +// -------- +// +// https://arduinojson.org/ contains the documentation for all the functions +// used above. It also includes an FAQ that will help you solve any +// serialization problem. +// +// The book "Mastering ArduinoJson" contains a tutorial on serialization. +// It begins with a simple example, then adds more features like serializing +// directly to a file or any stream. +// Learn more at https://arduinojson.org/book/ +// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤ diff --git a/Raumtermostat/lib/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino b/Raumtermostat/lib/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino new file mode 100644 index 0000000..3649081 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino @@ -0,0 +1,61 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to deserialize a MessagePack document with +// ArduinoJson. +// +// https://arduinojson.org/v7/example/msgpack-parser/ + +#include + +void setup() { + // Initialize serial port + Serial.begin(9600); + while (!Serial) + continue; + + // Allocate the JSON document + JsonDocument doc; + + // The MessagePack input string + uint8_t input[] = {131, 166, 115, 101, 110, 115, 111, 114, 163, 103, 112, 115, + 164, 116, 105, 109, 101, 206, 80, 147, 50, 248, 164, 100, + 97, 116, 97, 146, 203, 64, 72, 96, 199, 58, 188, 148, + 112, 203, 64, 2, 106, 146, 230, 33, 49, 169}; + // This MessagePack document contains: + // { + // "sensor": "gps", + // "time": 1351824120, + // "data": [48.75608, 2.302038] + // } + + // Parse the input + DeserializationError error = deserializeMsgPack(doc, input); + + // Test if parsing succeeded + if (error) { + Serial.print("deserializeMsgPack() failed: "); + Serial.println(error.f_str()); + return; + } + + // Fetch the values + // + // Most of the time, you can rely on the implicit casts. + // In other case, you can do doc["time"].as(); + const char* sensor = doc["sensor"]; + long time = doc["time"]; + double latitude = doc["data"][0]; + double longitude = doc["data"][1]; + + // Print the values + Serial.println(sensor); + Serial.println(time); + Serial.println(latitude, 6); + Serial.println(longitude, 6); +} + +void loop() { + // not used in this example +} diff --git a/Raumtermostat/lib/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino b/Raumtermostat/lib/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino new file mode 100644 index 0000000..729cb8b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino @@ -0,0 +1,63 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows the different ways you can use Flash strings with +// ArduinoJson. +// +// Use Flash strings sparingly, because ArduinoJson duplicates them in the +// JsonDocument. Prefer plain old char*, as they are more efficient in term of +// code size, speed, and memory usage. +// +// https://arduinojson.org/v7/example/progmem/ + +#include + +void setup() { + JsonDocument doc; + + // You can use a Flash String as your JSON input. + // WARNING: the strings in the input will be duplicated in the JsonDocument. + deserializeJson(doc, F("{\"sensor\":\"gps\",\"time\":1351824120," + "\"data\":[48.756080,2.302038]}")); + + // You can use a Flash String as a key to get a member from JsonDocument + // No duplication is done. + long time = doc[F("time")]; + + // You can use a Flash String as a key to set a member of a JsonDocument + // WARNING: the content of the Flash String will be duplicated in the + // JsonDocument. + doc[F("time")] = time; + + // You can set a Flash String as the content of a JsonVariant + // WARNING: the content of the Flash String will be duplicated in the + // JsonDocument. + doc["sensor"] = F("gps"); + + // It works with serialized() too: + doc["sensor"] = serialized(F("\"gps\"")); + doc["sensor"] = serialized(F("\xA3gps"), 3); + + // You can compare the content of a JsonVariant to a Flash String + if (doc["sensor"] == F("gps")) { + // ... + } +} + +void loop() { + // not used in this example +} + +// See also +// -------- +// +// https://arduinojson.org/ contains the documentation for all the functions +// used above. It also includes an FAQ that will help you solve any memory +// problem. +// +// The book "Mastering ArduinoJson" contains a quick C++ course that explains +// how your microcontroller stores strings in memory. It also tells why you +// should not abuse Flash strings with ArduinoJson. +// Learn more at https://arduinojson.org/book/ +// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤ diff --git a/Raumtermostat/lib/ArduinoJson/examples/StringExample/StringExample.ino b/Raumtermostat/lib/ArduinoJson/examples/StringExample/StringExample.ino new file mode 100644 index 0000000..845df9d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/examples/StringExample/StringExample.ino @@ -0,0 +1,76 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows the different ways you can use String with ArduinoJson. +// +// Use String objects sparingly, because ArduinoJson duplicates them in the +// JsonDocument. Prefer plain old char[], as they are more efficient in term of +// code size, speed, and memory usage. +// +// https://arduinojson.org/v7/example/string/ + +#include + +void setup() { + JsonDocument doc; + + // You can use a String as your JSON input. + // WARNING: the string in the input will be duplicated in the JsonDocument. + String input = + "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}"; + deserializeJson(doc, input); + + // You can use a String as a key to get a member from JsonDocument + // No duplication is done. + long time = doc[String("time")]; + + // You can use a String as a key to set a member of a JsonDocument + // WARNING: the content of the String will be duplicated in the JsonDocument. + doc[String("time")] = time; + + // You can get the content of a JsonVariant as a String + // No duplication is done, at least not in the JsonDocument. + String sensor = doc["sensor"]; + + // Unfortunately, the following doesn't work (issue #118): + // sensor = doc["sensor"]; // <- error "ambiguous overload for 'operator='" + // As a workaround, you need to replace by: + sensor = doc["sensor"].as(); + + // You can set a String as the content of a JsonVariant + // WARNING: the content of the String will be duplicated in the JsonDocument. + doc["sensor"] = sensor; + + // It works with serialized() too: + doc["sensor"] = serialized(sensor); + + // You can also concatenate strings + // WARNING: the content of the String will be duplicated in the JsonDocument. + doc[String("sen") + "sor"] = String("gp") + "s"; + + // You can compare the content of a JsonObject with a String + if (doc["sensor"] == sensor) { + // ... + } + + // Lastly, you can print the resulting JSON to a String + String output; + serializeJson(doc, output); +} + +void loop() { + // not used in this example +} + +// See also +// -------- +// +// https://arduinojson.org/ contains the documentation for all the functions +// used above. It also includes an FAQ that will help you solve any problem. +// +// The book "Mastering ArduinoJson" contains a quick C++ course that explains +// how your microcontroller stores strings in memory. On several occasions, it +// shows how you can avoid String in your program. +// Learn more at https://arduinojson.org/book/ +// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤ diff --git a/Raumtermostat/lib/ArduinoJson/extras/ArduinoJsonConfig.cmake.in b/Raumtermostat/lib/ArduinoJson/extras/ArduinoJsonConfig.cmake.in new file mode 100644 index 0000000..9c15f36 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/ArduinoJsonConfig.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/Raumtermostat/lib/ArduinoJson/extras/CompileOptions.cmake b/Raumtermostat/lib/ArduinoJson/extras/CompileOptions.cmake new file mode 100644 index 0000000..5d9f804 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/CompileOptions.cmake @@ -0,0 +1,112 @@ +if(NOT DEFINED COVERAGE) + set(COVERAGE OFF) +endif() + +if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") + add_compile_options( + -pedantic + -Wall + -Wcast-align + -Wcast-qual + -Wconversion + -Wctor-dtor-privacy + -Wdisabled-optimization + -Werror + -Wextra + -Wformat=2 + -Winit-self + -Wmissing-include-dirs + -Wnon-virtual-dtor + -Wold-style-cast + -Woverloaded-virtual + -Wparentheses + -Wredundant-decls + -Wshadow + -Wsign-conversion + -Wsign-promo + -Wstrict-aliasing + -Wundef + ) + + if(${COVERAGE}) + set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage") + endif() +endif() + +if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9) AND(NOT ${COVERAGE})) + add_compile_options(-g -Og) + else() # GCC 4.8 + add_compile_options( + -g + -O0 # GCC 4.8 doesn't support -Og + -Wno-shadow # allow the same name for a function parameter and a member functions + -Wp,-w # Disable preprocessing warnings (see below) + ) + # GCC 4.8 doesn't support __has_include, so we need to help him + add_definitions( + -DARDUINOJSON_ENABLE_STD_STRING=1 + -DARDUINOJSON_ENABLE_STD_STREAM=1 + ) + endif() + + add_compile_options( + -Wstrict-null-sentinel + -Wno-vla # Allow VLA in tests + ) + add_definitions(-DHAS_VARIABLE_LENGTH_ARRAY) + + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.5) + add_compile_options(-Wlogical-op) # the flag exists in 4.4 but is buggy + endif() + + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6) + add_compile_options(-Wnoexcept) + endif() +endif() + +if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + add_compile_options( + -Wc++11-compat + -Wdeprecated-register + -Wno-vla-extension # Allow VLA in tests + ) + add_definitions( + -DHAS_VARIABLE_LENGTH_ARRAY + -DSUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR + ) +endif() + +if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + add_compile_options(-stdlib=libc++) + link_libraries(c++ m) + + if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0) AND(NOT ${COVERAGE})) + add_compile_options(-g -Og) + else() + add_compile_options(-g -O0) + endif() +endif() + +if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") + if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0) AND(NOT ${COVERAGE})) + add_compile_options(-g -Og) + else() + add_compile_options(-g -O0) + endif() +endif() + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_compile_options( + /W4 # Set warning level + /WX # Treats all compiler warnings as errors. + /Zc:__cplusplus # Enable updated __cplusplus macro + ) +endif() + +if(MINGW) + # Static link on MinGW to avoid linking with the wrong DLLs when multiple + # versions are installed. + add_link_options(-static) +endif() diff --git a/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/CMakeLists.txt new file mode 100644 index 0000000..6135701 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/CMakeLists.txt @@ -0,0 +1,8 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +cmake_minimum_required(VERSION 3.5) + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) +project(example) diff --git a/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/CMakeLists.txt new file mode 100644 index 0000000..bf22507 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/CMakeLists.txt @@ -0,0 +1,8 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +idf_component_register( + SRCS "main.cpp" + INCLUDE_DIRS "" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/component.mk b/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/component.mk new file mode 100644 index 0000000..a98f634 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/component.mk @@ -0,0 +1,4 @@ +# +# "main" pseudo-component makefile. +# +# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.) diff --git a/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/main.cpp b/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/main.cpp new file mode 100644 index 0000000..436eb40 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/ci/espidf/main/main.cpp @@ -0,0 +1,16 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +extern "C" void app_main() { + char buffer[256]; + JsonDocument doc; + + doc["hello"] = "world"; + serializeJson(doc, buffer); + deserializeJson(doc, buffer); + serializeMsgPack(doc, buffer); + deserializeMsgPack(doc, buffer); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/ci/particle.sh b/Raumtermostat/lib/ArduinoJson/extras/ci/particle.sh new file mode 100644 index 0000000..5566353 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/ci/particle.sh @@ -0,0 +1,10 @@ +#!/bin/sh -ex + +BOARD=$1 + +cd "$(dirname "$0")/../../" + +cp extras/particle/src/smocktest.ino src/ +cp extras/particle/project.properties ./ + +particle compile "$BOARD" diff --git a/Raumtermostat/lib/ArduinoJson/extras/conf_test/avr.cpp b/Raumtermostat/lib/ArduinoJson/extras/conf_test/avr.cpp new file mode 100644 index 0000000..769317a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/conf_test/avr.cpp @@ -0,0 +1,18 @@ +#include + +static_assert(ARDUINOJSON_ENABLE_PROGMEM == 1, "ARDUINOJSON_ENABLE_PROGMEM"); + +static_assert(ARDUINOJSON_USE_LONG_LONG == 0, "ARDUINOJSON_USE_LONG_LONG"); + +static_assert(ARDUINOJSON_SLOT_ID_SIZE == 1, "ARDUINOJSON_SLOT_ID_SIZE"); + +static_assert(ARDUINOJSON_POOL_CAPACITY == 16, "ARDUINOJSON_POOL_CAPACITY"); + +static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); + +static_assert(ARDUINOJSON_USE_DOUBLE == 0, "ARDUINOJSON_USE_DOUBLE"); + +static_assert(ArduinoJson::detail::ResourceManager::slotSize == 6, "slot size"); + +void setup() {} +void loop() {} diff --git a/Raumtermostat/lib/ArduinoJson/extras/conf_test/esp8266.cpp b/Raumtermostat/lib/ArduinoJson/extras/conf_test/esp8266.cpp new file mode 100644 index 0000000..b37bfd6 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/conf_test/esp8266.cpp @@ -0,0 +1,16 @@ +#include + +static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); + +static_assert(ARDUINOJSON_SLOT_ID_SIZE == 2, "ARDUINOJSON_SLOT_ID_SIZE"); + +static_assert(ARDUINOJSON_POOL_CAPACITY == 128, "ARDUINOJSON_POOL_CAPACITY"); + +static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); + +static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); + +static_assert(ArduinoJson::detail::ResourceManager::slotSize == 8, "slot size"); + +void setup() {} +void loop() {} diff --git a/Raumtermostat/lib/ArduinoJson/extras/conf_test/x64.cpp b/Raumtermostat/lib/ArduinoJson/extras/conf_test/x64.cpp new file mode 100644 index 0000000..df6b044 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/conf_test/x64.cpp @@ -0,0 +1,16 @@ +#include + +static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); + +static_assert(ARDUINOJSON_SLOT_ID_SIZE == 4, "ARDUINOJSON_SLOT_ID_SIZE"); + +static_assert(ARDUINOJSON_POOL_CAPACITY == 256, "ARDUINOJSON_POOL_CAPACITY"); + +static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); + +static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); + +static_assert(ArduinoJson::detail::ResourceManager::slotSize == 16, + "slot size"); + +int main() {} diff --git a/Raumtermostat/lib/ArduinoJson/extras/conf_test/x86.cpp b/Raumtermostat/lib/ArduinoJson/extras/conf_test/x86.cpp new file mode 100644 index 0000000..9dff8f1 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/conf_test/x86.cpp @@ -0,0 +1,15 @@ +#include + +static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); + +static_assert(ARDUINOJSON_SLOT_ID_SIZE == 2, "ARDUINOJSON_SLOT_ID_SIZE"); + +static_assert(ARDUINOJSON_POOL_CAPACITY == 128, "ARDUINOJSON_POOL_CAPACITY"); + +static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); + +static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); + +static_assert(ArduinoJson::detail::ResourceManager::slotSize == 8, "slot size"); + +int main() {} diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/CMakeLists.txt new file mode 100644 index 0000000..42c9260 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/CMakeLists.txt @@ -0,0 +1,67 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +if(MSVC) + add_compile_options(-D_CRT_SECURE_NO_WARNINGS) +endif() + +add_executable(msgpack_reproducer + msgpack_fuzzer.cpp + reproducer.cpp +) +target_link_libraries(msgpack_reproducer + ArduinoJson +) + +add_executable(json_reproducer + json_fuzzer.cpp + reproducer.cpp +) +target_link_libraries(json_reproducer + ArduinoJson +) + +macro(add_fuzzer name) + set(FUZZER "${name}_fuzzer") + set(CORPUS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${name}_corpus") + set(SEED_CORPUS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${name}_seed_corpus") + add_executable("${FUZZER}" + "${name}_fuzzer.cpp" + ) + target_link_libraries("${FUZZER}" + ArduinoJson + ) + set_target_properties("${FUZZER}" + PROPERTIES + COMPILE_FLAGS "-fprofile-instr-generate -fcoverage-mapping -fsanitize=fuzzer -fno-sanitize-recover=all" + LINK_FLAGS "-fprofile-instr-generate -fcoverage-mapping -fsanitize=fuzzer -fno-sanitize-recover=all" + ) + + add_test( + NAME "${FUZZER}" + COMMAND "${FUZZER}" "${CORPUS_DIR}" "${SEED_CORPUS_DIR}" -max_total_time=5 -timeout=1 + ) + + set_tests_properties("${FUZZER}" + PROPERTIES + LABELS "Fuzzing" + ) +endmacro() + +# Needs Clang 6+ to compile +if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6) + if(DEFINED ENV{GITHUB_ACTIONS} AND CMAKE_CXX_COMPILER_VERSION MATCHES "^11\\.") + # Clang 11 fails on GitHub Actions with the following error: + # > ERROR: UndefinedBehaviorSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22) + # > Sanitizer CHECK failed: /build/llvm-toolchain-11-mnvtwk/llvm-toolchain-11-11.1.0/compiler-rt/lib/sanitizer_common/sanitizer_common.cpp:54 ((0 && "unable to mmap")) != (0) (0, 0) + message(WARNING "Fuzzing is disabled on GitHub Actions to workaround a bug in Clang 11") + return() + endif() + + add_fuzzer(json) + add_fuzzer(msgpack) +endif() diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/Makefile b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/Makefile new file mode 100644 index 0000000..81fc412 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/Makefile @@ -0,0 +1,22 @@ +# CAUTION: this file is invoked by https://github.com/google/oss-fuzz + +CXXFLAGS += -I../../src -DARDUINOJSON_DEBUG=1 -std=c++11 + +all: \ + $(OUT)/json_fuzzer \ + $(OUT)/json_fuzzer_seed_corpus.zip \ + $(OUT)/json_fuzzer.options \ + $(OUT)/msgpack_fuzzer \ + $(OUT)/msgpack_fuzzer_seed_corpus.zip \ + $(OUT)/msgpack_fuzzer.options + +$(OUT)/%_fuzzer: %_fuzzer.cpp $(shell find ../../src -type f) + $(CXX) $(CXXFLAGS) $< -o$@ $(LIB_FUZZING_ENGINE) + +$(OUT)/%_fuzzer_seed_corpus.zip: %_seed_corpus/* + zip -j $@ $? + +$(OUT)/%_fuzzer.options: + @echo "[libfuzzer]" > $@ + @echo "max_len = 256" >> $@ + @echo "timeout = 10" >> $@ diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_corpus/.gitignore b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_corpus/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_corpus/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_fuzzer.cpp b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_fuzzer.cpp new file mode 100644 index 0000000..8d78aa3 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_fuzzer.cpp @@ -0,0 +1,11 @@ +#include + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + JsonDocument doc; + DeserializationError error = deserializeJson(doc, data, size); + if (!error) { + std::string json; + serializeJson(doc, json); + } + return 0; +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json new file mode 100644 index 0000000..bcc4cec --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json @@ -0,0 +1,10 @@ +//comment +/*comment*/ +[ //comment +/*comment*/"comment"/*comment*/,//comment +/*comment*/{//comment +/* comment*/"key"//comment +: //comment +"value"//comment +}/*comment*/ +]//comment \ No newline at end of file diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json new file mode 100644 index 0000000..9285019 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json @@ -0,0 +1 @@ +[1,[2,[3,[4,[5,[6,[7,[8,[9,[10,[11,[12,[13,[14,[15,[16,[17,[18,[19,[20,[21,[22,[23,[24,[25,[26,[27,[28,[29,[30,[31,[32,[33,[34,[35,[36,[37,[38,[39,[40,[41,[42,[43,[44,[45,[46,[47,[48,[49,[50,[51,[52,[53,[54,[55,[56,[57,[58,[59,[60,[61,[62,[63,[64,[65,[66,[67,[68,[69,[70,[71,[72,[73,[74,[75,[76,[77,[78,[79,[80,[81,[82,[83,[84,[85,[86,[87,[88,[89,[90,[91,[92,[93,[94,[95,[96,[97,[98,[99,[100,[101,[102,[103,[104,[105,[106,[107,[108,[109,[110,[111,[112,[113,[114,[115,[116,[117,[118,[119,[120]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] \ No newline at end of file diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json new file mode 100644 index 0000000..3a33cb8 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json @@ -0,0 +1 @@ +9720730739393920739 diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json new file mode 100644 index 0000000..f6b9419 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json @@ -0,0 +1,24 @@ +[ + 123, + -123, + 123.456, + -123.456, + 12e34, + 12e-34, + 12e+34, + 12E34, + 12E-34, + 12E+34, + 12.34e56, + 12.34e-56, + 12.34e+56, + 12.34E56, + 12.34E-56, + 12.34E+56, + NaN, + -NaN, + +NaN, + Infinity, + +Infinity, + -Infinity +] \ No newline at end of file diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json new file mode 100644 index 0000000..27d6baf --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json @@ -0,0 +1,53 @@ +{ + "coord": { + "lon": -0.13, + "lat": 51.51 + }, + "weather": [ + { + "id": 301, + "main": "Drizzle", + "description": "drizzle", + "icon": "09n" + }, + { + "id": 701, + "main": "Mist", + "description": "mist", + "icon": "50n" + }, + { + "id": 741, + "main": "Fog", + "description": "fog", + "icon": "50n" + } + ], + "base": "stations", + "main": { + "temp": 281.87, + "pressure": 1032, + "humidity": 100, + "temp_min": 281.15, + "temp_max": 283.15 + }, + "visibility": 2900, + "wind": { + "speed": 1.5 + }, + "clouds": { + "all": 90 + }, + "dt": 1483820400, + "sys": { + "type": 1, + "id": 5091, + "message": 0.0226, + "country": "GB", + "sunrise": 1483776245, + "sunset": 1483805443 + }, + "id": 2643743, + "name": "London", + "cod": 200 +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json new file mode 100644 index 0000000..3ffa235 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json @@ -0,0 +1,8 @@ +[ + "hello", + 'hello', + hello, + {"hello":"world"}, + {'hello':'world'}, + {hello:world} +] \ No newline at end of file diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json new file mode 100644 index 0000000..d53ce00 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json @@ -0,0 +1,90 @@ +{ + "response": { + "version": "0.1", + "termsofService": "http://www.wunderground.com/weather/api/d/terms.html", + "features": { + "conditions": 1 + } + }, + "current_observation": { + "image": { + "url": "http://icons-ak.wxug.com/graphics/wu2/logo_130x80.png", + "title": "Weather Underground", + "link": "http://www.wunderground.com" + }, + "display_location": { + "full": "San Francisco, CA", + "city": "San Francisco", + "state": "CA", + "state_name": "California", + "country": "US", + "country_iso3166": "US", + "zip": "94101", + "latitude": "37.77500916", + "longitude": "-122.41825867", + "elevation": "47.00000000" + }, + "observation_location": { + "full": "SOMA - Near Van Ness, San Francisco, California", + "city": "SOMA - Near Van Ness, San Francisco", + "state": "California", + "country": "US", + "country_iso3166": "US", + "latitude": "37.773285", + "longitude": "-122.417725", + "elevation": "49 ft" + }, + "estimated": {}, + "station_id": "KCASANFR58", + "observation_time": "Last Updated on June 27, 5:27 PM PDT", + "observation_time_rfc822": "Wed, 27 Jun 2012 17:27:13 -0700", + "observation_epoch": "1340843233", + "local_time_rfc822": "Wed, 27 Jun 2012 17:27:14 -0700", + "local_epoch": "1340843234", + "local_tz_short": "PDT", + "local_tz_long": "America/Los_Angeles", + "local_tz_offset": "-0700", + "weather": "Partly Cloudy", + "temperature_string": "66.3 F (19.1 C)", + "temp_f": 66.3, + "temp_c": 19.1, + "relative_humidity": "65%", + "wind_string": "From the NNW at 22.0 MPH Gusting to 28.0 MPH", + "wind_dir": "NNW", + "wind_degrees": 346, + "wind_mph": 22, + "wind_gust_mph": "28.0", + "wind_kph": 35.4, + "wind_gust_kph": "45.1", + "pressure_mb": "1013", + "pressure_in": "29.93", + "pressure_trend": "+", + "dewpoint_string": "54 F (12 C)", + "dewpoint_f": 54, + "dewpoint_c": 12, + "heat_index_string": "NA", + "heat_index_f": "NA", + "heat_index_c": "NA", + "windchill_string": "NA", + "windchill_f": "NA", + "windchill_c": "NA", + "feelslike_string": "66.3 F (19.1 C)", + "feelslike_f": "66.3", + "feelslike_c": "19.1", + "visibility_mi": "10.0", + "visibility_km": "16.1", + "solarradiation": "", + "UV": "5", + "precip_1hr_string": "0.00 in ( 0 mm)", + "precip_1hr_in": "0.00", + "precip_1hr_metric": " 0", + "precip_today_string": "0.00 in (0 mm)", + "precip_today_in": "0.00", + "precip_today_metric": "0", + "icon": "partlycloudy", + "icon_url": "http://icons-ak.wxug.com/i/c/k/partlycloudy.gif", + "forecast_url": "http://www.wunderground.com/US/CA/San_Francisco.html", + "history_url": "http://www.wunderground.com/history/airport/KCASANFR58/2012/6/27/DailyHistory.html", + "ob_url": "http://www.wunderground.com/cgi-bin/findweather/getForecast?query=37.773285,-122.417725" + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_corpus/.gitignore b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_corpus/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_corpus/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp new file mode 100644 index 0000000..3011501 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp @@ -0,0 +1,11 @@ +#include + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + JsonDocument doc; + DeserializationError error = deserializeMsgPack(doc, data, size); + if (!error) { + std::string json; + serializeMsgPack(doc, json); + } + return 0; +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array16 b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array16 new file mode 100644 index 0000000000000000000000000000000000000000..714ba99e70cbed2056b4e4b04c86bb1a2ff7311b GIT binary patch literal 15 Wcmcb^z_c_YH76&3X?cE8P6_}q=LTf} literal 0 HcmV?d00001 diff --git a/Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array32 b/Raumtermostat/lib/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array32 new file mode 100644 index 0000000000000000000000000000000000000000..6e3ed7b1b81742fbb90a4135004b55a9a45a5769 GIT binary patch literal 15 Vcmcc1z`($C3P>=Va`5 // size_t +#include // fopen et al. +#include // exit +#include +#include + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size); + +std::vector read(const char* path) { + FILE* f = fopen(path, "rb"); + if (!f) { + std::cerr << "Failed to open " << path << std::endl; + exit(1); + } + + fseek(f, 0, SEEK_END); + size_t size = static_cast(ftell(f)); + fseek(f, 0, SEEK_SET); + + std::vector buffer(size); + if (fread(buffer.data(), 1, size, f) != size) { + fclose(f); + std::cerr << "Failed to read " << path << std::endl; + exit(1); + } + + fclose(f); + return buffer; +} + +int main(int argc, const char* argv[]) { + if (argc < 2) { + std::cerr << "Usage: msgpack_fuzzer files" << std::endl; + return 1; + } + + for (int i = 1; i < argc; i++) { + std::cout << "Loading " << argv[i] << std::endl; + std::vector buffer = read(argv[i]); + LLVMFuzzerTestOneInput(buffer.data(), buffer.size()); + } + return 0; +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/particle/project.properties b/Raumtermostat/lib/ArduinoJson/extras/particle/project.properties new file mode 100644 index 0000000..d39555a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/particle/project.properties @@ -0,0 +1 @@ +name=ArduinoJsonCI diff --git a/Raumtermostat/lib/ArduinoJson/extras/particle/src/smocktest.ino b/Raumtermostat/lib/ArduinoJson/extras/particle/src/smocktest.ino new file mode 100644 index 0000000..ca17189 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/particle/src/smocktest.ino @@ -0,0 +1,5 @@ +#include "ArduinoJson.h" + +void setup() {} + +void loop() {} diff --git a/Raumtermostat/lib/ArduinoJson/extras/scripts/build-single-header.sh b/Raumtermostat/lib/ArduinoJson/extras/scripts/build-single-header.sh new file mode 100644 index 0000000..00292e3 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/scripts/build-single-header.sh @@ -0,0 +1,65 @@ +#!/bin/bash + +set -e + +RE_RELATIVE_INCLUDE='^#[[:space:]]*include[[:space:]]*"(.*)"' +RE_ABSOLUTE_INCLUDE='^#[[:space:]]*include[[:space:]]*<(ArduinoJson/.*)>' +RE_SYSTEM_INCLUDE='^#[[:space:]]*include[[:space:]]*<(.*)>' +RE_EMPTY='^(#[[:space:]]*pragma[[:space:]]+once)?[[:space:]]*(//.*)?$' +SRC_DIRECTORY="$(realpath "$(dirname $0)/../../src")" + + +declare -A INCLUDED + +process() +{ + local PARENT=$1 + local FOLDER=$(dirname $1) + local SHOW_COMMENT=$2 + while IFS= read -r LINE; do + if [[ $LINE =~ $RE_ABSOLUTE_INCLUDE ]]; then + local CHILD=${BASH_REMATCH[1]} + local CHILD_PATH + CHILD_PATH=$(realpath "$SRC_DIRECTORY/$CHILD") + echo "$PARENT -> $CHILD" >&2 + if [[ ! ${INCLUDED[$CHILD_PATH]} ]]; then + INCLUDED[$CHILD_PATH]=true + process "$CHILD" false + fi + elif [[ $LINE =~ $RE_RELATIVE_INCLUDE ]]; then + local CHILD=${BASH_REMATCH[1]} + pushd "$FOLDER" > /dev/null + local CHILD_PATH + CHILD_PATH=$(realpath "$CHILD") + echo "$PARENT -> $CHILD" >&2 + if [[ ! ${INCLUDED[$CHILD_PATH]} ]]; then + INCLUDED[$CHILD_PATH]=true + process "$CHILD" false + fi + popd > /dev/null + elif [[ $LINE =~ $RE_SYSTEM_INCLUDE ]]; then + local CHILD=${BASH_REMATCH[1]} + echo "$PARENT -> <$CHILD>" >&2 + if [[ ! ${INCLUDED[$CHILD]} ]]; then + echo "#include <$CHILD>" + INCLUDED[$CHILD]=true + fi + elif [[ "${SHOW_COMMENT}" = "true" ]] ; then + echo "$LINE" + elif [[ ! $LINE =~ $RE_EMPTY ]]; then + echo "$LINE" + fi + done < $PARENT +} + +simplify_namespaces() { + perl -p0i -e 's|ARDUINOJSON_END_PUBLIC_NAMESPACE\r?\nARDUINOJSON_BEGIN_PUBLIC_NAMESPACE\r?\n||igs' "$1" + perl -p0i -e 's|ARDUINOJSON_END_PRIVATE_NAMESPACE\r?\nARDUINOJSON_BEGIN_PRIVATE_NAMESPACE\r?\n||igs' "$1" + rm -f "$1.bak" +} + +INCLUDED=() +INPUT=$1 +OUTPUT=$2 +process "$INPUT" true > "$OUTPUT" +simplify_namespaces "$OUTPUT" diff --git a/Raumtermostat/lib/ArduinoJson/extras/scripts/extract_changes.awk b/Raumtermostat/lib/ArduinoJson/extras/scripts/extract_changes.awk new file mode 100644 index 0000000..d96d459 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/scripts/extract_changes.awk @@ -0,0 +1,29 @@ +#!/usr/bin/awk -f + +# Start echoing after the first list item +/\* / { + STARTED=1 + EMPTY_LINE=0 +} + +# Remember if we have seen an empty line +/^[[:space:]]*$/ { + EMPTY_LINE=1 +} + +# Exit when seeing a new version number +/^v[[:digit:]]/ { + if (STARTED) exit +} + +# Print if the line is not empty +# and restore the empty line we have skipped +!/^[[:space:]]*$/ { + if (STARTED) { + if (EMPTY_LINE) { + print "" + EMPTY_LINE=0 + } + print + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/scripts/get-release-page.sh b/Raumtermostat/lib/ArduinoJson/extras/scripts/get-release-page.sh new file mode 100644 index 0000000..10fa087 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/scripts/get-release-page.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -eu + +VERSION="$1" +CHANGELOG="$2" +ARDUINOJSON_H="$3" + +cat << END +--- +branch: v7 +version: $VERSION +date: '$(date +'%Y-%m-%d')' +$(extras/scripts/wandbox/publish.sh "$ARDUINOJSON_H") +--- + +$(extras/scripts/extract_changes.awk "$CHANGELOG") +END diff --git a/Raumtermostat/lib/ArduinoJson/extras/scripts/publish-particle-library.sh b/Raumtermostat/lib/ArduinoJson/extras/scripts/publish-particle-library.sh new file mode 100644 index 0000000..d410c47 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/scripts/publish-particle-library.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +set -eu + +SOURCE_DIR="$(dirname "$0")/../.." +WORK_DIR=$(mktemp -d) +trap 'rm -rf "$WORK_DIR"' EXIT + +cp "$SOURCE_DIR/README.md" "$WORK_DIR/README.md" +cp "$SOURCE_DIR/CHANGELOG.md" "$WORK_DIR/CHANGELOG.md" +cp "$SOURCE_DIR/library.properties" "$WORK_DIR/library.properties" +cp "$SOURCE_DIR/LICENSE.txt" "$WORK_DIR/LICENSE.txt" +cp -r "$SOURCE_DIR/src" "$WORK_DIR/" +cp -r "$SOURCE_DIR/examples" "$WORK_DIR/" + +cd "$WORK_DIR" +particle library upload +particle library publish diff --git a/Raumtermostat/lib/ArduinoJson/extras/scripts/publish.sh b/Raumtermostat/lib/ArduinoJson/extras/scripts/publish.sh new file mode 100644 index 0000000..60af5fc --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/scripts/publish.sh @@ -0,0 +1,87 @@ +#!/usr/bin/env bash + +set -eu + +which awk sed jq curl perl >/dev/null + +cd "$(dirname "$0")/../.." + +if ! git diff --quiet --exit-code; then + echo "Repository contains uncommitted changes" + exit +fi + +VERSION="$1" +DATE=$(date +%F) +TAG="v$VERSION" +VERSION_REGEX='[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)?' +STARS=$(curl -s https://api.github.com/repos/bblanchon/ArduinoJson | jq '.stargazers_count') + +update_version_in_source () { + IFS=".-" read MAJOR MINOR REVISION EXTRA < <(echo "$VERSION") + UNDERLINE=$(printf -- '-%.0s' $(seq 1 ${#TAG})) + + sed -i~ -bE "1,20{s/$VERSION_REGEX/$VERSION/g}" README.md + rm README.md~ + + sed -i~ -bE "4s/HEAD/$TAG ($DATE)/; 5s/-+/$UNDERLINE/" CHANGELOG.md + rm CHANGELOG.md~ + + sed -i~ -bE "s/(project\\s*\\(ArduinoJson\\s+VERSION\\s+).*?\\)/\\1$MAJOR.$MINOR.$REVISION)/" CMakeLists.txt + rm CMakeLists.txt~ + + sed -i~ -bE \ + -e "s/\"version\":.*$/\"version\": \"$VERSION\",/" \ + -e "s/[0-9]+ stars/$STARS stars/" \ + library.json + rm library.json~ + + sed -i~ -bE \ + -e "s/version=.*$/version=$VERSION/" \ + -e "s/[0-9]+ stars/$STARS stars/" \ + library.properties + rm library.properties~ + + sed -i~ -bE "s/version: .*$/version: $VERSION.{build}/" appveyor.yml + rm appveyor.yml~ + + sed -i~ -bE \ + -e "s/^version: .*$/version: \"$VERSION\"/" \ + -e "s/[0-9]+ stars/$STARS stars/" \ + idf_component.yml + rm idf_component.yml~ + + sed -i~ -bE \ + -e "s/ARDUINOJSON_VERSION .*$/ARDUINOJSON_VERSION \"$VERSION\"/" \ + -e "s/ARDUINOJSON_VERSION_MAJOR .*$/ARDUINOJSON_VERSION_MAJOR $MAJOR/" \ + -e "s/ARDUINOJSON_VERSION_MINOR .*$/ARDUINOJSON_VERSION_MINOR $MINOR/" \ + -e "s/ARDUINOJSON_VERSION_REVISION .*$/ARDUINOJSON_VERSION_REVISION $REVISION/" \ + -e "s/ARDUINOJSON_VERSION_MACRO .*$/ARDUINOJSON_VERSION_MACRO V$MAJOR$MINOR$REVISION/" \ + src/ArduinoJson/version.hpp + rm src/ArduinoJson/version.hpp*~ +} + +commit_new_version () { + git add src/ArduinoJson/version.hpp README.md CHANGELOG.md library.json library.properties appveyor.yml CMakeLists.txt idf_component.yml + git commit -m "Set version to $VERSION" +} + +add_tag () { + CHANGES=$(awk '/\* /{ FOUND=1; print; next } { if (FOUND) exit}' CHANGELOG.md) + git tag -m "ArduinoJson $VERSION"$'\n'"$CHANGES" "$TAG" +} + +push () { + git push --follow-tags +} + +update_version_in_source +commit_new_version +add_tag +push + +extras/scripts/build-single-header.sh "src/ArduinoJson.h" "../ArduinoJson-$TAG.h" +extras/scripts/build-single-header.sh "src/ArduinoJson.hpp" "../ArduinoJson-$TAG.hpp" +extras/scripts/get-release-page.sh "$VERSION" "CHANGELOG.md" "../ArduinoJson-$TAG.h" > "../ArduinoJson-$TAG.md" + +echo "You can now copy ../ArduinoJson-$TAG.md into arduinojson.org/collections/_versions/$VERSION.md" diff --git a/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp b/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp new file mode 100644 index 0000000..2e08b4c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp @@ -0,0 +1,42 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to generate a JSON document with ArduinoJson. + +#include +#include "ArduinoJson.h" + +int main() { + // Allocate the JSON document + JsonDocument doc; + + // Add values in the document. + doc["sensor"] = "gps"; + doc["time"] = 1351824120; + + // Add an array + JsonArray data = doc["data"].to(); + data.add(48.756080); + data.add(2.302038); + + // Generate the minified JSON and send it to STDOUT + serializeJson(doc, std::cout); + // The above line prints: + // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]} + + // Start a new line + std::cout << std::endl; + + // Generate the prettified JSON and send it to STDOUT + serializeJsonPretty(doc, std::cout); + // The above line prints: + // { + // "sensor": "gps", + // "time": 1351824120, + // "data": [ + // 48.756080, + // 2.302038 + // ] + // } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp b/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp new file mode 100644 index 0000000..1969cf2 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp @@ -0,0 +1,43 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to deserialize a JSON document with ArduinoJson. + +#include +#include "ArduinoJson.h" + +int main() { + // Allocate the JSON document + JsonDocument doc; + + // JSON input string + const char* json = + "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}"; + + // Deserialize the JSON document + DeserializationError error = deserializeJson(doc, json); + + // Test if parsing succeeds + if (error) { + std::cerr << "deserializeJson() failed: " << error.c_str() << std::endl; + return 1; + } + + // Fetch the values + // + // Most of the time, you can rely on the implicit casts. + // In other case, you can do doc["time"].as(); + const char* sensor = doc["sensor"]; + long time = doc["time"]; + double latitude = doc["data"][0]; + double longitude = doc["data"][1]; + + // Print the values + std::cout << sensor << std::endl; + std::cout << time << std::endl; + std::cout << latitude << std::endl; + std::cout << longitude << std::endl; + + return 0; +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp b/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp new file mode 100644 index 0000000..81e6822 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp @@ -0,0 +1,51 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License +// +// This example shows how to generate a JSON document with ArduinoJson. + +#include +#include "ArduinoJson.h" + +int main() { + // Allocate the JSON document + JsonDocument doc; + + // The MessagePack input string + uint8_t input[] = {131, 166, 115, 101, 110, 115, 111, 114, 163, 103, 112, 115, + 164, 116, 105, 109, 101, 206, 80, 147, 50, 248, 164, 100, + 97, 116, 97, 146, 203, 64, 72, 96, 199, 58, 188, 148, + 112, 203, 64, 2, 106, 146, 230, 33, 49, 169}; + // This MessagePack document contains: + // { + // "sensor": "gps", + // "time": 1351824120, + // "data": [48.75608, 2.302038] + // } + + // Parse the input + DeserializationError error = deserializeMsgPack(doc, input); + + // Test if parsing succeeds + if (error) { + std::cerr << "deserializeMsgPack() failed: " << error.c_str() << std::endl; + return 1; + } + + // Fetch the values + // + // Most of the time, you can rely on the implicit casts. + // In other case, you can do doc["time"].as(); + const char* sensor = doc["sensor"]; + long time = doc["time"]; + double latitude = doc["data"][0]; + double longitude = doc["data"][1]; + + // Print the values + std::cout << sensor << std::endl; + std::cout << time << std::endl; + std::cout << latitude << std::endl; + std::cout << longitude << std::endl; + + return 0; +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/publish.sh b/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/publish.sh new file mode 100644 index 0000000..611572f --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/scripts/wandbox/publish.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +set -eu + +ARDUINOJSON_H="$1" + +read_string() { + jq --slurp --raw-input '.' "$1" +} + +compile() { + FILE_PATH="$(dirname $0)/$1.cpp" + cat >parameters.json < +// but we don't want it to included accidentally +#undef ARDUINO +#define ARDUINOJSON_ENABLE_STD_STREAM 0 +#define ARDUINOJSON_ENABLE_STD_STRING 0 + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +#if !ARDUINOJSON_ENABLE_STRING_VIEW +# error ARDUINOJSON_ENABLE_STRING_VIEW must be set to 1 +#endif + +using ArduinoJson::detail::sizeofArray; + +TEST_CASE("string_view") { + SpyingAllocator spy; + JsonDocument doc(&spy); + JsonVariant variant = doc.to(); + + SECTION("deserializeJson()") { + auto err = deserializeJson(doc, std::string_view("123", 2)); + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == 12); + } + + SECTION("JsonDocument::set()") { + doc.set(std::string_view("123", 2)); + REQUIRE(doc.as() == "12"); + } + + SECTION("JsonDocument::operator[]() const") { + doc["ab"] = "Yes"; + doc["abc"] = "No"; + REQUIRE(doc[std::string_view("abc", 2)] == "Yes"); + } + + SECTION("JsonDocument::operator[]()") { + doc[std::string_view("abc", 2)] = "Yes"; + REQUIRE(doc["ab"] == "Yes"); + } + + SECTION("JsonVariant::operator==()") { + variant.set("A"); + REQUIRE(variant == std::string_view("AX", 1)); + REQUIRE_FALSE(variant == std::string_view("BX", 1)); + } + + SECTION("JsonVariant::operator>()") { + variant.set("B"); + REQUIRE(variant > std::string_view("AX", 1)); + REQUIRE_FALSE(variant > std::string_view("CX", 1)); + } + + SECTION("JsonVariant::operator<()") { + variant.set("B"); + REQUIRE(variant < std::string_view("CX", 1)); + REQUIRE_FALSE(variant < std::string_view("AX", 1)); + } + + SECTION("String deduplication") { + doc.add(std::string_view("example one", 7)); + doc.add(std::string_view("example two", 7)); + doc.add(std::string_view("example\0tree", 12)); + doc.add(std::string_view("example\0tree and a half", 12)); + + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("example")), + Allocate(sizeofString("example tree")), + }); + } + + SECTION("as()") { + doc["s"] = "Hello World"; + doc["i"] = 42; + REQUIRE(doc["s"].as() == std::string_view("Hello World")); + REQUIRE(doc["i"].as() == std::string_view()); + } + + SECTION("is()") { + doc["s"] = "Hello World"; + doc["i"] = 42; + REQUIRE(doc["s"].is() == true); + REQUIRE(doc["i"].is() == false); + } + + SECTION("String containing NUL") { + doc.set("hello\0world"_s); + REQUIRE(doc.as().size() == 11); + REQUIRE(doc.as() == std::string_view("hello\0world", 11)); + } +} + +using ArduinoJson::detail::adaptString; + +TEST_CASE("StringViewAdapter") { + std::string_view str("bravoXXX", 5); + auto adapter = adaptString(str); + + CHECK(stringCompare(adapter, adaptString("alpha", 5)) > 0); + CHECK(stringCompare(adapter, adaptString("bravo", 5)) == 0); + CHECK(stringCompare(adapter, adaptString("charlie", 7)) < 0); + + CHECK(adapter.size() == 5); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Cpp20/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/Cpp20/CMakeLists.txt new file mode 100644 index 0000000..6346d4d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Cpp20/CMakeLists.txt @@ -0,0 +1,29 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +if(MSVC_VERSION LESS 1910) + return() +endif() + +if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10) + return() +endif() + +if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10) + return() +endif() + +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +add_executable(Cpp20Tests + smoke_test.cpp +) + +add_test(Cpp20 Cpp20Tests) + +set_tests_properties(Cpp20 + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Cpp20/smoke_test.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Cpp20/smoke_test.cpp new file mode 100644 index 0000000..72dd50f --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Cpp20/smoke_test.cpp @@ -0,0 +1,15 @@ +#include + +#include +#include + +TEST_CASE("C++20 smoke test") { + JsonDocument doc; + + deserializeJson(doc, "{\"hello\":\"world\"}"); + REQUIRE(doc["hello"] == "world"); + + std::string json; + serializeJson(doc, json); + REQUIRE(json == "{\"hello\":\"world\"}"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/BasicJsonDocument.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/BasicJsonDocument.cpp new file mode 100644 index 0000000..a350977 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/BasicJsonDocument.cpp @@ -0,0 +1,69 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +using ArduinoJson::detail::is_base_of; + +static std::string allocatorLog; + +struct CustomAllocator { + CustomAllocator() { + allocatorLog = ""; + } + + void* allocate(size_t n) { + allocatorLog += "A"; + return malloc(n); + } + + void deallocate(void* p) { + free(p); + allocatorLog += "D"; + } + + void* reallocate(void* p, size_t n) { + allocatorLog += "R"; + return realloc(p, n); + } +}; + +TEST_CASE("BasicJsonDocument") { + allocatorLog.clear(); + + SECTION("is a JsonDocument") { + REQUIRE( + is_base_of>::value == + true); + } + + SECTION("deserialize / serialize") { + BasicJsonDocument doc(256); + deserializeJson(doc, "{\"hello\":\"world\"}"); + REQUIRE(doc.as() == "{\"hello\":\"world\"}"); + doc.clear(); + REQUIRE(allocatorLog == "AARARDDD"); + } + + SECTION("copy") { + BasicJsonDocument doc(256); + doc["hello"] = "world"; + auto copy = doc; + REQUIRE(copy.as() == "{\"hello\":\"world\"}"); + REQUIRE(allocatorLog == "AA"); + } + + SECTION("capacity") { + BasicJsonDocument doc(256); + REQUIRE(doc.capacity() == 256); + } + + SECTION("garbageCollect()") { + BasicJsonDocument doc(256); + doc.garbageCollect(); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/CMakeLists.txt new file mode 100644 index 0000000..bcf33e1 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/CMakeLists.txt @@ -0,0 +1,35 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") + add_compile_options( + -w + ) +endif() + +if(MSVC) + add_compile_options( + /wd4996 + ) +endif() + +add_executable(DeprecatedTests + add.cpp + BasicJsonDocument.cpp + containsKey.cpp + createNestedArray.cpp + createNestedObject.cpp + DynamicJsonDocument.cpp + macros.cpp + memoryUsage.cpp + shallowCopy.cpp + StaticJsonDocument.cpp +) + +add_test(Deprecated DeprecatedTests) + +set_tests_properties(Deprecated + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/DynamicJsonDocument.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/DynamicJsonDocument.cpp new file mode 100644 index 0000000..7c6d44b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/DynamicJsonDocument.cpp @@ -0,0 +1,37 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +using ArduinoJson::detail::is_base_of; + +TEST_CASE("DynamicJsonDocument") { + SECTION("is a JsonDocument") { + REQUIRE(is_base_of::value == true); + } + + SECTION("deserialize / serialize") { + DynamicJsonDocument doc(256); + deserializeJson(doc, "{\"hello\":\"world\"}"); + REQUIRE(doc.as() == "{\"hello\":\"world\"}"); + } + + SECTION("copy") { + DynamicJsonDocument doc(256); + doc["hello"] = "world"; + auto copy = doc; + REQUIRE(copy.as() == "{\"hello\":\"world\"}"); + } + + SECTION("capacity") { + DynamicJsonDocument doc(256); + REQUIRE(doc.capacity() == 256); + } + + SECTION("garbageCollect()") { + DynamicJsonDocument doc(256); + doc.garbageCollect(); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/StaticJsonDocument.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/StaticJsonDocument.cpp new file mode 100644 index 0000000..39a363b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/StaticJsonDocument.cpp @@ -0,0 +1,32 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +using ArduinoJson::detail::is_base_of; + +TEST_CASE("StaticJsonDocument") { + SECTION("is a JsonDocument") { + REQUIRE(is_base_of>::value == true); + } + + SECTION("deserialize / serialize") { + StaticJsonDocument<256> doc; + deserializeJson(doc, "{\"hello\":\"world\"}"); + REQUIRE(doc.as() == "{\"hello\":\"world\"}"); + } + + SECTION("copy") { + StaticJsonDocument<256> doc; + doc["hello"] = "world"; + auto copy = doc; + REQUIRE(copy.as() == "{\"hello\":\"world\"}"); + } + + SECTION("capacity") { + StaticJsonDocument<256> doc; + REQUIRE(doc.capacity() == 256); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/add.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/add.cpp new file mode 100644 index 0000000..586e22b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/add.cpp @@ -0,0 +1,38 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArray::add()") { + JsonDocument doc; + JsonArray array = doc.to(); + array.add().set(42); + REQUIRE(doc.as() == "[42]"); +} + +TEST_CASE("JsonDocument::add()") { + JsonDocument doc; + doc.add().set(42); + REQUIRE(doc.as() == "[42]"); +} + +TEST_CASE("ElementProxy::add()") { + JsonDocument doc; + doc[0].add().set(42); + REQUIRE(doc.as() == "[[42]]"); +} + +TEST_CASE("MemberProxy::add()") { + JsonDocument doc; + doc["x"].add().set(42); + REQUIRE(doc.as() == "{\"x\":[42]}"); +} + +TEST_CASE("JsonVariant::add()") { + JsonDocument doc; + JsonVariant v = doc.add(); + v.add().set(42); + REQUIRE(doc.as() == "[[42]]"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/containsKey.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/containsKey.cpp new file mode 100644 index 0000000..d001d40 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/containsKey.cpp @@ -0,0 +1,246 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Literals.hpp" + +TEST_CASE("JsonDocument::containsKey()") { + JsonDocument doc; + + SECTION("returns true on object") { + doc["hello"] = "world"; + + REQUIRE(doc.containsKey("hello") == true); + } + + SECTION("returns true when value is null") { + doc["hello"] = static_cast(0); + + REQUIRE(doc.containsKey("hello") == true); + } + + SECTION("returns true when key is a std::string") { + doc["hello"] = "world"; + + REQUIRE(doc.containsKey("hello"_s) == true); + } + + SECTION("returns false on object") { + doc["world"] = "hello"; + + REQUIRE(doc.containsKey("hello") == false); + } + + SECTION("returns false on array") { + doc.add("hello"); + + REQUIRE(doc.containsKey("hello") == false); + } + + SECTION("returns false on null") { + REQUIRE(doc.containsKey("hello") == false); + } + + SECTION("supports JsonVariant") { + doc["hello"] = "world"; + doc["key"] = "hello"; + + REQUIRE(doc.containsKey(doc["key"]) == true); + REQUIRE(doc.containsKey(doc["foo"]) == false); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("supports VLAs") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + doc["hello"] = "world"; + + REQUIRE(doc.containsKey(vla) == true); + } +#endif +} + +TEST_CASE("MemberProxy::containsKey()") { + JsonDocument doc; + const auto& mp = doc["hello"]; + + SECTION("containsKey(const char*)") { + mp["key"] = "value"; + + REQUIRE(mp.containsKey("key") == true); + REQUIRE(mp.containsKey("key") == true); + } + + SECTION("containsKey(std::string)") { + mp["key"] = "value"; + + REQUIRE(mp.containsKey("key"_s) == true); + REQUIRE(mp.containsKey("key"_s) == true); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("supports VLAs") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + mp["hello"] = "world"; + + REQUIRE(mp.containsKey(vla) == true); + } +#endif +} + +TEST_CASE("JsonObject::containsKey()") { + JsonDocument doc; + JsonObject obj = doc.to(); + obj["hello"] = 42; + + SECTION("returns true only if key is present") { + REQUIRE(false == obj.containsKey("world")); + REQUIRE(true == obj.containsKey("hello")); + } + + SECTION("returns false after remove()") { + obj.remove("hello"); + + REQUIRE(false == obj.containsKey("hello")); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("key is a VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + REQUIRE(true == obj.containsKey(vla)); + } +#endif + + SECTION("key is a JsonVariant") { + doc["key"] = "hello"; + REQUIRE(true == obj.containsKey(obj["key"])); + REQUIRE(false == obj.containsKey(obj["hello"])); + } + + SECTION("std::string") { + REQUIRE(true == obj.containsKey("hello"_s)); + } + + SECTION("unsigned char[]") { + unsigned char key[] = "hello"; + REQUIRE(true == obj.containsKey(key)); + } +} + +TEST_CASE("JsonObjectConst::containsKey()") { + JsonDocument doc; + doc["hello"] = 42; + auto obj = doc.as(); + + SECTION("supports const char*") { + REQUIRE(false == obj.containsKey("world")); + REQUIRE(true == obj.containsKey("hello")); + } + + SECTION("supports std::string") { + REQUIRE(false == obj.containsKey("world"_s)); + REQUIRE(true == obj.containsKey("hello"_s)); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("supports VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + REQUIRE(true == obj.containsKey(vla)); + } +#endif + + SECTION("supports JsonVariant") { + doc["key"] = "hello"; + REQUIRE(true == obj.containsKey(obj["key"])); + REQUIRE(false == obj.containsKey(obj["hello"])); + } +} + +TEST_CASE("JsonVariant::containsKey()") { + JsonDocument doc; + JsonVariant var = doc.to(); + + SECTION("returns false is unbound") { + CHECK_FALSE(JsonVariant().containsKey("hello")); + } + + SECTION("containsKey(const char*)") { + var["hello"] = "world"; + + REQUIRE(var.containsKey("hello") == true); + REQUIRE(var.containsKey("world") == false); + } + + SECTION("containsKey(std::string)") { + var["hello"] = "world"; + + REQUIRE(var.containsKey("hello"_s) == true); + REQUIRE(var.containsKey("world"_s) == false); + } + + SECTION("containsKey(JsonVariant)") { + var["hello"] = "world"; + var["key"] = "hello"; + + REQUIRE(var.containsKey(doc["key"]) == true); + REQUIRE(var.containsKey(doc["foo"]) == false); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("supports VLAs") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + var["hello"] = "world"; + + REQUIRE(var.containsKey(vla) == true); + } +#endif +} + +TEST_CASE("JsonVariantConst::containsKey()") { + JsonDocument doc; + doc["hello"] = "world"; + JsonVariantConst var = doc.as(); + + SECTION("support const char*") { + REQUIRE(var.containsKey("hello") == true); + REQUIRE(var.containsKey("world") == false); + } + + SECTION("support std::string") { + REQUIRE(var.containsKey("hello"_s) == true); + REQUIRE(var.containsKey("world"_s) == false); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("supports VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + REQUIRE(true == var.containsKey(vla)); + } +#endif + + SECTION("support JsonVariant") { + doc["key"] = "hello"; + REQUIRE(var.containsKey(var["key"]) == true); + REQUIRE(var.containsKey(var["foo"]) == false); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/createNestedArray.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/createNestedArray.cpp new file mode 100644 index 0000000..858c022 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/createNestedArray.cpp @@ -0,0 +1,113 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +#include "Literals.hpp" + +TEST_CASE("JsonDocument::createNestedArray()") { + JsonDocument doc; + + SECTION("createNestedArray()") { + JsonArray array = doc.createNestedArray(); + array.add(42); + REQUIRE(doc.as() == "[[42]]"); + } + + SECTION("createNestedArray(const char*)") { + JsonArray array = doc.createNestedArray("key"); + array.add(42); + REQUIRE(doc.as() == "{\"key\":[42]}"); + } + + SECTION("createNestedArray(std::string)") { + JsonArray array = doc.createNestedArray("key"_s); + array.add(42); + REQUIRE(doc.as() == "{\"key\":[42]}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("createNestedArray(VLA)") { + size_t i = 16; + char vla[i]; + strcpy(vla, "key"); + JsonArray array = doc.createNestedArray(vla); + array.add(42); + REQUIRE(doc.as() == "{\"key\":[42]}"); + } +#endif +} + +TEST_CASE("JsonArray::createNestedArray()") { + JsonDocument doc; + JsonArray array = doc.to(); + JsonArray nestedArray = array.createNestedArray(); + nestedArray.add(42); + REQUIRE(doc.as() == "[[42]]"); +} + +TEST_CASE("JsonObject::createNestedArray()") { + JsonDocument doc; + JsonObject object = doc.to(); + + SECTION("createNestedArray(const char*)") { + JsonArray array = object.createNestedArray("key"); + array.add(42); + REQUIRE(doc.as() == "{\"key\":[42]}"); + } + + SECTION("createNestedArray(std::string)") { + JsonArray array = object.createNestedArray("key"_s); + array.add(42); + REQUIRE(doc.as() == "{\"key\":[42]}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("createNestedArray(VLA)") { + size_t i = 16; + char vla[i]; + strcpy(vla, "key"); + JsonArray array = object.createNestedArray(vla); + array.add(42); + REQUIRE(doc.as() == "{\"key\":[42]}"); + } +#endif +} + +TEST_CASE("JsonVariant::createNestedArray()") { + JsonDocument doc; + JsonVariant variant = doc.to(); + + SECTION("createNestedArray()") { + JsonArray array = variant.createNestedArray(); + array.add(42); + REQUIRE(doc.as() == "[[42]]"); + } + + SECTION("createNestedArray(const char*)") { + JsonArray array = variant.createNestedArray("key"); + array.add(42); + REQUIRE(doc.as() == "{\"key\":[42]}"); + } + + SECTION("createNestedArray(std::string)") { + JsonArray array = variant.createNestedArray("key"_s); + array.add(42); + REQUIRE(doc.as() == "{\"key\":[42]}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("createNestedArray(VLA)") { + size_t i = 16; + char vla[i]; + strcpy(vla, "key"); + JsonArray array = variant.createNestedArray(vla); + array.add(42); + REQUIRE(doc.as() == "{\"key\":[42]}"); + } +#endif +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/createNestedObject.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/createNestedObject.cpp new file mode 100644 index 0000000..c035eb8 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/createNestedObject.cpp @@ -0,0 +1,113 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +#include "Literals.hpp" + +TEST_CASE("JsonDocument::createNestedObject()") { + JsonDocument doc; + + SECTION("createNestedObject()") { + JsonObject object = doc.createNestedObject(); + object["hello"] = "world"; + REQUIRE(doc.as() == "[{\"hello\":\"world\"}]"); + } + + SECTION("createNestedObject(const char*)") { + JsonObject object = doc.createNestedObject("key"); + object["hello"] = "world"; + REQUIRE(doc.as() == "{\"key\":{\"hello\":\"world\"}}"); + } + + SECTION("createNestedObject(std::string)") { + JsonObject object = doc.createNestedObject("key"_s); + object["hello"] = "world"; + REQUIRE(doc.as() == "{\"key\":{\"hello\":\"world\"}}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("createNestedObject(VLA)") { + size_t i = 16; + char vla[i]; + strcpy(vla, "key"); + JsonObject object = doc.createNestedObject(vla); + object["hello"] = "world"; + REQUIRE(doc.as() == "{\"key\":{\"hello\":\"world\"}}"); + } +#endif +} + +TEST_CASE("JsonArray::createNestedObject()") { + JsonDocument doc; + JsonArray array = doc.to(); + JsonObject object = array.createNestedObject(); + object["hello"] = "world"; + REQUIRE(doc.as() == "[{\"hello\":\"world\"}]"); +} + +TEST_CASE("JsonObject::createNestedObject()") { + JsonDocument doc; + JsonObject object = doc.to(); + + SECTION("createNestedObject(const char*)") { + JsonObject nestedObject = object.createNestedObject("key"); + nestedObject["hello"] = "world"; + REQUIRE(doc.as() == "{\"key\":{\"hello\":\"world\"}}"); + } + + SECTION("createNestedObject(std::string)") { + JsonObject nestedObject = object.createNestedObject("key"_s); + nestedObject["hello"] = "world"; + REQUIRE(doc.as() == "{\"key\":{\"hello\":\"world\"}}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("createNestedObject(VLA)") { + size_t i = 16; + char vla[i]; + strcpy(vla, "key"); + JsonObject nestedObject = object.createNestedObject(vla); + nestedObject["hello"] = "world"; + REQUIRE(doc.as() == "{\"key\":{\"hello\":\"world\"}}"); + } +#endif +} + +TEST_CASE("JsonVariant::createNestedObject()") { + JsonDocument doc; + JsonVariant variant = doc.to(); + + SECTION("createNestedObject()") { + JsonObject object = variant.createNestedObject(); + object["hello"] = "world"; + REQUIRE(doc.as() == "[{\"hello\":\"world\"}]"); + } + + SECTION("createNestedObject(const char*)") { + JsonObject object = variant.createNestedObject("key"); + object["hello"] = "world"; + REQUIRE(doc.as() == "{\"key\":{\"hello\":\"world\"}}"); + } + + SECTION("createNestedObject(std::string)") { + JsonObject object = variant.createNestedObject("key"_s); + object["hello"] = "world"; + REQUIRE(doc.as() == "{\"key\":{\"hello\":\"world\"}}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("createNestedObject(VLA)") { + size_t i = 16; + char vla[i]; + strcpy(vla, "key"); + JsonObject object = variant.createNestedObject(vla); + object["hello"] = "world"; + REQUIRE(doc.as() == "{\"key\":{\"hello\":\"world\"}}"); + } +#endif +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/macros.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/macros.cpp new file mode 100644 index 0000000..2e73d5b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/macros.cpp @@ -0,0 +1,18 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JSON_ARRAY_SIZE") { + REQUIRE(JSON_ARRAY_SIZE(10) == ArduinoJson::detail::sizeofArray(10)); +} + +TEST_CASE("JSON_OBJECT_SIZE") { + REQUIRE(JSON_OBJECT_SIZE(10) == ArduinoJson::detail::sizeofObject(10)); +} + +TEST_CASE("JSON_STRING_SIZE") { + REQUIRE(JSON_STRING_SIZE(10) == 11); // issue #2054 +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/memoryUsage.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/memoryUsage.cpp new file mode 100644 index 0000000..89258f0 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/memoryUsage.cpp @@ -0,0 +1,51 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArray::memoryUsage()") { + JsonArray array; + REQUIRE(array.memoryUsage() == 0); +} + +TEST_CASE("JsonArrayConst::memoryUsage()") { + JsonArrayConst array; + REQUIRE(array.memoryUsage() == 0); +} + +TEST_CASE("JsonDocument::memoryUsage()") { + JsonDocument doc; + REQUIRE(doc.memoryUsage() == 0); +} + +TEST_CASE("JsonObject::memoryUsage()") { + JsonObject array; + REQUIRE(array.memoryUsage() == 0); +} + +TEST_CASE("JsonObjectConst::memoryUsage()") { + JsonObjectConst array; + REQUIRE(array.memoryUsage() == 0); +} + +TEST_CASE("JsonVariant::memoryUsage()") { + JsonVariant doc; + REQUIRE(doc.memoryUsage() == 0); +} + +TEST_CASE("JsonVariantConst::memoryUsage()") { + JsonVariantConst doc; + REQUIRE(doc.memoryUsage() == 0); +} + +TEST_CASE("ElementProxy::memoryUsage()") { + JsonDocument doc; + REQUIRE(doc[0].memoryUsage() == 0); +} + +TEST_CASE("MemberProxy::memoryUsage()") { + JsonDocument doc; + REQUIRE(doc["hello"].memoryUsage() == 0); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/shallowCopy.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/shallowCopy.cpp new file mode 100644 index 0000000..1f0d12e --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Deprecated/shallowCopy.cpp @@ -0,0 +1,14 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("shallowCopy()") { + JsonDocument doc1, doc2; + doc1["b"] = "c"; + doc2["a"].shallowCopy(doc1); + + REQUIRE(doc2.as() == "{\"a\":{\"b\":\"c\"}}"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/CMakeLists.txt new file mode 100644 index 0000000..08dbe52 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/CMakeLists.txt @@ -0,0 +1,32 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +macro(add_failing_build source_file) + get_filename_component(target ${source_file} NAME_WE) + + add_executable(${target} ${source_file}) + + set_target_properties(${target} + PROPERTIES + EXCLUDE_FROM_ALL TRUE + EXCLUDE_FROM_DEFAULT_BUILD TRUE + ) + add_test( + NAME ${target} + COMMAND ${CMAKE_COMMAND} --build . --target ${target} --config $ + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + ) + set_tests_properties(${target} + PROPERTIES + WILL_FAIL TRUE + LABELS "WillFail" + ) +endmacro() + +add_failing_build(Issue978.cpp) +add_failing_build(read_long_long.cpp) +add_failing_build(write_long_long.cpp) +add_failing_build(variant_as_char.cpp) +add_failing_build(assign_char.cpp) +add_failing_build(deserialize_object.cpp) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/Issue978.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/Issue978.cpp new file mode 100644 index 0000000..3b9ec95 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/Issue978.cpp @@ -0,0 +1,13 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +struct Stream {}; + +int main() { + Stream* stream = 0; + JsonDocument doc; + deserializeJson(doc, stream); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/assign_char.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/assign_char.cpp new file mode 100644 index 0000000..888d23c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/assign_char.cpp @@ -0,0 +1,12 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +// See issue #1498 + +int main() { + JsonDocument doc; + doc["dummy"] = 'A'; +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/deserialize_object.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/deserialize_object.cpp new file mode 100644 index 0000000..b9313ed --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/deserialize_object.cpp @@ -0,0 +1,12 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +// See issue #2135 + +int main() { + JsonObject obj; + deserializeJson(obj, ""); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/read_long_long.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/read_long_long.cpp new file mode 100644 index 0000000..daf1f40 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/read_long_long.cpp @@ -0,0 +1,16 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_USE_LONG_LONG 0 +#include + +#if defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ >= 8 +# error This test requires sizeof(long) < 8 +#endif + +ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(long long) +int main() { + JsonDocument doc; + doc["dummy"].as(); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/variant_as_char.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/variant_as_char.cpp new file mode 100644 index 0000000..b1e86ee --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/variant_as_char.cpp @@ -0,0 +1,12 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +// See issue #1498 + +int main() { + JsonDocument doc; + doc["dummy"].as(); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/write_long_long.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/write_long_long.cpp new file mode 100644 index 0000000..4aee656 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/FailingBuilds/write_long_long.cpp @@ -0,0 +1,15 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_USE_LONG_LONG 0 +#include + +#if defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ >= 8 +# error This test requires sizeof(long) < 8 +#endif + +int main() { + JsonDocument doc; + doc["dummy"] = static_cast(42); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Allocators.hpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Allocators.hpp new file mode 100644 index 0000000..17e05ca --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Allocators.hpp @@ -0,0 +1,288 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#pragma once + +#include +#include +#include + +#include + +namespace { + +struct FailingAllocator : ArduinoJson::Allocator { + static FailingAllocator* instance() { + static FailingAllocator allocator; + return &allocator; + } + + private: + FailingAllocator() = default; + ~FailingAllocator() = default; + + void* allocate(size_t) override { + return nullptr; + } + + void deallocate(void*) override {} + + void* reallocate(void*, size_t) override { + return nullptr; + } +}; + +class AllocatorLogEntry { + public: + AllocatorLogEntry(std::string s, size_t n = 1) : str_(s), count_(n) {} + + const std::string& str() const { + return str_; + } + + size_t count() const { + return count_; + } + + AllocatorLogEntry operator*(size_t n) const { + return AllocatorLogEntry(str_, n); + } + + private: + std::string str_; + size_t count_; +}; + +inline AllocatorLogEntry Allocate(size_t s) { + char buffer[32]; + snprintf(buffer, sizeof(buffer), "allocate(%zu)", s); + return AllocatorLogEntry(buffer); +} + +inline AllocatorLogEntry AllocateFail(size_t s) { + char buffer[32]; + snprintf(buffer, sizeof(buffer), "allocate(%zu) -> nullptr", s); + return AllocatorLogEntry(buffer); +} + +inline AllocatorLogEntry Reallocate(size_t s1, size_t s2) { + char buffer[32]; + snprintf(buffer, sizeof(buffer), "reallocate(%zu, %zu)", s1, s2); + return AllocatorLogEntry(buffer); +} + +inline AllocatorLogEntry ReallocateFail(size_t s1, size_t s2) { + char buffer[32]; + snprintf(buffer, sizeof(buffer), "reallocate(%zu, %zu) -> nullptr", s1, s2); + return AllocatorLogEntry(buffer); +} + +inline AllocatorLogEntry Deallocate(size_t s) { + char buffer[32]; + snprintf(buffer, sizeof(buffer), "deallocate(%zu)", s); + return AllocatorLogEntry(buffer); +} + +class AllocatorLog { + public: + AllocatorLog() = default; + AllocatorLog(std::initializer_list list) { + for (auto& entry : list) + append(entry); + } + + void clear() { + log_.str(""); + } + + void append(const AllocatorLogEntry& entry) { + for (size_t i = 0; i < entry.count(); i++) + log_ << entry.str() << "\n"; + } + + std::string str() const { + auto s = log_.str(); + if (s.empty()) + return "(empty)"; + s.pop_back(); // remove the trailing '\n' + return s; + } + + bool operator==(const AllocatorLog& other) const { + return str() == other.str(); + } + + friend std::ostream& operator<<(std::ostream& os, const AllocatorLog& log) { + os << log.str(); + return os; + } + + private: + std::ostringstream log_; +}; + +class SpyingAllocator : public ArduinoJson::Allocator { + public: + SpyingAllocator( + Allocator* upstream = ArduinoJson::detail::DefaultAllocator::instance()) + : upstream_(upstream) {} + virtual ~SpyingAllocator() {} + + size_t allocatedBytes() const { + return allocatedBytes_; + } + + void* allocate(size_t n) override { + auto block = reinterpret_cast( + upstream_->allocate(sizeof(AllocatedBlock) + n - 1)); + if (block) { + log_.append(Allocate(n)); + allocatedBytes_ += n; + block->size = n; + return block->payload; + } else { + log_.append(AllocateFail(n)); + return nullptr; + } + } + + void deallocate(void* p) override { + auto block = AllocatedBlock::fromPayload(p); + allocatedBytes_ -= block->size; + log_.append(Deallocate(block ? block->size : 0)); + upstream_->deallocate(block); + } + + void* reallocate(void* p, size_t n) override { + auto block = AllocatedBlock::fromPayload(p); + auto oldSize = block ? block->size : 0; + block = reinterpret_cast( + upstream_->reallocate(block, sizeof(AllocatedBlock) + n - 1)); + if (block) { + log_.append(Reallocate(oldSize, n)); + block->size = n; + allocatedBytes_ += n - oldSize; + return block->payload; + } else { + log_.append(ReallocateFail(oldSize, n)); + return nullptr; + } + } + + void clearLog() { + log_.clear(); + } + + const AllocatorLog& log() const { + return log_; + } + + private: + struct AllocatedBlock { + size_t size; + char payload[1]; + + static AllocatedBlock* fromPayload(void* p) { + if (!p) + return nullptr; + return reinterpret_cast( + // Cast to void* to silence "cast increases required alignment of + // target type [-Werror=cast-align]" + reinterpret_cast(reinterpret_cast(p) - + offsetof(AllocatedBlock, payload))); + } + }; + + AllocatorLog log_; + Allocator* upstream_; + size_t allocatedBytes_ = 0; +}; + +class KillswitchAllocator : public ArduinoJson::Allocator { + public: + KillswitchAllocator( + Allocator* upstream = ArduinoJson::detail::DefaultAllocator::instance()) + : working_(true), upstream_(upstream) {} + virtual ~KillswitchAllocator() {} + + void* allocate(size_t n) override { + return working_ ? upstream_->allocate(n) : 0; + } + + void deallocate(void* p) override { + upstream_->deallocate(p); + } + + void* reallocate(void* ptr, size_t n) override { + return working_ ? upstream_->reallocate(ptr, n) : 0; + } + + // Turn the killswitch on, so all allocation fail + void on() { + working_ = false; + } + + private: + bool working_; + Allocator* upstream_; +}; + +class TimebombAllocator : public ArduinoJson::Allocator { + public: + TimebombAllocator( + size_t initialCountdown, + Allocator* upstream = ArduinoJson::detail::DefaultAllocator::instance()) + : countdown_(initialCountdown), upstream_(upstream) {} + virtual ~TimebombAllocator() {} + + void* allocate(size_t n) override { + if (!countdown_) + return nullptr; + countdown_--; + return upstream_->allocate(n); + } + + void deallocate(void* p) override { + upstream_->deallocate(p); + } + + void* reallocate(void* ptr, size_t n) override { + if (!countdown_) + return nullptr; + countdown_--; + return upstream_->reallocate(ptr, n); + } + + void setCountdown(size_t value) { + countdown_ = value; + } + + private: + size_t countdown_ = 0; + Allocator* upstream_; +}; +} // namespace + +inline size_t sizeofPoolList(size_t n = ARDUINOJSON_INITIAL_POOL_COUNT) { + using namespace ArduinoJson::detail; + return sizeof(MemoryPool) * n; +} + +inline size_t sizeofPool( + ArduinoJson::detail::SlotCount n = ARDUINOJSON_POOL_CAPACITY) { + using namespace ArduinoJson::detail; + return MemoryPool::slotsToBytes(n); +} + +inline size_t sizeofStringBuffer(size_t iteration = 1) { + // returns 31, 63, 127, 255, etc. + auto capacity = ArduinoJson::detail::StringBuilder::initialCapacity; + for (size_t i = 1; i < iteration; i++) + capacity = capacity * 2 + 1; + return ArduinoJson::detail::sizeofString(capacity); +} + +inline size_t sizeofString(const char* s) { + return ArduinoJson::detail::sizeofString(strlen(s)); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Arduino.h b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Arduino.h new file mode 100644 index 0000000..d12f872 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Arduino.h @@ -0,0 +1,13 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#pragma once + +#include "api/Print.h" +#include "api/Stream.h" +#include "api/String.h" +#include "avr/pgmspace.h" + +#define ARDUINO +#define ARDUINO_H_INCLUDED 1 diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/CustomReader.hpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/CustomReader.hpp new file mode 100644 index 0000000..76a5138 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/CustomReader.hpp @@ -0,0 +1,24 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#pragma once + +#include + +class CustomReader { + std::stringstream stream_; + + public: + CustomReader(const char* input) : stream_(input) {} + CustomReader(const CustomReader&) = delete; + + int read() { + return stream_.get(); + } + + size_t readBytes(char* buffer, size_t length) { + stream_.read(buffer, static_cast(length)); + return static_cast(stream_.gcount()); + } +}; diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Literals.hpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Literals.hpp new file mode 100644 index 0000000..07c079d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/Literals.hpp @@ -0,0 +1,12 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#pragma once + +#include + +// the space before _s is required by GCC 4.8 +inline std::string operator"" _s(const char* str, size_t len) { + return std::string(str, len); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/Print.h b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/Print.h new file mode 100644 index 0000000..cdf05bb --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/Print.h @@ -0,0 +1,33 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#pragma once + +#include +#include +#include + +class Print { + public: + virtual ~Print() {} + + virtual size_t write(uint8_t) = 0; + virtual size_t write(const uint8_t* buffer, size_t size) = 0; + + size_t write(const char* str) { + if (!str) + return 0; + return write(reinterpret_cast(str), strlen(str)); + } + + size_t write(const char* buffer, size_t size) { + return write(reinterpret_cast(buffer), size); + } +}; + +class Printable { + public: + virtual ~Printable() {} + virtual size_t printTo(Print& p) const = 0; +}; diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/Stream.h b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/Stream.h new file mode 100644 index 0000000..64b9eaf --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/Stream.h @@ -0,0 +1,14 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#pragma once + +// Reproduces Arduino's Stream class +class Stream // : public Print +{ + public: + virtual ~Stream() {} + virtual int read() = 0; + virtual size_t readBytes(char* buffer, size_t length) = 0; +}; diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/String.h b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/String.h new file mode 100644 index 0000000..1841610 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/api/String.h @@ -0,0 +1,75 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#pragma once + +#include + +// Reproduces Arduino's String class +class String { + public: + String() = default; + String(const char* s) { + if (s) + str_.assign(s); + } + + void limitCapacityTo(size_t maxCapacity) { + maxCapacity_ = maxCapacity; + } + + unsigned char concat(const char* s) { + return concat(s, strlen(s)); + } + + size_t length() const { + return str_.size(); + } + + const char* c_str() const { + return str_.c_str(); + } + + bool operator==(const char* s) const { + return str_ == s; + } + + String& operator=(const char* s) { + if (s) + str_.assign(s); + else + str_.clear(); + return *this; + } + + char operator[](unsigned int index) const { + if (index >= str_.size()) + return 0; + return str_[index]; + } + + friend std::ostream& operator<<(std::ostream& lhs, const ::String& rhs) { + lhs << rhs.str_; + return lhs; + } + + protected: + // This function is protected in most Arduino cores + unsigned char concat(const char* s, size_t n) { + if (str_.size() + n > maxCapacity_) + return 0; + str_.append(s, n); + return 1; + } + + private: + std::string str_; + size_t maxCapacity_ = 1024; +}; + +class StringSumHelper : public ::String {}; + +inline bool operator==(const std::string& lhs, const ::String& rhs) { + return lhs == rhs.c_str(); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/avr/pgmspace.h b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/avr/pgmspace.h new file mode 100644 index 0000000..8cbf44e --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Helpers/avr/pgmspace.h @@ -0,0 +1,31 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#pragma once + +#include // uint8_t + +#define PROGMEM + +class __FlashStringHelper; + +inline const void* convertPtrToFlash(const void* s) { + return reinterpret_cast(s) + 42; +} + +inline const void* convertFlashToPtr(const void* s) { + return reinterpret_cast(s) - 42; +} + +#define PSTR(X) reinterpret_cast(convertPtrToFlash(X)) +#define F(X) reinterpret_cast(PSTR(X)) + +inline uint8_t pgm_read_byte(const void* p) { + return *reinterpret_cast(convertFlashToPtr(p)); +} + +#define ARDUINOJSON_DEFINE_PROGMEM_ARRAY(type, name, ...) \ + static type const ARDUINOJSON_CONCAT2(name, _progmem)[] = __VA_ARGS__; \ + static type const* name = reinterpret_cast( \ + convertPtrToFlash(ARDUINOJSON_CONCAT2(name, _progmem))); diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt new file mode 100644 index 0000000..d3e4004 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt @@ -0,0 +1,24 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(IntegrationTests + gbathree.cpp + issue772.cpp + round_trip.cpp + openweathermap.cpp +) + +if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6) + target_compile_options(IntegrationTests + PUBLIC + -fsingle-precision-constant # issue 544 + ) +endif() + +add_test(IntegrationTests IntegrationTests) + +set_tests_properties(IntegrationTests + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp new file mode 100644 index 0000000..fead9ff --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp @@ -0,0 +1,210 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("Gbathree") { + JsonDocument doc; + + DeserializationError error = deserializeJson( + doc, + "{\"protocol_name\":\"fluorescence\",\"repeats\":1,\"wait\":0," + "\"averages\":1,\"measurements\":3,\"meas2_light\":15,\"meas1_" + "baseline\":0,\"act_light\":20,\"pulsesize\":25,\"pulsedistance\":" + "10000,\"actintensity1\":50,\"actintensity2\":255,\"measintensity\":" + "255,\"calintensity\":255,\"pulses\":[50,50,50],\"act\":[2,1,2,2]," + "\"red\":[2,2,2,2],\"detectors\":[[34,34,34,34],[34,34,34,34],[34," + "34,34,34],[34,34,34,34]],\"alta\":[2,2,2,2],\"altb\":[2,2,2,2]," + "\"measlights\":[[15,15,15,15],[15,15,15,15],[15,15,15,15],[15,15," + "15,15]],\"measlights2\":[[15,15,15,15],[15,15,15,15],[15,15,15,15]," + "[15,15,15,15]],\"altc\":[2,2,2,2],\"altd\":[2,2,2,2]}"); + JsonObject root = doc.as(); + + SECTION("Success") { + REQUIRE(error == DeserializationError::Ok); + } + + SECTION("ProtocolName") { + REQUIRE("fluorescence" == root["protocol_name"]); + } + + SECTION("Repeats") { + REQUIRE(1 == root["repeats"]); + } + + SECTION("Wait") { + REQUIRE(0 == root["wait"]); + } + + SECTION("Measurements") { + REQUIRE(3 == root["measurements"]); + } + + SECTION("Meas2_Light") { + REQUIRE(15 == root["meas2_light"]); + } + + SECTION("Meas1_Baseline") { + REQUIRE(0 == root["meas1_baseline"]); + } + + SECTION("Act_Light") { + REQUIRE(20 == root["act_light"]); + } + + SECTION("Pulsesize") { + REQUIRE(25 == root["pulsesize"]); + } + + SECTION("Pulsedistance") { + REQUIRE(10000 == root["pulsedistance"]); + } + + SECTION("Actintensity1") { + REQUIRE(50 == root["actintensity1"]); + } + + SECTION("Actintensity2") { + REQUIRE(255 == root["actintensity2"]); + } + + SECTION("Measintensity") { + REQUIRE(255 == root["measintensity"]); + } + + SECTION("Calintensity") { + REQUIRE(255 == root["calintensity"]); + } + + SECTION("Pulses") { + // "pulses":[50,50,50] + + JsonArray array = root["pulses"]; + REQUIRE(array.isNull() == false); + + REQUIRE(3 == array.size()); + + for (size_t i = 0; i < 3; i++) { + REQUIRE(50 == array[i]); + } + } + + SECTION("Act") { + // "act":[2,1,2,2] + + JsonArray array = root["act"]; + REQUIRE(array.isNull() == false); + + REQUIRE(4 == array.size()); + REQUIRE(2 == array[0]); + REQUIRE(1 == array[1]); + REQUIRE(2 == array[2]); + REQUIRE(2 == array[3]); + } + + SECTION("Detectors") { + // "detectors":[[34,34,34,34],[34,34,34,34],[34,34,34,34],[34,34,34,34]] + + JsonArray array = root["detectors"]; + REQUIRE(array.isNull() == false); + REQUIRE(4 == array.size()); + + for (size_t i = 0; i < 4; i++) { + JsonArray nestedArray = array[i]; + REQUIRE(4 == nestedArray.size()); + + for (size_t j = 0; j < 4; j++) { + REQUIRE(34 == nestedArray[j]); + } + } + } + + SECTION("Alta") { + // alta:[2,2,2,2] + + JsonArray array = root["alta"]; + REQUIRE(array.isNull() == false); + + REQUIRE(4 == array.size()); + + for (size_t i = 0; i < 4; i++) { + REQUIRE(2 == array[i]); + } + } + + SECTION("Altb") { + // altb:[2,2,2,2] + + JsonArray array = root["altb"]; + REQUIRE(array.isNull() == false); + + REQUIRE(4 == array.size()); + + for (size_t i = 0; i < 4; i++) { + REQUIRE(2 == array[i]); + } + } + + SECTION("Measlights") { + // "measlights":[[15,15,15,15],[15,15,15,15],[15,15,15,15],[15,15,15,15]] + + JsonArray array = root["measlights"]; + REQUIRE(array.isNull() == false); + REQUIRE(4 == array.size()); + + for (size_t i = 0; i < 4; i++) { + JsonArray nestedArray = array[i]; + + REQUIRE(4 == nestedArray.size()); + + for (size_t j = 0; j < 4; j++) { + REQUIRE(15 == nestedArray[j]); + } + } + } + + SECTION("Measlights2") { + // "measlights2":[[15,15,15,15],[15,15,15,15],[15,15,15,15],[15,15,15,15]] + + JsonArray array = root["measlights2"]; + REQUIRE(array.isNull() == false); + REQUIRE(4 == array.size()); + + for (size_t i = 0; i < 4; i++) { + JsonArray nestedArray = array[i]; + REQUIRE(4 == nestedArray.size()); + + for (size_t j = 0; j < 4; j++) { + REQUIRE(15 == nestedArray[j]); + } + } + } + + SECTION("Altc") { + // altc:[2,2,2,2] + + JsonArray array = root["altc"]; + REQUIRE(array.isNull() == false); + + REQUIRE(4 == array.size()); + + for (size_t i = 0; i < 4; i++) { + REQUIRE(2 == array[i]); + } + } + + SECTION("Altd") { + // altd:[2,2,2,2] + + JsonArray array = root["altd"]; + REQUIRE(array.isNull() == false); + + REQUIRE(4 == array.size()); + + for (size_t i = 0; i < 4; i++) { + REQUIRE(2 == array[i]); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp new file mode 100644 index 0000000..e81cf40 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp @@ -0,0 +1,28 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +// https://github.com/bblanchon/ArduinoJson/issues/772 + +TEST_CASE("Issue772") { + JsonDocument doc1; + JsonDocument doc2; + DeserializationError err; + std::string data = + "{\"state\":{\"reported\":{\"timestamp\":\"2018-07-02T09:40:12Z\"," + "\"mac\":\"2C3AE84FC076\",\"firmwareVersion\":\"v0.2.7-5-gf4d4d78\"," + "\"visibleLight\":261,\"infraRed\":255,\"ultraViolet\":0.02," + "\"Temperature\":26.63,\"Pressure\":101145.7,\"Humidity\":54.79883," + "\"Vbat\":4.171261,\"soilMoisture\":0,\"ActB\":0}}}"; + err = deserializeJson(doc1, data); + REQUIRE(err == DeserializationError::Ok); + + data = ""; + serializeMsgPack(doc1, data); + err = deserializeMsgPack(doc2, data); + + REQUIRE(err == DeserializationError::Ok); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/openweathermap.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/openweathermap.cpp new file mode 100644 index 0000000..34dbba2 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/openweathermap.cpp @@ -0,0 +1,68 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("OpenWeatherMap") { + // clang-format off + const char* input_json = "{\"cod\":\"200\",\"message\":0,\"cnt\":40,\"list\":[{\"dt\":1581498000,\"main\":{\"temp\":3.23,\"feels_like\":-3.63,\"temp_min\":3.23,\"temp_max\":4.62,\"pressure\":1014,\"sea_level\":1014,\"grnd_level\":1010,\"humidity\":58,\"temp_kf\":-1.39},\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":0},\"wind\":{\"speed\":6.19,\"deg\":266},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 09:00:00\"},{\"dt\":1581508800,\"main\":{\"temp\":6.09,\"feels_like\":-1.07,\"temp_min\":6.09,\"temp_max\":7.13,\"pressure\":1015,\"sea_level\":1015,\"grnd_level\":1011,\"humidity\":48,\"temp_kf\":-1.04},\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":9},\"wind\":{\"speed\":6.64,\"deg\":268},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 12:00:00\"},{\"dt\":1581519600,\"main\":{\"temp\":6.82,\"feels_like\":0.47,\"temp_min\":6.82,\"temp_max\":7.52,\"pressure\":1015,\"sea_level\":1015,\"grnd_level\":1011,\"humidity\":47,\"temp_kf\":-0.7},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04d\"}],\"clouds\":{\"all\":97},\"wind\":{\"speed\":5.55,\"deg\":267},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 15:00:00\"},{\"dt\":1581530400,\"main\":{\"temp\":5.76,\"feels_like\":1.84,\"temp_min\":5.76,\"temp_max\":6.11,\"pressure\":1015,\"sea_level\":1015,\"grnd_level\":1010,\"humidity\":57,\"temp_kf\":-0.35},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":99},\"wind\":{\"speed\":2.35,\"deg\":232},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-12 18:00:00\"},{\"dt\":1581541200,\"main\":{\"temp\":5.7,\"feels_like\":1.34,\"temp_min\":5.7,\"temp_max\":5.7,\"pressure\":1012,\"sea_level\":1012,\"grnd_level\":1008,\"humidity\":71,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":3.57,\"deg\":198},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-12 21:00:00\"},{\"dt\":1581552000,\"main\":{\"temp\":5.82,\"feels_like\":1.39,\"temp_min\":5.82,\"temp_max\":5.82,\"pressure\":1009,\"sea_level\":1009,\"grnd_level\":1004,\"humidity\":86,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":4.35,\"deg\":169},\"rain\":{\"3h\":0.5},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-13 00:00:00\"},{\"dt\":1581562800,\"main\":{\"temp\":5.9,\"feels_like\":-0.85,\"temp_min\":5.9,\"temp_max\":5.9,\"pressure\":1000,\"sea_level\":1000,\"grnd_level\":997,\"humidity\":86,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":7.69,\"deg\":178},\"rain\":{\"3h\":1.75},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-13 03:00:00\"},{\"dt\":1581573600,\"main\":{\"temp\":7.52,\"feels_like\":1.74,\"temp_min\":7.52,\"temp_max\":7.52,\"pressure\":993,\"sea_level\":993,\"grnd_level\":988,\"humidity\":88,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":6.84,\"deg\":184},\"rain\":{\"3h\":7.06},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-13 06:00:00\"},{\"dt\":1581584400,\"main\":{\"temp\":7.23,\"feels_like\":0.81,\"temp_min\":7.23,\"temp_max\":7.23,\"pressure\":992,\"sea_level\":992,\"grnd_level\":988,\"humidity\":69,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":49},\"wind\":{\"speed\":6.77,\"deg\":239},\"rain\":{\"3h\":0.25},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-13 09:00:00\"},{\"dt\":1581595200,\"main\":{\"temp\":7.67,\"feels_like\":2.81,\"temp_min\":7.67,\"temp_max\":7.67,\"pressure\":991,\"sea_level\":991,\"grnd_level\":987,\"humidity\":75,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":73},\"wind\":{\"speed\":4.93,\"deg\":235},\"rain\":{\"3h\":0.75},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-13 12:00:00\"},{\"dt\":1581606000,\"main\":{\"temp\":8.83,\"feels_like\":3.23,\"temp_min\":8.83,\"temp_max\":8.83,\"pressure\":993,\"sea_level\":993,\"grnd_level\":990,\"humidity\":64,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":83},\"wind\":{\"speed\":5.7,\"deg\":293},\"rain\":{\"3h\":0.38},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-13 15:00:00\"},{\"dt\":1581616800,\"main\":{\"temp\":7.42,\"feels_like\":1.77,\"temp_min\":7.42,\"temp_max\":7.42,\"pressure\":1000,\"sea_level\":1000,\"grnd_level\":996,\"humidity\":71,\"temp_kf\":0},\"weather\":[{\"id\":803,\"main\":\"Clouds\",\"description\":\"broken clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":54},\"wind\":{\"speed\":5.81,\"deg\":307},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-13 18:00:00\"},{\"dt\":1581627600,\"main\":{\"temp\":5.82,\"feels_like\":0.89,\"temp_min\":5.82,\"temp_max\":5.82,\"pressure\":1007,\"sea_level\":1007,\"grnd_level\":1003,\"humidity\":79,\"temp_kf\":0},\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear sky\",\"icon\":\"01n\"}],\"clouds\":{\"all\":6},\"wind\":{\"speed\":4.76,\"deg\":300},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-13 21:00:00\"},{\"dt\":1581638400,\"main\":{\"temp\":5.58,\"feels_like\":2.09,\"temp_min\":5.58,\"temp_max\":5.58,\"pressure\":1011,\"sea_level\":1011,\"grnd_level\":1007,\"humidity\":81,\"temp_kf\":0},\"weather\":[{\"id\":802,\"main\":\"Clouds\",\"description\":\"scattered clouds\",\"icon\":\"03n\"}],\"clouds\":{\"all\":47},\"wind\":{\"speed\":2.73,\"deg\":326},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-14 00:00:00\"},{\"dt\":1581649200,\"main\":{\"temp\":4.27,\"feels_like\":1.72,\"temp_min\":4.27,\"temp_max\":4.27,\"pressure\":1014,\"sea_level\":1014,\"grnd_level\":1010,\"humidity\":85,\"temp_kf\":0},\"weather\":[{\"id\":803,\"main\":\"Clouds\",\"description\":\"broken clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":69},\"wind\":{\"speed\":1.24,\"deg\":295},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-14 03:00:00\"},{\"dt\":1581660000,\"main\":{\"temp\":3.91,\"feels_like\":1.54,\"temp_min\":3.91,\"temp_max\":3.91,\"pressure\":1016,\"sea_level\":1016,\"grnd_level\":1012,\"humidity\":87,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":85},\"wind\":{\"speed\":0.98,\"deg\":211},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-14 06:00:00\"},{\"dt\":1581670800,\"main\":{\"temp\":4.77,\"feels_like\":0.74,\"temp_min\":4.77,\"temp_max\":4.77,\"pressure\":1017,\"sea_level\":1017,\"grnd_level\":1013,\"humidity\":78,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":3.19,\"deg\":184},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-14 09:00:00\"},{\"dt\":1581681600,\"main\":{\"temp\":9.03,\"feels_like\":4,\"temp_min\":9.03,\"temp_max\":9.03,\"pressure\":1016,\"sea_level\":1016,\"grnd_level\":1012,\"humidity\":73,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":5.43,\"deg\":206},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-14 12:00:00\"},{\"dt\":1581692400,\"main\":{\"temp\":9.86,\"feels_like\":4.22,\"temp_min\":9.86,\"temp_max\":9.86,\"pressure\":1014,\"sea_level\":1014,\"grnd_level\":1010,\"humidity\":74,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":6.58,\"deg\":209},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-14 15:00:00\"},{\"dt\":1581703200,\"main\":{\"temp\":9.48,\"feels_like\":4.8,\"temp_min\":9.48,\"temp_max\":9.48,\"pressure\":1013,\"sea_level\":1013,\"grnd_level\":1009,\"humidity\":83,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":5.6,\"deg\":206},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-14 18:00:00\"},{\"dt\":1581714000,\"main\":{\"temp\":10.03,\"feels_like\":6.48,\"temp_min\":10.03,\"temp_max\":10.03,\"pressure\":1013,\"sea_level\":1013,\"grnd_level\":1009,\"humidity\":93,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":4.75,\"deg\":226},\"rain\":{\"3h\":3.13},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-14 21:00:00\"},{\"dt\":1581724800,\"main\":{\"temp\":9.48,\"feels_like\":6.25,\"temp_min\":9.48,\"temp_max\":9.48,\"pressure\":1013,\"sea_level\":1013,\"grnd_level\":1009,\"humidity\":89,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":3.87,\"deg\":214},\"rain\":{\"3h\":2.38},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-15 00:00:00\"},{\"dt\":1581735600,\"main\":{\"temp\":9.12,\"feels_like\":7.08,\"temp_min\":9.12,\"temp_max\":9.12,\"pressure\":1011,\"sea_level\":1011,\"grnd_level\":1007,\"humidity\":96,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":2.43,\"deg\":194},\"rain\":{\"3h\":1},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-15 03:00:00\"},{\"dt\":1581746400,\"main\":{\"temp\":10.32,\"feels_like\":6.71,\"temp_min\":10.32,\"temp_max\":10.32,\"pressure\":1009,\"sea_level\":1009,\"grnd_level\":1004,\"humidity\":95,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":5.05,\"deg\":196},\"rain\":{\"3h\":1.75},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-15 06:00:00\"},{\"dt\":1581757200,\"main\":{\"temp\":11.57,\"feels_like\":5.85,\"temp_min\":11.57,\"temp_max\":11.57,\"pressure\":1006,\"sea_level\":1006,\"grnd_level\":1002,\"humidity\":85,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":7.91,\"deg\":205},\"rain\":{\"3h\":1.44},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-15 09:00:00\"},{\"dt\":1581768000,\"main\":{\"temp\":12.25,\"feels_like\":4.46,\"temp_min\":12.25,\"temp_max\":12.25,\"pressure\":1003,\"sea_level\":1003,\"grnd_level\":998,\"humidity\":78,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":10.65,\"deg\":201},\"rain\":{\"3h\":1.81},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-15 12:00:00\"},{\"dt\":1581778800,\"main\":{\"temp\":12.19,\"feels_like\":3.17,\"temp_min\":12.19,\"temp_max\":12.19,\"pressure\":998,\"sea_level\":998,\"grnd_level\":994,\"humidity\":80,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":12.52,\"deg\":204},\"rain\":{\"3h\":3.5},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-15 15:00:00\"},{\"dt\":1581789600,\"main\":{\"temp\":12.25,\"feels_like\":4.15,\"temp_min\":12.25,\"temp_max\":12.25,\"pressure\":996,\"sea_level\":996,\"grnd_level\":992,\"humidity\":83,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":11.42,\"deg\":215},\"rain\":{\"3h\":4.88},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-15 18:00:00\"},{\"dt\":1581800400,\"main\":{\"temp\":12.64,\"feels_like\":5.85,\"temp_min\":12.64,\"temp_max\":12.64,\"pressure\":994,\"sea_level\":994,\"grnd_level\":990,\"humidity\":76,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":9.22,\"deg\":217},\"rain\":{\"3h\":6.88},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-15 21:00:00\"},{\"dt\":1581811200,\"main\":{\"temp\":12.96,\"feels_like\":4.03,\"temp_min\":12.96,\"temp_max\":12.96,\"pressure\":988,\"sea_level\":988,\"grnd_level\":984,\"humidity\":83,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":12.88,\"deg\":211},\"rain\":{\"3h\":5.63},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-16 00:00:00\"},{\"dt\":1581822000,\"main\":{\"temp\":13.13,\"feels_like\":5.17,\"temp_min\":13.13,\"temp_max\":13.13,\"pressure\":987,\"sea_level\":987,\"grnd_level\":982,\"humidity\":82,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":11.49,\"deg\":246},\"rain\":{\"3h\":7.25},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-16 03:00:00\"},{\"dt\":1581832800,\"main\":{\"temp\":9.07,\"feels_like\":0.79,\"temp_min\":9.07,\"temp_max\":9.07,\"pressure\":990,\"sea_level\":990,\"grnd_level\":986,\"humidity\":75,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":10.18,\"deg\":255},\"rain\":{\"3h\":2},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-16 06:00:00\"},{\"dt\":1581843600,\"main\":{\"temp\":8.05,\"feels_like\":-0.9,\"temp_min\":8.05,\"temp_max\":8.05,\"pressure\":994,\"sea_level\":994,\"grnd_level\":990,\"humidity\":51,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":9.65,\"deg\":245},\"rain\":{\"3h\":1.19},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-16 09:00:00\"},{\"dt\":1581854400,\"main\":{\"temp\":9.54,\"feels_like\":0.13,\"temp_min\":9.54,\"temp_max\":9.54,\"pressure\":996,\"sea_level\":996,\"grnd_level\":991,\"humidity\":41,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04d\"}],\"clouds\":{\"all\":94},\"wind\":{\"speed\":10.03,\"deg\":243},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-16 12:00:00\"},{\"dt\":1581865200,\"main\":{\"temp\":9.08,\"feels_like\":-0.35,\"temp_min\":9.08,\"temp_max\":9.08,\"pressure\":996,\"sea_level\":996,\"grnd_level\":991,\"humidity\":44,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":89},\"wind\":{\"speed\":10.15,\"deg\":246},\"rain\":{\"3h\":0.25},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-16 15:00:00\"},{\"dt\":1581876000,\"main\":{\"temp\":7.41,\"feels_like\":-1.34,\"temp_min\":7.41,\"temp_max\":7.41,\"pressure\":996,\"sea_level\":996,\"grnd_level\":992,\"humidity\":50,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":94},\"wind\":{\"speed\":9.21,\"deg\":240},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-16 18:00:00\"},{\"dt\":1581886800,\"main\":{\"temp\":6.42,\"feels_like\":-1.7,\"temp_min\":6.42,\"temp_max\":6.42,\"pressure\":997,\"sea_level\":997,\"grnd_level\":993,\"humidity\":58,\"temp_kf\":0},\"weather\":[{\"id\":803,\"main\":\"Clouds\",\"description\":\"broken clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":67},\"wind\":{\"speed\":8.52,\"deg\":236},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-16 21:00:00\"},{\"dt\":1581897600,\"main\":{\"temp\":6.03,\"feels_like\":-2.65,\"temp_min\":6.03,\"temp_max\":6.03,\"pressure\":996,\"sea_level\":996,\"grnd_level\":993,\"humidity\":51,\"temp_kf\":0},\"weather\":[{\"id\":802,\"main\":\"Clouds\",\"description\":\"scattered clouds\",\"icon\":\"03n\"}],\"clouds\":{\"all\":38},\"wind\":{\"speed\":8.94,\"deg\":240},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-17 00:00:00\"},{\"dt\":1581908400,\"main\":{\"temp\":5.62,\"feels_like\":-2.86,\"temp_min\":5.62,\"temp_max\":5.62,\"pressure\":995,\"sea_level\":995,\"grnd_level\":991,\"humidity\":53,\"temp_kf\":0},\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear sky\",\"icon\":\"01n\"}],\"clouds\":{\"all\":0},\"wind\":{\"speed\":8.67,\"deg\":241},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-17 03:00:00\"},{\"dt\":1581919200,\"main\":{\"temp\":5.51,\"feels_like\":-2.41,\"temp_min\":5.51,\"temp_max\":5.51,\"pressure\":995,\"sea_level\":995,\"grnd_level\":991,\"humidity\":61,\"temp_kf\":0},\"weather\":[{\"id\":802,\"main\":\"Clouds\",\"description\":\"scattered clouds\",\"icon\":\"03n\"}],\"clouds\":{\"all\":35},\"wind\":{\"speed\":8.2,\"deg\":244},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-17 06:00:00\"}],\"city\":{\"id\":2643743,\"name\":\"London\",\"coord\":{\"lat\":51.5085,\"lon\":-0.1257},\"country\":\"GB\",\"population\":1000000,\"timezone\":0,\"sunrise\":1581492085,\"sunset\":1581527294}}"; + + const char* expected_json = "{\"list\":[" + "{\"dt\":1581498000,\"main\":{\"temp\":3.23},\"weather\":[{\"description\":\"clear sky\"}]}," + "{\"dt\":1581508800,\"main\":{\"temp\":6.09},\"weather\":[{\"description\":\"clear sky\"}]}," + "{\"dt\":1581519600,\"main\":{\"temp\":6.82},\"weather\":[{\"description\":\"overcast clouds\"}]}," + "{\"dt\":1581530400,\"main\":{\"temp\":5.76},\"weather\":[{\"description\":\"overcast clouds\"}]}," + "{\"dt\":1581541200,\"main\":{\"temp\":5.7},\"weather\":[{\"description\":\"overcast clouds\"}]}," + "{\"dt\":1581552000,\"main\":{\"temp\":5.82},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581562800,\"main\":{\"temp\":5.9},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581573600,\"main\":{\"temp\":7.52},\"weather\":[{\"description\":\"moderate rain\"}]}," + "{\"dt\":1581584400,\"main\":{\"temp\":7.23},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581595200,\"main\":{\"temp\":7.67},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581606000,\"main\":{\"temp\":8.83},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581616800,\"main\":{\"temp\":7.42},\"weather\":[{\"description\":\"broken clouds\"}]}," + "{\"dt\":1581627600,\"main\":{\"temp\":5.82},\"weather\":[{\"description\":\"clear sky\"}]}," + "{\"dt\":1581638400,\"main\":{\"temp\":5.58},\"weather\":[{\"description\":\"scattered clouds\"}]}," + "{\"dt\":1581649200,\"main\":{\"temp\":4.27},\"weather\":[{\"description\":\"broken clouds\"}]}," + "{\"dt\":1581660000,\"main\":{\"temp\":3.91},\"weather\":[{\"description\":\"overcast clouds\"}]}," + "{\"dt\":1581670800,\"main\":{\"temp\":4.77},\"weather\":[{\"description\":\"overcast clouds\"}]}," + "{\"dt\":1581681600,\"main\":{\"temp\":9.03},\"weather\":[{\"description\":\"overcast clouds\"}]}," + "{\"dt\":1581692400,\"main\":{\"temp\":9.86},\"weather\":[{\"description\":\"overcast clouds\"}]}," + "{\"dt\":1581703200,\"main\":{\"temp\":9.48},\"weather\":[{\"description\":\"overcast clouds\"}]}," + "{\"dt\":1581714000,\"main\":{\"temp\":10.03},\"weather\":[{\"description\":\"moderate rain\"}]}," + "{\"dt\":1581724800,\"main\":{\"temp\":9.48},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581735600,\"main\":{\"temp\":9.12},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581746400,\"main\":{\"temp\":10.32},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581757200,\"main\":{\"temp\":11.57},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581768000,\"main\":{\"temp\":12.25},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581778800,\"main\":{\"temp\":12.19},\"weather\":[{\"description\":\"moderate rain\"}]}," + "{\"dt\":1581789600,\"main\":{\"temp\":12.25},\"weather\":[{\"description\":\"moderate rain\"}]}," + "{\"dt\":1581800400,\"main\":{\"temp\":12.64},\"weather\":[{\"description\":\"moderate rain\"}]}," + "{\"dt\":1581811200,\"main\":{\"temp\":12.96},\"weather\":[{\"description\":\"moderate rain\"}]}," + "{\"dt\":1581822000,\"main\":{\"temp\":13.13},\"weather\":[{\"description\":\"moderate rain\"}]}," + "{\"dt\":1581832800,\"main\":{\"temp\":9.07},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581843600,\"main\":{\"temp\":8.05},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581854400,\"main\":{\"temp\":9.54},\"weather\":[{\"description\":\"overcast clouds\"}]}," + "{\"dt\":1581865200,\"main\":{\"temp\":9.08},\"weather\":[{\"description\":\"light rain\"}]}," + "{\"dt\":1581876000,\"main\":{\"temp\":7.41},\"weather\":[{\"description\":\"overcast clouds\"}]}," + "{\"dt\":1581886800,\"main\":{\"temp\":6.42},\"weather\":[{\"description\":\"broken clouds\"}]}," + "{\"dt\":1581897600,\"main\":{\"temp\":6.03},\"weather\":[{\"description\":\"scattered clouds\"}]}," + "{\"dt\":1581908400,\"main\":{\"temp\":5.62},\"weather\":[{\"description\":\"clear sky\"}]}," + "{\"dt\":1581919200,\"main\":{\"temp\":5.51},\"weather\":[{\"description\":\"scattered clouds\"}]}" + "]}"; + // clang-format on + + JsonDocument filter; + filter["list"][0]["dt"] = true; + filter["list"][0]["main"]["temp"] = true; + filter["list"][0]["weather"][0]["description"] = true; + + JsonDocument doc; + + REQUIRE( + deserializeJson(doc, input_json, DeserializationOption::Filter(filter)) == + DeserializationError::Ok); + + REQUIRE(doc.as() == expected_json); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp new file mode 100644 index 0000000..54bd6f4 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp @@ -0,0 +1,82 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +void check(std::string originalJson) { + JsonDocument doc; + + std::string prettyJson; + deserializeJson(doc, originalJson); + serializeJsonPretty(doc, prettyJson); + + std::string finalJson; + deserializeJson(doc, originalJson); + serializeJson(doc, finalJson); + + REQUIRE(originalJson == finalJson); +} + +TEST_CASE("Round Trip: parse -> prettyPrint -> parse -> print") { + SECTION("OpenWeatherMap") { + check( + "{\"coord\":{\"lon\":145.77,\"lat\":-16.92},\"sys\":{\"type\":1,\"id\":" + "8166,\"message\":0.1222,\"country\":\"AU\",\"sunrise\":1414784325," + "\"sunset\":1414830137},\"weather\":[{\"id\":801,\"main\":\"Clouds\"," + "\"description\":\"few clouds\",\"icon\":\"02n\"}],\"base\":\"cmc " + "stations\",\"main\":{\"temp\":296.15,\"pressure\":1014,\"humidity\":" + "83,\"temp_min\":296.15,\"temp_max\":296.15},\"wind\":{\"speed\":2.22," + "\"deg\":114.501},\"clouds\":{\"all\":20},\"dt\":1414846800,\"id\":" + "2172797,\"name\":\"Cairns\",\"cod\":200}"); + } + + SECTION("YahooQueryLanguage") { + check( + "{\"query\":{\"count\":40,\"created\":\"2014-11-01T14:16:49Z\"," + "\"lang\":\"fr-FR\",\"results\":{\"item\":[{\"title\":\"Burkina army " + "backs Zida as interim leader\"},{\"title\":\"British jets intercept " + "Russian bombers\"},{\"title\":\"Doubts chip away at nation's most " + "trusted agencies\"},{\"title\":\"Cruise ship stuck off Norway, no " + "damage\"},{\"title\":\"U.S. military launches 10 air strikes in " + "Syria, Iraq\"},{\"title\":\"Blackout hits Bangladesh as line from " + "India fails\"},{\"title\":\"Burkina Faso president in Ivory Coast " + "after ouster\"},{\"title\":\"Kurds in Turkey rally to back city " + "besieged by IS\"},{\"title\":\"A majority of Scots would vote for " + "independence now:poll\"},{\"title\":\"Tunisia elections possible " + "model for region\"},{\"title\":\"Islamic State kills 85 more members " + "of Iraqi tribe\"},{\"title\":\"Iraqi officials:IS extremists line " + "up, kill 50\"},{\"title\":\"Burkina Faso army backs presidential " + "guard official to lead transition\"},{\"title\":\"Kurdish peshmerga " + "arrive with weapons in Syria's Kobani\"},{\"title\":\"Driver sought " + "in crash that killed 3 on Halloween\"},{\"title\":\"Ex-Marine arrives " + "in US after release from Mexico jail\"},{\"title\":\"UN panel " + "scrambling to finish climate report\"},{\"title\":\"Investigators, " + "Branson go to spacecraft crash site\"},{\"title\":\"Soldiers vie for " + "power after Burkina Faso president quits\"},{\"title\":\"For a man " + "without a party, turnout is big test\"},{\"title\":\"'We just had a " + "hunch':US marshals nab Eric Frein\"},{\"title\":\"Boko Haram leader " + "threatens to kill German hostage\"},{\"title\":\"Nurse free to move " + "about as restrictions eased\"},{\"title\":\"Former Burkina president " + "Compaore arrives in Ivory Coast:sources\"},{\"title\":\"Libyan port " + "rebel leader refuses to hand over oil ports to rival " + "group\"},{\"title\":\"Iraqi peshmerga fighters prepare for Syria " + "battle\"},{\"title\":\"1 Dem Senate candidate welcoming Obama's " + "help\"},{\"title\":\"Bikers cancel party after police recover " + "bar\"},{\"title\":\"New question in Texas:Can Davis survive " + "defeat?\"},{\"title\":\"Ukraine rebels to hold election, despite " + "criticism\"},{\"title\":\"Iraqi officials say Islamic State group " + "lines up, kills 50 tribesmen, women in Anbar " + "province\"},{\"title\":\"James rebounds, leads Cavaliers past " + "Bulls\"},{\"title\":\"UK warns travelers they could be terror " + "targets\"},{\"title\":\"Hello Kitty celebrates 40th " + "birthday\"},{\"title\":\"A look at people killed during space " + "missions\"},{\"title\":\"Nigeria's purported Boko Haram leader says " + "has 'married off' girls:AFP\"},{\"title\":\"Mexico orders immediate " + "release of Marine veteran\"},{\"title\":\"As election closes in, " + "Obama on center stage\"},{\"title\":\"Body of Zambian president " + "arrives home\"},{\"title\":\"South Africa arrests 2 Vietnamese for " + "poaching\"}]}}}"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt new file mode 100644 index 0000000..0b8a562 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt @@ -0,0 +1,25 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(JsonArrayTests + add.cpp + clear.cpp + compare.cpp + copyArray.cpp + equals.cpp + isNull.cpp + iterator.cpp + nesting.cpp + remove.cpp + size.cpp + subscript.cpp + unbound.cpp +) + +add_test(JsonArray JsonArrayTests) + +set_tests_properties(JsonArray + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/add.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/add.cpp new file mode 100644 index 0000000..0983e3b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/add.cpp @@ -0,0 +1,262 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofArray; + +TEST_CASE("JsonArray::add(T)") { + SpyingAllocator spy; + JsonDocument doc(&spy); + JsonArray array = doc.to(); + + SECTION("int") { + array.add(123); + + REQUIRE(123 == array[0].as()); + REQUIRE(array[0].is()); + REQUIRE(array[0].is()); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("double") { + array.add(123.45); + + REQUIRE(123.45 == array[0].as()); + REQUIRE(array[0].is()); + REQUIRE_FALSE(array[0].is()); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("bool") { + array.add(true); + + REQUIRE(array[0].as() == true); + REQUIRE(array[0].is()); + REQUIRE_FALSE(array[0].is()); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("string literal") { + array.add("hello"); + + REQUIRE(array[0].as() == "hello"); + REQUIRE(array[0].is()); + REQUIRE(array[0].is() == false); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("std::string") { + array.add("hello"_s); + + REQUIRE(array[0].as() == "hello"); + REQUIRE(array[0].is() == true); + REQUIRE(array[0].is() == false); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } + + SECTION("const char*") { + const char* str = "hello"; + array.add(str); + + REQUIRE(array[0].as() == "hello"); + REQUIRE(array[0].as() != str); + REQUIRE(array[0].is() == true); + REQUIRE(array[0].is() == false); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } + + SECTION("serialized(const char*)") { + array.add(serialized("{}")); + + REQUIRE(doc.as() == "[{}]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("{}")), + }); + } + + SECTION("serialized(char*)") { + array.add(serialized(const_cast("{}"))); + + REQUIRE(doc.as() == "[{}]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("{}")), + }); + } + + SECTION("serialized(std::string)") { + array.add(serialized("{}"_s)); + + REQUIRE(doc.as() == "[{}]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("{}")), + }); + } + + SECTION("serialized(std::string)") { + array.add(serialized("\0XX"_s)); + + REQUIRE(doc.as() == "[\0XX]"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString(" XX")), + }); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("vla") { + size_t i = 16; + char vla[i]; + strcpy(vla, "world"); + + array.add(vla); + + strcpy(vla, "hello"); + REQUIRE(array[0] == "world"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } +#endif + + SECTION("nested array") { + JsonDocument doc2; + JsonArray arr = doc2.to(); + + array.add(arr); + + REQUIRE(arr == array[0].as()); + REQUIRE(array[0].is()); + REQUIRE_FALSE(array[0].is()); + } + + SECTION("nested object") { + JsonDocument doc2; + JsonObject obj = doc2.to(); + + array.add(obj); + + REQUIRE(obj == array[0].as()); + REQUIRE(array[0].is()); + REQUIRE_FALSE(array[0].is()); + } + + SECTION("array subscript") { + const char* str = "hello"; + JsonDocument doc2; + JsonArray arr = doc2.to(); + arr.add(str); + + array.add(arr[0]); + + REQUIRE(str == array[0]); + } + + SECTION("object subscript") { + const char* str = "hello"; + JsonDocument doc2; + JsonObject obj = doc2.to(); + obj["x"] = str; + + array.add(obj["x"]); + + REQUIRE(str == array[0]); + } +} + +TEST_CASE("JsonArray::add()") { + JsonDocument doc; + JsonArray array = doc.to(); + + SECTION("add()") { + JsonArray nestedArray = array.add(); + nestedArray.add(1); + nestedArray.add(2); + REQUIRE(doc.as() == "[[1,2]]"); + } + + SECTION("add()") { + JsonObject nestedObject = array.add(); + nestedObject["a"] = 1; + nestedObject["b"] = 2; + REQUIRE(doc.as() == "[{\"a\":1,\"b\":2}]"); + } + + SECTION("add()") { + JsonVariant nestedVariant = array.add(); + nestedVariant.set(42); + REQUIRE(doc.as() == "[42]"); + } +} + +TEST_CASE("JsonObject::add(JsonObject) ") { + JsonDocument doc1; + doc1["key1"_s] = "value1"_s; + + TimebombAllocator allocator(10); + SpyingAllocator spy(&allocator); + JsonDocument doc2(&spy); + JsonArray array = doc2.to(); + + SECTION("success") { + bool result = array.add(doc1.as()); + + REQUIRE(result == true); + REQUIRE(doc2.as() == "[{\"key1\":\"value1\"}]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("key1")), + Allocate(sizeofString("value1")), + }); + } + + SECTION("partial failure") { // issue #2081 + allocator.setCountdown(2); + + bool result = array.add(doc1.as()); + + REQUIRE(result == false); + REQUIRE(doc2.as() == "[]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("key1")), + AllocateFail(sizeofString("value1")), + Deallocate(sizeofString("key1")), + }); + } + + SECTION("complete failure") { + allocator.setCountdown(0); + + bool result = array.add(doc1.as()); + + REQUIRE(result == false); + REQUIRE(doc2.as() == "[]"); + REQUIRE(spy.log() == AllocatorLog{ + AllocateFail(sizeofPool()), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/clear.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/clear.cpp new file mode 100644 index 0000000..069376d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/clear.cpp @@ -0,0 +1,46 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" + +TEST_CASE("JsonArray::clear()") { + SECTION("No-op on null JsonArray") { + JsonArray array; + array.clear(); + REQUIRE(array.isNull() == true); + REQUIRE(array.size() == 0); + } + + SECTION("Removes all elements") { + JsonDocument doc; + JsonArray array = doc.to(); + array.add(1); + array.add(2); + array.clear(); + REQUIRE(array.size() == 0); + REQUIRE(array.isNull() == false); + } + + SECTION("Removed elements are recycled") { + SpyingAllocator spy; + JsonDocument doc(&spy); + JsonArray array = doc.to(); + + // fill the pool entirely + for (int i = 0; i < ARDUINOJSON_POOL_CAPACITY; i++) + array.add(i); + + // clear and fill again + array.clear(); + for (int i = 0; i < ARDUINOJSON_POOL_CAPACITY; i++) + array.add(i); + + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/compare.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/compare.cpp new file mode 100644 index 0000000..23f2ea9 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/compare.cpp @@ -0,0 +1,512 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("Compare JsonArray with JsonArray") { + JsonDocument doc; + + SECTION("Compare with unbound") { + JsonArray array = doc.to(); + array.add(1); + array.add("hello"); + JsonArray unbound; + + CHECK(array != unbound); + CHECK_FALSE(array == unbound); + CHECK_FALSE(array <= unbound); + CHECK_FALSE(array >= unbound); + CHECK_FALSE(array > unbound); + CHECK_FALSE(array < unbound); + + CHECK(unbound != array); + CHECK_FALSE(unbound == array); + CHECK_FALSE(unbound <= array); + CHECK_FALSE(unbound >= array); + CHECK_FALSE(unbound > array); + CHECK_FALSE(unbound < array); + } + + SECTION("Compare with self") { + JsonArray array = doc.to(); + array.add(1); + array.add("hello"); + + CHECK(array == array); + CHECK(array <= array); + CHECK(array >= array); + CHECK_FALSE(array != array); + CHECK_FALSE(array > array); + CHECK_FALSE(array < array); + } + + SECTION("Compare with identical array") { + JsonArray array1 = doc.add(); + array1.add(1); + array1.add("hello"); + array1.add(); + + JsonArray array2 = doc.add(); + array2.add(1); + array2.add("hello"); + array2.add(); + + CHECK(array1 == array2); + CHECK(array1 <= array2); + CHECK(array1 >= array2); + CHECK_FALSE(array1 != array2); + CHECK_FALSE(array1 > array2); + CHECK_FALSE(array1 < array2); + } + + SECTION("Compare with different array") { + JsonArray array1 = doc.add(); + array1.add(1); + array1.add("hello1"); + array1.add(); + + JsonArray array2 = doc.add(); + array2.add(1); + array2.add("hello2"); + array2.add(); + + CHECK(array1 != array2); + CHECK_FALSE(array1 == array2); + CHECK_FALSE(array1 > array2); + CHECK_FALSE(array1 < array2); + CHECK_FALSE(array1 <= array2); + CHECK_FALSE(array1 >= array2); + } +} + +TEST_CASE("Compare JsonArray with JsonVariant") { + JsonDocument doc; + + SECTION("Compare with self") { + JsonArray array = doc.to(); + array.add(1); + array.add("hello"); + + JsonVariant variant = array; + + CHECK(array == variant); + CHECK(array <= variant); + CHECK(array >= variant); + CHECK_FALSE(array != variant); + CHECK_FALSE(array > variant); + CHECK_FALSE(array < variant); + + CHECK(variant == array); + CHECK(variant <= array); + CHECK(variant >= array); + CHECK_FALSE(variant != array); + CHECK_FALSE(variant > array); + CHECK_FALSE(variant < array); + } + + SECTION("Compare with identical array") { + JsonArray array = doc.add(); + array.add(1); + array.add("hello"); + array.add(); + + JsonVariant variant = doc.add(); + variant.add(1); + variant.add("hello"); + variant.add(); + + CHECK(array == variant); + CHECK(array <= variant); + CHECK(array >= variant); + CHECK_FALSE(array != variant); + CHECK_FALSE(array > variant); + CHECK_FALSE(array < variant); + + CHECK(variant == array); + CHECK(variant <= array); + CHECK(variant >= array); + CHECK_FALSE(variant != array); + CHECK_FALSE(variant > array); + CHECK_FALSE(variant < array); + } + + SECTION("Compare with different array") { + JsonArray array = doc.add(); + array.add(1); + array.add("hello1"); + array.add(); + + JsonVariant variant = doc.add(); + variant.add(1); + variant.add("hello2"); + variant.add(); + + CHECK(array != variant); + CHECK_FALSE(array == variant); + CHECK_FALSE(array > variant); + CHECK_FALSE(array < variant); + CHECK_FALSE(array <= variant); + CHECK_FALSE(array >= variant); + } +} + +TEST_CASE("Compare JsonArray with JsonVariantConst") { + JsonDocument doc; + + SECTION("Compare with unbound") { + JsonArray array = doc.to(); + array.add(1); + array.add("hello"); + JsonVariantConst unbound; + + CHECK(array != unbound); + CHECK_FALSE(array == unbound); + CHECK_FALSE(array <= unbound); + CHECK_FALSE(array >= unbound); + CHECK_FALSE(array > unbound); + CHECK_FALSE(array < unbound); + + CHECK(unbound != array); + CHECK_FALSE(unbound == array); + CHECK_FALSE(unbound <= array); + CHECK_FALSE(unbound >= array); + CHECK_FALSE(unbound > array); + CHECK_FALSE(unbound < array); + } + + SECTION("Compare with self") { + JsonArray array = doc.to(); + array.add(1); + array.add("hello"); + + JsonVariantConst variant = array; + + CHECK(array == variant); + CHECK(array <= variant); + CHECK(array >= variant); + CHECK_FALSE(array != variant); + CHECK_FALSE(array > variant); + CHECK_FALSE(array < variant); + + CHECK(variant == array); + CHECK(variant <= array); + CHECK(variant >= array); + CHECK_FALSE(variant != array); + CHECK_FALSE(variant > array); + CHECK_FALSE(variant < array); + } + + SECTION("Compare with identical array") { + JsonArray array = doc.add(); + array.add(1); + array.add("hello"); + array.add(); + + JsonArray array2 = doc.add(); + array2.add(1); + array2.add("hello"); + array2.add(); + JsonVariantConst variant = array2; + + CHECK(array == variant); + CHECK(array <= variant); + CHECK(array >= variant); + CHECK_FALSE(array != variant); + CHECK_FALSE(array > variant); + CHECK_FALSE(array < variant); + + CHECK(variant == array); + CHECK(variant <= array); + CHECK(variant >= array); + CHECK_FALSE(variant != array); + CHECK_FALSE(variant > array); + CHECK_FALSE(variant < array); + } + + SECTION("Compare with different array") { + JsonArray array = doc.add(); + array.add(1); + array.add("hello1"); + array.add(); + + JsonArray array2 = doc.add(); + array2.add(1); + array2.add("hello2"); + array2.add(); + JsonVariantConst variant = array2; + + CHECK(array != variant); + CHECK_FALSE(array == variant); + CHECK_FALSE(array > variant); + CHECK_FALSE(array < variant); + CHECK_FALSE(array <= variant); + CHECK_FALSE(array >= variant); + } +} + +TEST_CASE("Compare JsonArray with JsonArrayConst") { + JsonDocument doc; + + SECTION("Compare with unbound") { + JsonArray array = doc.to(); + array.add(1); + array.add("hello"); + JsonArrayConst unbound; + + CHECK(array != unbound); + CHECK_FALSE(array == unbound); + CHECK_FALSE(array <= unbound); + CHECK_FALSE(array >= unbound); + CHECK_FALSE(array > unbound); + CHECK_FALSE(array < unbound); + + CHECK(unbound != array); + CHECK_FALSE(unbound == array); + CHECK_FALSE(unbound <= array); + CHECK_FALSE(unbound >= array); + CHECK_FALSE(unbound > array); + CHECK_FALSE(unbound < array); + } + + SECTION("Compare with self") { + JsonArray array = doc.to(); + array.add(1); + array.add("hello"); + JsonArrayConst carray = array; + + CHECK(array == carray); + CHECK(array <= carray); + CHECK(array >= carray); + CHECK_FALSE(array != carray); + CHECK_FALSE(array > carray); + CHECK_FALSE(array < carray); + + CHECK(carray == array); + CHECK(carray <= array); + CHECK(carray >= array); + CHECK_FALSE(carray != array); + CHECK_FALSE(carray > array); + CHECK_FALSE(carray < array); + } + + SECTION("Compare with identical array") { + JsonArray array1 = doc.add(); + array1.add(1); + array1.add("hello"); + array1.add(); + + JsonArray array2 = doc.add(); + array2.add(1); + array2.add("hello"); + array2.add(); + JsonArrayConst carray2 = array2; + + CHECK(array1 == carray2); + CHECK(array1 <= carray2); + CHECK(array1 >= carray2); + CHECK_FALSE(array1 != carray2); + CHECK_FALSE(array1 > carray2); + CHECK_FALSE(array1 < carray2); + + CHECK(carray2 == array1); + CHECK(carray2 <= array1); + CHECK(carray2 >= array1); + CHECK_FALSE(carray2 != array1); + CHECK_FALSE(carray2 > array1); + CHECK_FALSE(carray2 < array1); + } + + SECTION("Compare with different array") { + JsonArray array1 = doc.add(); + array1.add(1); + array1.add("hello1"); + array1.add(); + + JsonArray array2 = doc.add(); + array2.add(1); + array2.add("hello2"); + array2.add(); + JsonArrayConst carray2 = array2; + + CHECK(array1 != carray2); + CHECK_FALSE(array1 == carray2); + CHECK_FALSE(array1 > carray2); + CHECK_FALSE(array1 < carray2); + CHECK_FALSE(array1 <= carray2); + CHECK_FALSE(array1 >= carray2); + + CHECK(carray2 != array1); + CHECK_FALSE(carray2 == array1); + CHECK_FALSE(carray2 > array1); + CHECK_FALSE(carray2 < array1); + CHECK_FALSE(carray2 <= array1); + CHECK_FALSE(carray2 >= array1); + } +} + +TEST_CASE("Compare JsonArrayConst with JsonArrayConst") { + JsonDocument doc; + + SECTION("Compare with unbound") { + JsonArray array = doc.to(); + array.add(1); + array.add("hello"); + + JsonArrayConst carray = array; + JsonArrayConst unbound; + + CHECK(carray != unbound); + CHECK_FALSE(carray == unbound); + CHECK_FALSE(carray <= unbound); + CHECK_FALSE(carray >= unbound); + CHECK_FALSE(carray > unbound); + CHECK_FALSE(carray < unbound); + + CHECK(unbound != carray); + CHECK_FALSE(unbound == carray); + CHECK_FALSE(unbound <= carray); + CHECK_FALSE(unbound >= carray); + CHECK_FALSE(unbound > carray); + CHECK_FALSE(unbound < carray); + } + + SECTION("Compare with self") { + JsonArray array = doc.to(); + array.add(1); + array.add("hello"); + JsonArrayConst carray = array; + + CHECK(carray == carray); + CHECK(carray <= carray); + CHECK(carray >= carray); + CHECK_FALSE(carray != carray); + CHECK_FALSE(carray > carray); + CHECK_FALSE(carray < carray); + } + + SECTION("Compare with identical array") { + JsonArray array1 = doc.add(); + array1.add(1); + array1.add("hello"); + array1.add(); + JsonArrayConst carray1 = array1; + + JsonArray array2 = doc.add(); + array2.add(1); + array2.add("hello"); + array2.add(); + JsonArrayConst carray2 = array2; + + CHECK(carray1 == carray2); + CHECK(carray1 <= carray2); + CHECK(carray1 >= carray2); + CHECK_FALSE(carray1 != carray2); + CHECK_FALSE(carray1 > carray2); + CHECK_FALSE(carray1 < carray2); + } + + SECTION("Compare with different array") { + JsonArray array1 = doc.add(); + array1.add(1); + array1.add("hello1"); + array1.add(); + JsonArrayConst carray1 = array1; + + JsonArray array2 = doc.add(); + array2.add(1); + array2.add("hello2"); + array2.add(); + JsonArrayConst carray2 = array2; + + CHECK(carray1 != carray2); + CHECK_FALSE(carray1 == carray2); + CHECK_FALSE(carray1 > carray2); + CHECK_FALSE(carray1 < carray2); + CHECK_FALSE(carray1 <= carray2); + CHECK_FALSE(carray1 >= carray2); + } +} + +TEST_CASE("Compare JsonArrayConst with JsonVariant") { + JsonDocument doc; + + SECTION("Compare with self") { + JsonArray array = doc.to(); + array.add(1); + array.add("hello"); + JsonArrayConst carray = array; + JsonVariant variant = array; + + CHECK(carray == variant); + CHECK(carray <= variant); + CHECK(carray >= variant); + CHECK_FALSE(carray != variant); + CHECK_FALSE(carray > variant); + CHECK_FALSE(carray < variant); + + CHECK(variant == carray); + CHECK(variant <= carray); + CHECK(variant >= carray); + CHECK_FALSE(variant != carray); + CHECK_FALSE(variant > carray); + CHECK_FALSE(variant < carray); + } + + SECTION("Compare with identical array") { + JsonArray array1 = doc.add(); + array1.add(1); + array1.add("hello"); + array1.add(); + JsonArrayConst carray1 = array1; + + JsonArray array2 = doc.add(); + array2.add(1); + array2.add("hello"); + array2.add(); + JsonVariant variant2 = array2; + + CHECK(carray1 == variant2); + CHECK(carray1 <= variant2); + CHECK(carray1 >= variant2); + CHECK_FALSE(carray1 != variant2); + CHECK_FALSE(carray1 > variant2); + CHECK_FALSE(carray1 < variant2); + + CHECK(variant2 == carray1); + CHECK(variant2 <= carray1); + CHECK(variant2 >= carray1); + CHECK_FALSE(variant2 != carray1); + CHECK_FALSE(variant2 > carray1); + CHECK_FALSE(variant2 < carray1); + } + + SECTION("Compare with different array") { + JsonArray array1 = doc.add(); + array1.add(1); + array1.add("hello1"); + array1.add(); + JsonArrayConst carray1 = array1; + + JsonArray array2 = doc.add(); + array2.add(1); + array2.add("hello2"); + array2.add(); + JsonVariant variant2 = array2; + + CHECK(carray1 != variant2); + CHECK_FALSE(carray1 == variant2); + CHECK_FALSE(carray1 > variant2); + CHECK_FALSE(carray1 < variant2); + CHECK_FALSE(carray1 <= variant2); + CHECK_FALSE(carray1 >= variant2); + + CHECK(variant2 != carray1); + CHECK_FALSE(variant2 == carray1); + CHECK_FALSE(variant2 > carray1); + CHECK_FALSE(variant2 < carray1); + CHECK_FALSE(variant2 <= carray1); + CHECK_FALSE(variant2 >= carray1); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/copyArray.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/copyArray.cpp new file mode 100644 index 0000000..dd31cf6 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/copyArray.cpp @@ -0,0 +1,335 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("copyArray()") { + SECTION("int[] -> JsonArray") { + JsonDocument doc; + JsonArray array = doc.to(); + char json[32]; + int source[] = {1, 2, 3}; + + bool ok = copyArray(source, array); + CHECK(ok); + + serializeJson(array, json); + CHECK("[1,2,3]"_s == json); + } + + SECTION("std::string[] -> JsonArray") { + JsonDocument doc; + JsonArray array = doc.to(); + char json[32]; + std::string source[] = {"a", "b", "c"}; + + bool ok = copyArray(source, array); + CHECK(ok); + + serializeJson(array, json); + CHECK("[\"a\",\"b\",\"c\"]"_s == json); + } + + SECTION("const char*[] -> JsonArray") { + JsonDocument doc; + JsonArray array = doc.to(); + char json[32]; + const char* source[] = {"a", "b", "c"}; + + bool ok = copyArray(source, array); + CHECK(ok); + + serializeJson(array, json); + CHECK("[\"a\",\"b\",\"c\"]"_s == json); + } + + SECTION("const char[][] -> JsonArray") { + JsonDocument doc; + JsonArray array = doc.to(); + char json[32]; + char source[][2] = {"a", "b", "c"}; + + bool ok = copyArray(source, array); + CHECK(ok); + + serializeJson(array, json); + CHECK("[\"a\",\"b\",\"c\"]"_s == json); + } + + SECTION("const char[][] -> JsonDocument") { + JsonDocument doc; + char json[32]; + char source[][2] = {"a", "b", "c"}; + + bool ok = copyArray(source, doc); + CHECK(ok); + + serializeJson(doc, json); + CHECK("[\"a\",\"b\",\"c\"]"_s == json); + } + + SECTION("const char[][] -> MemberProxy") { + JsonDocument doc; + char json[32]; + char source[][2] = {"a", "b", "c"}; + + bool ok = copyArray(source, doc["data"]); + CHECK(ok); + + serializeJson(doc, json); + CHECK("{\"data\":[\"a\",\"b\",\"c\"]}"_s == json); + } + + SECTION("int[] -> JsonDocument") { + JsonDocument doc; + char json[32]; + int source[] = {1, 2, 3}; + + bool ok = copyArray(source, doc); + CHECK(ok); + + serializeJson(doc, json); + CHECK("[1,2,3]"_s == json); + } + + SECTION("int[] -> MemberProxy") { + JsonDocument doc; + char json[32]; + int source[] = {1, 2, 3}; + + bool ok = copyArray(source, doc["data"]); + CHECK(ok); + + serializeJson(doc, json); + CHECK("{\"data\":[1,2,3]}"_s == json); + } + + SECTION("int[] -> JsonArray, but not enough memory") { + JsonDocument doc(FailingAllocator::instance()); + JsonArray array = doc.to(); + int source[] = {1, 2, 3}; + + bool ok = copyArray(source, array); + REQUIRE_FALSE(ok); + } + + SECTION("int[][] -> JsonArray") { + JsonDocument doc; + JsonArray array = doc.to(); + char json[32]; + int source[][3] = {{1, 2, 3}, {4, 5, 6}}; + + bool ok = copyArray(source, array); + CHECK(ok); + + serializeJson(array, json); + CHECK("[[1,2,3],[4,5,6]]"_s == json); + } + + SECTION("int[][] -> MemberProxy") { + JsonDocument doc; + char json[32]; + int source[][3] = {{1, 2, 3}, {4, 5, 6}}; + + bool ok = copyArray(source, doc["data"]); + CHECK(ok); + + serializeJson(doc, json); + CHECK("{\"data\":[[1,2,3],[4,5,6]]}"_s == json); + } + + SECTION("int[][] -> JsonDocument") { + JsonDocument doc; + char json[32]; + int source[][3] = {{1, 2, 3}, {4, 5, 6}}; + + bool ok = copyArray(source, doc); + CHECK(ok); + + serializeJson(doc, json); + CHECK("[[1,2,3],[4,5,6]]"_s == json); + } + + SECTION("int[][] -> JsonArray, but not enough memory") { + JsonDocument doc(FailingAllocator::instance()); + JsonArray array = doc.to(); + int source[][3] = {{1, 2, 3}, {4, 5, 6}}; + + bool ok = copyArray(source, array); + REQUIRE(ok == false); + } + + SECTION("JsonArray -> int[], with more space than needed") { + JsonDocument doc; + char json[] = "[1,2,3]"; + DeserializationError err = deserializeJson(doc, json); + CHECK(err == DeserializationError::Ok); + JsonArray array = doc.as(); + + int destination[4] = {0}; + size_t result = copyArray(array, destination); + + CHECK(3 == result); + CHECK(1 == destination[0]); + CHECK(2 == destination[1]); + CHECK(3 == destination[2]); + CHECK(0 == destination[3]); + } + + SECTION("JsonArray -> int[], without enough space") { + JsonDocument doc; + char json[] = "[1,2,3]"; + DeserializationError err = deserializeJson(doc, json); + CHECK(err == DeserializationError::Ok); + JsonArray array = doc.as(); + + int destination[2] = {0}; + size_t result = copyArray(array, destination); + + CHECK(2 == result); + CHECK(1 == destination[0]); + CHECK(2 == destination[1]); + } + + SECTION("JsonArray -> std::string[]") { + JsonDocument doc; + char json[] = "[\"a\",\"b\",\"c\"]"; + DeserializationError err = deserializeJson(doc, json); + CHECK(err == DeserializationError::Ok); + JsonArray array = doc.as(); + + std::string destination[4]; + size_t result = copyArray(array, destination); + + CHECK(3 == result); + CHECK("a" == destination[0]); + CHECK("b" == destination[1]); + CHECK("c" == destination[2]); + CHECK("" == destination[3]); + } + + SECTION("JsonArray -> char[N][]") { + JsonDocument doc; + char json[] = "[\"a12345\",\"b123456\",\"c1234567\"]"; + DeserializationError err = deserializeJson(doc, json); + CHECK(err == DeserializationError::Ok); + JsonArray array = doc.as(); + + char destination[4][8] = {{0}}; + size_t result = copyArray(array, destination); + + CHECK(3 == result); + CHECK("a12345"_s == destination[0]); + CHECK("b123456"_s == destination[1]); + CHECK("c123456"_s == destination[2]); // truncated + CHECK(std::string("") == destination[3]); + } + + SECTION("JsonDocument -> int[]") { + JsonDocument doc; + char json[] = "[1,2,3]"; + DeserializationError err = deserializeJson(doc, json); + CHECK(err == DeserializationError::Ok); + + int destination[4] = {0}; + size_t result = copyArray(doc, destination); + + CHECK(3 == result); + CHECK(1 == destination[0]); + CHECK(2 == destination[1]); + CHECK(3 == destination[2]); + CHECK(0 == destination[3]); + } + + SECTION("MemberProxy -> int[]") { + JsonDocument doc; + char json[] = "{\"data\":[1,2,3]}"; + DeserializationError err = deserializeJson(doc, json); + CHECK(err == DeserializationError::Ok); + + int destination[4] = {0}; + size_t result = copyArray(doc["data"], destination); + + CHECK(3 == result); + CHECK(1 == destination[0]); + CHECK(2 == destination[1]); + CHECK(3 == destination[2]); + CHECK(0 == destination[3]); + } + + SECTION("ElementProxy -> int[]") { + JsonDocument doc; + char json[] = "[[1,2,3]]"; + DeserializationError err = deserializeJson(doc, json); + CHECK(err == DeserializationError::Ok); + + int destination[4] = {0}; + size_t result = copyArray(doc[0], destination); + + CHECK(3 == result); + CHECK(1 == destination[0]); + CHECK(2 == destination[1]); + CHECK(3 == destination[2]); + CHECK(0 == destination[3]); + } + + SECTION("JsonArray -> int[][]") { + JsonDocument doc; + char json[] = "[[1,2],[3],[4]]"; + + DeserializationError err = deserializeJson(doc, json); + CHECK(err == DeserializationError::Ok); + JsonArray array = doc.as(); + + int destination[3][2] = {{0}}; + copyArray(array, destination); + + CHECK(1 == destination[0][0]); + CHECK(2 == destination[0][1]); + CHECK(3 == destination[1][0]); + CHECK(0 == destination[1][1]); + CHECK(4 == destination[2][0]); + CHECK(0 == destination[2][1]); + } + + SECTION("JsonDocument -> int[][]") { + JsonDocument doc; + char json[] = "[[1,2],[3],[4]]"; + + DeserializationError err = deserializeJson(doc, json); + CHECK(err == DeserializationError::Ok); + + int destination[3][2] = {{0}}; + copyArray(doc, destination); + + CHECK(1 == destination[0][0]); + CHECK(2 == destination[0][1]); + CHECK(3 == destination[1][0]); + CHECK(0 == destination[1][1]); + CHECK(4 == destination[2][0]); + CHECK(0 == destination[2][1]); + } + + SECTION("MemberProxy -> int[][]") { + JsonDocument doc; + char json[] = "{\"data\":[[1,2],[3],[4]]}"; + + DeserializationError err = deserializeJson(doc, json); + CHECK(err == DeserializationError::Ok); + + int destination[3][2] = {{0}}; + copyArray(doc["data"], destination); + + CHECK(1 == destination[0][0]); + CHECK(2 == destination[0][1]); + CHECK(3 == destination[1][0]); + CHECK(0 == destination[1][1]); + CHECK(4 == destination[2][0]); + CHECK(0 == destination[2][1]); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/equals.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/equals.cpp new file mode 100644 index 0000000..241aa71 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/equals.cpp @@ -0,0 +1,63 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArray::operator==()") { + JsonDocument doc1; + JsonArray array1 = doc1.to(); + + JsonDocument doc2; + JsonArray array2 = doc2.to(); + + SECTION("should return false when arrays differ") { + array1.add("coucou"); + array2.add(1); + + REQUIRE_FALSE(array1 == array2); + } + + SECTION("should return false when LHS has more elements") { + array1.add(1); + array1.add(2); + array2.add(1); + + REQUIRE_FALSE(array1 == array2); + } + + SECTION("should return false when RHS has more elements") { + array1.add(1); + array2.add(1); + array2.add(2); + + REQUIRE_FALSE(array1 == array2); + } + + SECTION("should return true when arrays equal") { + array1.add("coucou"); + array2.add("coucou"); + + REQUIRE(array1 == array2); + } + + SECTION("should return false when RHS is null") { + JsonArray null; + + REQUIRE_FALSE(array1 == null); + } + + SECTION("should return false when LHS is null") { + JsonArray null; + + REQUIRE_FALSE(null == array1); + } + + SECTION("should return true when both are null") { + JsonArray null1; + JsonArray null2; + + REQUIRE(null1 == null2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/isNull.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/isNull.cpp new file mode 100644 index 0000000..77f1512 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/isNull.cpp @@ -0,0 +1,32 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArray::isNull()") { + SECTION("returns true") { + JsonArray arr; + REQUIRE(arr.isNull() == true); + } + + SECTION("returns false") { + JsonDocument doc; + JsonArray arr = doc.to(); + REQUIRE(arr.isNull() == false); + } +} + +TEST_CASE("JsonArray::operator bool()") { + SECTION("returns false") { + JsonArray arr; + REQUIRE(static_cast(arr) == false); + } + + SECTION("returns true") { + JsonDocument doc; + JsonArray arr = doc.to(); + REQUIRE(static_cast(arr) == true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/iterator.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/iterator.cpp new file mode 100644 index 0000000..f6bb3ef --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/iterator.cpp @@ -0,0 +1,34 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArray::begin()/end()") { + SECTION("Non null JsonArray") { + JsonDocument doc; + JsonArray array = doc.to(); + array.add(12); + array.add(34); + + auto it = array.begin(); + auto end = array.end(); + + REQUIRE(end != it); + REQUIRE(12 == it->as()); + REQUIRE(12 == static_cast(*it)); + ++it; + REQUIRE(end != it); + REQUIRE(34 == it->as()); + REQUIRE(34 == static_cast(*it)); + ++it; + REQUIRE(end == it); + } + + SECTION("Null JsonArray") { + JsonArray array; + + REQUIRE(array.begin() == array.end()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/nesting.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/nesting.cpp new file mode 100644 index 0000000..434c418 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/nesting.cpp @@ -0,0 +1,35 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArray::nesting()") { + JsonDocument doc; + JsonArray arr = doc.to(); + + SECTION("return 0 if uninitialized") { + JsonArray unitialized; + REQUIRE(unitialized.nesting() == 0); + } + + SECTION("returns 1 for empty array") { + REQUIRE(arr.nesting() == 1); + } + + SECTION("returns 1 for flat array") { + arr.add("hello"); + REQUIRE(arr.nesting() == 1); + } + + SECTION("returns 2 with nested array") { + arr.add(); + REQUIRE(arr.nesting() == 2); + } + + SECTION("returns 2 with nested object") { + arr.add(); + REQUIRE(arr.nesting() == 2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/remove.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/remove.cpp new file mode 100644 index 0000000..8691171 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/remove.cpp @@ -0,0 +1,126 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" + +TEST_CASE("JsonArray::remove()") { + JsonDocument doc; + JsonArray array = doc.to(); + array.add(1); + array.add(2); + array.add(3); + + SECTION("remove first by index") { + array.remove(0); + + REQUIRE(2 == array.size()); + REQUIRE(array[0] == 2); + REQUIRE(array[1] == 3); + } + + SECTION("remove middle by index") { + array.remove(1); + + REQUIRE(2 == array.size()); + REQUIRE(array[0] == 1); + REQUIRE(array[1] == 3); + } + + SECTION("remove last by index") { + array.remove(2); + + REQUIRE(2 == array.size()); + REQUIRE(array[0] == 1); + REQUIRE(array[1] == 2); + } + + SECTION("remove first by iterator") { + JsonArray::iterator it = array.begin(); + array.remove(it); + + REQUIRE(2 == array.size()); + REQUIRE(array[0] == 2); + REQUIRE(array[1] == 3); + } + + SECTION("remove middle by iterator") { + JsonArray::iterator it = array.begin(); + ++it; + array.remove(it); + + REQUIRE(2 == array.size()); + REQUIRE(array[0] == 1); + REQUIRE(array[1] == 3); + } + + SECTION("remove last bty iterator") { + JsonArray::iterator it = array.begin(); + ++it; + ++it; + array.remove(it); + + REQUIRE(2 == array.size()); + REQUIRE(array[0] == 1); + REQUIRE(array[1] == 2); + } + + SECTION("remove end()") { + array.remove(array.end()); + + REQUIRE(3 == array.size()); + } + + SECTION("In a loop") { + for (JsonArray::iterator it = array.begin(); it != array.end(); ++it) { + if (*it == 2) + array.remove(it); + } + + REQUIRE(2 == array.size()); + REQUIRE(array[0] == 1); + REQUIRE(array[1] == 3); + } + + SECTION("remove by index on unbound reference") { + JsonArray unboundArray; + unboundArray.remove(20); + } + + SECTION("remove by iterator on unbound reference") { + JsonArray unboundArray; + unboundArray.remove(unboundArray.begin()); + } + + SECTION("use JsonVariant as index") { + array.remove(array[3]); // no effect with null variant + array.remove(array[0]); // remove element at index 1 + + REQUIRE(2 == array.size()); + REQUIRE(array[0] == 1); + REQUIRE(array[1] == 3); + } +} + +TEST_CASE("Removed elements are recycled") { + SpyingAllocator spy; + JsonDocument doc(&spy); + JsonArray array = doc.to(); + + // fill the pool entirely + for (int i = 0; i < ARDUINOJSON_POOL_CAPACITY; i++) + array.add(i); + + // free one slot in the pool + array.remove(0); + + // add one element; it should use the free slot + array.add(42); + + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), // only one pool + }); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/size.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/size.cpp new file mode 100644 index 0000000..63bf55d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/size.cpp @@ -0,0 +1,31 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArray::size()") { + JsonDocument doc; + JsonArray array = doc.to(); + + SECTION("returns 0 is empty") { + REQUIRE(0U == array.size()); + } + + SECTION("increases after add()") { + array.add("hello"); + REQUIRE(1U == array.size()); + + array.add("world"); + REQUIRE(2U == array.size()); + } + + SECTION("remains the same after replacing an element") { + array.add("hello"); + REQUIRE(1U == array.size()); + + array[0] = "hello"; + REQUIRE(1U == array.size()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/subscript.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/subscript.cpp new file mode 100644 index 0000000..fa0400c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/subscript.cpp @@ -0,0 +1,171 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonArray::operator[]") { + SpyingAllocator spy; + JsonDocument doc(&spy); + JsonArray array = doc.to(); + + SECTION("Pad with null") { + array[2] = 2; + array[5] = 5; + REQUIRE(array.size() == 6); + REQUIRE(array[0].isNull() == true); + REQUIRE(array[1].isNull() == true); + REQUIRE(array[2].isNull() == false); + REQUIRE(array[3].isNull() == true); + REQUIRE(array[4].isNull() == true); + REQUIRE(array[5].isNull() == false); + REQUIRE(array[2] == 2); + REQUIRE(array[5] == 5); + } + + SECTION("int") { + array[0] = 123; + REQUIRE(123 == array[0].as()); + REQUIRE(true == array[0].is()); + REQUIRE(false == array[0].is()); + } + +#if ARDUINOJSON_USE_LONG_LONG + SECTION("long long") { + array[0] = 9223372036854775807; + REQUIRE(9223372036854775807 == array[0].as()); + REQUIRE(true == array[0].is()); + REQUIRE(false == array[0].is()); + REQUIRE(false == array[0].is()); + } +#endif + + SECTION("double") { + array[0] = 123.45; + REQUIRE(123.45 == array[0].as()); + REQUIRE(true == array[0].is()); + REQUIRE(false == array[0].is()); + } + + SECTION("bool") { + array[0] = true; + REQUIRE(true == array[0].as()); + REQUIRE(true == array[0].is()); + REQUIRE(false == array[0].is()); + } + + SECTION("string literal") { + array[0] = "hello"; + + REQUIRE(array[0].as() == "hello"); + REQUIRE(true == array[0].is()); + REQUIRE(false == array[0].is()); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } + + SECTION("const char*") { + const char* str = "hello"; + array[0] = str; + + REQUIRE(array[0].as() == "hello"); + REQUIRE(true == array[0].is()); + REQUIRE(false == array[0].is()); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } + + SECTION("std::string") { + array[0] = "hello"_s; + + REQUIRE(array[0].as() == "hello"); + REQUIRE(true == array[0].is()); + REQUIRE(false == array[0].is()); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "world"); + + array.add("hello"); + array[0] = vla; + + REQUIRE(array[0] == "world"_s); + } +#endif + + SECTION("nested array") { + JsonDocument doc2; + JsonArray arr2 = doc2.to(); + + array[0] = arr2; + + REQUIRE(arr2 == array[0].as()); + REQUIRE(true == array[0].is()); + REQUIRE(false == array[0].is()); + } + + SECTION("nested object") { + JsonDocument doc2; + JsonObject obj = doc2.to(); + + array[0] = obj; + + REQUIRE(obj == array[0].as()); + REQUIRE(true == array[0].is()); + REQUIRE(false == array[0].is()); + } + + SECTION("array subscript") { + JsonDocument doc2; + JsonArray arr2 = doc2.to(); + const char* str = "hello"; + + arr2.add(str); + + array[0] = arr2[0]; + + REQUIRE(str == array[0]); + } + + SECTION("object subscript") { + const char* str = "hello"; + JsonDocument doc2; + JsonObject obj = doc2.to(); + + obj["x"] = str; + + array[0] = obj["x"]; + + REQUIRE(str == array[0]); + } + + SECTION("array[0].to()") { + JsonObject obj = array[0].to(); + REQUIRE(obj.isNull() == false); + } + + SECTION("Use a JsonVariant as index") { + array[0] = 1; + array[1] = 2; + array[2] = 3; + + REQUIRE(array[array[1]] == 3); + REQUIRE(array[array[3]] == nullptr); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/unbound.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/unbound.cpp new file mode 100644 index 0000000..ba80018 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArray/unbound.cpp @@ -0,0 +1,27 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +using namespace Catch::Matchers; + +TEST_CASE("Unbound JsonArray") { + JsonArray array; + + SECTION("SubscriptFails") { + REQUIRE(array[0].isNull()); + } + + SECTION("AddFails") { + array.add(1); + REQUIRE(0 == array.size()); + } + + SECTION("PrintToWritesBrackets") { + char buffer[32]; + serializeJson(array, buffer, sizeof(buffer)); + REQUIRE_THAT(buffer, Equals("null")); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/CMakeLists.txt new file mode 100644 index 0000000..4d69c71 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/CMakeLists.txt @@ -0,0 +1,19 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(JsonArrayConstTests + equals.cpp + isNull.cpp + iterator.cpp + nesting.cpp + size.cpp + subscript.cpp +) + +add_test(JsonArrayConst JsonArrayConstTests) + +set_tests_properties(JsonArrayConst + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/equals.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/equals.cpp new file mode 100644 index 0000000..de939cc --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/equals.cpp @@ -0,0 +1,63 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArrayConst::operator==()") { + JsonDocument doc1; + JsonArrayConst array1 = doc1.to(); + + JsonDocument doc2; + JsonArrayConst array2 = doc2.to(); + + SECTION("should return false when arrays differ") { + doc1.add("coucou"); + doc2.add(1); + + REQUIRE_FALSE(array1 == array2); + } + + SECTION("should return false when LHS has more elements") { + doc1.add(1); + doc1.add(2); + doc2.add(1); + + REQUIRE_FALSE(array1 == array2); + } + + SECTION("should return false when RHS has more elements") { + doc1.add(1); + doc2.add(1); + doc2.add(2); + + REQUIRE_FALSE(array1 == array2); + } + + SECTION("should return true when arrays equal") { + doc1.add("coucou"); + doc2.add("coucou"); + + REQUIRE(array1 == array2); + } + + SECTION("should return false when RHS is null") { + JsonArrayConst null; + + REQUIRE_FALSE(array1 == null); + } + + SECTION("should return false when LHS is null") { + JsonArrayConst null; + + REQUIRE_FALSE(null == array1); + } + + SECTION("should return true when both are null") { + JsonArrayConst null1; + JsonArrayConst null2; + + REQUIRE(null1 == null2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/isNull.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/isNull.cpp new file mode 100644 index 0000000..d443a73 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/isNull.cpp @@ -0,0 +1,32 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArrayConst::isNull()") { + SECTION("returns true") { + JsonArrayConst arr; + REQUIRE(arr.isNull() == true); + } + + SECTION("returns false") { + JsonDocument doc; + JsonArrayConst arr = doc.to(); + REQUIRE(arr.isNull() == false); + } +} + +TEST_CASE("JsonArrayConst::operator bool()") { + SECTION("returns false") { + JsonArrayConst arr; + REQUIRE(static_cast(arr) == false); + } + + SECTION("returns true") { + JsonDocument doc; + JsonArrayConst arr = doc.to(); + REQUIRE(static_cast(arr) == true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/iterator.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/iterator.cpp new file mode 100644 index 0000000..0907af7 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/iterator.cpp @@ -0,0 +1,34 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArrayConst::begin()/end()") { + SECTION("Non null JsonArrayConst") { + JsonDocument doc; + JsonArrayConst array = doc.to(); + doc.add(12); + doc.add(34); + + auto it = array.begin(); + auto end = array.end(); + + REQUIRE(end != it); + REQUIRE(12 == it->as()); + REQUIRE(12 == static_cast(*it)); + ++it; + REQUIRE(end != it); + REQUIRE(34 == it->as()); + REQUIRE(34 == static_cast(*it)); + ++it; + REQUIRE(end == it); + } + + SECTION("Null JsonArrayConst") { + JsonArrayConst array; + + REQUIRE(array.begin() == array.end()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/nesting.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/nesting.cpp new file mode 100644 index 0000000..547d5d4 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/nesting.cpp @@ -0,0 +1,35 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArrayConst::nesting()") { + JsonDocument doc; + JsonArrayConst arr = doc.to(); + + SECTION("return 0 if unbound") { + JsonArrayConst unbound; + REQUIRE(unbound.nesting() == 0); + } + + SECTION("returns 1 for empty array") { + REQUIRE(arr.nesting() == 1); + } + + SECTION("returns 1 for flat array") { + doc.add("hello"); + REQUIRE(arr.nesting() == 1); + } + + SECTION("returns 2 with nested array") { + doc.add(); + REQUIRE(arr.nesting() == 2); + } + + SECTION("returns 2 with nested object") { + doc.add(); + REQUIRE(arr.nesting() == 2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/size.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/size.cpp new file mode 100644 index 0000000..4bf000f --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/size.cpp @@ -0,0 +1,27 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonArrayConst::size()") { + JsonDocument doc; + JsonArrayConst array = doc.to(); + + SECTION("returns 0 if unbound") { + JsonArrayConst unbound; + REQUIRE(0U == unbound.size()); + } + + SECTION("returns 0 is empty") { + REQUIRE(0U == array.size()); + } + + SECTION("return number of elements") { + doc.add("hello"); + doc.add("world"); + + REQUIRE(2U == array.size()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/subscript.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/subscript.cpp new file mode 100644 index 0000000..907cf31 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonArrayConst/subscript.cpp @@ -0,0 +1,27 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +TEST_CASE("JsonArrayConst::operator[]") { + JsonDocument doc; + JsonArrayConst arr = doc.to(); + doc.add(1); + doc.add(2); + doc.add(3); + + SECTION("int") { + REQUIRE(1 == arr[0].as()); + REQUIRE(2 == arr[1].as()); + REQUIRE(3 == arr[2].as()); + REQUIRE(0 == arr[3].as()); + } + + SECTION("JsonVariant") { + REQUIRE(2 == arr[arr[0]].as()); + REQUIRE(0 == arr[arr[3]].as()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt new file mode 100644 index 0000000..6faaaa8 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt @@ -0,0 +1,26 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(JsonDeserializerTests + array.cpp + DeserializationError.cpp + destination_types.cpp + errors.cpp + filter.cpp + input_types.cpp + misc.cpp + nestingLimit.cpp + number.cpp + object.cpp + string.cpp +) + +set_target_properties(JsonDeserializerTests PROPERTIES UNITY_BUILD OFF) + +add_test(JsonDeserializer JsonDeserializerTests) + +set_tests_properties(JsonDeserializer + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp new file mode 100644 index 0000000..edfcd3a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp @@ -0,0 +1,122 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +void testStringification(DeserializationError error, std::string expected) { + REQUIRE(error.c_str() == expected); +} + +void testBoolification(DeserializationError error, bool expected) { + // DeserializationError on left-hand side + CHECK(bool(error) == expected); + CHECK(bool(error) != !expected); + CHECK(!bool(error) == !expected); + + // DeserializationError on right-hand side + CHECK(expected == bool(error)); + CHECK(!expected != bool(error)); + CHECK(!expected == !bool(error)); +} + +#define TEST_STRINGIFICATION(symbol) \ + testStringification(DeserializationError::symbol, #symbol) + +#define TEST_BOOLIFICATION(symbol, expected) \ + testBoolification(DeserializationError::symbol, expected) + +TEST_CASE("DeserializationError") { + SECTION("c_str()") { + TEST_STRINGIFICATION(Ok); + TEST_STRINGIFICATION(EmptyInput); + TEST_STRINGIFICATION(IncompleteInput); + TEST_STRINGIFICATION(InvalidInput); + TEST_STRINGIFICATION(NoMemory); + TEST_STRINGIFICATION(TooDeep); + } + + SECTION("as boolean") { + TEST_BOOLIFICATION(Ok, false); + TEST_BOOLIFICATION(EmptyInput, true); + TEST_BOOLIFICATION(IncompleteInput, true); + TEST_BOOLIFICATION(InvalidInput, true); + TEST_BOOLIFICATION(NoMemory, true); + TEST_BOOLIFICATION(TooDeep, true); + } + + SECTION("ostream DeserializationError") { + std::stringstream s; + s << DeserializationError(DeserializationError::InvalidInput); + REQUIRE(s.str() == "InvalidInput"); + } + + SECTION("ostream DeserializationError::Code") { + std::stringstream s; + s << DeserializationError::InvalidInput; + REQUIRE(s.str() == "InvalidInput"); + } + + SECTION("switch") { + DeserializationError err = DeserializationError::InvalidInput; + switch (err.code()) { + case DeserializationError::InvalidInput: + SUCCEED(); + break; + default: + FAIL(); + break; + } + } + + SECTION("Use in a condition") { + DeserializationError invalidInput(DeserializationError::InvalidInput); + DeserializationError ok(DeserializationError::Ok); + + SECTION("if (!err)") { + if (!invalidInput) + FAIL(); + } + + SECTION("if (err)") { + if (ok) + FAIL(); + } + } + + SECTION("Comparisons") { + DeserializationError invalidInput(DeserializationError::InvalidInput); + DeserializationError ok(DeserializationError::Ok); + + SECTION("DeserializationError == Code") { + REQUIRE(invalidInput == DeserializationError::InvalidInput); + REQUIRE(ok == DeserializationError::Ok); + } + + SECTION("Code == DeserializationError") { + REQUIRE(DeserializationError::InvalidInput == invalidInput); + REQUIRE(DeserializationError::Ok == ok); + } + + SECTION("DeserializationError != Code") { + REQUIRE(invalidInput != DeserializationError::Ok); + REQUIRE(ok != DeserializationError::InvalidInput); + } + + SECTION("Code != DeserializationError") { + REQUIRE(DeserializationError::Ok != invalidInput); + REQUIRE(DeserializationError::InvalidInput != ok); + } + + SECTION("DeserializationError == DeserializationError") { + REQUIRE_FALSE(invalidInput == ok); + } + + SECTION("DeserializationError != DeserializationError") { + REQUIRE(invalidInput != ok); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/array.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/array.cpp new file mode 100644 index 0000000..e6fb18d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/array.cpp @@ -0,0 +1,337 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" + +using ArduinoJson::detail::sizeofArray; + +TEST_CASE("deserialize JSON array") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + SECTION("An empty array") { + DeserializationError err = deserializeJson(doc, "[]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(0 == arr.size()); + } + + SECTION("Spaces") { + SECTION("Before the opening bracket") { + DeserializationError err = deserializeJson(doc, " []"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(0 == arr.size()); + } + + SECTION("Before first value") { + DeserializationError err = deserializeJson(doc, "[ \t\r\n42]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == 42); + } + + SECTION("After first value") { + DeserializationError err = deserializeJson(doc, "[42 \t\r\n]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == 42); + } + } + + SECTION("Values types") { + SECTION("On integer") { + DeserializationError err = deserializeJson(doc, "[42]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == 42); + } + + SECTION("Two integers") { + DeserializationError err = deserializeJson(doc, "[42,84]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0] == 42); + REQUIRE(arr[1] == 84); + } + + SECTION("Float") { + DeserializationError err = deserializeJson(doc, "[4.2,1e2]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0].as() == Approx(4.2f)); + REQUIRE(arr[1] == 1e2f); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofPool(2)), + }); + } + + SECTION("Double") { + DeserializationError err = deserializeJson(doc, "[4.2123456,-7E89]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0].as() == Approx(4.2123456)); + REQUIRE(arr[1] == -7E89); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofPool(4)), + }); + } + + SECTION("Unsigned long") { + DeserializationError err = deserializeJson(doc, "[4294967295]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == 4294967295UL); + } + + SECTION("Boolean") { + DeserializationError err = deserializeJson(doc, "[true,false]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0] == true); + REQUIRE(arr[1] == false); + } + + SECTION("Null") { + DeserializationError err = deserializeJson(doc, "[null,null]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0].as() == 0); + REQUIRE(arr[1].as() == 0); + } + } + + SECTION("Quotes") { + SECTION("Double quotes") { + DeserializationError err = + deserializeJson(doc, "[ \"hello\" , \"world\" ]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0] == "hello"); + REQUIRE(arr[1] == "world"); + } + + SECTION("Single quotes") { + DeserializationError err = deserializeJson(doc, "[ 'hello' , 'world' ]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0] == "hello"); + REQUIRE(arr[1] == "world"); + } + + SECTION("No quotes") { + DeserializationError err = deserializeJson(doc, "[ hello , world ]"); + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("Double quotes (empty strings)") { + DeserializationError err = deserializeJson(doc, "[\"\",\"\"]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0] == ""); + REQUIRE(arr[1] == ""); + } + + SECTION("Single quotes (empty strings)") { + DeserializationError err = deserializeJson(doc, "[\'\',\'\']"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0] == ""); + REQUIRE(arr[1] == ""); + } + + SECTION("No quotes (empty strings)") { + DeserializationError err = deserializeJson(doc, "[,]"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("Closing single quotes missing") { + DeserializationError err = deserializeJson(doc, "[\"]"); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("Closing double quotes missing") { + DeserializationError err = deserializeJson(doc, "[\']"); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + } + + SECTION("Premature null-terminator") { + SECTION("After opening bracket") { + DeserializationError err = deserializeJson(doc, "["); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("After value") { + DeserializationError err = deserializeJson(doc, "[1"); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("After comma") { + DeserializationError err = deserializeJson(doc, "[1,"); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + } + + SECTION("Premature end of input") { + const char* input = "[1,2]"; + + SECTION("After opening bracket") { + DeserializationError err = deserializeJson(doc, input, 1); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("After value") { + DeserializationError err = deserializeJson(doc, input, 2); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("After comma") { + DeserializationError err = deserializeJson(doc, input, 3); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + } + + SECTION("Misc") { + SECTION("Nested objects") { + char jsonString[] = + " [ { \"a\" : 1 , \"b\" : 2 } , { \"c\" : 3 , \"d\" : 4 } ] "; + + DeserializationError err = deserializeJson(doc, jsonString); + JsonArray arr = doc.as(); + + JsonObject object1 = arr[0]; + const JsonObject object2 = arr[1]; + JsonObject object3 = arr[2]; + + REQUIRE(err == DeserializationError::Ok); + + REQUIRE(object1.isNull() == false); + REQUIRE(object2.isNull() == false); + REQUIRE(object3.isNull() == true); + + REQUIRE(2 == object1.size()); + REQUIRE(2 == object2.size()); + REQUIRE(0 == object3.size()); + + REQUIRE(1 == object1["a"].as()); + REQUIRE(2 == object1["b"].as()); + REQUIRE(3 == object2["c"].as()); + REQUIRE(4 == object2["d"].as()); + REQUIRE(0 == object3["e"].as()); + } + } + + SECTION("Should clear the JsonArray") { + deserializeJson(doc, "[1,2,3,4]"); + spy.clearLog(); + + deserializeJson(doc, "[]"); + + JsonArray arr = doc.as(); + REQUIRE(arr.size() == 0); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofArray(4)), + }); + } +} + +TEST_CASE("deserialize JSON array under memory constraints") { + TimebombAllocator timebomb(100); + SpyingAllocator spy(&timebomb); + JsonDocument doc(&spy); + + SECTION("empty array requires no allocation") { + timebomb.setCountdown(0); + char input[] = "[]"; + + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("allocation of pool list fails") { + timebomb.setCountdown(0); + char input[] = "[1]"; + + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + REQUIRE(doc.as() == "[]"); + } + + SECTION("allocation of pool fails") { + timebomb.setCountdown(0); + char input[] = "[1]"; + + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + REQUIRE(doc.as() == "[]"); + } + + SECTION("allocation of string fails in array") { + timebomb.setCountdown(1); + char input[] = "[0,\"hi!\"]"; + + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + REQUIRE(doc.as() == "[0,null]"); + } + + SECTION("don't store space characters") { + deserializeJson(doc, " [ \"1234567\" ] "); + + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("1234567")), + Reallocate(sizeofPool(), sizeofArray(1)), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/destination_types.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/destination_types.cpp new file mode 100644 index 0000000..0f96b23 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/destination_types.cpp @@ -0,0 +1,109 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofArray; +using ArduinoJson::detail::sizeofObject; + +TEST_CASE("deserializeJson(JsonDocument&)") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc.add("hello"_s); + spy.clearLog(); + + auto err = deserializeJson(doc, "[42]"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "[42]"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofPool()), + Deallocate(sizeofString("hello")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofArray(1)), + }); +} + +TEST_CASE("deserializeJson(JsonVariant)") { + SECTION("variant is bound") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc.add("hello"_s); + spy.clearLog(); + + JsonVariant variant = doc[0]; + + auto err = deserializeJson(variant, "[42]"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "[[42]]"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("hello")), + }); + } + + SECTION("variant is unbound") { + JsonVariant variant; + + auto err = deserializeJson(variant, "[42]"); + + REQUIRE(err == DeserializationError::NoMemory); + } +} + +TEST_CASE("deserializeJson(ElementProxy)") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc.add("hello"_s); + spy.clearLog(); + + SECTION("element already exists") { + auto err = deserializeJson(doc[0], "[42]"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "[[42]]"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("hello")), + }); + } + + SECTION("element must be created") { + auto err = deserializeJson(doc[1], "[42]"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "[\"hello\",[42]]"); + REQUIRE(spy.log() == AllocatorLog{}); + } +} + +TEST_CASE("deserializeJson(MemberProxy)") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc["hello"_s] = "world"_s; + spy.clearLog(); + + SECTION("member already exists") { + auto err = deserializeJson(doc["hello"], "[42]"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "{\"hello\":[42]}"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("world")), + }); + } + + SECTION("member must be created exists") { + auto err = deserializeJson(doc["value"], "[42]"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "{\"hello\":\"world\",\"value\":[42]}"); + REQUIRE(spy.log() == AllocatorLog{}); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/errors.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/errors.cpp new file mode 100644 index 0000000..35d3ca3 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/errors.cpp @@ -0,0 +1,162 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_DECODE_UNICODE 1 +#include +#include + +#include "Allocators.hpp" + +TEST_CASE("deserializeJson() returns IncompleteInput") { + const char* testCases[] = { + // strings + "\"\\", + "\"hello", + "\'hello", + // unicode + "'\\u", + "'\\u00", + "'\\u000", + // false + "f", + "fa", + "fal", + "fals", + // true + "t", + "tr", + "tru", + // null + "n", + "nu", + "nul", + // object + "{", + "{a", + "{a:", + "{a:1", + "{a:1,", + "{a:1,b", + "{a:1,b:", + }; + + for (auto input : testCases) { + SECTION(input) { + JsonDocument doc; + REQUIRE(deserializeJson(doc, input) == + DeserializationError::IncompleteInput); + } + } +} + +TEST_CASE("deserializeJson() returns InvalidInput") { + const char* testCases[] = { + // unicode + "'\\u'", "'\\u000g'", "'\\u000'", "'\\u000G'", "'\\u000/'", "\\x1234", + // numbers + "6a9", "1,", "2]", "3}", + // constants + "nulL", "tru3", "fals3", + // garbage + "%*$£¤"}; + + for (auto input : testCases) { + SECTION(input) { + JsonDocument doc; + REQUIRE(deserializeJson(doc, input) == + DeserializationError::InvalidInput); + } + } +} + +TEST_CASE("deserializeJson() oversees some edge cases") { + const char* testCases[] = { + "'\\ud83d'", // leading surrogate without a trailing surrogate + "'\\udda4'", // trailing surrogate without a leading surrogate + "'\\ud83d\\ud83d'", // two leading surrogates + }; + + for (auto input : testCases) { + SECTION(input) { + JsonDocument doc; + REQUIRE(deserializeJson(doc, input) == DeserializationError::Ok); + } + } +} + +TEST_CASE("deserializeJson() returns EmptyInput") { + JsonDocument doc; + + SECTION("null") { + auto err = deserializeJson(doc, static_cast(0)); + REQUIRE(err == DeserializationError::EmptyInput); + } + + SECTION("Empty string") { + auto err = deserializeJson(doc, ""); + REQUIRE(err == DeserializationError::EmptyInput); + } + + SECTION("Only spaces") { + auto err = deserializeJson(doc, " \t\n\r"); + REQUIRE(err == DeserializationError::EmptyInput); + } +} + +TEST_CASE("deserializeJson() returns NoMemory if string length overflows") { + JsonDocument doc; + auto maxLength = ArduinoJson::detail::StringNode::maxLength; + + SECTION("max length should succeed") { + auto err = deserializeJson(doc, "\"" + std::string(maxLength, 'a') + "\""); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("one above max length should fail") { + auto err = + deserializeJson(doc, "\"" + std::string(maxLength + 1, 'a') + "\""); + REQUIRE(err == DeserializationError::NoMemory); + } +} + +TEST_CASE("deserializeJson() returns NoMemory if extension allocation fails") { + JsonDocument doc(FailingAllocator::instance()); + + SECTION("uint32_t should pass") { + auto err = deserializeJson(doc, "4294967295"); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("uint64_t should fail") { + auto err = deserializeJson(doc, "18446744073709551615"); + + REQUIRE(err == DeserializationError::NoMemory); + } + + SECTION("int32_t should pass") { + auto err = deserializeJson(doc, "-2147483648"); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("int64_t should fail") { + auto err = deserializeJson(doc, "-9223372036854775808"); + + REQUIRE(err == DeserializationError::NoMemory); + } + + SECTION("float should pass") { + auto err = deserializeJson(doc, "3.402823e38"); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("double should fail") { + auto err = deserializeJson(doc, "1.7976931348623157e308"); + + REQUIRE(err == DeserializationError::NoMemory); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/filter.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/filter.cpp new file mode 100644 index 0000000..4f9d9b9 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/filter.cpp @@ -0,0 +1,831 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_ENABLE_COMMENTS 1 +#include +#include + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofArray; +using ArduinoJson::detail::sizeofObject; + +TEST_CASE("Filtering") { + struct TestCase { + const char* description; + const char* input; + const char* filter; + uint8_t nestingLimit; + DeserializationError error; + const char* output; + size_t memoryUsage; + }; + + TestCase testCases[] = { + { + "Input is object, filter is null", // description + "{\"hello\":\"world\"}", // input + "null", // filter + 10, // nestingLimit + DeserializationError::Ok, // error + "null", // output + 0, // memoryUsage + }, + { + "Input is object, filter is false", + "{\"hello\":\"world\"}", + "false", + 10, + DeserializationError::Ok, + "null", + 0, + }, + { + "Input is object, filter is true", + "{\"abcdefg\":\"hijklmn\"}", + "true", + 10, + DeserializationError::Ok, + "{\"abcdefg\":\"hijklmn\"}", + sizeofObject(1) + sizeofString("abcdefg") + sizeofString("hijklmn"), + }, + { + "Input is object, filter is empty object", + "{\"hello\":\"world\"}", + "{}", + 10, + DeserializationError::Ok, + "{}", + sizeofObject(0), + }, + { + "Input in an object, but filter wants an array", + "{\"hello\":\"world\"}", + "[]", + 10, + DeserializationError::Ok, + "null", + 0, + }, + { + "Member is a string, but filter wants an array", + "{\"example\":\"example\"}", + "{\"example\":[true]}", + 10, + DeserializationError::Ok, + "{\"example\":null}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Member is a number, but filter wants an array", + "{\"example\":42}", + "{\"example\":[true]}", + 10, + DeserializationError::Ok, + "{\"example\":null}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Input is an array, but filter wants an object", + "[\"hello\",\"world\"]", + "{}", + 10, + DeserializationError::Ok, + "null", + 0, + }, + { + "Input is a bool, but filter wants an object", + "true", + "{}", + 10, + DeserializationError::Ok, + "null", + 0, + }, + { + "Input is a string, but filter wants an object", + "\"hello\"", + "{}", + 10, + DeserializationError::Ok, + "null", + 0, + }, + { + "Skip an integer", + "{\"an_integer\":666,example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip a float", + "{\"a_float\":12.34e-6,example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip false", + "{\"a_bool\":false,example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip true", + "{\"a_bool\":true,example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip null", + "{\"a_bool\":null,example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip a double-quoted string", + "{\"a_double_quoted_string\":\"hello\",example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip a single-quoted string", + "{\"a_single_quoted_string\":'hello',example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip an empty array", + "{\"an_empty_array\":[],example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip an empty array with spaces in it", + "{\"an_empty_array\":[\t],example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip an array", + "{\"an_array\":[1,2,3],example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip an array with spaces in it", + "{\"an_array\": [ 1 , 2 , 3 ] ,example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip an empty nested object", + "{\"an_empty_object\":{},example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip an empty nested object with spaces in it", + "{\"an_empty_object\":{ },example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip a nested object", + "{\"an_object\":{a:1,'b':2,\"c\":3},example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip an object with spaces in it", + "{\"an_object\" : { a : 1 , 'b' : 2 , \"c\" : 3 } ,example:42}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{\"example\":42}", + sizeofObject(1) + sizeofString("example"), + }, + { + "Skip a string in a nested object", + "{\"an_integer\": 0,\"example\":{\"type\":\"int\",\"outcome\":42}}", + "{\"example\":{\"outcome\":true}}", + 10, + DeserializationError::Ok, + "{\"example\":{\"outcome\":42}}", + 2 * sizeofObject(1) + 2 * sizeofString("example"), + }, + { + "wildcard", + "{\"example\":{\"type\":\"int\",\"outcome\":42}}", + "{\"*\":{\"outcome\":true}}", + 10, + DeserializationError::Ok, + "{\"example\":{\"outcome\":42}}", + 2 * sizeofObject(1) + 2 * sizeofString("example"), + }, + { + "exclusion filter (issue #1628)", + "{\"example\":1,\"ignored\":2}", + "{\"*\":true,\"ignored\":false}", + 10, + DeserializationError::Ok, + "{\"example\":1}", + sizeofObject(1) + sizeofString("example"), + }, + { + "only the first element of array counts", + "[1,2,3]", + "[true, false]", + 10, + DeserializationError::Ok, + "[1,2,3]", + sizeofArray(3), + }, + { + "only the first element of array counts", + "[1,2,3]", + "[false, true]", + 10, + DeserializationError::Ok, + "[]", + sizeofArray(0), + }, + { + "filter members of object in array", + "[{\"example\":1,\"ignore\":2},{\"example\":3,\"ignore\":4}]", + "[{\"example\":true}]", + 10, + DeserializationError::Ok, + "[{\"example\":1},{\"example\":3}]", + sizeofArray(2) + 2 * sizeofObject(1) + sizeofString("example"), + }, + { + "Unclosed single quote in skipped element", + "[',2,3]", + "[false,true]", + 10, + DeserializationError::IncompleteInput, + "[]", + sizeofArray(0), + }, + { + "Unclosed double quote in skipped element", + "[\",2,3]", + "[false,true]", + 10, + DeserializationError::IncompleteInput, + "[]", + sizeofArray(0), + }, + { + "Detect errors in skipped value", + "[!,2,\\]", + "[false]", + 10, + DeserializationError::InvalidInput, + "[]", + sizeofArray(0), + }, + { + "Detect incomplete string event if it's skipped", + "\"ABC", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Detect incomplete string event if it's skipped", + "'ABC", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Handle escaped quotes", + "'A\\'BC'", + "false", + 10, + DeserializationError::Ok, + "null", + 0, + }, + { + "Handle escaped quotes", + "\"A\\\"BC\"", + "false", + 10, + DeserializationError::Ok, + "null", + 0, + }, + { + "Detect incomplete string in presence of escaped quotes", + "'A\\'BC", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Detect incomplete string in presence of escaped quotes", + "\"A\\\"BC", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "skip empty array", + "[]", + "false", + 10, + DeserializationError::Ok, + "null", + 0, + }, + { + "Skip empty array with spaces", + " [ ] ", + "false", + 10, + DeserializationError::Ok, + "null", + 0, + }, + { + "Bubble up element error even if array is skipped", + "[1,'2,3]", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Bubble up member error even if object is skipped", + "{'hello':'worl}", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Bubble up colon error even if object is skipped", + "{'hello','world'}", + "false", + 10, + DeserializationError::InvalidInput, + "null", + 0, + }, + { + "Bubble up key error even if object is skipped", + "{'hello:1}", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Detect invalid value in skipped object", + "{'hello':!}", + "false", + 10, + DeserializationError::InvalidInput, + "null", + 0, + }, + { + "Ignore invalid value in skipped object", + "{'hello':\\}", + "false", + 10, + DeserializationError::InvalidInput, + "null", + 0, + }, + { + "Check nesting limit even for ignored objects", + "{}", + "false", + 0, + DeserializationError::TooDeep, + "null", + 0, + }, + { + "Check nesting limit even for ignored objects", + "{'hello':{}}", + "false", + 1, + DeserializationError::TooDeep, + "null", + 0, + }, + { + "Check nesting limit even for ignored values in objects", + "{'hello':{}}", + "{}", + 1, + DeserializationError::TooDeep, + "{}", + sizeofObject(0), + }, + { + "Check nesting limit even for ignored arrays", + "[]", + "false", + 0, + DeserializationError::TooDeep, + "null", + 0, + }, + { + "Check nesting limit even for ignored arrays", + "[[]]", + "false", + 1, + DeserializationError::TooDeep, + "null", + 0, + }, + { + "Check nesting limit even for ignored values in arrays", + "[[]]", + "[]", + 1, + DeserializationError::TooDeep, + "[]", + sizeofArray(0), + }, + { + "Supports back-slash at the end of skipped string", + "\"hell\\", + "false", + 1, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Invalid comment at after an element in a skipped array", + "[1/]", + "false", + 10, + DeserializationError::InvalidInput, + "null", + 0, + }, + { + "Incomplete comment at after an element in a skipped array", + "[1/*]", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Missing comma in a skipped array", + "[1 2]", + "false", + 10, + DeserializationError::InvalidInput, + "null", + 0, + }, + { + "Invalid comment at the beginning of array", + "[/1]", + "[false]", + 10, + DeserializationError::InvalidInput, + "[]", + sizeofArray(0), + }, + { + "Incomplete comment at the begining of an array", + "[/*]", + "[false]", + 10, + DeserializationError::IncompleteInput, + "[]", + sizeofArray(0), + }, + { + "Invalid comment before key", + "{/1:2}", + "{}", + 10, + DeserializationError::InvalidInput, + "{}", + sizeofObject(0), + }, + { + "Incomplete comment before key", + "{/*:2}", + "{}", + 10, + DeserializationError::IncompleteInput, + "{}", + sizeofObject(0), + }, + { + "Invalid comment after key", + "{\"example\"/1:2}", + "{}", + 10, + DeserializationError::InvalidInput, + "{}", + sizeofObject(0), + }, + { + "Incomplete comment after key", + "{\"example\"/*:2}", + "{}", + 10, + DeserializationError::IncompleteInput, + "{}", + sizeofObject(0), + }, + { + "Invalid comment after colon", + "{\"example\":/12}", + "{}", + 10, + DeserializationError::InvalidInput, + "{}", + sizeofObject(0), + }, + { + "Incomplete comment after colon", + "{\"example\":/*2}", + "{}", + 10, + DeserializationError::IncompleteInput, + "{}", + sizeofObject(0), + }, + { + "Comment next to an integer", + "{\"ignore\":1//,\"example\":2\n}", + "{\"example\":true}", + 10, + DeserializationError::Ok, + "{}", + sizeofObject(0), + }, + { + "Invalid comment after opening brace of a skipped object", + "{/1:2}", + "false", + 10, + DeserializationError::InvalidInput, + "null", + 0, + }, + { + "Incomplete after opening brace of a skipped object", + "{/*:2}", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Invalid comment after key of a skipped object", + "{\"example\"/:2}", + "false", + 10, + DeserializationError::InvalidInput, + "null", + 0, + }, + { + "Incomplete comment after key of a skipped object", + "{\"example\"/*:2}", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Invalid comment after value in a skipped object", + "{\"example\":2/}", + "false", + 10, + DeserializationError::InvalidInput, + "null", + 0, + }, + { + "Incomplete comment after value of a skipped object", + "{\"example\":2/*}", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "Incomplete comment after comma in skipped object", + "{\"example\":2,/*}", + "false", + 10, + DeserializationError::IncompleteInput, + "null", + 0, + }, + { + "NUL character in key", + "{\"x\":0,\"x\\u0000a\":1,\"x\\u0000b\":2}", + "{\"x\\u0000a\":true}", + 10, + DeserializationError::Ok, + "{\"x\\u0000a\":1}", + sizeofObject(1) + sizeofString("x?a"), + }, + }; + + for (auto& tc : testCases) { + SECTION(tc.description) { + SpyingAllocator spy; + JsonDocument filter; + JsonDocument doc(&spy); + + REQUIRE(deserializeJson(filter, tc.filter) == DeserializationError::Ok); + + CHECK(deserializeJson( + doc, tc.input, DeserializationOption::Filter(filter), + DeserializationOption::NestingLimit(tc.nestingLimit)) == + tc.error); + + CHECK(doc.as() == tc.output); + + doc.shrinkToFit(); + CHECK(spy.allocatedBytes() == tc.memoryUsage); + } + } +} + +TEST_CASE("Overloads") { + JsonDocument doc; + JsonDocument filter; + + using namespace DeserializationOption; + + // deserializeJson(..., Filter) + + SECTION("const char*, Filter") { + deserializeJson(doc, "{}", Filter(filter)); + } + + SECTION("const char*, size_t, Filter") { + deserializeJson(doc, "{}", 2, Filter(filter)); + } + + SECTION("const std::string&, Filter") { + deserializeJson(doc, "{}"_s, Filter(filter)); + } + + SECTION("std::istream&, Filter") { + std::stringstream s("{}"); + deserializeJson(doc, s, Filter(filter)); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("char[n], Filter") { + size_t i = 4; + char vla[i]; + strcpy(vla, "{}"); + deserializeJson(doc, vla, Filter(filter)); + } +#endif + + // deserializeJson(..., Filter, NestingLimit) + + SECTION("const char*, Filter, NestingLimit") { + deserializeJson(doc, "{}", Filter(filter), NestingLimit(5)); + } + + SECTION("const char*, size_t, Filter, NestingLimit") { + deserializeJson(doc, "{}", 2, Filter(filter), NestingLimit(5)); + } + + SECTION("const std::string&, Filter, NestingLimit") { + deserializeJson(doc, "{}"_s, Filter(filter), NestingLimit(5)); + } + + SECTION("std::istream&, Filter, NestingLimit") { + std::stringstream s("{}"); + deserializeJson(doc, s, Filter(filter), NestingLimit(5)); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("char[n], Filter, NestingLimit") { + size_t i = 4; + char vla[i]; + strcpy(vla, "{}"); + deserializeJson(doc, vla, Filter(filter), NestingLimit(5)); + } +#endif + + // deserializeJson(..., NestingLimit, Filter) + + SECTION("const char*, NestingLimit, Filter") { + deserializeJson(doc, "{}", NestingLimit(5), Filter(filter)); + } + + SECTION("const char*, size_t, NestingLimit, Filter") { + deserializeJson(doc, "{}", 2, NestingLimit(5), Filter(filter)); + } + + SECTION("const std::string&, NestingLimit, Filter") { + deserializeJson(doc, "{}"_s, NestingLimit(5), Filter(filter)); + } + + SECTION("std::istream&, NestingLimit, Filter") { + std::stringstream s("{}"); + deserializeJson(doc, s, NestingLimit(5), Filter(filter)); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("char[n], NestingLimit, Filter") { + size_t i = 4; + char vla[i]; + strcpy(vla, "{}"); + deserializeJson(doc, vla, NestingLimit(5), Filter(filter)); + } +#endif +} + +TEST_CASE("shrink filter") { + JsonDocument doc; + SpyingAllocator spy; + JsonDocument filter(&spy); + filter["a"] = true; + spy.clearLog(); + + deserializeJson(doc, "{}", DeserializationOption::Filter(filter)); + + REQUIRE(spy.log() == AllocatorLog{ + Reallocate(sizeofPool(), sizeofObject(1)), + }); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp new file mode 100644 index 0000000..e750fd6 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp @@ -0,0 +1,232 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +#include +#include + +#include "Allocators.hpp" +#include "CustomReader.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofObject; + +TEST_CASE("deserializeJson(char*)") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + char input[] = "{\"hello\":\"world\"}"; + + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::Ok); + + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + Allocate(sizeofPool()), + Reallocate(sizeofStringBuffer(), sizeofString("hello")), + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("world")), + Reallocate(sizeofPool(), sizeofObject(1)), + }); +} + +TEST_CASE("deserializeJson(unsigned char*, unsigned int)") { // issue #1897 + JsonDocument doc; + + unsigned char input[] = "{\"hello\":\"world\"}"; + unsigned char* input_ptr = input; + unsigned int size = sizeof(input); + + DeserializationError err = deserializeJson(doc, input_ptr, size); + + REQUIRE(err == DeserializationError::Ok); +} + +TEST_CASE("deserializeJson(uint8_t*, size_t)") { // issue #1898 + JsonDocument doc; + + uint8_t input[] = "{\"hello\":\"world\"}"; + uint8_t* input_ptr = input; + size_t size = sizeof(input); + + DeserializationError err = deserializeJson(doc, input_ptr, size); + + REQUIRE(err == DeserializationError::Ok); +} + +TEST_CASE("deserializeJson(const std::string&)") { + JsonDocument doc; + + SECTION("should accept const string") { + const std::string input("[42]"); + + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("should accept temporary string") { + DeserializationError err = deserializeJson(doc, "[42]"_s); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("should duplicate content") { + std::string input("[\"hello\"]"); + + DeserializationError err = deserializeJson(doc, input); + input[2] = 'X'; // alter the string tomake sure we made a copy + + JsonArray array = doc.as(); + REQUIRE(err == DeserializationError::Ok); + REQUIRE("hello"_s == array[0]); + } +} + +TEST_CASE("deserializeJson(std::istream&)") { + JsonDocument doc; + + SECTION("array") { + std::istringstream json(" [ 42 ] "); + + DeserializationError err = deserializeJson(doc, json); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(42 == arr[0]); + } + + SECTION("object") { + std::istringstream json(" { hello : 'world' }"); + + DeserializationError err = deserializeJson(doc, json); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == obj.size()); + REQUIRE("world"_s == obj["hello"]); + } + + SECTION("Should not read after the closing brace of an empty object") { + std::istringstream json("{}123"); + + deserializeJson(doc, json); + + REQUIRE('1' == char(json.get())); + } + + SECTION("Should not read after the closing brace") { + std::istringstream json("{\"hello\":\"world\"}123"); + + deserializeJson(doc, json); + + REQUIRE('1' == char(json.get())); + } + + SECTION("Should not read after the closing bracket of an empty array") { + std::istringstream json("[]123"); + + deserializeJson(doc, json); + + REQUIRE('1' == char(json.get())); + } + + SECTION("Should not read after the closing bracket") { + std::istringstream json("[\"hello\",\"world\"]123"); + + deserializeJson(doc, json); + + REQUIRE('1' == char(json.get())); + } + + SECTION("Should not read after the closing quote") { + std::istringstream json("\"hello\"123"); + + deserializeJson(doc, json); + + REQUIRE('1' == char(json.get())); + } +} + +#ifdef HAS_VARIABLE_LENGTH_ARRAY +TEST_CASE("deserializeJson(VLA)") { + size_t i = 9; + char vla[i]; + strcpy(vla, "{\"a\":42}"); + + JsonDocument doc; + DeserializationError err = deserializeJson(doc, vla); + + REQUIRE(err == DeserializationError::Ok); +} +#endif + +TEST_CASE("deserializeJson(CustomReader)") { + JsonDocument doc; + CustomReader reader("[4,2]"); + DeserializationError err = deserializeJson(doc, reader); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.size() == 2); + REQUIRE(doc[0] == 4); + REQUIRE(doc[1] == 2); +} + +TEST_CASE("deserializeJson(JsonDocument&, MemberProxy)") { + JsonDocument doc1; + doc1["payload"] = "[4,2]"; + + JsonDocument doc2; + DeserializationError err = deserializeJson(doc2, doc1["payload"]); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc2.size() == 2); + REQUIRE(doc2[0] == 4); + REQUIRE(doc2[1] == 2); +} + +TEST_CASE("deserializeJson(JsonDocument&, JsonVariant)") { + JsonDocument doc1; + doc1["payload"] = "[4,2]"; + + JsonDocument doc2; + DeserializationError err = + deserializeJson(doc2, doc1["payload"].as()); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc2.size() == 2); + REQUIRE(doc2[0] == 4); + REQUIRE(doc2[1] == 2); +} + +TEST_CASE("deserializeJson(JsonDocument&, JsonVariantConst)") { + JsonDocument doc1; + doc1["payload"] = "[4,2]"; + + JsonDocument doc2; + DeserializationError err = + deserializeJson(doc2, doc1["payload"].as()); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc2.size() == 2); + REQUIRE(doc2[0] == 4); + REQUIRE(doc2[1] == 2); +} + +TEST_CASE("deserializeJson(JsonDocument&, ElementProxy)") { + JsonDocument doc1; + doc1[0] = "[4,2]"; + + JsonDocument doc2; + DeserializationError err = deserializeJson(doc2, doc1[0]); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc2.size() == 2); + REQUIRE(doc2[0] == 4); + REQUIRE(doc2[1] == 2); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp new file mode 100644 index 0000000..c13956b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp @@ -0,0 +1,49 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" + +using ArduinoJson::detail::sizeofArray; + +TEST_CASE("deserializeJson() misc cases") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + SECTION("null") { + DeserializationError err = deserializeJson(doc, "null"); + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == false); + } + + SECTION("true") { + DeserializationError err = deserializeJson(doc, "true"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(doc.as() == true); + } + + SECTION("false") { + DeserializationError err = deserializeJson(doc, "false"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(doc.as() == false); + } + + SECTION("Should clear the JsonVariant") { + deserializeJson(doc, "[1,2,3]"); + spy.clearLog(); + + deserializeJson(doc, "{}"); + + REQUIRE(doc.is()); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofArray(3)), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp new file mode 100644 index 0000000..07f8f19 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp @@ -0,0 +1,105 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +#include "Literals.hpp" + +#define SHOULD_WORK(expression) REQUIRE(DeserializationError::Ok == expression); +#define SHOULD_FAIL(expression) \ + REQUIRE(DeserializationError::TooDeep == expression); + +TEST_CASE("JsonDeserializer nesting") { + JsonDocument doc; + + SECTION("Input = const char*") { + SECTION("limit = 0") { + DeserializationOption::NestingLimit nesting(0); + SHOULD_WORK(deserializeJson(doc, "\"toto\"", nesting)); + SHOULD_WORK(deserializeJson(doc, "123", nesting)); + SHOULD_WORK(deserializeJson(doc, "true", nesting)); + SHOULD_FAIL(deserializeJson(doc, "[]", nesting)); + SHOULD_FAIL(deserializeJson(doc, "{}", nesting)); + SHOULD_FAIL(deserializeJson(doc, "[\"toto\"]", nesting)); + SHOULD_FAIL(deserializeJson(doc, "{\"toto\":1}", nesting)); + } + + SECTION("limit = 1") { + DeserializationOption::NestingLimit nesting(1); + SHOULD_WORK(deserializeJson(doc, "[\"toto\"]", nesting)); + SHOULD_WORK(deserializeJson(doc, "{\"toto\":1}", nesting)); + SHOULD_FAIL(deserializeJson(doc, "{\"toto\":{}}", nesting)); + SHOULD_FAIL(deserializeJson(doc, "{\"toto\":[]}", nesting)); + SHOULD_FAIL(deserializeJson(doc, "[[\"toto\"]]", nesting)); + SHOULD_FAIL(deserializeJson(doc, "[{\"toto\":1}]", nesting)); + } + } + + SECTION("char* and size_t") { + SECTION("limit = 0") { + DeserializationOption::NestingLimit nesting(0); + SHOULD_WORK(deserializeJson(doc, "\"toto\"", 6, nesting)); + SHOULD_WORK(deserializeJson(doc, "123", 3, nesting)); + SHOULD_WORK(deserializeJson(doc, "true", 4, nesting)); + SHOULD_FAIL(deserializeJson(doc, "[]", 2, nesting)); + SHOULD_FAIL(deserializeJson(doc, "{}", 2, nesting)); + SHOULD_FAIL(deserializeJson(doc, "[\"toto\"]", 8, nesting)); + SHOULD_FAIL(deserializeJson(doc, "{\"toto\":1}", 10, nesting)); + } + + SECTION("limit = 1") { + DeserializationOption::NestingLimit nesting(1); + SHOULD_WORK(deserializeJson(doc, "[\"toto\"]", 8, nesting)); + SHOULD_WORK(deserializeJson(doc, "{\"toto\":1}", 10, nesting)); + SHOULD_FAIL(deserializeJson(doc, "{\"toto\":{}}", 11, nesting)); + SHOULD_FAIL(deserializeJson(doc, "{\"toto\":[]}", 11, nesting)); + SHOULD_FAIL(deserializeJson(doc, "[[\"toto\"]]", 10, nesting)); + SHOULD_FAIL(deserializeJson(doc, "[{\"toto\":1}]", 12, nesting)); + } + } + + SECTION("Input = std::string") { + SECTION("limit = 0") { + DeserializationOption::NestingLimit nesting(0); + SHOULD_WORK(deserializeJson(doc, "\"toto\""_s, nesting)); + SHOULD_WORK(deserializeJson(doc, "123"_s, nesting)); + SHOULD_WORK(deserializeJson(doc, "true"_s, nesting)); + SHOULD_FAIL(deserializeJson(doc, "[]"_s, nesting)); + SHOULD_FAIL(deserializeJson(doc, "{}"_s, nesting)); + SHOULD_FAIL(deserializeJson(doc, "[\"toto\"]"_s, nesting)); + SHOULD_FAIL(deserializeJson(doc, "{\"toto\":1}"_s, nesting)); + } + + SECTION("limit = 1") { + DeserializationOption::NestingLimit nesting(1); + SHOULD_WORK(deserializeJson(doc, "[\"toto\"]"_s, nesting)); + SHOULD_WORK(deserializeJson(doc, "{\"toto\":1}"_s, nesting)); + SHOULD_FAIL(deserializeJson(doc, "{\"toto\":{}}"_s, nesting)); + SHOULD_FAIL(deserializeJson(doc, "{\"toto\":[]}"_s, nesting)); + SHOULD_FAIL(deserializeJson(doc, "[[\"toto\"]]"_s, nesting)); + SHOULD_FAIL(deserializeJson(doc, "[{\"toto\":1}]"_s, nesting)); + } + } + + SECTION("Input = std::istream") { + SECTION("limit = 0") { + DeserializationOption::NestingLimit nesting(0); + std::istringstream good("true"); + std::istringstream bad("[]"); + SHOULD_WORK(deserializeJson(doc, good, nesting)); + SHOULD_FAIL(deserializeJson(doc, bad, nesting)); + } + + SECTION("limit = 1") { + DeserializationOption::NestingLimit nesting(1); + std::istringstream good("[\"toto\"]"); + std::istringstream bad("{\"toto\":{}}"); + SHOULD_WORK(deserializeJson(doc, good, nesting)); + SHOULD_FAIL(deserializeJson(doc, bad, nesting)); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/number.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/number.cpp new file mode 100644 index 0000000..a74e50b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/number.cpp @@ -0,0 +1,133 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_USE_LONG_LONG 0 +#define ARDUINOJSON_ENABLE_NAN 1 +#define ARDUINOJSON_ENABLE_INFINITY 1 + +#include +#include +#include + +namespace my { +using ArduinoJson::detail::isinf; +using ArduinoJson::detail::isnan; +} // namespace my + +TEST_CASE("deserialize an integer") { + JsonDocument doc; + + SECTION("Integer") { + SECTION("0") { + DeserializationError err = deserializeJson(doc, "0"); + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == true); + REQUIRE(doc.as() == 0); + REQUIRE(doc.as() == "0"); // issue #808 + } + + SECTION("Negative") { + DeserializationError err = deserializeJson(doc, "-42"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE_FALSE(doc.is()); + REQUIRE(doc.as() == -42); + } + +#if LONG_MAX == 2147483647 + SECTION("LONG_MAX") { + DeserializationError err = deserializeJson(doc, "2147483647"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == true); + REQUIRE(doc.as() == LONG_MAX); + } + + SECTION("LONG_MAX + 1") { + DeserializationError err = deserializeJson(doc, "2147483648"); + + CAPTURE(LONG_MIN); + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == false); + REQUIRE(doc.is() == true); + } +#endif + +#if LONG_MIN == -2147483648 + SECTION("LONG_MIN") { + DeserializationError err = deserializeJson(doc, "-2147483648"); + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == true); + REQUIRE(doc.as() == LONG_MIN); + } + + SECTION("LONG_MIN - 1") { + DeserializationError err = deserializeJson(doc, "-2147483649"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == false); + REQUIRE(doc.is() == true); + } +#endif + +#if ULONG_MAX == 4294967295 + SECTION("ULONG_MAX") { + DeserializationError err = deserializeJson(doc, "4294967295"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == true); + REQUIRE(doc.as() == ULONG_MAX); + REQUIRE(doc.is() == false); + } + + SECTION("ULONG_MAX + 1") { + DeserializationError err = deserializeJson(doc, "4294967296"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == false); + REQUIRE(doc.is() == true); + } +#endif + } + + SECTION("Floats") { + SECTION("Double") { + DeserializationError err = deserializeJson(doc, "-1.23e+4"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE_FALSE(doc.is()); + REQUIRE(doc.is()); + REQUIRE(doc.as() == Approx(-1.23e+4)); + } + + SECTION("NaN") { + DeserializationError err = deserializeJson(doc, "NaN"); + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == true); + REQUIRE(my::isnan(doc.as())); + } + + SECTION("Infinity") { + DeserializationError err = deserializeJson(doc, "Infinity"); + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == true); + REQUIRE(my::isinf(doc.as())); + } + + SECTION("+Infinity") { + DeserializationError err = deserializeJson(doc, "+Infinity"); + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == true); + REQUIRE(my::isinf(doc.as())); + } + + SECTION("-Infinity") { + DeserializationError err = deserializeJson(doc, "-Infinity"); + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is() == true); + REQUIRE(my::isinf(doc.as())); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/object.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/object.cpp new file mode 100644 index 0000000..34b357a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/object.cpp @@ -0,0 +1,400 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofObject; + +TEST_CASE("deserialize JSON object") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + SECTION("An empty object") { + DeserializationError err = deserializeJson(doc, "{}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 0); + } + + SECTION("Quotes") { + SECTION("Double quotes") { + DeserializationError err = deserializeJson(doc, "{\"key\":\"value\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 1); + REQUIRE(obj["key"] == "value"); + } + + SECTION("Single quotes") { + DeserializationError err = deserializeJson(doc, "{'key':'value'}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 1); + REQUIRE(obj["key"] == "value"); + } + + SECTION("No quotes") { + DeserializationError err = deserializeJson(doc, "{key:'value'}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 1); + REQUIRE(obj["key"] == "value"); + } + + SECTION("No quotes, allow underscore in key") { + DeserializationError err = deserializeJson(doc, "{_k_e_y_:42}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 1); + REQUIRE(obj["_k_e_y_"] == 42); + } + } + + SECTION("Spaces") { + SECTION("Before the key") { + DeserializationError err = deserializeJson(doc, "{ \"key\":\"value\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 1); + REQUIRE(obj["key"] == "value"); + } + + SECTION("After the key") { + DeserializationError err = deserializeJson(doc, "{\"key\" :\"value\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 1); + REQUIRE(obj["key"] == "value"); + } + + SECTION("Before the value") { + DeserializationError err = deserializeJson(doc, "{\"key\": \"value\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 1); + REQUIRE(obj["key"] == "value"); + } + + SECTION("After the value") { + DeserializationError err = deserializeJson(doc, "{\"key\":\"value\" }"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 1); + REQUIRE(obj["key"] == "value"); + } + + SECTION("Before the comma") { + DeserializationError err = + deserializeJson(doc, "{\"key1\":\"value1\" ,\"key2\":\"value2\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["key1"] == "value1"); + REQUIRE(obj["key2"] == "value2"); + } + + SECTION("After the comma") { + DeserializationError err = + deserializeJson(doc, "{\"key1\":\"value1\", \"key2\":\"value2\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["key1"] == "value1"); + REQUIRE(obj["key2"] == "value2"); + } + } + + SECTION("Values types") { + SECTION("String") { + DeserializationError err = + deserializeJson(doc, "{\"key1\":\"value1\",\"key2\":\"value2\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["key1"] == "value1"); + REQUIRE(obj["key2"] == "value2"); + } + + SECTION("Integer") { + DeserializationError err = + deserializeJson(doc, "{\"key1\":42,\"key2\":-42}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["key1"] == 42); + REQUIRE(obj["key2"] == -42); + } + + SECTION("Float") { + DeserializationError err = + deserializeJson(doc, "{\"key1\":12.345,\"key2\":-7E3}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["key1"].as() == Approx(12.345f)); + REQUIRE(obj["key2"] == -7E3f); + } + + SECTION("Double") { + DeserializationError err = + deserializeJson(doc, "{\"key1\":12.3456789,\"key2\":-7E89}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["key1"].as() == Approx(12.3456789)); + REQUIRE(obj["key2"] == -7E89); + } + + SECTION("Booleans") { + DeserializationError err = + deserializeJson(doc, "{\"key1\":true,\"key2\":false}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["key1"] == true); + REQUIRE(obj["key2"] == false); + } + + SECTION("Null") { + DeserializationError err = + deserializeJson(doc, "{\"key1\":null,\"key2\":null}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["key1"].as() == 0); + REQUIRE(obj["key2"].as() == 0); + } + + SECTION("Array") { + char jsonString[] = " { \"ab\" : [ 1 , 2 ] , \"cd\" : [ 3 , 4 ] } "; + + DeserializationError err = deserializeJson(doc, jsonString); + JsonObject obj = doc.as(); + + JsonArray array1 = obj["ab"]; + const JsonArray array2 = obj["cd"]; + JsonArray array3 = obj["ef"]; + + REQUIRE(err == DeserializationError::Ok); + + REQUIRE(array1.isNull() == false); + REQUIRE(array2.isNull() == false); + REQUIRE(array3.isNull() == true); + + REQUIRE(2 == array1.size()); + REQUIRE(2 == array2.size()); + REQUIRE(0 == array3.size()); + + REQUIRE(1 == array1[0].as()); + REQUIRE(2 == array1[1].as()); + + REQUIRE(3 == array2[0].as()); + REQUIRE(4 == array2[1].as()); + + REQUIRE(0 == array3[0].as()); + } + } + + SECTION("Premature null terminator") { + SECTION("After opening brace") { + DeserializationError err = deserializeJson(doc, "{"); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("After key") { + DeserializationError err = deserializeJson(doc, "{\"hello\""); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("After colon") { + DeserializationError err = deserializeJson(doc, "{\"hello\":"); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("After value") { + DeserializationError err = deserializeJson(doc, "{\"hello\":\"world\""); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("After comma") { + DeserializationError err = deserializeJson(doc, "{\"hello\":\"world\","); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + } + + SECTION("Misc") { + SECTION("A quoted key without value") { + DeserializationError err = deserializeJson(doc, "{\"key\"}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("A non-quoted key without value") { + DeserializationError err = deserializeJson(doc, "{key}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("A dangling comma") { + DeserializationError err = deserializeJson(doc, "{\"key1\":\"value1\",}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("null as a key") { + DeserializationError err = deserializeJson(doc, "{null:\"value\"}"); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("Repeated key") { + DeserializationError err = + deserializeJson(doc, "{alfa:{bravo:{charlie:1}},alfa:2}"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "{\"alfa\":2}"); + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + Allocate(sizeofPool()), + Reallocate(sizeofStringBuffer(), sizeofString("alfa")), + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("bravo")), + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("charlie")), + Allocate(sizeofStringBuffer()), + Deallocate(sizeofString("bravo")), + Deallocate(sizeofString("charlie")), + Deallocate(sizeofStringBuffer()), + Reallocate(sizeofPool(), sizeofObject(2) + sizeofObject(1)), + }); + } + + SECTION("Repeated key with zero copy mode") { // issue #1697 + char input[] = "{a:{b:{c:1}},a:2}"; + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc["a"] == 2); + } + + SECTION("NUL in keys") { + DeserializationError err = + deserializeJson(doc, "{\"x\":0,\"x\\u0000a\":1,\"x\\u0000b\":2}"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == + "{\"x\":0,\"x\\u0000a\":1,\"x\\u0000b\":2}"); + } + } + + SECTION("Should clear the JsonObject") { + deserializeJson(doc, "{\"hello\":\"world\"}"); + spy.clearLog(); + + deserializeJson(doc, "{}"); + + REQUIRE(doc.is()); + REQUIRE(doc.size() == 0); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofObject(1)), + Deallocate(sizeofString("hello")), + Deallocate(sizeofString("world")), + }); + } + + SECTION("Issue #1335") { + std::string json("{\"a\":{},\"b\":{}}"); + deserializeJson(doc, json); + CHECK(doc.as() == json); + } +} + +TEST_CASE("deserialize JSON object under memory constraints") { + TimebombAllocator timebomb(1024); + JsonDocument doc(&timebomb); + + SECTION("empty object requires no allocation") { + timebomb.setCountdown(0); + char input[] = "{}"; + + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "{}"); + } + + SECTION("key allocation fails") { + timebomb.setCountdown(0); + char input[] = "{\"a\":1}"; + + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + REQUIRE(doc.as() == "{}"); + } + + SECTION("pool allocation fails") { + timebomb.setCountdown(1); + char input[] = "{\"a\":1}"; + + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + REQUIRE(doc.as() == "{}"); + } + + SECTION("string allocation fails") { + timebomb.setCountdown(3); + char input[] = "{\"alfa\":\"bravo\"}"; + + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + REQUIRE(doc.as() == "{\"alfa\":null}"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/string.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/string.cpp new file mode 100644 index 0000000..5ad8678 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDeserializer/string.cpp @@ -0,0 +1,214 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_DECODE_UNICODE 1 +#include +#include + +#include "Allocators.hpp" + +using ArduinoJson::detail::sizeofArray; +using ArduinoJson::detail::sizeofObject; + +TEST_CASE("Valid JSON strings value") { + struct TestCase { + const char* input; + const char* expectedOutput; + }; + + TestCase testCases[] = { + {"\"hello world\"", "hello world"}, + {"\'hello world\'", "hello world"}, + {"'\"'", "\""}, + {"'\\\\'", "\\"}, + {"'\\/'", "/"}, + {"'\\b'", "\b"}, + {"'\\f'", "\f"}, + {"'\\n'", "\n"}, + {"'\\r'", "\r"}, + {"'\\t'", "\t"}, + {"\"1\\\"2\\\\3\\/4\\b5\\f6\\n7\\r8\\t9\"", "1\"2\\3/4\b5\f6\n7\r8\t9"}, + {"'\\u0041'", "A"}, + {"'\\u00e4'", "\xc3\xa4"}, // ä + {"'\\u00E4'", "\xc3\xa4"}, // ä + {"'\\u3042'", "\xe3\x81\x82"}, // あ + {"'\\ud83d\\udda4'", "\xf0\x9f\x96\xa4"}, // 🖤 + {"'\\uF053'", "\xef\x81\x93"}, // issue #1173 + {"'\\uF015'", "\xef\x80\x95"}, // issue #1173 + {"'\\uF054'", "\xef\x81\x94"}, // issue #1173 + }; + const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); + + JsonDocument doc; + + for (size_t i = 0; i < testCount; i++) { + const TestCase& testCase = testCases[i]; + CAPTURE(testCase.input); + DeserializationError err = deserializeJson(doc, testCase.input); + CHECK(err == DeserializationError::Ok); + CHECK(doc.as() == testCase.expectedOutput); + } +} + +TEST_CASE("\\u0000") { + JsonDocument doc; + + DeserializationError err = deserializeJson(doc, "\"wx\\u0000yz\""); + REQUIRE(err == DeserializationError::Ok); + + const char* result = doc.as(); + CHECK(result[0] == 'w'); + CHECK(result[1] == 'x'); + CHECK(result[2] == 0); + CHECK(result[3] == 'y'); + CHECK(result[4] == 'z'); + CHECK(result[5] == 0); + + CHECK(doc.as().size() == 5); + CHECK(doc.as().size() == 5); +} + +TEST_CASE("Truncated JSON string") { + const char* testCases[] = {"\"hello", "\'hello", "'\\u", "'\\u00", "'\\u000"}; + const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); + + JsonDocument doc; + + for (size_t i = 0; i < testCount; i++) { + const char* input = testCases[i]; + CAPTURE(input); + REQUIRE(deserializeJson(doc, input) == + DeserializationError::IncompleteInput); + } +} + +TEST_CASE("Escape single quote in single quoted string") { + JsonDocument doc; + + DeserializationError err = deserializeJson(doc, "'ab\\\'cd'"); + REQUIRE(err == DeserializationError::Ok); + CHECK(doc.as() == "ab\'cd"); +} + +TEST_CASE("Escape double quote in double quoted string") { + JsonDocument doc; + + DeserializationError err = deserializeJson(doc, "'ab\\\"cd'"); + REQUIRE(err == DeserializationError::Ok); + CHECK(doc.as() == "ab\"cd"); +} + +TEST_CASE("Invalid JSON string") { + const char* testCases[] = {"'\\u'", "'\\u000g'", "'\\u000'", + "'\\u000G'", "'\\u000/'", "'\\x1234'"}; + const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); + + JsonDocument doc; + + for (size_t i = 0; i < testCount; i++) { + const char* input = testCases[i]; + CAPTURE(input); + REQUIRE(deserializeJson(doc, input) == DeserializationError::InvalidInput); + } +} + +TEST_CASE("Allocation of the key fails") { + TimebombAllocator timebomb(0); + SpyingAllocator spy(&timebomb); + JsonDocument doc(&spy); + + SECTION("Quoted string, first member") { + REQUIRE(deserializeJson(doc, "{\"example\":1}") == + DeserializationError::NoMemory); + REQUIRE(spy.log() == AllocatorLog{ + AllocateFail(sizeofStringBuffer()), + }); + } + + SECTION("Quoted string, second member") { + timebomb.setCountdown(3); + REQUIRE(deserializeJson(doc, "{\"hello\":1,\"world\"}") == + DeserializationError::NoMemory); + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + Allocate(sizeofPool()), + Reallocate(sizeofStringBuffer(), sizeofString("hello")), + AllocateFail(sizeofStringBuffer()), + ReallocateFail(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("Non-Quoted string, first member") { + REQUIRE(deserializeJson(doc, "{example:1}") == + DeserializationError::NoMemory); + REQUIRE(spy.log() == AllocatorLog{ + AllocateFail(sizeofStringBuffer()), + }); + } + + SECTION("Non-Quoted string, second member") { + timebomb.setCountdown(3); + REQUIRE(deserializeJson(doc, "{hello:1,world}") == + DeserializationError::NoMemory); + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + Allocate(sizeofPool()), + Reallocate(sizeofStringBuffer(), sizeofString("hello")), + AllocateFail(sizeofStringBuffer()), + ReallocateFail(sizeofPool(), sizeofObject(1)), + }); + } +} + +TEST_CASE("String allocation fails") { + SpyingAllocator spy(FailingAllocator::instance()); + JsonDocument doc(&spy); + + SECTION("Input is const char*") { + REQUIRE(deserializeJson(doc, "\"hello\"") == + DeserializationError::NoMemory); + REQUIRE(spy.log() == AllocatorLog{ + AllocateFail(sizeofStringBuffer()), + }); + } +} + +TEST_CASE("Deduplicate values") { + SpyingAllocator spy; + JsonDocument doc(&spy); + deserializeJson(doc, "[\"example\",\"example\"]"); + + CHECK(doc[0].as() == doc[1].as()); + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("example")), + Allocate(sizeofStringBuffer()), + Deallocate(sizeofStringBuffer()), + Reallocate(sizeofPool(), sizeofArray(2)), + }); +} + +TEST_CASE("Deduplicate keys") { + SpyingAllocator spy; + JsonDocument doc(&spy); + deserializeJson(doc, "[{\"example\":1},{\"example\":2}]"); + + const char* key1 = doc[0].as().begin()->key().c_str(); + const char* key2 = doc[1].as().begin()->key().c_str(); + CHECK(key1 == key2); + + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("example")), + Allocate(sizeofStringBuffer()), + Deallocate(sizeofStringBuffer()), + Reallocate(sizeofPool(), sizeofArray(2) + 2 * sizeofObject(1)), + }); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt new file mode 100644 index 0000000..dc8036a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt @@ -0,0 +1,31 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(JsonDocumentTests + add.cpp + assignment.cpp + cast.cpp + clear.cpp + compare.cpp + constructor.cpp + ElementProxy.cpp + isNull.cpp + issue1120.cpp + MemberProxy.cpp + nesting.cpp + overflowed.cpp + remove.cpp + set.cpp + shrinkToFit.cpp + size.cpp + subscript.cpp + swap.cpp +) + +add_test(JsonDocument JsonDocumentTests) + +set_tests_properties(JsonDocument + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/ElementProxy.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/ElementProxy.cpp new file mode 100644 index 0000000..9cf8855 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/ElementProxy.cpp @@ -0,0 +1,297 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ElementProxy = ArduinoJson::detail::ElementProxy; + +TEST_CASE("ElementProxy::add()") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc.add(); + const ElementProxy& ep = doc[0]; + + SECTION("integer") { + ep.add(42); + + REQUIRE(doc.as() == "[[42]]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("string literal") { + ep.add("world"); + + REQUIRE(doc.as() == "[[\"world\"]]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("const char*") { + const char* s = "world"; + ep.add(s); + + REQUIRE(doc.as() == "[[\"world\"]]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } + + SECTION("char[]") { + char s[] = "world"; + ep.add(s); + strcpy(s, "!!!!!"); + + REQUIRE(doc.as() == "[[\"world\"]]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("VLA") { + size_t i = 8; + char vla[i]; + strcpy(vla, "world"); + + ep.add(vla); + + REQUIRE(doc.as() == "[[\"world\"]]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } +#endif +} + +TEST_CASE("ElementProxy::clear()") { + JsonDocument doc; + doc.add(); + const ElementProxy& ep = doc[0]; + + SECTION("size goes back to zero") { + ep.add(42); + ep.clear(); + + REQUIRE(ep.size() == 0); + } + + SECTION("isNull() return true") { + ep.add("hello"); + ep.clear(); + + REQUIRE(ep.isNull() == true); + } +} + +TEST_CASE("ElementProxy::operator==()") { + JsonDocument doc; + + SECTION("1 vs 1") { + doc.add(1); + doc.add(1); + + REQUIRE(doc[0] <= doc[1]); + REQUIRE(doc[0] == doc[1]); + REQUIRE(doc[0] >= doc[1]); + REQUIRE_FALSE(doc[0] != doc[1]); + REQUIRE_FALSE(doc[0] < doc[1]); + REQUIRE_FALSE(doc[0] > doc[1]); + } + + SECTION("1 vs 2") { + doc.add(1); + doc.add(2); + + REQUIRE(doc[0] != doc[1]); + REQUIRE(doc[0] < doc[1]); + REQUIRE(doc[0] <= doc[1]); + REQUIRE_FALSE(doc[0] == doc[1]); + REQUIRE_FALSE(doc[0] > doc[1]); + REQUIRE_FALSE(doc[0] >= doc[1]); + } + + SECTION("'abc' vs 'bcd'") { + doc.add("abc"); + doc.add("bcd"); + + REQUIRE(doc[0] != doc[1]); + REQUIRE(doc[0] < doc[1]); + REQUIRE(doc[0] <= doc[1]); + REQUIRE_FALSE(doc[0] == doc[1]); + REQUIRE_FALSE(doc[0] > doc[1]); + REQUIRE_FALSE(doc[0] >= doc[1]); + } +} + +TEST_CASE("ElementProxy::remove()") { + JsonDocument doc; + doc.add(); + const ElementProxy& ep = doc[0]; + + SECTION("remove(int)") { + ep.add(1); + ep.add(2); + ep.add(3); + + ep.remove(1); + + REQUIRE(ep.as() == "[1,3]"); + } + + SECTION("remove(const char *)") { + ep["a"] = 1; + ep["b"] = 2; + + ep.remove("a"); + + REQUIRE(ep.as() == "{\"b\":2}"); + } + + SECTION("remove(std::string)") { + ep["a"] = 1; + ep["b"] = 2; + + ep.remove("b"_s); + + REQUIRE(ep.as() == "{\"a\":1}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("remove(vla)") { + ep["a"] = 1; + ep["b"] = 2; + + size_t i = 4; + char vla[i]; + strcpy(vla, "b"); + ep.remove(vla); + + REQUIRE(ep.as() == "{\"a\":1}"); + } +#endif +} + +TEST_CASE("ElementProxy::set()") { + JsonDocument doc; + const ElementProxy& ep = doc[0]; + + SECTION("set(int)") { + ep.set(42); + + REQUIRE(doc.as() == "[42]"); + } + + SECTION("set(const char*)") { + ep.set("world"); + + REQUIRE(doc.as() == "[\"world\"]"); + } + + SECTION("set(char[])") { + char s[] = "world"; + ep.set(s); + strcpy(s, "!!!!!"); + + REQUIRE(doc.as() == "[\"world\"]"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("set(VLA)") { + size_t i = 8; + char vla[i]; + strcpy(vla, "world"); + + ep.set(vla); + + REQUIRE(doc.as() == "[\"world\"]"); + } +#endif +} + +TEST_CASE("ElementProxy::size()") { + JsonDocument doc; + doc.add(); + const ElementProxy& ep = doc[0]; + + SECTION("returns 0") { + REQUIRE(ep.size() == 0); + } + + SECTION("as an array, returns 2") { + ep.add(1); + ep.add(2); + REQUIRE(ep.size() == 2); + } + + SECTION("as an object, returns 2") { + ep["a"] = 1; + ep["b"] = 2; + REQUIRE(ep.size() == 2); + } +} + +TEST_CASE("ElementProxy::operator[]") { + JsonDocument doc; + const ElementProxy& ep = doc[1]; + + SECTION("set member") { + ep["world"] = 42; + + REQUIRE(doc.as() == "[null,{\"world\":42}]"); + } + + SECTION("set element") { + ep[2] = 42; + + REQUIRE(doc.as() == "[null,[null,null,42]]"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("set VLA") { + size_t i = 8; + char vla[i]; + strcpy(vla, "world"); + + ep[0] = vla; + + REQUIRE(doc.as() == "[null,[\"world\"]]"); + } +#endif +} + +TEST_CASE("ElementProxy cast to JsonVariantConst") { + JsonDocument doc; + doc[0] = "world"; + + const ElementProxy& ep = doc[0]; + + JsonVariantConst var = ep; + + CHECK(var.as() == "world"); +} + +TEST_CASE("ElementProxy cast to JsonVariant") { + JsonDocument doc; + doc[0] = "world"; + + const ElementProxy& ep = doc[0]; + + JsonVariant var = ep; + + CHECK(var.as() == "world"); + + var.set("toto"); + + CHECK(doc.as() == "[\"toto\"]"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/MemberProxy.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/MemberProxy.cpp new file mode 100644 index 0000000..c42edcc --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/MemberProxy.cpp @@ -0,0 +1,432 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1 +#define ARDUINOJSON_ENABLE_PROGMEM 1 +#include + +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofArray; +using ArduinoJson::detail::sizeofObject; + +TEST_CASE("MemberProxy::add()") { + SpyingAllocator spy; + JsonDocument doc(&spy); + const auto& mp = doc["hello"]; + + SECTION("integer") { + mp.add(42); + + REQUIRE(doc.as() == "{\"hello\":[42]}"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("string literal") { + mp.add("world"); + + REQUIRE(doc.as() == "{\"hello\":[\"world\"]}"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("const char*") { + const char* temp = "world"; + mp.add(temp); + + REQUIRE(doc.as() == "{\"hello\":[\"world\"]}"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } + + SECTION("char[]") { + char temp[] = "world"; + mp.add(temp); + + REQUIRE(doc.as() == "{\"hello\":[\"world\"]}"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + + }); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "world"); + + mp.add(vla); + + REQUIRE(doc.as() == "{\"hello\":[\"world\"]}"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } +#endif +} + +TEST_CASE("MemberProxy::clear()") { + JsonDocument doc; + const auto& mp = doc["hello"]; + + SECTION("size goes back to zero") { + mp.add(42); + mp.clear(); + + REQUIRE(mp.size() == 0); + } + + SECTION("isNull() return true") { + mp.add("hello"); + mp.clear(); + + REQUIRE(mp.isNull() == true); + } +} + +TEST_CASE("MemberProxy::operator==()") { + JsonDocument doc; + + SECTION("1 vs 1") { + doc["a"] = 1; + doc["b"] = 1; + + REQUIRE(doc["a"] <= doc["b"]); + REQUIRE(doc["a"] == doc["b"]); + REQUIRE(doc["a"] >= doc["b"]); + REQUIRE_FALSE(doc["a"] != doc["b"]); + REQUIRE_FALSE(doc["a"] < doc["b"]); + REQUIRE_FALSE(doc["a"] > doc["b"]); + } + + SECTION("1 vs 2") { + doc["a"] = 1; + doc["b"] = 2; + + REQUIRE(doc["a"] != doc["b"]); + REQUIRE(doc["a"] < doc["b"]); + REQUIRE(doc["a"] <= doc["b"]); + REQUIRE_FALSE(doc["a"] == doc["b"]); + REQUIRE_FALSE(doc["a"] > doc["b"]); + REQUIRE_FALSE(doc["a"] >= doc["b"]); + } + + SECTION("'abc' vs 'bcd'") { + doc["a"] = "abc"; + doc["b"] = "bcd"; + + REQUIRE(doc["a"] != doc["b"]); + REQUIRE(doc["a"] < doc["b"]); + REQUIRE(doc["a"] <= doc["b"]); + REQUIRE_FALSE(doc["a"] == doc["b"]); + REQUIRE_FALSE(doc["a"] > doc["b"]); + REQUIRE_FALSE(doc["a"] >= doc["b"]); + } +} + +TEST_CASE("MemberProxy::operator|()") { + JsonDocument doc; + + SECTION("const char*") { + doc["a"] = "hello"; + + REQUIRE((doc["a"] | "world") == "hello"_s); + REQUIRE((doc["b"] | "world") == "world"_s); + } + + SECTION("Issue #1411") { + doc["sensor"] = "gps"; + + const char* test = "test"; // <- the literal must be captured in a variable + // to trigger the bug + const char* sensor = doc["sensor"] | test; // "gps" + + REQUIRE(sensor == "gps"_s); + } + + SECTION("Issue #1415") { + JsonObject object = doc.to(); + object["hello"] = "world"; + + JsonDocument emptyDoc; + JsonObject anotherObject = object["hello"] | emptyDoc.to(); + + REQUIRE(anotherObject.isNull() == false); + REQUIRE(anotherObject.size() == 0); + } +} + +TEST_CASE("MemberProxy::remove()") { + JsonDocument doc; + const auto& mp = doc["hello"]; + + SECTION("remove(int)") { + mp.add(1); + mp.add(2); + mp.add(3); + + mp.remove(1); + + REQUIRE(mp.as() == "[1,3]"); + } + + SECTION("remove(const char *)") { + mp["a"] = 1; + mp["b"] = 2; + + mp.remove("a"); + + REQUIRE(mp.as() == "{\"b\":2}"); + } + + SECTION("remove(std::string)") { + mp["a"] = 1; + mp["b"] = 2; + + mp.remove("b"_s); + + REQUIRE(mp.as() == "{\"a\":1}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("remove(vla)") { + mp["a"] = 1; + mp["b"] = 2; + + size_t i = 4; + char vla[i]; + strcpy(vla, "b"); + mp.remove(vla); + + REQUIRE(mp.as() == "{\"a\":1}"); + } +#endif +} + +TEST_CASE("MemberProxy::set()") { + JsonDocument doc; + const auto& mp = doc["hello"]; + + SECTION("set(int)") { + mp.set(42); + + REQUIRE(doc.as() == "{\"hello\":42}"); + } + + SECTION("set(const char*)") { + mp.set("world"); + + REQUIRE(doc.as() == "{\"hello\":\"world\"}"); + } + + SECTION("set(char[])") { // issue #1191 + char s[] = "world"; + mp.set(s); + strcpy(s, "!!!!!"); + + REQUIRE(doc.as() == "{\"hello\":\"world\"}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("set(vla)") { + size_t i = 8; + char vla[i]; + strcpy(vla, "world"); + + mp.set(vla); + + REQUIRE(doc.as() == "{\"hello\":\"world\"}"); + } +#endif +} + +TEST_CASE("MemberProxy::size()") { + JsonDocument doc; + const auto& mp = doc["hello"]; + + SECTION("returns 0") { + REQUIRE(mp.size() == 0); + } + + SECTION("as an array, return 2") { + mp.add(1); + mp.add(2); + + REQUIRE(mp.size() == 2); + } + + SECTION("as an object, return 2") { + mp["a"] = 1; + mp["b"] = 2; + + REQUIRE(mp.size() == 2); + } +} + +TEST_CASE("MemberProxy::operator[]") { + JsonDocument doc; + const auto& mp = doc["hello"]; + + SECTION("set member") { + mp["world"] = 42; + + REQUIRE(doc.as() == "{\"hello\":{\"world\":42}}"); + } + + SECTION("set element") { + mp[2] = 42; + + REQUIRE(doc.as() == "{\"hello\":[null,null,42]}"); + } +} + +TEST_CASE("MemberProxy cast to JsonVariantConst") { + JsonDocument doc; + doc["hello"] = "world"; + + const auto& mp = doc["hello"]; + + JsonVariantConst var = mp; + + CHECK(var.as() == "world"); +} + +TEST_CASE("MemberProxy cast to JsonVariant") { + JsonDocument doc; + doc["hello"] = "world"; + + const auto& mp = doc["hello"]; + + JsonVariant var = mp; + + CHECK(var.as() == "world"); + + var.set("toto"); + + CHECK(doc.as() == "{\"hello\":\"toto\"}"); +} + +TEST_CASE("Deduplicate keys") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + SECTION("std::string") { + doc[0]["example"_s] = 1; + doc[1]["example"_s] = 2; + + const char* key1 = doc[0].as().begin()->key().c_str(); + const char* key2 = doc[1].as().begin()->key().c_str(); + CHECK(key1 == key2); + + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("example")), + }); + } + + SECTION("char*") { + char key[] = "example"; + doc[0][key] = 1; + doc[1][key] = 2; + + const char* key1 = doc[0].as().begin()->key().c_str(); + const char* key2 = doc[1].as().begin()->key().c_str(); + CHECK(key1 == key2); + + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("example")), + }); + } + + SECTION("Arduino String") { + doc[0][String("example")] = 1; + doc[1][String("example")] = 2; + + const char* key1 = doc[0].as().begin()->key().c_str(); + const char* key2 = doc[1].as().begin()->key().c_str(); + CHECK(key1 == key2); + + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("example")), + }); + } + + SECTION("Flash string") { + doc[0][F("example")] = 1; + doc[1][F("example")] = 2; + + const char* key1 = doc[0].as().begin()->key().c_str(); + const char* key2 = doc[1].as().begin()->key().c_str(); + CHECK(key1 == key2); + + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("example")), + }); + } +} + +TEST_CASE("MemberProxy under memory constraints") { + TimebombAllocator timebomb(1); + SpyingAllocator spy(&timebomb); + JsonDocument doc(&spy); + + SECTION("key slot allocation fails") { + timebomb.setCountdown(0); + + doc["hello"_s] = "world"; + + REQUIRE(doc.is()); + REQUIRE(doc.size() == 0); + REQUIRE(doc.overflowed() == true); + REQUIRE(spy.log() == AllocatorLog{ + AllocateFail(sizeofPool()), + }); + } + + SECTION("value slot allocation fails") { + timebomb.setCountdown(1); + + // fill the pool entirely, but leave one slot for the key + doc["foo"][ARDUINOJSON_POOL_CAPACITY - 4] = 1; + REQUIRE(doc.overflowed() == false); + + doc["hello"_s] = "world"; + + REQUIRE(doc.is()); + REQUIRE(doc.size() == 1); + REQUIRE(doc.overflowed() == true); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + AllocateFail(sizeofPool()), + }); + } + + SECTION("key string allocation fails") { + timebomb.setCountdown(1); + + doc["hello"_s] = "world"; + + REQUIRE(doc.is()); + REQUIRE(doc.size() == 0); + REQUIRE(doc.overflowed() == true); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + AllocateFail(sizeofString("hello")), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/add.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/add.cpp new file mode 100644 index 0000000..da898e6 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/add.cpp @@ -0,0 +1,176 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1 +#define ARDUINOJSON_ENABLE_PROGMEM 1 +#include + +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofArray; + +TEST_CASE("JsonDocument::add(T)") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + SECTION("integer") { + doc.add(42); + + REQUIRE(doc.as() == "[42]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("string literal") { + doc.add("hello"); + + REQUIRE(doc.as() == "[\"hello\"]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("const char*") { + const char* value = "hello"; + doc.add(value); + + REQUIRE(doc.as() == "[\"hello\"]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } + + SECTION("std::string") { + doc.add("example"_s); + doc.add("example"_s); + + CHECK(doc[0].as() == doc[1].as()); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("example")), + }); + } + + SECTION("char*") { + char value[] = "example"; + doc.add(value); + doc.add(value); + + CHECK(doc[0].as() == doc[1].as()); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("example")), + }); + } + + SECTION("Arduino String") { + doc.add(String("example")); + doc.add(String("example")); + + CHECK(doc[0].as() == doc[1].as()); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("example")), + }); + } + + SECTION("Flash string") { + doc.add(F("example")); + doc.add(F("example")); + + CHECK(doc[0].as() == doc[1].as()); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("example")), + }); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "example"); + + doc.add(vla); + doc.add(vla); + + CHECK(doc[0].as() == doc[1].as()); + REQUIRE("example"_s == doc[0]); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("example")), + }); + } +#endif +} + +TEST_CASE("JsonDocument::add()") { + JsonDocument doc; + + SECTION("JsonArray") { + JsonArray array = doc.add(); + array.add(1); + array.add(2); + REQUIRE(doc.as() == "[[1,2]]"); + } + + SECTION("JsonVariant") { + JsonVariant variant = doc.add(); + variant.set(42); + REQUIRE(doc.as() == "[42]"); + } +} + +TEST_CASE("JsonObject::add(JsonObject) ") { + JsonDocument doc1; + doc1["hello"_s] = "world"_s; + + TimebombAllocator allocator(10); + SpyingAllocator spy(&allocator); + JsonDocument doc2(&spy); + + SECTION("success") { + bool result = doc2.add(doc1.as()); + + REQUIRE(result == true); + REQUIRE(doc2.as() == "[{\"hello\":\"world\"}]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + Allocate(sizeofString("world")), + }); + } + + SECTION("partial failure") { // issue #2081 + allocator.setCountdown(2); + + bool result = doc2.add(doc1.as()); + + REQUIRE(result == false); + REQUIRE(doc2.as() == "[]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + AllocateFail(sizeofString("world")), + Deallocate(sizeofString("hello")), + }); + } + + SECTION("complete failure") { + allocator.setCountdown(0); + + bool result = doc2.add(doc1.as()); + + REQUIRE(result == false); + REQUIRE(doc2.as() == "[]"); + REQUIRE(spy.log() == AllocatorLog{ + AllocateFail(sizeofPool()), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/assignment.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/assignment.cpp new file mode 100644 index 0000000..4e59584 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/assignment.cpp @@ -0,0 +1,135 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonDocument assignment") { + SpyingAllocator spyingAllocator; + + SECTION("Copy assignment same capacity") { + JsonDocument doc1(&spyingAllocator); + deserializeJson(doc1, "{\"hello\":\"world\"}"); + JsonDocument doc2(&spyingAllocator); + spyingAllocator.clearLog(); + + doc2 = doc1; + + REQUIRE(doc2.as() == "{\"hello\":\"world\"}"); + + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + Allocate(sizeofString("world")), + }); + } + + SECTION("Copy assignment reallocates when capacity is smaller") { + JsonDocument doc1(&spyingAllocator); + deserializeJson(doc1, "[{\"hello\":\"world\"}]"); + JsonDocument doc2(&spyingAllocator); + spyingAllocator.clearLog(); + + doc2 = doc1; + + REQUIRE(doc2.as() == "[{\"hello\":\"world\"}]"); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + Allocate(sizeofString("world")), + }); + } + + SECTION("Copy assignment reallocates when capacity is larger") { + JsonDocument doc1(&spyingAllocator); + deserializeJson(doc1, "{\"hello\":\"world\"}"); + JsonDocument doc2(&spyingAllocator); + spyingAllocator.clearLog(); + + doc2 = doc1; + + REQUIRE(doc2.as() == "{\"hello\":\"world\"}"); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + Allocate(sizeofString("world")), + }); + } + + SECTION("Move assign") { + { + JsonDocument doc1(&spyingAllocator); + doc1["hello"_s] = "world"_s; + JsonDocument doc2(&spyingAllocator); + + doc2 = std::move(doc1); + + REQUIRE(doc2.as() == "{\"hello\":\"world\"}"); + REQUIRE(doc1.as() == "null"); + } + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + Allocate(sizeofString("world")), + Deallocate(sizeofString("hello")), + Deallocate(sizeofString("world")), + Deallocate(sizeofPool()), + }); + } + + SECTION("Assign from JsonObject") { + JsonDocument doc1; + JsonObject obj = doc1.to(); + obj["hello"] = "world"; + + JsonDocument doc2; + doc2 = obj; + + REQUIRE(doc2.as() == "{\"hello\":\"world\"}"); + } + + SECTION("Assign from JsonArray") { + JsonDocument doc1; + JsonArray arr = doc1.to(); + arr.add("hello"); + + JsonDocument doc2; + doc2 = arr; + + REQUIRE(doc2.as() == "[\"hello\"]"); + } + + SECTION("Assign from JsonVariant") { + JsonDocument doc1; + deserializeJson(doc1, "42"); + + JsonDocument doc2; + doc2 = doc1.as(); + + REQUIRE(doc2.as() == "42"); + } + + SECTION("Assign from MemberProxy") { + JsonDocument doc1; + doc1["value"] = 42; + + JsonDocument doc2; + doc2 = doc1["value"]; + + REQUIRE(doc2.as() == "42"); + } + + SECTION("Assign from ElementProxy") { + JsonDocument doc1; + doc1[0] = 42; + + JsonDocument doc2; + doc2 = doc1[0]; + + REQUIRE(doc2.as() == "42"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/cast.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/cast.cpp new file mode 100644 index 0000000..0bb9caa --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/cast.cpp @@ -0,0 +1,18 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +TEST_CASE("Implicit cast to JsonVariant") { + JsonDocument doc; + + doc["hello"] = "world"; + + JsonVariant var = doc; + + CHECK(var.as() == "{\"hello\":\"world\"}"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/clear.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/clear.cpp new file mode 100644 index 0000000..98d2499 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/clear.cpp @@ -0,0 +1,48 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include // malloc, free +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonDocument::clear()") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + SECTION("null") { + doc.clear(); + + REQUIRE(doc.isNull()); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("releases resources") { + doc["hello"_s] = "world"_s; + spy.clearLog(); + + doc.clear(); + + REQUIRE(doc.isNull()); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofPool()), + Deallocate(sizeofString("hello")), + Deallocate(sizeofString("world")), + }); + } + + SECTION("clear free list") { // issue #2034 + JsonObject obj = doc.to(); + obj["a"] = 1; + obj.clear(); // puts the slot in the free list + + doc.clear(); + + doc["b"] = 2; // will it pick from the free list? + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/compare.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/compare.cpp new file mode 100644 index 0000000..da7af58 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/compare.cpp @@ -0,0 +1,29 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonDocument::operator==(const JsonDocument&)") { + JsonDocument doc1; + JsonDocument doc2; + + SECTION("Empty") { + REQUIRE(doc1 == doc2); + REQUIRE_FALSE(doc1 != doc2); + } + + SECTION("With same object") { + doc1["hello"] = "world"; + doc2["hello"] = "world"; + REQUIRE(doc1 == doc2); + REQUIRE_FALSE(doc1 != doc2); + } + SECTION("With different object") { + doc1["hello"] = "world"; + doc2["world"] = "hello"; + REQUIRE_FALSE(doc1 == doc2); + REQUIRE(doc1 != doc2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/constructor.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/constructor.cpp new file mode 100644 index 0000000..1eaec20 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/constructor.cpp @@ -0,0 +1,148 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::addPadding; + +TEST_CASE("JsonDocument constructor") { + SpyingAllocator spyingAllocator; + + SECTION("JsonDocument(size_t)") { + { JsonDocument doc(&spyingAllocator); } + REQUIRE(spyingAllocator.log() == AllocatorLog{}); + } + + SECTION("JsonDocument(const JsonDocument&)") { + { + JsonDocument doc1(&spyingAllocator); + doc1.set("The size of this string is 32!!"_s); + + JsonDocument doc2(doc1); + + REQUIRE(doc1.as() == "The size of this string is 32!!"); + REQUIRE(doc2.as() == "The size of this string is 32!!"); + } + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofStringBuffer()), + Allocate(sizeofStringBuffer()), + Deallocate(sizeofStringBuffer()), + Deallocate(sizeofStringBuffer()), + }); + } + + SECTION("JsonDocument(JsonDocument&&)") { + { + JsonDocument doc1(&spyingAllocator); + doc1.set("The size of this string is 32!!"_s); + + JsonDocument doc2(std::move(doc1)); + + REQUIRE(doc2.as() == "The size of this string is 32!!"); + REQUIRE(doc1.as() == "null"); + } + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofStringBuffer()), + Deallocate(sizeofStringBuffer()), + }); + } + + SECTION("JsonDocument(JsonObject, Allocator*)") { + JsonDocument doc1; + JsonObject obj = doc1.to(); + obj["hello"] = "world"; + + JsonDocument doc2(obj, &spyingAllocator); + + REQUIRE(doc2.as() == "{\"hello\":\"world\"}"); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("JsonDocument(JsonObject)") { + JsonDocument doc1; + JsonObject obj = doc1.to(); + obj["hello"] = "world"; + + JsonDocument doc2(obj); + + REQUIRE(doc2.as() == "{\"hello\":\"world\"}"); + } + + SECTION("JsonDocument(JsonArray, Allocator*)") { + JsonDocument doc1; + JsonArray arr = doc1.to(); + arr.add("hello"); + + JsonDocument doc2(arr, &spyingAllocator); + + REQUIRE(doc2.as() == "[\"hello\"]"); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("JsonDocument(JsonArray)") { + JsonDocument doc1; + JsonArray arr = doc1.to(); + arr.add("hello"); + + JsonDocument doc2(arr); + + REQUIRE(doc2.as() == "[\"hello\"]"); + } + + SECTION("JsonDocument(JsonVariant, Allocator*)") { + JsonDocument doc1; + deserializeJson(doc1, "\"hello\""); + + JsonDocument doc2(doc1.as(), &spyingAllocator); + + REQUIRE(doc2.as() == "hello"); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofString("hello")), + }); + } + + SECTION("JsonDocument(JsonVariant)") { + JsonDocument doc1; + deserializeJson(doc1, "\"hello\""); + + JsonDocument doc2(doc1.as()); + + REQUIRE(doc2.as() == "hello"); + } + + SECTION("JsonDocument(JsonVariantConst)") { + JsonDocument doc1; + deserializeJson(doc1, "\"hello\""); + + JsonDocument doc2(doc1.as()); + + REQUIRE(doc2.as() == "hello"); + } + + SECTION("JsonDocument(ElementProxy)") { + JsonDocument doc1; + deserializeJson(doc1, "[\"hello\",\"world\"]"); + + JsonDocument doc2(doc1[1]); + + REQUIRE(doc2.as() == "world"); + } + + SECTION("JsonDocument(MemberProxy)") { + JsonDocument doc1; + deserializeJson(doc1, "{\"hello\":\"world\"}"); + + JsonDocument doc2(doc1["hello"]); + + REQUIRE(doc2.as() == "world"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/isNull.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/isNull.cpp new file mode 100644 index 0000000..d030842 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/isNull.cpp @@ -0,0 +1,39 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonDocument::isNull()") { + JsonDocument doc; + + SECTION("returns true if uninitialized") { + REQUIRE(doc.isNull() == true); + } + + SECTION("returns false after to()") { + doc.to(); + REQUIRE(doc.isNull() == false); + } + + SECTION("returns false after to()") { + doc.to(); + REQUIRE(doc.isNull() == false); + } + + SECTION("returns true after to()") { + REQUIRE(doc.isNull() == true); + } + + SECTION("returns false after set()") { + doc.to().set(42); + REQUIRE(doc.isNull() == false); + } + + SECTION("returns true after clear()") { + doc.to(); + doc.clear(); + REQUIRE(doc.isNull() == true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/issue1120.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/issue1120.cpp new file mode 100644 index 0000000..aa3132f --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/issue1120.cpp @@ -0,0 +1,52 @@ +#include + +#include + +#include "Literals.hpp" + +TEST_CASE("Issue #1120") { + JsonDocument doc; + constexpr char str[] = + "{\"contents\":[{\"module\":\"Packet\"},{\"module\":\"Analog\"}]}"; + deserializeJson(doc, str); + + SECTION("MemberProxy::isNull()") { + SECTION("returns false") { + CHECK(doc["contents"_s].isNull() == false); + } + + SECTION("returns true") { + CHECK(doc["zontents"_s].isNull() == true); + } + } + + SECTION("ElementProxy >::isNull()") { + SECTION("returns false") { // Issue #1120 + CHECK(doc["contents"][1].isNull() == false); + } + + SECTION("returns true") { + CHECK(doc["contents"][2].isNull() == true); + } + } + + SECTION("MemberProxy, const char*>::isNull()") { + SECTION("returns false") { + CHECK(doc["contents"][1]["module"].isNull() == false); + } + + SECTION("returns true") { + CHECK(doc["contents"][1]["zodule"].isNull() == true); + } + } + + SECTION("MemberProxy, std::string>::isNull()") { + SECTION("returns false") { + CHECK(doc["contents"][1]["module"_s].isNull() == false); + } + + SECTION("returns true") { + CHECK(doc["contents"][1]["zodule"_s].isNull() == true); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/nesting.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/nesting.cpp new file mode 100644 index 0000000..2fb86e1 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/nesting.cpp @@ -0,0 +1,30 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonDocument::nesting()") { + JsonDocument doc; + + SECTION("return 0 if uninitialized") { + REQUIRE(doc.nesting() == 0); + } + + SECTION("returns 0 for string") { + JsonVariant var = doc.to(); + var.set("hello"); + REQUIRE(doc.nesting() == 0); + } + + SECTION("returns 1 for empty object") { + doc.to(); + REQUIRE(doc.nesting() == 1); + } + + SECTION("returns 1 for empty array") { + doc.to(); + REQUIRE(doc.nesting() == 1); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/overflowed.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/overflowed.cpp new file mode 100644 index 0000000..44003eb --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/overflowed.cpp @@ -0,0 +1,96 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonDocument::overflowed()") { + TimebombAllocator timebomb(10); + JsonDocument doc(&timebomb); + + SECTION("returns false on a fresh object") { + timebomb.setCountdown(0); + CHECK(doc.overflowed() == false); + } + + SECTION("returns true after a failed insertion") { + timebomb.setCountdown(0); + doc.add(0); + CHECK(doc.overflowed() == true); + } + + SECTION("returns false after successful insertion") { + timebomb.setCountdown(2); + doc.add(0); + CHECK(doc.overflowed() == false); + } + + SECTION("returns true after a failed string copy") { + timebomb.setCountdown(0); + doc.add("example"_s); + CHECK(doc.overflowed() == true); + } + + SECTION("returns false after a successful string copy") { + timebomb.setCountdown(3); + doc.add("example"_s); + CHECK(doc.overflowed() == false); + } + + SECTION("returns true after a failed member add") { + timebomb.setCountdown(0); + doc["example"] = true; + CHECK(doc.overflowed() == true); + } + + SECTION("returns true after a failed deserialization") { + timebomb.setCountdown(0); + deserializeJson(doc, "[1, 2]"); + CHECK(doc.overflowed() == true); + } + + SECTION("returns false after a successful deserialization") { + timebomb.setCountdown(3); + deserializeJson(doc, "[\"example\"]"); + CHECK(doc.overflowed() == false); + } + + SECTION("returns false after clear()") { + timebomb.setCountdown(0); + doc.add(0); + doc.clear(); + CHECK(doc.overflowed() == false); + } + + SECTION("remains false after shrinkToFit()") { + timebomb.setCountdown(2); + doc.add(0); + timebomb.setCountdown(2); + doc.shrinkToFit(); + CHECK(doc.overflowed() == false); + } + + SECTION("remains true after shrinkToFit()") { + timebomb.setCountdown(0); + doc.add(0); + timebomb.setCountdown(2); + doc.shrinkToFit(); + CHECK(doc.overflowed() == true); + } + + SECTION("returns false when string length doesn't overflow") { + auto maxLength = ArduinoJson::detail::StringNode::maxLength; + CHECK(doc.set(std::string(maxLength, 'a')) == true); + CHECK(doc.overflowed() == false); + } + + SECTION("returns true when string length overflows") { + auto maxLength = ArduinoJson::detail::StringNode::maxLength; + CHECK(doc.set(std::string(maxLength + 1, 'a')) == false); + CHECK(doc.overflowed() == true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/remove.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/remove.cpp new file mode 100644 index 0000000..f017bb9 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/remove.cpp @@ -0,0 +1,85 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Literals.hpp" + +TEST_CASE("JsonDocument::remove()") { + JsonDocument doc; + + SECTION("remove(int)") { + doc.add(1); + doc.add(2); + doc.add(3); + + doc.remove(1); + + REQUIRE(doc.as() == "[1,3]"); + } + + SECTION("string literal") { + doc["a"] = 1; + doc["a\0b"_s] = 2; + doc["b"] = 3; + + doc.remove("a\0b"); + + REQUIRE(doc.as() == "{\"a\":1,\"b\":3}"); + } + + SECTION("remove(const char *)") { + doc["a"] = 1; + doc["b"] = 2; + + doc.remove(static_cast("a")); + + REQUIRE(doc.as() == "{\"b\":2}"); + } + + SECTION("remove(std::string)") { + doc["a"] = 1; + doc["b"] = 2; + + doc.remove("b"_s); + + REQUIRE(doc.as() == "{\"a\":1}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("remove(vla)") { + doc["a"] = 1; + doc["b"] = 2; + + size_t i = 4; + char vla[i]; + strcpy(vla, "b"); + doc.remove(vla); + + REQUIRE(doc.as() == "{\"a\":1}"); + } +#endif + + SECTION("remove(JsonVariant) from object") { + doc["a"] = 1; + doc["b"] = 2; + doc["c"] = "b"; + + doc.remove(doc["c"]); + + REQUIRE(doc.as() == "{\"a\":1,\"c\":\"b\"}"); + } + + SECTION("remove(JsonVariant) from array") { + doc[0] = 3; + doc[1] = 2; + doc[2] = 1; + + doc.remove(doc[2]); + doc.remove(doc[3]); // noop + + REQUIRE(doc.as() == "[3,1]"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/set.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/set.cpp new file mode 100644 index 0000000..1205acf --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/set.cpp @@ -0,0 +1,104 @@ +#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1 +#define ARDUINOJSON_ENABLE_PROGMEM 1 +#include + +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonDocument::set()") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + SECTION("nullptr") { + doc.set(nullptr); + + REQUIRE(doc.isNull()); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("integer&") { + int toto = 42; + doc.set(toto); + + REQUIRE(doc.as() == "42"); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("integer") { + doc.set(42); + + REQUIRE(doc.as() == "42"); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("string literal") { + doc.set("example"); + + REQUIRE(doc.as() == "example"_s); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("const char*") { + const char* value = "example"; + doc.set(value); + + REQUIRE(doc.as() == "example"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("example")), + }); + } + + SECTION("std::string") { + doc.set("example"_s); + + REQUIRE(doc.as() == "example"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("example")), + }); + } + + SECTION("char*") { + char value[] = "example"; + doc.set(value); + + REQUIRE(doc.as() == "example"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("example")), + }); + } + + SECTION("Arduino String") { + doc.set(String("example")); + + REQUIRE(doc.as() == "example"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("example")), + }); + } + + SECTION("Flash string") { + doc.set(F("example")); + + REQUIRE(doc.as() == "example"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("example")), + }); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "example"); + + doc.set(vla); + + REQUIRE(doc.as() == "example"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("example")), + }); + } +#endif +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp new file mode 100644 index 0000000..148b552 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp @@ -0,0 +1,184 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include // malloc, free +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofArray; +using ArduinoJson::detail::sizeofObject; + +class ArmoredAllocator : public Allocator { + public: + virtual ~ArmoredAllocator() {} + + void* allocate(size_t size) override { + return malloc(size); + } + + void deallocate(void* ptr) override { + free(ptr); + } + + void* reallocate(void* ptr, size_t new_size) override { + // don't call realloc, instead alloc a new buffer and erase the old one + // this way we make sure we support relocation + void* new_ptr = malloc(new_size); + memset(new_ptr, '#', new_size); // erase + if (ptr) { + memcpy(new_ptr, ptr, std::min(new_size, new_size)); + free(ptr); + } + return new_ptr; + } +}; + +TEST_CASE("JsonDocument::shrinkToFit()") { + ArmoredAllocator armoredAllocator; + SpyingAllocator spyingAllocator(&armoredAllocator); + JsonDocument doc(&spyingAllocator); + + SECTION("null") { + doc.shrinkToFit(); + + REQUIRE(doc.as() == "null"); + REQUIRE(spyingAllocator.log() == AllocatorLog{}); + } + + SECTION("empty object") { + deserializeJson(doc, "{}"); + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "{}"); + REQUIRE(spyingAllocator.log() == AllocatorLog{}); + } + + SECTION("empty array") { + deserializeJson(doc, "[]"); + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "[]"); + REQUIRE(spyingAllocator.log() == AllocatorLog{}); + } + + SECTION("linked string") { + doc.set("hello"); + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "hello"); + REQUIRE(spyingAllocator.log() == AllocatorLog{}); + } + + SECTION("owned string") { + doc.set("abcdefg"_s); + REQUIRE(doc.as() == "abcdefg"); + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "abcdefg"); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofString("abcdefg")), + }); + } + + SECTION("raw string") { + doc.set(serialized("[{},12]")); + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "[{},12]"); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofString("[{},12]")), + }); + } + + SECTION("linked key") { + doc["key"] = 42; + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "{\"key\":42}"); + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("owned key") { + doc["abcdefg"_s] = 42; + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "{\"abcdefg\":42}"); + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("abcdefg")), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("linked string in array") { + doc.add("hello"); + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "[\"hello\"]"); + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofArray(1)), + }); + } + + SECTION("owned string in array") { + doc.add("abcdefg"_s); + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "[\"abcdefg\"]"); + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("abcdefg")), + Reallocate(sizeofPool(), sizeofArray(1)), + }); + } + + SECTION("linked string in object") { + doc["key"] = "hello"; + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "{\"key\":\"hello\"}"); + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("owned string in object") { + doc["key"] = "abcdefg"_s; + + doc.shrinkToFit(); + + REQUIRE(doc.as() == "{\"key\":\"abcdefg\"}"); + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("abcdefg")), + Reallocate(sizeofPool(), sizeofPool(2)), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/size.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/size.cpp new file mode 100644 index 0000000..fad6584 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/size.cpp @@ -0,0 +1,28 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonDocument::size()") { + JsonDocument doc; + + SECTION("returns 0") { + REQUIRE(doc.size() == 0); + } + + SECTION("as an array, return 2") { + doc.add(1); + doc.add(2); + + REQUIRE(doc.size() == 2); + } + + SECTION("as an object, return 2") { + doc["a"] = 1; + doc["b"] = 2; + + REQUIRE(doc.size() == 2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/subscript.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/subscript.cpp new file mode 100644 index 0000000..17bdcc2 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/subscript.cpp @@ -0,0 +1,167 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonDocument::operator[]") { + JsonDocument doc; + const JsonDocument& cdoc = doc; + + SECTION("object") { + doc["abc"_s] = "ABC"; + doc["abc\0d"_s] = "ABCD"; + + SECTION("const char*") { + const char* key = "abc"; + REQUIRE(doc[key] == "ABC"); + REQUIRE(cdoc[key] == "ABC"); + } + + SECTION("string literal") { + REQUIRE(doc["abc"] == "ABC"); + REQUIRE(cdoc["abc"] == "ABC"); + REQUIRE(doc["abc\0d"] == "ABCD"); + REQUIRE(cdoc["abc\0d"] == "ABCD"); + } + + SECTION("std::string") { + REQUIRE(doc["abc"_s] == "ABC"); + REQUIRE(cdoc["abc"_s] == "ABC"); + REQUIRE(doc["abc\0d"_s] == "ABCD"); + REQUIRE(cdoc["abc\0d"_s] == "ABCD"); + } + + SECTION("JsonVariant") { + doc["key1"] = "abc"; + doc["key2"] = "abc\0d"_s; + doc["key3"] = "foo"; + + CHECK(doc[doc["key1"]] == "ABC"); + CHECK(doc[doc["key2"]] == "ABCD"); + CHECK(doc[doc["key3"]] == nullptr); + CHECK(doc[doc["key4"]] == nullptr); + + CHECK(cdoc[cdoc["key1"]] == "ABC"); + CHECK(cdoc[cdoc["key2"]] == "ABCD"); + CHECK(cdoc[cdoc["key3"]] == nullptr); + CHECK(cdoc[cdoc["key4"]] == nullptr); + } + + SECTION("supports operator|") { + REQUIRE((doc["abc"] | "nope") == "ABC"_s); + REQUIRE((doc["def"] | "nope") == "nope"_s); + } + +#if defined(HAS_VARIABLE_LENGTH_ARRAY) && \ + !defined(SUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR) + SECTION("supports VLAs") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + doc[vla] = "world"; + + REQUIRE(doc[vla] == "world"); + REQUIRE(cdoc[vla] == "world"); + } +#endif + } + + SECTION("array") { + deserializeJson(doc, "[\"hello\",\"world\"]"); + + SECTION("int") { + REQUIRE(doc[1] == "world"); + REQUIRE(cdoc[1] == "world"); + } + + SECTION("JsonVariant") { + doc[2] = 1; + REQUIRE(doc[doc[2]] == "world"); + REQUIRE(cdoc[doc[2]] == "world"); + } + } +} + +TEST_CASE("JsonDocument automatically promotes to object") { + JsonDocument doc; + + doc["one"]["two"]["three"] = 4; + + REQUIRE(doc["one"]["two"]["three"] == 4); +} + +TEST_CASE("JsonDocument automatically promotes to array") { + JsonDocument doc; + + doc[2] = 2; + + REQUIRE(doc.as() == "[null,null,2]"); +} + +TEST_CASE("JsonDocument::operator[] key storage") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + SECTION("string literal") { + doc["hello"] = 0; + + REQUIRE(doc.as() == "{\"hello\":0}"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("const char*") { + const char* key = "hello"; + doc[key] = 0; + + REQUIRE(doc.as() == "{\"hello\":0}"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } + + SECTION("char[]") { + char key[] = "hello"; + doc[key] = 0; + + REQUIRE(doc.as() == "{\"hello\":0}"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } + + SECTION("std::string") { + doc["hello"_s] = 0; + + REQUIRE(doc.as() == "{\"hello\":0}"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } +#if defined(HAS_VARIABLE_LENGTH_ARRAY) && \ + !defined(SUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR) + SECTION("VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + doc[vla] = 0; + + REQUIRE(doc.as() == "{\"hello\":0}"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } +#endif +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/swap.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/swap.cpp new file mode 100644 index 0000000..3538308 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonDocument/swap.cpp @@ -0,0 +1,25 @@ +#include + +#include +#include +#include + +using namespace std; + +TEST_CASE("std::swap") { + SECTION("JsonDocument*") { + JsonDocument *p1, *p2; + swap(p1, p2); // issue #1678 + } + + SECTION("JsonDocument") { + JsonDocument doc1, doc2; + doc1.set("hello"); + doc2.set("world"); + + swap(doc1, doc2); + + CHECK(doc1.as() == "world"); + CHECK(doc2.as() == "hello"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt new file mode 100644 index 0000000..3f44d98 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt @@ -0,0 +1,25 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(JsonObjectTests + clear.cpp + compare.cpp + equals.cpp + isNull.cpp + iterator.cpp + nesting.cpp + remove.cpp + set.cpp + size.cpp + std_string.cpp + subscript.cpp + unbound.cpp +) + +add_test(JsonObject JsonObjectTests) + +set_tests_properties(JsonObject + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/clear.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/clear.cpp new file mode 100644 index 0000000..f6f8a22 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/clear.cpp @@ -0,0 +1,25 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonObject::clear()") { + SECTION("No-op on null JsonObject") { + JsonObject obj; + obj.clear(); + REQUIRE(obj.isNull() == true); + REQUIRE(obj.size() == 0); + } + + SECTION("Removes all elements") { + JsonDocument doc; + JsonObject obj = doc.to(); + obj["hello"] = 1; + obj["world"] = 2; + obj.clear(); + REQUIRE(obj.size() == 0); + REQUIRE(obj.isNull() == false); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/compare.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/compare.cpp new file mode 100644 index 0000000..faa0cbd --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/compare.cpp @@ -0,0 +1,512 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("Compare JsonObject with JsonObject") { + JsonDocument doc; + + SECTION("Compare with unbound") { + JsonObject object = doc.to(); + object["a"] = 1; + object["b"] = "hello"; + JsonObject unbound; + + CHECK(object != unbound); + CHECK_FALSE(object == unbound); + CHECK_FALSE(object <= unbound); + CHECK_FALSE(object >= unbound); + CHECK_FALSE(object > unbound); + CHECK_FALSE(object < unbound); + + CHECK(unbound != object); + CHECK_FALSE(unbound == object); + CHECK_FALSE(unbound <= object); + CHECK_FALSE(unbound >= object); + CHECK_FALSE(unbound > object); + CHECK_FALSE(unbound < object); + } + + SECTION("Compare with self") { + JsonObject object = doc.to(); + object["a"] = 1; + object["b"] = "hello"; + + CHECK(object == object); + CHECK(object <= object); + CHECK(object >= object); + CHECK_FALSE(object != object); + CHECK_FALSE(object > object); + CHECK_FALSE(object < object); + } + + SECTION("Compare with identical object") { + JsonObject object1 = doc.add(); + object1["a"] = 1; + object1["b"] = "hello"; + object1["c"][0] = false; + + JsonObject object2 = doc.add(); + object2["a"] = 1; + object2["b"] = "hello"; + object2["c"][0] = false; + + CHECK(object1 == object2); + CHECK(object1 <= object2); + CHECK(object1 >= object2); + CHECK_FALSE(object1 != object2); + CHECK_FALSE(object1 > object2); + CHECK_FALSE(object1 < object2); + } + + SECTION("Compare with different object") { + JsonObject object1 = doc.add(); + object1["a"] = 1; + object1["b"] = "hello1"; + object1["c"][0] = false; + + JsonObject object2 = doc.add(); + object2["a"] = 1; + object2["b"] = "hello2"; + object2["c"][0] = false; + + CHECK(object1 != object2); + CHECK_FALSE(object1 == object2); + CHECK_FALSE(object1 > object2); + CHECK_FALSE(object1 < object2); + CHECK_FALSE(object1 <= object2); + CHECK_FALSE(object1 >= object2); + } +} + +TEST_CASE("Compare JsonObject with JsonVariant") { + JsonDocument doc; + + SECTION("Compare with self") { + JsonObject object = doc.to(); + object["a"] = 1; + object["b"] = "hello"; + + JsonVariant variant = object; + + CHECK(object == variant); + CHECK(object <= variant); + CHECK(object >= variant); + CHECK_FALSE(object != variant); + CHECK_FALSE(object > variant); + CHECK_FALSE(object < variant); + + CHECK(variant == object); + CHECK(variant <= object); + CHECK(variant >= object); + CHECK_FALSE(variant != object); + CHECK_FALSE(variant > object); + CHECK_FALSE(variant < object); + } + + SECTION("Compare with identical object") { + JsonObject object = doc.add(); + object["a"] = 1; + object["b"] = "hello"; + object["c"][0] = false; + + JsonVariant variant = doc.add(); + variant["a"] = 1; + variant["b"] = "hello"; + variant["c"][0] = false; + + CHECK(object == variant); + CHECK(object <= variant); + CHECK(object >= variant); + CHECK_FALSE(object != variant); + CHECK_FALSE(object > variant); + CHECK_FALSE(object < variant); + + CHECK(variant == object); + CHECK(variant <= object); + CHECK(variant >= object); + CHECK_FALSE(variant != object); + CHECK_FALSE(variant > object); + CHECK_FALSE(variant < object); + } + + SECTION("Compare with different object") { + JsonObject object = doc.add(); + object["a"] = 1; + object["b"] = "hello1"; + object["c"][0] = false; + + JsonVariant variant = doc.add(); + variant["a"] = 1; + variant["b"] = "hello2"; + variant["c"][0] = false; + + CHECK(object != variant); + CHECK_FALSE(object == variant); + CHECK_FALSE(object > variant); + CHECK_FALSE(object < variant); + CHECK_FALSE(object <= variant); + CHECK_FALSE(object >= variant); + } +} + +TEST_CASE("Compare JsonObject with JsonVariantConst") { + JsonDocument doc; + + SECTION("Compare with unbound") { + JsonObject object = doc.to(); + object["a"] = 1; + object["b"] = "hello"; + JsonVariantConst unbound; + + CHECK(object != unbound); + CHECK_FALSE(object == unbound); + CHECK_FALSE(object <= unbound); + CHECK_FALSE(object >= unbound); + CHECK_FALSE(object > unbound); + CHECK_FALSE(object < unbound); + + CHECK(unbound != object); + CHECK_FALSE(unbound == object); + CHECK_FALSE(unbound <= object); + CHECK_FALSE(unbound >= object); + CHECK_FALSE(unbound > object); + CHECK_FALSE(unbound < object); + } + + SECTION("Compare with self") { + JsonObject object = doc.to(); + object["a"] = 1; + object["b"] = "hello"; + + JsonVariantConst variant = object; + + CHECK(object == variant); + CHECK(object <= variant); + CHECK(object >= variant); + CHECK_FALSE(object != variant); + CHECK_FALSE(object > variant); + CHECK_FALSE(object < variant); + + CHECK(variant == object); + CHECK(variant <= object); + CHECK(variant >= object); + CHECK_FALSE(variant != object); + CHECK_FALSE(variant > object); + CHECK_FALSE(variant < object); + } + + SECTION("Compare with identical object") { + JsonObject object = doc.add(); + object["a"] = 1; + object["b"] = "hello"; + object["c"][0] = false; + + JsonObject object2 = doc.add(); + object2["a"] = 1; + object2["b"] = "hello"; + object2["c"][0] = false; + JsonVariantConst variant = object2; + + CHECK(object == variant); + CHECK(object <= variant); + CHECK(object >= variant); + CHECK_FALSE(object != variant); + CHECK_FALSE(object > variant); + CHECK_FALSE(object < variant); + + CHECK(variant == object); + CHECK(variant <= object); + CHECK(variant >= object); + CHECK_FALSE(variant != object); + CHECK_FALSE(variant > object); + CHECK_FALSE(variant < object); + } + + SECTION("Compare with different object") { + JsonObject object = doc.add(); + object["a"] = 1; + object["b"] = "hello1"; + object["c"][0] = false; + + JsonObject object2 = doc.add(); + object2["a"] = 1; + object2["b"] = "hello2"; + object2["c"][0] = false; + JsonVariantConst variant = object2; + + CHECK(object != variant); + CHECK_FALSE(object == variant); + CHECK_FALSE(object > variant); + CHECK_FALSE(object < variant); + CHECK_FALSE(object <= variant); + CHECK_FALSE(object >= variant); + } +} + +TEST_CASE("Compare JsonObject with JsonObjectConst") { + JsonDocument doc; + + SECTION("Compare with unbound") { + JsonObject object = doc.to(); + object["a"] = 1; + object["b"] = "hello"; + JsonObjectConst unbound; + + CHECK(object != unbound); + CHECK_FALSE(object == unbound); + CHECK_FALSE(object <= unbound); + CHECK_FALSE(object >= unbound); + CHECK_FALSE(object > unbound); + CHECK_FALSE(object < unbound); + + CHECK(unbound != object); + CHECK_FALSE(unbound == object); + CHECK_FALSE(unbound <= object); + CHECK_FALSE(unbound >= object); + CHECK_FALSE(unbound > object); + CHECK_FALSE(unbound < object); + } + + SECTION("Compare with self") { + JsonObject object = doc.to(); + object["a"] = 1; + object["b"] = "hello"; + JsonObjectConst cobject = object; + + CHECK(object == cobject); + CHECK(object <= cobject); + CHECK(object >= cobject); + CHECK_FALSE(object != cobject); + CHECK_FALSE(object > cobject); + CHECK_FALSE(object < cobject); + + CHECK(cobject == object); + CHECK(cobject <= object); + CHECK(cobject >= object); + CHECK_FALSE(cobject != object); + CHECK_FALSE(cobject > object); + CHECK_FALSE(cobject < object); + } + + SECTION("Compare with identical object") { + JsonObject object1 = doc.add(); + object1["a"] = 1; + object1["b"] = "hello"; + object1["c"][0] = false; + + JsonObject object2 = doc.add(); + object2["a"] = 1; + object2["b"] = "hello"; + object2["c"][0] = false; + JsonObjectConst carray2 = object2; + + CHECK(object1 == carray2); + CHECK(object1 <= carray2); + CHECK(object1 >= carray2); + CHECK_FALSE(object1 != carray2); + CHECK_FALSE(object1 > carray2); + CHECK_FALSE(object1 < carray2); + + CHECK(carray2 == object1); + CHECK(carray2 <= object1); + CHECK(carray2 >= object1); + CHECK_FALSE(carray2 != object1); + CHECK_FALSE(carray2 > object1); + CHECK_FALSE(carray2 < object1); + } + + SECTION("Compare with different object") { + JsonObject object1 = doc.add(); + object1["a"] = 1; + object1["b"] = "hello1"; + object1["c"][0] = false; + + JsonObject object2 = doc.add(); + object2["a"] = 1; + object2["b"] = "hello2"; + object2["c"][0] = false; + JsonObjectConst carray2 = object2; + + CHECK(object1 != carray2); + CHECK_FALSE(object1 == carray2); + CHECK_FALSE(object1 > carray2); + CHECK_FALSE(object1 < carray2); + CHECK_FALSE(object1 <= carray2); + CHECK_FALSE(object1 >= carray2); + + CHECK(carray2 != object1); + CHECK_FALSE(carray2 == object1); + CHECK_FALSE(carray2 > object1); + CHECK_FALSE(carray2 < object1); + CHECK_FALSE(carray2 <= object1); + CHECK_FALSE(carray2 >= object1); + } +} + +TEST_CASE("Compare JsonObjectConst with JsonObjectConst") { + JsonDocument doc; + + SECTION("Compare with unbound") { + JsonObject object = doc.to(); + object["a"] = 1; + object["b"] = "hello"; + + JsonObjectConst cobject = object; + JsonObjectConst unbound; + + CHECK(cobject != unbound); + CHECK_FALSE(cobject == unbound); + CHECK_FALSE(cobject <= unbound); + CHECK_FALSE(cobject >= unbound); + CHECK_FALSE(cobject > unbound); + CHECK_FALSE(cobject < unbound); + + CHECK(unbound != cobject); + CHECK_FALSE(unbound == cobject); + CHECK_FALSE(unbound <= cobject); + CHECK_FALSE(unbound >= cobject); + CHECK_FALSE(unbound > cobject); + CHECK_FALSE(unbound < cobject); + } + + SECTION("Compare with self") { + JsonObject object = doc.to(); + object["a"] = 1; + object["b"] = "hello"; + JsonObjectConst cobject = object; + + CHECK(cobject == cobject); + CHECK(cobject <= cobject); + CHECK(cobject >= cobject); + CHECK_FALSE(cobject != cobject); + CHECK_FALSE(cobject > cobject); + CHECK_FALSE(cobject < cobject); + } + + SECTION("Compare with identical object") { + JsonObject object1 = doc.add(); + object1["a"] = 1; + object1["b"] = "hello"; + object1["c"][0] = false; + JsonObjectConst carray1 = object1; + + JsonObject object2 = doc.add(); + object2["a"] = 1; + object2["b"] = "hello"; + object2["c"][0] = false; + JsonObjectConst carray2 = object2; + + CHECK(carray1 == carray2); + CHECK(carray1 <= carray2); + CHECK(carray1 >= carray2); + CHECK_FALSE(carray1 != carray2); + CHECK_FALSE(carray1 > carray2); + CHECK_FALSE(carray1 < carray2); + } + + SECTION("Compare with different object") { + JsonObject object1 = doc.add(); + object1["a"] = 1; + object1["b"] = "hello1"; + object1["c"][0] = false; + JsonObjectConst carray1 = object1; + + JsonObject object2 = doc.add(); + object2["a"] = 1; + object2["b"] = "hello2"; + object2["c"][0] = false; + JsonObjectConst carray2 = object2; + + CHECK(carray1 != carray2); + CHECK_FALSE(carray1 == carray2); + CHECK_FALSE(carray1 > carray2); + CHECK_FALSE(carray1 < carray2); + CHECK_FALSE(carray1 <= carray2); + CHECK_FALSE(carray1 >= carray2); + } +} + +TEST_CASE("Compare JsonObjectConst with JsonVariant") { + JsonDocument doc; + + SECTION("Compare with self") { + JsonObject object = doc.to(); + object["a"] = 1; + object["b"] = "hello"; + JsonObjectConst cobject = object; + JsonVariant variant = object; + + CHECK(cobject == variant); + CHECK(cobject <= variant); + CHECK(cobject >= variant); + CHECK_FALSE(cobject != variant); + CHECK_FALSE(cobject > variant); + CHECK_FALSE(cobject < variant); + + CHECK(variant == cobject); + CHECK(variant <= cobject); + CHECK(variant >= cobject); + CHECK_FALSE(variant != cobject); + CHECK_FALSE(variant > cobject); + CHECK_FALSE(variant < cobject); + } + + SECTION("Compare with identical object") { + JsonObject object1 = doc.add(); + object1["a"] = 1; + object1["b"] = "hello"; + object1["c"][0] = false; + JsonObjectConst carray1 = object1; + + JsonObject object2 = doc.add(); + object2["a"] = 1; + object2["b"] = "hello"; + object2["c"][0] = false; + JsonVariant variant2 = object2; + + CHECK(carray1 == variant2); + CHECK(carray1 <= variant2); + CHECK(carray1 >= variant2); + CHECK_FALSE(carray1 != variant2); + CHECK_FALSE(carray1 > variant2); + CHECK_FALSE(carray1 < variant2); + + CHECK(variant2 == carray1); + CHECK(variant2 <= carray1); + CHECK(variant2 >= carray1); + CHECK_FALSE(variant2 != carray1); + CHECK_FALSE(variant2 > carray1); + CHECK_FALSE(variant2 < carray1); + } + + SECTION("Compare with different object") { + JsonObject object1 = doc.add(); + object1["a"] = 1; + object1["b"] = "hello1"; + object1["c"][0] = false; + JsonObjectConst carray1 = object1; + + JsonObject object2 = doc.add(); + object2["a"] = 1; + object2["b"] = "hello2"; + object2["c"][0] = false; + JsonVariant variant2 = object2; + + CHECK(carray1 != variant2); + CHECK_FALSE(carray1 == variant2); + CHECK_FALSE(carray1 > variant2); + CHECK_FALSE(carray1 < variant2); + CHECK_FALSE(carray1 <= variant2); + CHECK_FALSE(carray1 >= variant2); + + CHECK(variant2 != carray1); + CHECK_FALSE(variant2 == carray1); + CHECK_FALSE(variant2 > carray1); + CHECK_FALSE(variant2 < carray1); + CHECK_FALSE(variant2 <= carray1); + CHECK_FALSE(variant2 >= carray1); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/equals.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/equals.cpp new file mode 100644 index 0000000..4a594a7 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/equals.cpp @@ -0,0 +1,59 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonObject::operator==()") { + JsonDocument doc1; + JsonObject obj1 = doc1.to(); + + JsonDocument doc2; + JsonObject obj2 = doc2.to(); + + SECTION("should return false when objs differ") { + obj1["hello"] = "coucou"; + obj2["world"] = 1; + + REQUIRE_FALSE(obj1 == obj2); + } + + SECTION("should return false when LHS has more elements") { + obj1["hello"] = "coucou"; + obj1["world"] = 666; + obj2["hello"] = "coucou"; + + REQUIRE_FALSE(obj1 == obj2); + } + + SECTION("should return false when RKS has more elements") { + obj1["hello"] = "coucou"; + obj2["hello"] = "coucou"; + obj2["world"] = 666; + + REQUIRE_FALSE(obj1 == obj2); + } + + SECTION("should return true when objs equal") { + obj1["hello"] = "world"; + obj1["anwser"] = 42; + // insert in different order + obj2["anwser"] = 42; + obj2["hello"] = "world"; + + REQUIRE(obj1 == obj2); + } + + SECTION("should return false when RHS is null") { + JsonObject null; + + REQUIRE_FALSE(obj1 == null); + } + + SECTION("should return false when LHS is null") { + JsonObject null; + + REQUIRE_FALSE(null == obj2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/isNull.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/isNull.cpp new file mode 100644 index 0000000..8ddb51c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/isNull.cpp @@ -0,0 +1,32 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonObject::isNull()") { + SECTION("returns true") { + JsonObject obj; + REQUIRE(obj.isNull() == true); + } + + SECTION("returns false") { + JsonDocument doc; + JsonObject obj = doc.to(); + REQUIRE(obj.isNull() == false); + } +} + +TEST_CASE("JsonObject::operator bool()") { + SECTION("returns false") { + JsonObject obj; + REQUIRE(static_cast(obj) == false); + } + + SECTION("returns true") { + JsonDocument doc; + JsonObject obj = doc.to(); + REQUIRE(static_cast(obj) == true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/iterator.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/iterator.cpp new file mode 100644 index 0000000..e22d72a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/iterator.cpp @@ -0,0 +1,36 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonObject::begin()/end()") { + JsonDocument doc; + JsonObject obj = doc.to(); + obj["ab"] = 12; + obj["cd"] = 34; + + SECTION("NonConstIterator") { + JsonObject::iterator it = obj.begin(); + REQUIRE(obj.end() != it); + REQUIRE(it->key() == "ab"); + REQUIRE(12 == it->value()); + ++it; + REQUIRE(obj.end() != it); + REQUIRE(it->key() == "cd"); + REQUIRE(34 == it->value()); + ++it; + REQUIRE(obj.end() == it); + } + + SECTION("Dereferencing end() is safe") { + REQUIRE(obj.end()->key().isNull()); + REQUIRE(obj.end()->value().isNull()); + } + + SECTION("null JsonObject") { + JsonObject null; + REQUIRE(null.begin() == null.end()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/nesting.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/nesting.cpp new file mode 100644 index 0000000..a3fdaea --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/nesting.cpp @@ -0,0 +1,35 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonObject::nesting()") { + JsonDocument doc; + JsonObject obj = doc.to(); + + SECTION("return 0 if uninitialized") { + JsonObject unitialized; + REQUIRE(unitialized.nesting() == 0); + } + + SECTION("returns 1 for empty object") { + REQUIRE(obj.nesting() == 1); + } + + SECTION("returns 1 for flat object") { + obj["hello"] = "world"; + REQUIRE(obj.nesting() == 1); + } + + SECTION("returns 2 with nested array") { + obj["nested"].to(); + REQUIRE(obj.nesting() == 2); + } + + SECTION("returns 2 with nested object") { + obj["nested"].to(); + REQUIRE(obj.nesting() == 2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/remove.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/remove.cpp new file mode 100644 index 0000000..052433d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/remove.cpp @@ -0,0 +1,89 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +TEST_CASE("JsonObject::remove()") { + JsonDocument doc; + JsonObject obj = doc.to(); + obj["a"] = 0; + obj["b"] = 1; + obj["c"] = 2; + std::string result; + + SECTION("remove(key)") { + SECTION("Remove first") { + obj.remove("a"); + serializeJson(obj, result); + REQUIRE("{\"b\":1,\"c\":2}" == result); + } + + SECTION("Remove middle") { + obj.remove("b"); + serializeJson(obj, result); + REQUIRE("{\"a\":0,\"c\":2}" == result); + } + + SECTION("Remove last") { + obj.remove("c"); + serializeJson(obj, result); + REQUIRE("{\"a\":0,\"b\":1}" == result); + } + } + + SECTION("remove(iterator)") { + JsonObject::iterator it = obj.begin(); + + SECTION("Remove first") { + obj.remove(it); + serializeJson(obj, result); + REQUIRE("{\"b\":1,\"c\":2}" == result); + } + + SECTION("Remove middle") { + ++it; + obj.remove(it); + serializeJson(obj, result); + REQUIRE("{\"a\":0,\"c\":2}" == result); + } + + SECTION("Remove last") { + ++it; + ++it; + obj.remove(it); + serializeJson(obj, result); + REQUIRE("{\"a\":0,\"b\":1}" == result); + } + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("key is a vla") { + size_t i = 16; + char vla[i]; + strcpy(vla, "b"); + obj.remove(vla); + + serializeJson(obj, result); + REQUIRE("{\"a\":0,\"c\":2}" == result); + } +#endif + + SECTION("remove by key on unbound reference") { + JsonObject unboundObject; + unboundObject.remove("key"); + } + + SECTION("remove by iterator on unbound reference") { + JsonObject unboundObject; + unboundObject.remove(unboundObject.begin()); + } + + SECTION("remove(JsonVariant)") { + obj["key"] = "b"; + obj.remove(obj["key"]); + REQUIRE("{\"a\":0,\"c\":2,\"key\":\"b\"}" == doc.as()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/set.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/set.cpp new file mode 100644 index 0000000..e5c3044 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/set.cpp @@ -0,0 +1,142 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonObject::set()") { + SpyingAllocator spy; + JsonDocument doc1(&spy); + JsonDocument doc2(&spy); + + JsonObject obj1 = doc1.to(); + JsonObject obj2 = doc2.to(); + + SECTION("doesn't copy static string in key or value") { + obj1["hello"] = "world"; + spy.clearLog(); + + bool success = obj2.set(obj1); + + REQUIRE(success == true); + REQUIRE(obj2["hello"] == "world"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("copy local string value") { + obj1["hello"] = "world"_s; + spy.clearLog(); + + bool success = obj2.set(obj1); + + REQUIRE(success == true); + REQUIRE(obj2["hello"] == "world"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } + + SECTION("copy local key") { + obj1["hello"_s] = "world"; + spy.clearLog(); + + bool success = obj2.set(obj1); + + REQUIRE(success == true); + REQUIRE(obj2["hello"] == "world"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } + + SECTION("copy string from deserializeJson()") { + deserializeJson(doc1, "{'hello':'world'}"); + spy.clearLog(); + + bool success = obj2.set(obj1); + + REQUIRE(success == true); + REQUIRE(obj2["hello"] == "world"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + Allocate(sizeofString("world")), + }); + } + + SECTION("copy string from deserializeMsgPack()") { + deserializeMsgPack(doc1, "\x81\xA5hello\xA5world"); + spy.clearLog(); + + bool success = obj2.set(obj1); + + REQUIRE(success == true); + REQUIRE(obj2["hello"] == "world"_s); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + Allocate(sizeofString("world")), + }); + } + + SECTION("should work with JsonObjectConst") { + obj1["hello"] = "world"; + + obj2.set(static_cast(obj1)); + + REQUIRE(obj2["hello"] == "world"_s); + } + + SECTION("copy fails in the middle of an object") { + TimebombAllocator timebomb(2); + JsonDocument doc3(&timebomb); + JsonObject obj3 = doc3.to(); + + obj1["alpha"_s] = 1; + obj1["beta"_s] = 2; + + bool success = obj3.set(obj1); + + REQUIRE(success == false); + REQUIRE(doc3.as() == "{\"alpha\":1}"); + } + + SECTION("copy fails in the middle of an array") { + TimebombAllocator timebomb(1); + JsonDocument doc3(&timebomb); + JsonObject obj3 = doc3.to(); + + obj1["hello"][0] = "world"_s; + + bool success = obj3.set(obj1); + + REQUIRE(success == false); + REQUIRE(doc3.as() == "{\"hello\":[]}"); + } + + SECTION("destination is null") { + JsonObject null; + obj1["hello"] = "world"; + + bool success = null.set(obj1); + + REQUIRE(success == false); + } + + SECTION("source is null") { + JsonObject null; + obj1["hello"] = "world"; + + bool success = obj1.set(null); + + REQUIRE(success == false); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/size.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/size.cpp new file mode 100644 index 0000000..5c5258e --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/size.cpp @@ -0,0 +1,39 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +TEST_CASE("JsonObject::size()") { + JsonDocument doc; + JsonObject obj = doc.to(); + + SECTION("initial size is zero") { + REQUIRE(0 == obj.size()); + } + + SECTION("increases when values are added") { + obj["hello"] = 42; + REQUIRE(1 == obj.size()); + } + + SECTION("decreases when values are removed") { + obj["hello"] = 42; + obj.remove("hello"); + REQUIRE(0 == obj.size()); + } + + SECTION("doesn't increase when the same key is added twice") { + obj["hello"] = 1; + obj["hello"] = 2; + REQUIRE(1 == obj.size()); + } + + SECTION("doesn't decrease when another key is removed") { + obj["hello"] = 1; + obj.remove("world"); + REQUIRE(1 == obj.size()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/std_string.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/std_string.cpp new file mode 100644 index 0000000..82b87b9 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/std_string.cpp @@ -0,0 +1,61 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Literals.hpp" + +static void eraseString(std::string& str) { + char* p = const_cast(str.c_str()); + while (*p) + *p++ = '*'; +} + +TEST_CASE("std::string") { + JsonDocument doc; + + SECTION("operator[]") { + char json[] = "{\"key\":\"value\"}"; + + deserializeJson(doc, json); + JsonObject obj = doc.as(); + + REQUIRE("value"_s == obj["key"_s]); + } + + SECTION("operator[] const") { + char json[] = "{\"key\":\"value\"}"; + + deserializeJson(doc, json); + JsonObject obj = doc.as(); + + REQUIRE("value"_s == obj["key"_s]); + } + + SECTION("remove()") { + JsonObject obj = doc.to(); + obj["key"] = "value"; + + obj.remove("key"_s); + + REQUIRE(0 == obj.size()); + } + + SECTION("operator[], set key") { + std::string key("hello"); + JsonObject obj = doc.to(); + obj[key] = "world"; + eraseString(key); + REQUIRE("world"_s == obj["hello"]); + } + + SECTION("operator[], set value") { + std::string value("world"); + JsonObject obj = doc.to(); + obj["hello"] = value; + eraseString(value); + REQUIRE("world"_s == obj["hello"]); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/subscript.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/subscript.cpp new file mode 100644 index 0000000..bdf900f --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/subscript.cpp @@ -0,0 +1,267 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonObject::operator[]") { + SpyingAllocator spy; + JsonDocument doc(&spy); + JsonObject obj = doc.to(); + + SECTION("int") { + obj["hello"] = 123; + + REQUIRE(123 == obj["hello"].as()); + REQUIRE(true == obj["hello"].is()); + REQUIRE(false == obj["hello"].is()); + } + + SECTION("volatile int") { // issue #415 + volatile int i = 123; + obj["hello"] = i; + + REQUIRE(123 == obj["hello"].as()); + REQUIRE(true == obj["hello"].is()); + REQUIRE(false == obj["hello"].is()); + } + + SECTION("double") { + obj["hello"] = 123.45; + + REQUIRE(true == obj["hello"].is()); + REQUIRE(false == obj["hello"].is()); + REQUIRE(123.45 == obj["hello"].as()); + } + + SECTION("bool") { + obj["hello"] = true; + + REQUIRE(true == obj["hello"].is()); + REQUIRE(false == obj["hello"].is()); + REQUIRE(true == obj["hello"].as()); + } + + SECTION("const char*") { + obj["hello"] = "h3110"; + + REQUIRE(true == obj["hello"].is()); + REQUIRE(false == obj["hello"].is()); + REQUIRE("h3110"_s == obj["hello"].as()); + } + + SECTION("array") { + JsonDocument doc2; + JsonArray arr = doc2.to(); + + obj["hello"] = arr; + + REQUIRE(arr == obj["hello"].as()); + REQUIRE(true == obj["hello"].is()); + REQUIRE(false == obj["hello"].is()); + } + + SECTION("object") { + JsonDocument doc2; + JsonObject obj2 = doc2.to(); + + obj["hello"] = obj2; + + REQUIRE(obj2 == obj["hello"].as()); + REQUIRE(true == obj["hello"].is()); + REQUIRE(false == obj["hello"].is()); + } + + SECTION("array subscript") { + JsonDocument doc2; + JsonArray arr = doc2.to(); + arr.add(42); + + obj["a"] = arr[0]; + + REQUIRE(42 == obj["a"]); + } + + SECTION("object subscript") { + JsonDocument doc2; + JsonObject obj2 = doc2.to(); + obj2["x"] = 42; + + obj["a"] = obj2["x"]; + + REQUIRE(42 == obj["a"]); + } + + SECTION("char key[]") { // issue #423 + char key[] = "hello"; + obj[key] = 42; + REQUIRE(42 == obj[key]); + } + + SECTION("should not duplicate const char*") { + obj["hello"] = "world"; + REQUIRE(spy.log() == AllocatorLog{Allocate(sizeofPool())}); + } + + SECTION("should duplicate char* value") { + obj["hello"] = const_cast("world"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } + + SECTION("should duplicate char* key") { + obj[const_cast("hello")] = "world"; + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } + + SECTION("should duplicate char* key&value") { + obj[const_cast("hello")] = const_cast("world"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + Allocate(sizeofString("world")), + }); + } + + SECTION("should duplicate std::string value") { + obj["hello"] = "world"_s; + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("world")), + }); + } + + SECTION("should duplicate std::string key") { + obj["hello"_s] = "world"; + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } + + SECTION("should duplicate std::string key&value") { + obj["hello"_s] = "world"_s; + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + Allocate(sizeofString("world")), + }); + } + + SECTION("should duplicate a non-static JsonString key") { + obj[JsonString("hello", false)] = "world"; + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + }); + } + + SECTION("should not duplicate a static JsonString key") { + obj[JsonString("hello", true)] = "world"; + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + }); + } + + SECTION("should ignore null key") { + // object must have a value to make a call to strcmp() + obj["dummy"] = 42; + + const char* null = 0; + obj[null] = 666; + + REQUIRE(obj.size() == 1); + REQUIRE(obj[null] == null); + } + + SECTION("obj[key].to()") { + JsonArray arr = obj["hello"].to(); + + REQUIRE(arr.isNull() == false); + } + +#if defined(HAS_VARIABLE_LENGTH_ARRAY) && \ + !defined(SUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR) + SECTION("obj[VLA] = str") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + obj[vla] = "world"; + + REQUIRE("world"_s == obj["hello"]); + } + + SECTION("obj[str] = VLA") { // issue #416 + size_t i = 32; + char vla[i]; + strcpy(vla, "world"); + + obj["hello"] = vla; + + REQUIRE("world"_s == obj["hello"].as()); + } + + SECTION("obj.set(VLA, str)") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + obj[vla] = "world"; + + REQUIRE("world"_s == obj["hello"]); + } + + SECTION("obj.set(str, VLA)") { + size_t i = 32; + char vla[i]; + strcpy(vla, "world"); + + obj["hello"].set(vla); + + REQUIRE("world"_s == obj["hello"].as()); + } + + SECTION("obj[VLA]") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + deserializeJson(doc, "{\"hello\":\"world\"}"); + + obj = doc.as(); + REQUIRE("world"_s == obj[vla]); + } +#endif + + SECTION("chain") { + obj["hello"]["world"] = 123; + + REQUIRE(123 == obj["hello"]["world"].as()); + REQUIRE(true == obj["hello"]["world"].is()); + REQUIRE(false == obj["hello"]["world"].is()); + } + + SECTION("JsonVariant") { + obj["hello"] = "world"; + obj["a\0b"_s] = "ABC"; + + doc["key1"] = "hello"; + doc["key2"] = "a\0b"_s; + doc["key3"] = "foo"; + + REQUIRE(obj[obj["key1"]] == "world"); + REQUIRE(obj[obj["key2"]] == "ABC"); + REQUIRE(obj[obj["key3"]] == nullptr); + REQUIRE(obj[obj["key4"]] == nullptr); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/unbound.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/unbound.cpp new file mode 100644 index 0000000..0300502 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObject/unbound.cpp @@ -0,0 +1,27 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +using namespace Catch::Matchers; + +TEST_CASE("Unbound JsonObject") { + JsonObject obj; + + SECTION("retrieve member") { + REQUIRE(obj["key"].isNull()); + } + + SECTION("add member") { + obj["hello"] = "world"; + REQUIRE(0 == obj.size()); + } + + SECTION("serialize") { + char buffer[32]; + serializeJson(obj, buffer, sizeof(buffer)); + REQUIRE_THAT(buffer, Equals("null")); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/CMakeLists.txt new file mode 100644 index 0000000..9eb1144 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/CMakeLists.txt @@ -0,0 +1,19 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(JsonObjectConstTests + equals.cpp + isNull.cpp + iterator.cpp + nesting.cpp + size.cpp + subscript.cpp +) + +add_test(JsonObjectConst JsonObjectConstTests) + +set_tests_properties(JsonObjectConst + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/equals.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/equals.cpp new file mode 100644 index 0000000..c1ad6ff --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/equals.cpp @@ -0,0 +1,65 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonObjectConst::operator==()") { + JsonDocument doc1; + JsonObjectConst obj1 = doc1.to(); + + JsonDocument doc2; + JsonObjectConst obj2 = doc2.to(); + + SECTION("should return false when objs differ") { + doc1["hello"] = "coucou"; + doc2["world"] = 1; + + REQUIRE_FALSE(obj1 == obj2); + } + + SECTION("should return false when LHS has more elements") { + doc1["hello"] = "coucou"; + doc1["world"] = 666; + doc2["hello"] = "coucou"; + + REQUIRE_FALSE(obj1 == obj2); + } + + SECTION("should return false when RKS has more elements") { + doc1["hello"] = "coucou"; + doc2["hello"] = "coucou"; + doc2["world"] = 666; + + REQUIRE_FALSE(obj1 == obj2); + } + + SECTION("should return true when objs equal") { + doc1["hello"] = "world"; + doc1["anwser"] = 42; + // insert in different order + doc2["anwser"] = 42; + doc2["hello"] = "world"; + + REQUIRE(obj1 == obj2); + } + + SECTION("should return false when RHS is null") { + JsonObjectConst null; + + REQUIRE_FALSE(obj1 == null); + } + + SECTION("should return false when LHS is null") { + JsonObjectConst null; + + REQUIRE_FALSE(null == obj2); + } + + SECTION("should return true when both are null") { + JsonObjectConst null1, null2; + + REQUIRE(null1 == null2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/isNull.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/isNull.cpp new file mode 100644 index 0000000..c88b9d7 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/isNull.cpp @@ -0,0 +1,32 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonObjectConst::isNull()") { + SECTION("returns true") { + JsonObjectConst obj; + REQUIRE(obj.isNull() == true); + } + + SECTION("returns false") { + JsonDocument doc; + JsonObjectConst obj = doc.to(); + REQUIRE(obj.isNull() == false); + } +} + +TEST_CASE("JsonObjectConst::operator bool()") { + SECTION("returns false") { + JsonObjectConst obj; + REQUIRE(static_cast(obj) == false); + } + + SECTION("returns true") { + JsonDocument doc; + JsonObjectConst obj = doc.to(); + REQUIRE(static_cast(obj) == true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/iterator.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/iterator.cpp new file mode 100644 index 0000000..3b474f4 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/iterator.cpp @@ -0,0 +1,39 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonObjectConst::begin()/end()") { + JsonDocument doc; + JsonObjectConst obj = doc.to(); + doc["ab"] = 12; + doc["cd"] = 34; + + SECTION("Iteration") { + JsonObjectConst::iterator it = obj.begin(); + REQUIRE(obj.end() != it); + REQUIRE(it->key() == "ab"); + REQUIRE(12 == it->value()); + + ++it; + REQUIRE(obj.end() != it); + JsonPairConst pair = *it; + REQUIRE(pair.key() == "cd"); + REQUIRE(34 == pair.value()); + + ++it; + REQUIRE(obj.end() == it); + } + + SECTION("Dereferencing end() is safe") { + REQUIRE(obj.end()->key().isNull()); + REQUIRE(obj.end()->value().isNull()); + } + + SECTION("null JsonObjectConst") { + JsonObjectConst null; + REQUIRE(null.begin() == null.end()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/nesting.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/nesting.cpp new file mode 100644 index 0000000..6d72cdf --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/nesting.cpp @@ -0,0 +1,35 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonObjectConst::nesting()") { + JsonDocument doc; + JsonObjectConst obj = doc.to(); + + SECTION("return 0 if unbound") { + JsonObjectConst unbound; + REQUIRE(unbound.nesting() == 0); + } + + SECTION("returns 1 for empty object") { + REQUIRE(obj.nesting() == 1); + } + + SECTION("returns 1 for flat object") { + doc["hello"] = "world"; + REQUIRE(obj.nesting() == 1); + } + + SECTION("returns 2 with nested array") { + doc["nested"].to(); + REQUIRE(obj.nesting() == 2); + } + + SECTION("returns 2 with nested object") { + doc["nested"].to(); + REQUIRE(obj.nesting() == 2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/size.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/size.cpp new file mode 100644 index 0000000..10e1e13 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/size.cpp @@ -0,0 +1,22 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +TEST_CASE("JsonObjectConst::size()") { + JsonDocument doc; + JsonObjectConst obj = doc.to(); + + SECTION("returns 0 when empty") { + REQUIRE(0 == obj.size()); + } + + SECTION("returns the number of members") { + doc["hello"] = 1; + doc["world"] = 2; + REQUIRE(2 == obj.size()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/subscript.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/subscript.cpp new file mode 100644 index 0000000..d611b3c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonObjectConst/subscript.cpp @@ -0,0 +1,46 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonObjectConst::operator[]") { + JsonDocument doc; + doc["hello"] = "world"; + doc["a\0b"_s] = "ABC"; + JsonObjectConst obj = doc.as(); + + SECTION("supports const char*") { + REQUIRE(obj["hello"] == "world"); // issue #2019 + } + + SECTION("supports std::string") { + REQUIRE(obj["hello"_s] == "world"); // issue #2019 + REQUIRE(obj["a\0b"_s] == "ABC"); + } + +#if defined(HAS_VARIABLE_LENGTH_ARRAY) && \ + !defined(SUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR) + SECTION("supports VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + REQUIRE(obj[vla] == "world"_s); + } +#endif + + SECTION("supports JsonVariant") { + doc["key1"] = "hello"; + doc["key2"] = "a\0b"_s; + doc["key3"] = "foo"; + REQUIRE(obj[obj["key1"]] == "world"); + REQUIRE(obj[obj["key2"]] == "ABC"); + REQUIRE(obj[obj["key3"]] == nullptr); + REQUIRE(obj[obj["key4"]] == nullptr); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt new file mode 100644 index 0000000..28ba51e --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt @@ -0,0 +1,22 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(JsonSerializerTests + CustomWriter.cpp + JsonArray.cpp + JsonArrayPretty.cpp + JsonObject.cpp + JsonObjectPretty.cpp + JsonVariant.cpp + misc.cpp + std_stream.cpp + std_string.cpp +) + +add_test(JsonSerializer JsonSerializerTests) + +set_tests_properties(JsonSerializer + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp new file mode 100644 index 0000000..8e7f1de --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp @@ -0,0 +1,51 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +class CustomWriter { + public: + CustomWriter() {} + CustomWriter(const CustomWriter&) = delete; + CustomWriter& operator=(const CustomWriter&) = delete; + + size_t write(uint8_t c) { + str_.append(1, static_cast(c)); + return 1; + } + + size_t write(const uint8_t* s, size_t n) { + str_.append(reinterpret_cast(s), n); + return n; + } + + const std::string& str() const { + return str_; + } + + private: + std::string str_; +}; + +TEST_CASE("CustomWriter") { + JsonDocument doc; + JsonArray array = doc.to(); + array.add(4); + array.add(2); + + SECTION("serializeJson()") { + CustomWriter writer; + serializeJson(array, writer); + + REQUIRE("[4,2]" == writer.str()); + } + + SECTION("serializeJsonPretty") { + CustomWriter writer; + serializeJsonPretty(array, writer); + + REQUIRE("[\r\n 4,\r\n 2\r\n]" == writer.str()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp new file mode 100644 index 0000000..f33c152 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp @@ -0,0 +1,105 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +static void check(JsonArray array, std::string expected) { + std::string actual; + size_t actualLen = serializeJson(array, actual); + REQUIRE(expected == actual); + REQUIRE(actualLen == expected.size()); + size_t measuredLen = measureJson(array); + REQUIRE(measuredLen == expected.size()); +} + +TEST_CASE("serializeJson(JsonArray)") { + JsonDocument doc; + JsonArray array = doc.to(); + + SECTION("Empty") { + check(array, "[]"); + } + + SECTION("Null") { + array.add(static_cast(0)); + + check(array, "[null]"); + } + + SECTION("OneString") { + array.add("hello"); + + check(array, "[\"hello\"]"); + } + + SECTION("TwoStrings") { + array.add("hello"); + array.add("world"); + + check(array, "[\"hello\",\"world\"]"); + } + + SECTION("One double") { + array.add(3.1415927); + check(array, "[3.1415927]"); + } + + SECTION("OneInteger") { + array.add(1); + + check(array, "[1]"); + } + + SECTION("TwoIntegers") { + array.add(1); + array.add(2); + + check(array, "[1,2]"); + } + + SECTION("serialized(const char*)") { + array.add(serialized("{\"key\":\"value\"}")); + + check(array, "[{\"key\":\"value\"}]"); + } + + SECTION("serialized(char*)") { + char tmp[] = "{\"key\":\"value\"}"; + array.add(serialized(tmp)); + + check(array, "[{\"key\":\"value\"}]"); + } + + SECTION("OneTrue") { + array.add(true); + + check(array, "[true]"); + } + + SECTION("OneFalse") { + array.add(false); + + check(array, "[false]"); + } + + SECTION("TwoBooleans") { + array.add(false); + array.add(true); + + check(array, "[false,true]"); + } + + SECTION("OneEmptyNestedArray") { + array.add(); + + check(array, "[[]]"); + } + + SECTION("OneEmptyNestedHash") { + array.add(); + + check(array, "[{}]"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp new file mode 100644 index 0000000..7939bd9 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp @@ -0,0 +1,75 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +static void checkArray(JsonArray array, std::string expected) { + std::string actual; + size_t actualLen = serializeJsonPretty(array, actual); + size_t measuredLen = measureJsonPretty(array); + CHECK(actualLen == expected.size()); + CHECK(measuredLen == expected.size()); + REQUIRE(expected == actual); +} + +TEST_CASE("serializeJsonPretty(JsonArray)") { + JsonDocument doc; + JsonArray array = doc.to(); + + SECTION("Empty") { + checkArray(array, "[]"); + } + + SECTION("OneElement") { + array.add(1); + + checkArray(array, + "[\r\n" + " 1\r\n" + "]"); + } + + SECTION("TwoElements") { + array.add(1); + array.add(2); + + checkArray(array, + "[\r\n" + " 1,\r\n" + " 2\r\n" + "]"); + } + + SECTION("EmptyNestedArrays") { + array.add(); + array.add(); + + checkArray(array, + "[\r\n" + " [],\r\n" + " []\r\n" + "]"); + } + + SECTION("NestedArrays") { + JsonArray nested1 = array.add(); + nested1.add(1); + nested1.add(2); + + JsonObject nested2 = array.add(); + nested2["key"] = 3; + + checkArray(array, + "[\r\n" + " [\r\n" + " 1,\r\n" + " 2\r\n" + " ],\r\n" + " {\r\n" + " \"key\": 3\r\n" + " }\r\n" + "]"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp new file mode 100644 index 0000000..c21d16d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp @@ -0,0 +1,119 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +static void checkObject(const JsonObject obj, const std::string& expected) { + char actual[256]; + memset(actual, '!', sizeof(actual)); + + size_t actualLen = serializeJson(obj, actual); + size_t measuredLen = measureJson(obj); + + REQUIRE(expected.size() == measuredLen); + REQUIRE(expected.size() == actualLen); + REQUIRE(actual[actualLen] == 0); // serializeJson() adds a null terminator + REQUIRE(expected == actual); +} + +TEST_CASE("serializeJson(JsonObject)") { + JsonDocument doc; + JsonObject obj = doc.to(); + + SECTION("EmptyObject") { + checkObject(obj, "{}"); + } + + SECTION("TwoStrings") { + obj["key1"] = "value1"; + obj["key2"] = "value2"; + + checkObject(obj, "{\"key1\":\"value1\",\"key2\":\"value2\"}"); + } + + SECTION("RemoveFirst") { + obj["key1"] = "value1"; + obj["key2"] = "value2"; + obj.remove("key1"); + + checkObject(obj, "{\"key2\":\"value2\"}"); + } + + SECTION("RemoveLast") { + obj["key1"] = "value1"; + obj["key2"] = "value2"; + obj.remove("key2"); + + checkObject(obj, "{\"key1\":\"value1\"}"); + } + + SECTION("RemoveUnexistingKey") { + obj["key1"] = "value1"; + obj["key2"] = "value2"; + obj.remove("key3"); + + checkObject(obj, "{\"key1\":\"value1\",\"key2\":\"value2\"}"); + } + + SECTION("ReplaceExistingKey") { + obj["key"] = "value1"; + obj["key"] = "value2"; + + checkObject(obj, "{\"key\":\"value2\"}"); + } + + SECTION("TwoIntegers") { + obj["a"] = 1; + obj["b"] = 2; + checkObject(obj, "{\"a\":1,\"b\":2}"); + } + + SECTION("serialized(const char*)") { + obj["a"] = serialized("[1,2]"); + obj["b"] = serialized("[4,5]"); + checkObject(obj, "{\"a\":[1,2],\"b\":[4,5]}"); + } + + SECTION("Two doubles") { + obj["a"] = 12.34; + obj["b"] = 56.78; + checkObject(obj, "{\"a\":12.34,\"b\":56.78}"); + } + + SECTION("TwoNull") { + obj["a"] = static_cast(0); + obj["b"] = static_cast(0); + checkObject(obj, "{\"a\":null,\"b\":null}"); + } + + SECTION("TwoBooleans") { + obj["a"] = true; + obj["b"] = false; + checkObject(obj, "{\"a\":true,\"b\":false}"); + } + + SECTION("ThreeNestedArrays") { + JsonDocument b; + JsonDocument c; + + obj["a"].to(); + obj["b"] = b.to(); + obj["c"] = c.to(); + + checkObject(obj, "{\"a\":[],\"b\":[],\"c\":[]}"); + } + + SECTION("ThreeNestedObjects") { + JsonDocument b; + JsonDocument c; + + obj["a"].to(); + obj["b"] = b.to(); + obj["c"] = c.to(); + + checkObject(obj, "{\"a\":{},\"b\":{},\"c\":{}}"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp new file mode 100644 index 0000000..24e32fb --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp @@ -0,0 +1,77 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +static void checkObjectPretty(const JsonObject obj, + const std::string expected) { + char json[256]; + + size_t actualLen = serializeJsonPretty(obj, json); + size_t measuredLen = measureJsonPretty(obj); + + REQUIRE(json == expected); + REQUIRE(expected.size() == actualLen); + REQUIRE(expected.size() == measuredLen); +} + +TEST_CASE("serializeJsonPretty(JsonObject)") { + JsonDocument doc; + JsonObject obj = doc.to(); + + SECTION("EmptyObject") { + checkObjectPretty(obj, "{}"); + } + + SECTION("OneMember") { + obj["key"] = "value"; + + checkObjectPretty(obj, + "{\r\n" + " \"key\": \"value\"\r\n" + "}"); + } + + SECTION("TwoMembers") { + obj["key1"] = "value1"; + obj["key2"] = "value2"; + + checkObjectPretty(obj, + "{\r\n" + " \"key1\": \"value1\",\r\n" + " \"key2\": \"value2\"\r\n" + "}"); + } + + SECTION("EmptyNestedContainers") { + obj["key1"].to(); + obj["key2"].to(); + + checkObjectPretty(obj, + "{\r\n" + " \"key1\": {},\r\n" + " \"key2\": []\r\n" + "}"); + } + + SECTION("NestedContainers") { + JsonObject nested1 = obj["key1"].to(); + nested1["a"] = 1; + + JsonArray nested2 = obj["key2"].to(); + nested2.add(2); + + checkObjectPretty(obj, + "{\r\n" + " \"key1\": {\r\n" + " \"a\": 1\r\n" + " },\r\n" + " \"key2\": [\r\n" + " 2\r\n" + " ]\r\n" + "}"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp new file mode 100644 index 0000000..dcb8aee --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp @@ -0,0 +1,132 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Literals.hpp" + +template +void check(T value, const std::string& expected) { + JsonDocument doc; + doc.to().set(value); + char buffer[256] = ""; + size_t returnValue = serializeJson(doc, buffer, sizeof(buffer)); + REQUIRE(expected == buffer); + REQUIRE(expected.size() == returnValue); +} + +TEST_CASE("serializeJson(JsonVariant)") { + SECTION("Undefined") { + check(JsonVariant(), "null"); + } + + SECTION("Null string") { + check(static_cast(0), "null"); + } + + SECTION("const char*") { + check("hello", "\"hello\""); + } + + SECTION("string") { + check("hello"_s, "\"hello\""); + + SECTION("Escape quotation mark") { + check("hello \"world\""_s, "\"hello \\\"world\\\"\""); + } + + SECTION("Escape reverse solidus") { + check("hello\\world"_s, "\"hello\\\\world\""); + } + + SECTION("Don't escape solidus") { + check("fifty/fifty"_s, "\"fifty/fifty\""); + } + + SECTION("Don't escape single quote") { + check("hello'world"_s, "\"hello'world\""); + } + + SECTION("Escape backspace") { + check("hello\bworld"_s, "\"hello\\bworld\""); + } + + SECTION("Escape formfeed") { + check("hello\fworld"_s, "\"hello\\fworld\""); + } + + SECTION("Escape linefeed") { + check("hello\nworld"_s, "\"hello\\nworld\""); + } + + SECTION("Escape carriage return") { + check("hello\rworld"_s, "\"hello\\rworld\""); + } + + SECTION("Escape tab") { + check("hello\tworld"_s, "\"hello\\tworld\""); + } + + SECTION("NUL char") { + check("hello\0world"_s, "\"hello\\u0000world\""); + } + } + + SECTION("SerializedValue") { + check(serialized("[1,2]"), "[1,2]"); + } + + SECTION("SerializedValue") { + check(serialized("[1,2]"_s), "[1,2]"); + } + + SECTION("Double") { + check(3.1415927, "3.1415927"); + } + + SECTION("Float") { + REQUIRE(sizeof(float) == 4); + check(3.1415927f, "3.141593"); + } + + SECTION("Zero") { + check(0, "0"); + } + + SECTION("Integer") { + check(42, "42"); + } + + SECTION("NegativeLong") { + check(-42, "-42"); + } + + SECTION("UnsignedLong") { + check(4294967295UL, "4294967295"); + } + + SECTION("True") { + check(true, "true"); + } + + SECTION("OneFalse") { + check(false, "false"); + } + +#if ARDUINOJSON_USE_LONG_LONG + SECTION("NegativeInt64") { + check(-9223372036854775807 - 1, "-9223372036854775808"); + } + + SECTION("PositiveInt64") { + check(9223372036854775807, "9223372036854775807"); + } + + SECTION("UInt64") { + check(18446744073709551615U, "18446744073709551615"); + } +#endif +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/misc.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/misc.cpp new file mode 100644 index 0000000..46d7da5 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/misc.cpp @@ -0,0 +1,36 @@ +#include +#include +#include + +TEST_CASE("serializeJson(MemberProxy)") { + JsonDocument doc; + deserializeJson(doc, "{\"hello\":42}"); + JsonObject obj = doc.as(); + std::string result; + + serializeJson(obj["hello"], result); + + REQUIRE(result == "42"); +} + +TEST_CASE("serializeJson(ElementProxy)") { + JsonDocument doc; + deserializeJson(doc, "[42]"); + JsonArray arr = doc.as(); + std::string result; + + serializeJson(arr[0], result); + + REQUIRE(result == "42"); +} + +TEST_CASE("serializeJson(JsonVariantSubscript)") { + JsonDocument doc; + deserializeJson(doc, "[42]"); + JsonVariant var = doc.as(); + std::string result; + + serializeJson(var[0], result); + + REQUIRE(result == "42"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp new file mode 100644 index 0000000..28fd6f7 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp @@ -0,0 +1,66 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +TEST_CASE("operator<<(std::ostream)") { + JsonDocument doc; + std::ostringstream os; + + SECTION("JsonVariant containing false") { + JsonVariant variant = doc.to(); + + variant.set(false); + os << variant; + + REQUIRE("false" == os.str()); + } + + SECTION("JsonVariant containing string") { + JsonVariant variant = doc.to(); + + variant.set("coucou"); + os << variant; + + REQUIRE("\"coucou\"" == os.str()); + } + + SECTION("JsonObject") { + JsonObject object = doc.to(); + object["key"] = "value"; + + os << object; + + REQUIRE("{\"key\":\"value\"}" == os.str()); + } + + SECTION("MemberProxy") { + JsonObject object = doc.to(); + object["key"] = "value"; + + os << object["key"]; + + REQUIRE("\"value\"" == os.str()); + } + + SECTION("JsonArray") { + JsonArray array = doc.to(); + array.add("value"); + + os << array; + + REQUIRE("[\"value\"]" == os.str()); + } + + SECTION("ElementProxy") { + JsonArray array = doc.to(); + array.add("value"); + + os << array[0]; + + REQUIRE("\"value\"" == os.str()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp new file mode 100644 index 0000000..0d23429 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp @@ -0,0 +1,58 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Literals.hpp" + +TEST_CASE("serialize JsonArray to std::string") { + JsonDocument doc; + JsonArray array = doc.to(); + array.add(4); + array.add(2); + + SECTION("serializeJson()") { + std::string json = "erase me"; + serializeJson(array, json); + + REQUIRE("[4,2]" == json); + } + + SECTION("serializeJsonPretty") { + std::string json = "erase me"; + serializeJsonPretty(array, json); + + REQUIRE("[\r\n 4,\r\n 2\r\n]" == json); + } +} + +TEST_CASE("serialize JsonObject to std::string") { + JsonDocument doc; + JsonObject obj = doc.to(); + obj["key"] = "value"; + + SECTION("object") { + std::string json = "erase me"; + serializeJson(doc, json); + + REQUIRE("{\"key\":\"value\"}" == json); + } + + SECTION("serializeJsonPretty") { + std::string json = "erase me"; + serializeJsonPretty(doc, json); + + REQUIRE("{\r\n \"key\": \"value\"\r\n}" == json); + } +} + +TEST_CASE("serialize an std::string containing a NUL") { + JsonDocument doc; + doc.set("hello\0world"_s); + + std::string json = "erase me"; + serializeJson(doc, json); + CHECK("\"hello\\u0000world\"" == json); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt new file mode 100644 index 0000000..6aec75f --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt @@ -0,0 +1,33 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(JsonVariantTests + add.cpp + as.cpp + clear.cpp + compare.cpp + converters.cpp + copy.cpp + is.cpp + isnull.cpp + misc.cpp + nesting.cpp + nullptr.cpp + or.cpp + overflow.cpp + remove.cpp + set.cpp + size.cpp + stl_containers.cpp + subscript.cpp + types.cpp + unbound.cpp +) + +add_test(JsonVariant JsonVariantTests) + +set_tests_properties(JsonVariant + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/add.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/add.cpp new file mode 100644 index 0000000..3aaa724 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/add.cpp @@ -0,0 +1,128 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonVariant::add(T)") { + JsonDocument doc; + JsonVariant var = doc.to(); + + SECTION("add integer to new variant") { + var.add(42); + + REQUIRE(var.as() == "[42]"); + } + + SECTION("add const char* to new variant") { + var.add("hello"); + + REQUIRE(var.as() == "[\"hello\"]"); + } + + SECTION("add std::string to new variant") { + var.add("hello"_s); + + REQUIRE(var.as() == "[\"hello\"]"); + } + + SECTION("add integer to integer") { + var.set(123); + + var.add(456); // no-op + + REQUIRE(var.as() == "123"); + } + + SECTION("add integer to object") { + var["val"] = 123; + + var.add(456); // no-op + + REQUIRE(var.as() == "{\"val\":123}"); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("supports VLAs") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + var.add(vla); + + REQUIRE(var.as() == "[\"hello\"]"); + } +#endif +} + +TEST_CASE("JsonVariant::add()") { + JsonDocument doc; + JsonVariant var = doc.to(); + + SECTION("JsonArray") { + JsonArray array = var.add(); + array.add(1); + array.add(2); + REQUIRE(doc.as() == "[[1,2]]"); + } + + SECTION("JsonVariant") { + JsonVariant variant = var.add(); + variant.set(42); + REQUIRE(doc.as() == "[42]"); + } +} + +TEST_CASE("JsonObject::add(JsonObject) ") { + JsonDocument doc1; + doc1["hello"_s] = "world"_s; + + TimebombAllocator allocator(10); + SpyingAllocator spy(&allocator); + JsonDocument doc2(&spy); + JsonVariant variant = doc2.to(); + + SECTION("success") { + bool result = variant.add(doc1.as()); + + REQUIRE(result == true); + REQUIRE(doc2.as() == "[{\"hello\":\"world\"}]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + Allocate(sizeofString("world")), + }); + } + + SECTION("partial failure") { // issue #2081 + allocator.setCountdown(2); + + bool result = variant.add(doc1.as()); + + REQUIRE(result == false); + REQUIRE(doc2.as() == "[]"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("hello")), + AllocateFail(sizeofString("world")), + Deallocate(sizeofString("hello")), + }); + } + + SECTION("complete failure") { + allocator.setCountdown(0); + + bool result = variant.add(doc1.as()); + + REQUIRE(result == false); + REQUIRE(doc2.as() == "[]"); + REQUIRE(spy.log() == AllocatorLog{ + AllocateFail(sizeofPool()), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/as.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/as.cpp new file mode 100644 index 0000000..b123572 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/as.cpp @@ -0,0 +1,327 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Literals.hpp" + +namespace my { +using ArduinoJson::detail::isinf; +} // namespace my + +enum MY_ENUM { ONE = 1, TWO = 2 }; + +TEST_CASE("JsonVariant::as()") { + static const char* null = 0; + + JsonDocument doc; + JsonVariant variant = doc.to(); + + SECTION("not set") { + REQUIRE(false == variant.as()); + REQUIRE(0 == variant.as()); + REQUIRE(0.0f == variant.as()); + REQUIRE(0 == variant.as()); + REQUIRE("null" == variant.as()); + REQUIRE(variant.as().isNull()); + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("set(float)") { + variant.set(4.2f); + + REQUIRE(variant.as()); + REQUIRE(0 == variant.as()); + REQUIRE(variant.as() == "4.2"); + REQUIRE(variant.as() == 4L); + REQUIRE(variant.as() == 4.2f); + REQUIRE(variant.as() == 4U); + REQUIRE(variant.as().isNull()); + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("set(double)") { + variant.set(4.2); + + REQUIRE(variant.as()); + REQUIRE(0 == variant.as()); + REQUIRE(variant.as() == "4.2"); + REQUIRE(variant.as() == 4L); + REQUIRE(variant.as() == 4.2); + REQUIRE(variant.as() == 4U); + REQUIRE(variant.as().isNull()); + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("set(0.0)") { + variant.set(0.0); + + REQUIRE(variant.as() == false); + REQUIRE(variant.as() == 0L); + REQUIRE(variant.as().isNull()); + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("set(false)") { + variant.set(false); + + REQUIRE(false == variant.as()); + REQUIRE(variant.as() == 0.0); + REQUIRE(variant.as() == 0L); + REQUIRE(variant.as() == "false"); + REQUIRE(variant.as().isNull()); + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("set(true)") { + variant.set(true); + + REQUIRE(variant.as()); + REQUIRE(variant.as() == 1.0); + REQUIRE(variant.as() == 1L); + REQUIRE(variant.as() == "true"); + REQUIRE(variant.as().isNull()); + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("set(uint32_t)") { + variant.set(4294967295U); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == 4294967295.0); + REQUIRE(variant.as() == 0); + REQUIRE(variant.as() == 4294967295U); + REQUIRE(variant.as() == 4294967295U); + REQUIRE(variant.as() == "4294967295"); + REQUIRE(variant.as().isNull()); + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("set(int32_t)") { + variant.set(-2147483648LL); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == -2147483648LL); + REQUIRE(variant.as() == -2147483648LL); + REQUIRE(variant.as() == -2147483648LL); + REQUIRE(variant.as() == 0); + REQUIRE(variant.as() == 0); + REQUIRE(variant.as() == "-2147483648"); + REQUIRE(variant.as().isNull()); + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("set(uint64_t)") { + variant.set(4294967296U); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == 4294967296.0); + REQUIRE(variant.as() == 0); + REQUIRE(variant.as() == 0); + REQUIRE(variant.as() == 4294967296U); + REQUIRE(variant.as() == "4294967296"); + REQUIRE(variant.as().isNull()); + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("set(int64_t)") { + variant.set(-2147483649LL); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == -2147483649LL); + REQUIRE(variant.as() == 0); + REQUIRE(variant.as() == -2147483649LL); + REQUIRE(variant.as() == 0); + REQUIRE(variant.as() == 0); + REQUIRE(variant.as() == "-2147483649"); + REQUIRE(variant.as().isNull()); + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("set(0L)") { + variant.set(0L); + + REQUIRE(variant.as() == false); + REQUIRE(variant.as() == 0.0); + REQUIRE(variant.as() == "0"); + REQUIRE(variant.as().isNull()); + } + + SECTION("set(0UL)") { + variant.set(0UL); + + REQUIRE(variant.as() == false); + REQUIRE(variant.as() == 0.0); + REQUIRE(variant.as() == "0"); + REQUIRE(variant.as().isNull()); + } + + SECTION("set(null)") { + variant.set(null); + + REQUIRE(variant.as() == false); + REQUIRE(variant.as() == 0.0); + REQUIRE(variant.as() == 0L); + REQUIRE(variant.as() == "null"); + REQUIRE(variant.as().isNull()); + } + + SECTION("set(\"42\")") { + variant.set("42"); + + REQUIRE(variant.as() == 42L); + REQUIRE(variant.as() == 42); + REQUIRE(variant.as() == "42"); + REQUIRE(variant.as().isStatic() == true); + } + + SECTION("set(\"hello\")") { + variant.set("hello"); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == 0L); + REQUIRE(variant.as() == "hello"_s); + REQUIRE(variant.as() == "hello"_s); + REQUIRE(variant.as() == "hello"_s); + REQUIRE(variant.as() == "hello"); + } + + SECTION("set(std::string(\"4.2\")) (tiny string optimization)") { + variant.set("4.2"_s); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == 4L); + REQUIRE(variant.as() == Approx(4.2)); + REQUIRE(variant.as() == "4.2"_s); + REQUIRE(variant.as() == "4.2"_s); + REQUIRE(variant.as() == "4.2"); + REQUIRE(variant.as().isStatic() == false); + } + + SECTION("set(std::string(\"123.45\"))") { + variant.set("123.45"_s); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == 123L); + REQUIRE(variant.as() == Approx(123.45)); + REQUIRE(variant.as() == "123.45"_s); + REQUIRE(variant.as() == "123.45"_s); + REQUIRE(variant.as() == "123.45"); + REQUIRE(variant.as().isStatic() == false); + } + + SECTION("set(\"true\")") { + variant.set("true"); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == 0); + REQUIRE(variant.as() == "true"); + } + + SECTION("set(-1e300)") { + variant.set(-1e300); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == -1e300); + REQUIRE(variant.as() < 0); + REQUIRE(my::isinf(variant.as())); + REQUIRE(variant.as().isNull()); + } + + SECTION("set(1e300)") { + variant.set(1e300); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == 1e300); + REQUIRE(variant.as() > 0); + REQUIRE(my::isinf(variant.as())); + REQUIRE(variant.as().isNull()); + } + + SECTION("set(1e-300)") { + variant.set(1e-300); + + REQUIRE(variant.as() == true); + REQUIRE(variant.as() == 1e-300); + REQUIRE(variant.as() == 0); + REQUIRE(variant.as().isNull()); + } + + SECTION("set(serialized(\"hello\"))") { + variant.set(serialized("hello")); + + REQUIRE(variant.as().data() == nullptr); + REQUIRE(variant.as().data() == nullptr); + } + + SECTION("to()") { + JsonObject obj = variant.to(); + obj["key"] = "value"; + + SECTION("as()") { + REQUIRE(variant.as() == true); + } + + SECTION("as()") { + REQUIRE(variant.as() == "{\"key\":\"value\"}"_s); + } + + SECTION("ObjectAsJsonObject") { + JsonObject o = variant.as(); + REQUIRE(o.size() == 1); + REQUIRE(o["key"] == "value"_s); + } + } + + SECTION("to()") { + JsonArray arr = variant.to(); + arr.add(4); + arr.add(2); + + SECTION("as()") { + REQUIRE(variant.as() == true); + } + + SECTION("as()") { + REQUIRE(variant.as() == "[4,2]"_s); + } + + SECTION("as()") { + JsonArray a = variant.as(); + REQUIRE(a.size() == 2); + REQUIRE(a[0] == 4); + REQUIRE(a[1] == 2); + } + } + +#if ARDUINOJSON_USE_LONG_LONG + SECTION("Smallest int64 negative") { + variant.set("-9223372036854775808"); + REQUIRE(variant.as() == -9223372036854775807 - 1); + } + + SECTION("Biggest int64 positive") { + variant.set("9223372036854775807"); + REQUIRE(variant.as() == 9223372036854775807); + } +#endif + + SECTION("as()") { + variant.set(1); + + REQUIRE(variant.as() == ONE); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/clear.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/clear.cpp new file mode 100644 index 0000000..6078d6b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/clear.cpp @@ -0,0 +1,40 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +TEST_CASE("JsonVariant::clear()") { + SpyingAllocator spy; + JsonDocument doc(&spy); + JsonVariant var = doc.to(); + + SECTION("size goes back to zero") { + var.add(42); + var.clear(); + + REQUIRE(var.size() == 0); + } + + SECTION("isNull() return true") { + var.add("hello"); + var.clear(); + + REQUIRE(var.isNull() == true); + } + + SECTION("releases owned string") { + var.set("hello"_s); + var.clear(); + + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("hello")), + Deallocate(sizeofString("hello")), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/compare.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/compare.cpp new file mode 100644 index 0000000..719566e --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/compare.cpp @@ -0,0 +1,352 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +// Most code is already covered by arithmeticCompare.cpp. +// Here, we're just filling the holes + +TEST_CASE("Compare JsonVariant with value") { + JsonDocument doc; + JsonVariant a = doc.add(); + + SECTION("null vs (char*)0") { + char* b = 0; + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("42 vs 42") { + a.set(42); + int b = 42; + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } +} + +TEST_CASE("Compare JsonVariant with JsonVariant") { + JsonDocument doc; + JsonVariant a = doc.add(); + JsonVariant b = doc.add(); + + SECTION("'abc' vs 'abc'") { + a.set("abc"); + b.set("abc"); + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("'abc' vs 'bcd'") { + a.set("abc"); + b.set("bcd"); + + CHECK(a != b); + CHECK(a < b); + CHECK(a <= b); + CHECK_FALSE(a == b); + CHECK_FALSE(a > b); + CHECK_FALSE(a >= b); + } + + SECTION("'bcd' vs 'abc'") { + a.set("bcd"); + b.set("abc"); + + CHECK(a != b); + CHECK(a > b); + CHECK(a >= b); + CHECK_FALSE(a < b); + CHECK_FALSE(a <= b); + CHECK_FALSE(a == b); + } + + SECTION("serialized('abc') vs serialized('abc')") { + a.set(serialized("abc")); + b.set(serialized("abc")); + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("serialized('abc') vs serialized('bcd')") { + a.set(serialized("abc")); + b.set(serialized("bcd")); + + CHECK(a != b); + CHECK(a < b); + CHECK(a <= b); + CHECK_FALSE(a == b); + CHECK_FALSE(a > b); + CHECK_FALSE(a >= b); + } + + SECTION("serialized('bcd') vs serialized('abc')") { + a.set(serialized("bcd")); + b.set(serialized("abc")); + + CHECK(a != b); + CHECK(a > b); + CHECK(a >= b); + CHECK_FALSE(a < b); + CHECK_FALSE(a <= b); + CHECK_FALSE(a == b); + } + + SECTION("MsgPackBinary('abc') vs MsgPackBinary('abc')") { + a.set(MsgPackBinary("abc", 4)); + b.set(MsgPackBinary("abc", 4)); + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("MsgPackBinary('abc') vs MsgPackBinary('bcd')") { + a.set(MsgPackBinary("abc", 4)); + b.set(MsgPackBinary("bcd", 4)); + + CHECK(a != b); + CHECK(a < b); + CHECK(a <= b); + CHECK_FALSE(a == b); + CHECK_FALSE(a > b); + CHECK_FALSE(a >= b); + } + + SECTION("MsgPackBinary('bcd') vs MsgPackBinary('abc')") { + a.set(MsgPackBinary("bcd", 4)); + b.set(MsgPackBinary("abc", 4)); + + CHECK(a != b); + CHECK(a > b); + CHECK(a >= b); + CHECK_FALSE(a < b); + CHECK_FALSE(a <= b); + CHECK_FALSE(a == b); + } + + SECTION("false vs true") { + a.set(false); + b.set(true); + + CHECK(a != b); + CHECK(a < b); + CHECK(a <= b); + CHECK_FALSE(a == b); + CHECK_FALSE(a > b); + CHECK_FALSE(a >= b); + } + + SECTION("false vs -1") { + a.set(false); + b.set(-1); + + CHECK(a != b); + CHECK(a > b); + CHECK(a >= b); + CHECK_FALSE(a < b); + CHECK_FALSE(a <= b); + CHECK_FALSE(a == b); + } + + SECTION("null vs null") { + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("42 vs 42") { + a.set(42); + b.set(42); + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("42 vs 42U") { + a.set(42); + b.set(42U); + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("42 vs 42.0") { + a.set(42); + b.set(42.0); + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("42.0 vs 42") { + a.set(42.0); + b.set(42); + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("-42 vs -42") { + a.set(-42); + b.set(-42); + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("-42 vs 42") { + a.set(-42); + b.set(42); + + CHECK(a != b); + CHECK(a < b); + CHECK(a <= b); + CHECK_FALSE(a == b); + CHECK_FALSE(a > b); + CHECK_FALSE(a >= b); + } + + SECTION("42 vs -42") { + a.set(42); + b.set(-42); + + CHECK(a != b); + CHECK(a > b); + CHECK(a >= b); + CHECK_FALSE(a < b); + CHECK_FALSE(a <= b); + CHECK_FALSE(a == b); + } + + SECTION("42.0 vs -42") { + a.set(42.0); + b.set(-42); + + CHECK(a != b); + CHECK(a > b); + CHECK(a >= b); + CHECK_FALSE(a < b); + CHECK_FALSE(a <= b); + CHECK_FALSE(a == b); + } + + SECTION("42U vs 42U") { + a.set(42U); + b.set(42U); + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("42U vs 42") { + a.set(42U); + b.set(42); + + CHECK(a == b); + CHECK(a <= b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("[1] vs [1]") { + a.add(1); + b.add(1); + + CHECK(a <= b); + CHECK(a == b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("[1] vs [2]") { + a.add(1); + b.add(2); + + CHECK(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a <= b); + CHECK_FALSE(a == b); + CHECK_FALSE(a > b); + CHECK_FALSE(a >= b); + } + + SECTION("{x:1} vs {x:1}") { + a["x"] = 1; + b["x"] = 1; + + CHECK(a <= b); + CHECK(a == b); + CHECK(a >= b); + CHECK_FALSE(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a > b); + } + + SECTION("{x:1} vs {x:2}") { + a["x"] = 1; + b["x"] = 2; + + CHECK(a != b); + CHECK_FALSE(a < b); + CHECK_FALSE(a <= b); + CHECK_FALSE(a == b); + CHECK_FALSE(a > b); + CHECK_FALSE(a >= b); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/converters.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/converters.cpp new file mode 100644 index 0000000..10d7385 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/converters.cpp @@ -0,0 +1,142 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +namespace { +struct Date { + int day; + int month; + int year; +}; + +void convertToJson(const Date& src, JsonVariant dst) { + dst["day"] = src.day; + dst["month"] = src.month; + dst["year"] = src.year; +} + +void convertFromJson(JsonVariantConst src, Date& dst) { + dst.day = src["day"]; + dst.month = src["month"]; + dst.year = src["year"]; +} + +bool canConvertFromJson(JsonVariantConst src, const Date&) { + return src["day"].is() && src["month"].is() && + src["year"].is(); +} +} // namespace + +TEST_CASE("Custom converter with overloading") { + JsonDocument doc; + + SECTION("convert JSON to Date") { + doc["date"]["day"] = 2; + doc["date"]["month"] = 3; + doc["date"]["year"] = 2021; + + Date date = doc["date"]; + + REQUIRE(date.day == 2); + REQUIRE(date.month == 3); + REQUIRE(date.year == 2021); + } + + SECTION("is() returns true") { + doc["date"]["day"] = 2; + doc["date"]["month"] = 3; + doc["date"]["year"] = 2021; + + REQUIRE(doc["date"].is()); + } + + SECTION("is() returns false") { + doc["date"]["day"] = 2; + doc["date"]["month"] = 3; + doc["date"]["year"] = "2021"; + + REQUIRE(doc["date"].is() == false); + } + + SECTION("convert Date to JSON") { + Date date = {19, 3, 2021}; + doc["date"] = date; + + REQUIRE(doc["date"]["day"] == 19); + REQUIRE(doc["date"]["month"] == 3); + REQUIRE(doc["date"]["year"] == 2021); + } +} + +class Complex { + public: + explicit Complex(double r, double i) : real_(r), imag_(i) {} + + double real() const { + return real_; + } + + double imag() const { + return imag_; + } + + private: + double real_, imag_; +}; + +namespace ArduinoJson { +template <> +struct Converter { + static void toJson(const Complex& src, JsonVariant dst) { + dst["real"] = src.real(); + dst["imag"] = src.imag(); + } + + static Complex fromJson(JsonVariantConst src) { + return Complex(src["real"], src["imag"]); + } + + static bool checkJson(JsonVariantConst src) { + return src["real"].is() && src["imag"].is(); + } +}; +} // namespace ArduinoJson + +TEST_CASE("Custom converter with specialization") { + JsonDocument doc; + + SECTION("convert JSON to Complex") { + doc["value"]["real"] = 2; + doc["value"]["imag"] = 3; + + Complex value = doc["value"]; + + REQUIRE(value.real() == 2); + REQUIRE(value.imag() == 3); + } + + SECTION("is() returns true") { + doc["value"]["real"] = 2; + doc["value"]["imag"] = 3; + + REQUIRE(doc["value"].is()); + } + + SECTION("is() returns false") { + doc["value"]["real"] = 2; + doc["value"]["imag"] = "3"; + + REQUIRE(doc["value"].is() == false); + } + + SECTION("convert value to JSON") { + doc["value"] = Complex(19, 3); + + REQUIRE(doc["value"]["real"] == 19); + REQUIRE(doc["value"]["imag"] == 3); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/copy.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/copy.cpp new file mode 100644 index 0000000..b5da71f --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/copy.cpp @@ -0,0 +1,142 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include "Allocators.hpp" + +#include "Literals.hpp" + +TEST_CASE("JsonVariant::set(JsonVariant)") { + KillswitchAllocator killswitch; + SpyingAllocator spyingAllocator(&killswitch); + JsonDocument doc1(&spyingAllocator); + JsonDocument doc2(&spyingAllocator); + JsonVariant var1 = doc1.to(); + JsonVariant var2 = doc2.to(); + + SECTION("stores JsonArray by copy") { + JsonArray arr = doc2.to(); + JsonObject obj = arr.add(); + obj["hello"] = "world"; + + var1.set(arr); + + arr[0] = 666; + REQUIRE(var1.as() == "[{\"hello\":\"world\"}]"); + } + + SECTION("stores JsonObject by copy") { + JsonObject obj = doc2.to(); + JsonArray arr = obj["value"].to(); + arr.add(42); + + var1.set(obj); + + obj["value"] = 666; + REQUIRE(var1.as() == "{\"value\":[42]}"); + } + + SECTION("stores const char* by reference") { + var1.set("hello!!"); + spyingAllocator.clearLog(); + + var2.set(var1); + + REQUIRE(spyingAllocator.log() == AllocatorLog{}); + } + + SECTION("stores char* by copy") { + char str[] = "hello!!"; + var1.set(str); + spyingAllocator.clearLog(); + + var2.set(var1); + + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofString("hello!!")), + }); + } + + SECTION("fails gracefully if string allocation fails") { + char str[] = "hello!!"; + var1.set(str); + killswitch.on(); + spyingAllocator.clearLog(); + + var2.set(var1); + + REQUIRE(doc2.overflowed() == true); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + AllocateFail(sizeofString("hello!!")), + }); + } + + SECTION("stores std::string by copy") { + var1.set("hello!!"_s); + spyingAllocator.clearLog(); + + var2.set(var1); + + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofString("hello!!")), + }); + } + + SECTION("stores Serialized by copy") { + var1.set(serialized("hello!!", 7)); + spyingAllocator.clearLog(); + + var2.set(var1); + + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofString("hello!!")), + }); + } + + SECTION("stores Serialized by copy") { + char str[] = "hello!!"; + var1.set(serialized(str, 7)); + spyingAllocator.clearLog(); + + var2.set(var1); + + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofString("hello!!")), + }); + } + + SECTION("stores Serialized by copy") { + var1.set(serialized("hello!!"_s)); + spyingAllocator.clearLog(); + + var2.set(var1); + + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofString("hello!!")), + }); + } + + SECTION("fails gracefully if raw string allocation fails") { + var1.set(serialized("hello!!"_s)); + killswitch.on(); + spyingAllocator.clearLog(); + + var2.set(var1); + + REQUIRE(doc2.overflowed() == true); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + AllocateFail(sizeofString("hello!!")), + }); + } + + SECTION("destination is unbound") { + JsonVariant unboundVariant; + + unboundVariant.set(var1); + + REQUIRE(unboundVariant.isUnbound()); + REQUIRE(unboundVariant.isNull()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/is.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/is.cpp new file mode 100644 index 0000000..9e38b7b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/is.cpp @@ -0,0 +1,164 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +enum MYENUM2 { ONE = 1, TWO = 2 }; + +TEST_CASE("JsonVariant::is()") { + JsonDocument doc; + JsonVariant variant = doc.to(); + + SECTION("unbound") { + variant = JsonVariant(); + + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + } + + SECTION("null") { + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + } + + SECTION("true") { + variant.set(true); + + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + } + + SECTION("false") { + variant.set(false); + + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + } + + SECTION("int") { + variant.set(42); + + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + } + + SECTION("double") { + variant.set(4.2); + + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + } + + SECTION("const char*") { + variant.set("4.2"); + + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + } + + SECTION("JsonArray") { + variant.to(); + + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + } + + SECTION("JsonObject") { + variant.to(); + + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == false); + CHECK(variant.is() == true); + CHECK(variant.is() == true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/isnull.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/isnull.cpp new file mode 100644 index 0000000..7683eb8 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/isnull.cpp @@ -0,0 +1,72 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonVariant::isNull()") { + JsonDocument doc; + JsonVariant variant = doc.to(); + + SECTION("returns true when Undefined") { + REQUIRE(variant.isNull() == true); + } + + SECTION("returns false when Integer") { + variant.set(42); + + REQUIRE(variant.isNull() == false); + } + + SECTION("returns false when EmptyArray") { + JsonDocument doc2; + JsonArray array = doc2.to(); + + variant.set(array); + REQUIRE(variant.isNull() == false); + } + + SECTION("returns false when EmptyObject") { + JsonDocument doc2; + JsonObject obj = doc2.to(); + + variant.set(obj); + REQUIRE(variant.isNull() == false); + } + + SECTION("returns true after set(JsonArray())") { + variant.set(JsonArray()); + REQUIRE(variant.isNull() == true); + } + + SECTION("returns true after set(JsonObject())") { + variant.set(JsonObject()); + REQUIRE(variant.isNull() == true); + } + + SECTION("returns false after set('hello')") { + variant.set("hello"); + REQUIRE(variant.isNull() == false); + } + + SECTION("returns true after set((char*)0)") { + variant.set(static_cast(0)); + REQUIRE(variant.isNull() == true); + } + + SECTION("returns true after set((const char*)0)") { + variant.set(static_cast(0)); + REQUIRE(variant.isNull() == true); + } + + SECTION("returns true after set(serialized((char*)0))") { + variant.set(serialized(static_cast(0))); + REQUIRE(variant.isNull() == true); + } + + SECTION("returns true after set(serialized((const char*)0))") { + variant.set(serialized(static_cast(0))); + REQUIRE(variant.isNull() == true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/misc.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/misc.cpp new file mode 100644 index 0000000..6298344 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/misc.cpp @@ -0,0 +1,60 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("VariantData") { + REQUIRE(std::is_standard_layout::value == + true); +} + +TEST_CASE("StringNode") { + REQUIRE(std::is_standard_layout::value == + true); +} + +TEST_CASE("JsonVariant from JsonArray") { + SECTION("JsonArray is null") { + JsonArray arr; + JsonVariant v = arr; + REQUIRE(v.isNull() == true); + } + + SECTION("JsonArray is not null") { + JsonDocument doc; + JsonArray arr = doc.to(); + arr.add(12); + arr.add(34); + + JsonVariant v = arr; + + REQUIRE(v.is() == true); + REQUIRE(v.size() == 2); + REQUIRE(v[0] == 12); + REQUIRE(v[1] == 34); + } +} + +TEST_CASE("JsonVariant from JsonObject") { + SECTION("JsonObject is null") { + JsonObject obj; + JsonVariant v = obj; + REQUIRE(v.isNull() == true); + } + + SECTION("JsonObject is not null") { + JsonDocument doc; + JsonObject obj = doc.to(); + obj["a"] = 12; + obj["b"] = 34; + + JsonVariant v = obj; + + REQUIRE(v.is() == true); + REQUIRE(v.size() == 2); + REQUIRE(v["a"] == 12); + REQUIRE(v["b"] == 34); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/nesting.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/nesting.cpp new file mode 100644 index 0000000..cb4e351 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/nesting.cpp @@ -0,0 +1,31 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonVariant::nesting()") { + JsonDocument doc; + JsonVariant var = doc.to(); + + SECTION("return 0 if uninitialized") { + JsonVariant unitialized; + REQUIRE(unitialized.nesting() == 0); + } + + SECTION("returns 0 for string") { + var.set("hello"); + REQUIRE(var.nesting() == 0); + } + + SECTION("returns 1 for empty object") { + var.to(); + REQUIRE(var.nesting() == 1); + } + + SECTION("returns 1 for empty array") { + var.to(); + REQUIRE(var.nesting() == 1); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/nullptr.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/nullptr.cpp new file mode 100644 index 0000000..434ba5c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/nullptr.cpp @@ -0,0 +1,43 @@ +#include + +#include + +TEST_CASE("nullptr") { + JsonDocument doc; + JsonVariant variant = doc.to(); + + SECTION("JsonVariant == nullptr") { + REQUIRE(variant == nullptr); + REQUIRE_FALSE(variant != nullptr); + } + + SECTION("JsonVariant != nullptr") { + variant.set(42); + + REQUIRE_FALSE(variant == nullptr); + REQUIRE(variant != nullptr); + } + + SECTION("JsonVariant.set(nullptr)") { + variant.set(42); + variant.set(nullptr); + + REQUIRE(variant.isNull()); + } + + SECTION("JsonVariant.set(nullptr) with unbound reference") { + JsonVariant unboundReference; + + unboundReference.set(nullptr); + + REQUIRE(variant.isNull()); + } + + SECTION("JsonVariant.is()") { + variant.set(42); + REQUIRE(variant.is() == false); + + variant.clear(); + REQUIRE(variant.is() == true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/or.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/or.cpp new file mode 100644 index 0000000..5886899 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/or.cpp @@ -0,0 +1,159 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonVariant::operator|()") { + JsonDocument doc; + JsonVariant variant = doc["value"].to(); + + SECTION("null") { + SECTION("null | const char*") { + std::string result = variant | "default"; + REQUIRE(result == "default"); + } + + SECTION("null | int") { + int result = variant | 42; + REQUIRE(result == 42); + } + + SECTION("null | bool") { + bool result = variant | true; + REQUIRE(result == true); + } + + SECTION("null | ElementProxy") { + doc["array"][0] = 42; + + JsonVariantConst result = variant | doc["array"][0]; + REQUIRE(result == 42); + } + + SECTION("null | MemberProxy") { + doc["other"] = 42; + + JsonVariantConst result = variant | doc["other"]; + REQUIRE(result == 42); + } + + SECTION("ElementProxy | ElementProxy") { + doc["array"][0] = 42; + + JsonVariantConst result = doc["array"][1] | doc["array"][0]; + REQUIRE(result == 42); + } + } + + SECTION("null") { + variant.set(static_cast(0)); + + SECTION("null | const char*") { + std::string result = variant | "default"; + REQUIRE(result == "default"); + } + + SECTION("null | int") { + int result = variant | 42; + REQUIRE(result == 42); + } + + SECTION("null | bool") { + bool result = variant | true; + REQUIRE(result == true); + } + + SECTION("null | ElementProxy") { + doc["array"][0] = 42; + + JsonVariantConst result = variant | doc["array"][0]; + REQUIRE(result == 42); + } + + SECTION("null | MemberProxy") { + doc["other"] = 42; + + JsonVariantConst result = variant | doc["other"]; + REQUIRE(result == 42); + } + } + + SECTION("int | const char*") { + variant.set(42); + std::string result = variant | "default"; + REQUIRE(result == "default"); + } + + SECTION("int | uint8_t (out of range)") { + variant.set(666); + uint8_t result = variant | static_cast(42); + REQUIRE(result == 42); + } + + SECTION("int | ElementProxy") { + variant.set(42); + doc["array"][0] = 666; + JsonVariantConst result = variant | doc["array"][0]; + REQUIRE(result == 42); + } + + SECTION("int | MemberProxy") { + variant.set(42); + doc["other"] = 666; + JsonVariantConst result = variant | doc["other"]; + REQUIRE(result == 42); + } + + SECTION("int | int") { + variant.set(0); + int result = variant | 666; + REQUIRE(result == 0); + } + + SECTION("double | int") { + // NOTE: changed the behavior to fix #981 + variant.set(666.0); + int result = variant | 42; + REQUIRE(result == 42); + } + + SECTION("bool | bool") { + variant.set(false); + bool result = variant | true; + REQUIRE(result == false); + } + + SECTION("int | bool") { + variant.set(0); + bool result = variant | true; + REQUIRE(result == true); + } + + SECTION("const char* | const char*") { + variant.set("not default"); + std::string result = variant | "default"; + REQUIRE(result == "not default"); + } + + SECTION("const char* | char*") { + char dflt[] = "default"; + variant.set("not default"); + std::string result = variant | dflt; + REQUIRE(result == "not default"); + } + + SECTION("int | char*") { + char dflt[] = "default"; + variant.set(42); + std::string result = variant | dflt; + REQUIRE(result == "default"); + } + + SECTION("const char* | int") { + variant.set("not default"); + int result = variant | 42; + REQUIRE(result == 42); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/overflow.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/overflow.cpp new file mode 100644 index 0000000..00dbed7 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/overflow.cpp @@ -0,0 +1,72 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +template +void shouldBeOk(TIn value) { + JsonDocument doc; + JsonVariant var = doc.to(); + var.set(value); + REQUIRE(var.as() == TOut(value)); +} + +template +void shouldOverflow(TIn value) { + JsonDocument doc; + JsonVariant var = doc.to(); + var.set(value); + REQUIRE(var.as() == 0); + REQUIRE(var.is() == false); +} + +TEST_CASE("Handle integer overflow in stored integer") { + SECTION("int8_t") { + // ok + shouldBeOk(-128); + shouldBeOk(42.0); + shouldBeOk(127); + + // too low + shouldOverflow(-128.1); + shouldOverflow(-129); + + // too high + shouldOverflow(128); + shouldOverflow(127.1); + } + + SECTION("int16_t") { + // ok + shouldBeOk(-32768); + shouldBeOk(-32767.9); + shouldBeOk(32766.9); + shouldBeOk(32767); + + // too low + shouldOverflow(-32768.1); + shouldOverflow(-32769); + + // too high + shouldOverflow(32767.1); + shouldOverflow(32768); + } + + SECTION("uint8_t") { + // ok + shouldBeOk(1); + shouldBeOk(42.0); + shouldBeOk(255); + + // too low + shouldOverflow(-1); + shouldOverflow(-0.1); + + // to high + shouldOverflow(255.1); + shouldOverflow(256); + shouldOverflow(257); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/remove.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/remove.cpp new file mode 100644 index 0000000..2926cfe --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/remove.cpp @@ -0,0 +1,128 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofArray; + +TEST_CASE("JsonVariant::remove(int)") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + SECTION("release top level strings") { + doc.add("hello"_s); + doc.add("hello"_s); + doc.add("world"_s); + + JsonVariant var = doc.as(); + REQUIRE(var.as() == "[\"hello\",\"hello\",\"world\"]"); + + spy.clearLog(); + var.remove(1); + REQUIRE(var.as() == "[\"hello\",\"world\"]"); + REQUIRE(spy.log() == AllocatorLog{}); + + spy.clearLog(); + var.remove(1); + REQUIRE(var.as() == "[\"hello\"]"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("world")), + }); + + spy.clearLog(); + var.remove(0); + REQUIRE(var.as() == "[]"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("hello")), + }); + } + + SECTION("release strings in nested array") { + doc[0][0] = "hello"_s; + + JsonVariant var = doc.as(); + REQUIRE(var.as() == "[[\"hello\"]]"); + + spy.clearLog(); + var.remove(0); + + REQUIRE(var.as() == "[]"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("hello")), + }); + } +} + +TEST_CASE("JsonVariant::remove(const char *)") { + JsonDocument doc; + JsonVariant var = doc.to(); + + var["a"] = 1; + var["b"] = 2; + + var.remove("a"); + + REQUIRE(var.as() == "{\"b\":2}"); +} + +TEST_CASE("JsonVariant::remove(std::string)") { + JsonDocument doc; + JsonVariant var = doc.to(); + + var["a"] = 1; + var["b"] = 2; + + var.remove("b"_s); + + REQUIRE(var.as() == "{\"a\":1}"); +} + +#ifdef HAS_VARIABLE_LENGTH_ARRAY +TEST_CASE("JsonVariant::remove(VLA)") { + JsonDocument doc; + JsonVariant var = doc.to(); + + var["a"] = 1; + var["b"] = 2; + size_t i = 16; + char vla[i]; + strcpy(vla, "b"); + + var.remove("b"_s); + + REQUIRE(var.as() == "{\"a\":1}"); +} +#endif + +TEST_CASE("JsonVariant::remove(JsonVariant) from object") { + JsonDocument doc; + JsonVariant var = doc.to(); + + var["a"] = "a"; + var["b"] = 2; + var["c"] = "b"; + + var.remove(var["c"]); + + REQUIRE(var.as() == "{\"a\":\"a\",\"c\":\"b\"}"); +} + +TEST_CASE("JsonVariant::remove(JsonVariant) from array") { + JsonDocument doc; + JsonVariant var = doc.to(); + + var[0] = 3; + var[1] = 2; + var[2] = 1; + + var.remove(var[2]); + var.remove(var[3]); // noop + + REQUIRE(var.as() == "[3,1]"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/set.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/set.cpp new file mode 100644 index 0000000..7d56818 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/set.cpp @@ -0,0 +1,407 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofObject; + +enum ErrorCode { ERROR_01 = 1, ERROR_10 = 10 }; + +TEST_CASE("JsonVariant::set() when there is enough memory") { + SpyingAllocator spy; + JsonDocument doc(&spy); + JsonVariant variant = doc.to(); + + SECTION("string literal") { + bool result = variant.set("hello\0world"); + + REQUIRE(result == true); + CHECK(variant == + "hello"_s); // linked string cannot contain '\0' at the moment + CHECK(spy.log() == AllocatorLog{}); + } + + SECTION("const char*") { + char str[16]; + + strcpy(str, "hello"); + bool result = variant.set(static_cast(str)); + strcpy(str, "world"); + + REQUIRE(result == true); + REQUIRE(variant == "hello"); // stores by copy + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("hello")), + }); + } + + SECTION("(const char*)0") { + bool result = variant.set(static_cast(0)); + + REQUIRE(result == true); + REQUIRE(variant.isNull()); + REQUIRE(variant.as() == nullptr); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("char*") { + char str[16]; + + strcpy(str, "hello"); + bool result = variant.set(str); + strcpy(str, "world"); + + REQUIRE(result == true); + REQUIRE(variant == "hello"); // stores by copy + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("hello")), + }); + } + + SECTION("char* (tiny string optimization)") { + char str[16]; + + strcpy(str, "abc"); + bool result = variant.set(str); + strcpy(str, "def"); + + REQUIRE(result == true); + REQUIRE(variant == "abc"); // stores by copy + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("(char*)0") { + bool result = variant.set(static_cast(0)); + + REQUIRE(result == true); + REQUIRE(variant.isNull()); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("unsigned char*") { + char str[16]; + + strcpy(str, "hello"); + bool result = variant.set(reinterpret_cast(str)); + strcpy(str, "world"); + + REQUIRE(result == true); + REQUIRE(variant == "hello"); // stores by copy + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("hello")), + }); + } + + SECTION("signed char*") { + char str[16]; + + strcpy(str, "hello"); + bool result = variant.set(reinterpret_cast(str)); + strcpy(str, "world"); + + REQUIRE(result == true); + REQUIRE(variant == "hello"); // stores by copy + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("hello")), + }); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("VLA") { + size_t n = 16; + char str[n]; + + strcpy(str, "hello"); + bool result = variant.set(str); + strcpy(str, "world"); + + REQUIRE(result == true); + REQUIRE(variant == "hello"); // stores by copy + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("hello")), + }); + } +#endif + + SECTION("std::string") { + std::string str = "hello\0world"_s; + bool result = variant.set(str); + str.replace(0, 5, "world"); + + REQUIRE(result == true); + REQUIRE(variant == "hello\0world"_s); // stores by copy + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("hello?world")), + }); + } + + SECTION("static JsonString") { + char str[16]; + + strcpy(str, "hello"); + bool result = variant.set(JsonString(str, true)); + strcpy(str, "world"); + + REQUIRE(result == true); + REQUIRE(variant == "world"); // stores by pointer + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("non-static JsonString") { + char str[16]; + + strcpy(str, "hello"); + bool result = variant.set(JsonString(str)); + strcpy(str, "world"); + + REQUIRE(result == true); + REQUIRE(variant == "hello"); // stores by copy + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofString("hello")), + }); + } + + SECTION("enum") { + ErrorCode code = ERROR_10; + + bool result = variant.set(code); + + REQUIRE(result == true); + REQUIRE(variant.is() == true); + REQUIRE(variant.as() == 10); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("float") { + bool result = variant.set(1.2f); + + REQUIRE(result == true); + REQUIRE(variant.is() == true); + REQUIRE(variant.as() == 1.2f); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("double") { + bool result = variant.set(1.2); + doc.shrinkToFit(); + + REQUIRE(result == true); + REQUIRE(variant.is() == true); + REQUIRE(variant.as() == 1.2); + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofPool(1)), // one extension slot + }); + } + + SECTION("int32_t") { + bool result = variant.set(int32_t(42)); + + REQUIRE(result == true); + REQUIRE(variant.is() == true); + REQUIRE(variant.as() == 42); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("int64_t") { + bool result = variant.set(int64_t(-2147483649LL)); + doc.shrinkToFit(); + + REQUIRE(result == true); + REQUIRE(variant.is() == true); + REQUIRE(variant.as() == -2147483649LL); + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofPool(1)), // one extension slot + }); + } + + SECTION("uint32_t") { + bool result = variant.set(uint32_t(42)); + + REQUIRE(result == true); + REQUIRE(variant.is() == true); + REQUIRE(variant.as() == 42); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("uint64_t") { + bool result = variant.set(uint64_t(4294967296)); + doc.shrinkToFit(); + + REQUIRE(result == true); + REQUIRE(variant.is() == true); + REQUIRE(variant.as() == 4294967296); + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofPool(1)), // one extension slot + }); + } + + SECTION("JsonDocument") { + JsonDocument doc1; + doc1["hello"] = "world"; + + // Should copy the doc + variant.set(doc1); + doc1.clear(); + + std::string json; + serializeJson(doc, json); + REQUIRE(json == "{\"hello\":\"world\"}"); + } +} + +TEST_CASE("JsonVariant::set() with not enough memory") { + JsonDocument doc(FailingAllocator::instance()); + + JsonVariant v = doc.to(); + + SECTION("std::string") { + bool result = v.set("hello world!!"_s); + + REQUIRE(result == false); + REQUIRE(v.isNull()); + } + + SECTION("Serialized") { + bool result = v.set(serialized("hello world!!"_s)); + + REQUIRE(result == false); + REQUIRE(v.isNull()); + } + + SECTION("char*") { + char s[] = "hello world!!"; + bool result = v.set(s); + + REQUIRE(result == false); + REQUIRE(v.isNull()); + } + + SECTION("float") { + bool result = v.set(1.2f); + + REQUIRE(result == true); + REQUIRE(v.is()); + } + + SECTION("double") { + bool result = v.set(1.2); + + REQUIRE(result == false); + REQUIRE(v.isNull()); + } + + SECTION("int32_t") { + bool result = v.set(-42); + + REQUIRE(result == true); + REQUIRE(v.is()); + } + + SECTION("int64_t") { + bool result = v.set(-2147483649LL); + + REQUIRE(result == false); + REQUIRE(v.isNull()); + } + + SECTION("uint32_t") { + bool result = v.set(42); + + REQUIRE(result == true); + REQUIRE(v.is()); + } + + SECTION("uint64_t") { + bool result = v.set(4294967296U); + + REQUIRE(result == false); + REQUIRE(v.isNull()); + } +} + +TEST_CASE("JsonVariant::set() releases the previous value") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc["hello"] = "world"_s; + spy.clearLog(); + + JsonVariant v = doc["hello"]; + + SECTION("int") { + v.set(42); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("world")), + }); + } + + SECTION("bool") { + v.set(false); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("world")), + }); + } + + SECTION("const char*") { + v.set("hello"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("world")), + }); + } + + SECTION("float") { + v.set(1.2); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("world")), + }); + } + + SECTION("Serialized") { + v.set(serialized("[]")); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("world")), + Allocate(sizeofString("[]")), + }); + } +} + +TEST_CASE("JsonVariant::set() reuses extension slot") { + SpyingAllocator spy; + JsonDocument doc(&spy); + JsonVariant variant = doc.to(); + + variant.set(1.2); + doc.shrinkToFit(); + spy.clearLog(); + + SECTION("double") { + bool result = variant.set(3.4); + + REQUIRE(result == true); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("int64_t") { + bool result = variant.set(-2147483649LL); + + REQUIRE(result == true); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("uint64_t") { + bool result = variant.set(4294967296U); + + REQUIRE(result == true); + REQUIRE(spy.log() == AllocatorLog{}); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/size.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/size.cpp new file mode 100644 index 0000000..e0c5bb4 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/size.cpp @@ -0,0 +1,36 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonVariant::size()") { + JsonDocument doc; + JsonVariant variant = doc.to(); + + SECTION("unbound reference") { + JsonVariant unbound; + + CHECK(unbound.size() == 0); + } + + SECTION("int") { + variant.set(42); + + CHECK(variant.size() == 0); + } + + SECTION("string") { + variant.set("hello"); + + CHECK(variant.size() == 0); + } + + SECTION("object") { + variant["a"] = 1; + variant["b"] = 2; + + CHECK(variant.size() == 2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/stl_containers.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/stl_containers.cpp new file mode 100644 index 0000000..53a23fd --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/stl_containers.cpp @@ -0,0 +1,138 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include +#include +#include + +namespace ArduinoJson { +template +struct Converter> { + static void toJson(const std::vector& src, JsonVariant dst) { + JsonArray array = dst.to(); + for (T item : src) + array.add(item); + } + + static std::vector fromJson(JsonVariantConst src) { + std::vector dst; + for (T item : src.as()) + dst.push_back(item); + return dst; + } + + static bool checkJson(JsonVariantConst src) { + JsonArrayConst array = src; + bool result = array; + for (JsonVariantConst item : array) + result &= item.is(); + return result; + } +}; + +template +struct Converter> { + static void toJson(const std::array& src, JsonVariant dst) { + JsonArray array = dst.to(); + for (T item : src) + array.add(item); + } + + static std::array fromJson(JsonVariantConst src) { + std::array dst; + dst.fill(0); + size_t idx = 0; + for (T item : src.as()) + dst[idx++] = item; + return dst; + } + + static bool checkJson(JsonVariantConst src) { + JsonArrayConst array = src; + bool result = array; + size_t size = 0; + for (JsonVariantConst item : array) { + result &= item.is(); + size++; + } + return result && size == N; + } +}; +} // namespace ArduinoJson + +TEST_CASE("vector") { + SECTION("toJson") { + std::vector v = {1, 2}; + + JsonDocument doc; + doc.set(v); + REQUIRE(doc.as() == "[1,2]"); + } + + SECTION("fromJson") { + JsonDocument doc; + doc.add(1); + doc.add(2); + + auto v = doc.as>(); + REQUIRE(v.size() == 2); + CHECK(v[0] == 1); + CHECK(v[1] == 2); + } + + SECTION("checkJson") { + JsonDocument doc; + CHECK(doc.is>() == false); + + doc.add(1); + doc.add(2); + CHECK(doc.is>() == true); + + doc.add("foo"); + CHECK(doc.is>() == false); + } +} + +TEST_CASE("array") { + using array_type = std::array; + + SECTION("toJson") { + array_type v; + v[0] = 1; + v[1] = 2; + + JsonDocument doc; + doc.set(v); + REQUIRE(doc.as() == "[1,2]"); + } + + SECTION("fromJson") { + JsonDocument doc; + doc.add(1); + doc.add(2); + + auto v = doc.as(); + REQUIRE(v.size() == 2); + CHECK(v[0] == 1); + CHECK(v[1] == 2); + } + + SECTION("checkJson") { + JsonDocument doc; + CHECK(doc.is() == false); + + doc.add(1); + CHECK(doc.is() == false); + + doc.add(2); + CHECK(doc.is() == true); + + doc[0] = "foo"; + CHECK(doc.is() == false); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/subscript.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/subscript.cpp new file mode 100644 index 0000000..0f9509c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/subscript.cpp @@ -0,0 +1,159 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Literals.hpp" + +TEST_CASE("JsonVariant::operator[]") { + JsonDocument doc; + JsonVariant var = doc.to(); + + SECTION("The JsonVariant is null") { + REQUIRE(0 == var.size()); + REQUIRE(var["0"].isNull()); + REQUIRE(var[0].isNull()); + } + + SECTION("The JsonVariant is a string") { + var.set("hello world"); + REQUIRE(0 == var.size()); + REQUIRE(var["0"].isNull()); + REQUIRE(var[0].isNull()); + } + + SECTION("The JsonVariant is a JsonArray") { + JsonArray array = var.to(); + + SECTION("get value") { + array.add("element at index 0"); + array.add("element at index 1"); + + REQUIRE(2 == var.size()); + var[0].as(); + // REQUIRE("element at index 0"_s == ); + REQUIRE("element at index 1"_s == var[1]); + REQUIRE("element at index 0"_s == + var[static_cast(0)]); // issue #381 + REQUIRE(var[666].isNull()); + REQUIRE(var[3].isNull()); + REQUIRE(var["0"].isNull()); + } + + SECTION("set value") { + array.add("hello"); + + var[1] = "world"; + + REQUIRE(var.size() == 2); + REQUIRE("world"_s == var[1]); + } + + SECTION("set value in a nested object") { + array.add(); + + var[0]["hello"] = "world"; + + REQUIRE(1 == var.size()); + REQUIRE(1 == var[0].size()); + REQUIRE("world"_s == var[0]["hello"]); + } + + SECTION("variant[0] when variant contains an integer") { + var.set(123); + + var[0] = 345; // no-op + + REQUIRE(var.is()); + REQUIRE(var.as() == 123); + } + + SECTION("use JsonVariant as index") { + array.add("A"); + array.add("B"); + array.add(1); + + REQUIRE(var[var[2]] == "B"); + REQUIRE(var[var[3]].isNull()); + } + } + + SECTION("The JsonVariant is a JsonObject") { + JsonObject object = var.to(); + + SECTION("get value") { + object["a"] = "element at key \"a\""; + object["b"] = "element at key \"b\""; + + REQUIRE(2 == var.size()); + REQUIRE("element at key \"a\""_s == var["a"]); + REQUIRE("element at key \"b\""_s == var["b"]); + REQUIRE(var["c"].isNull()); + REQUIRE(var[0].isNull()); + } + + SECTION("set value, key is a const char*") { + var["hello"] = "world"; + + REQUIRE(1 == var.size()); + REQUIRE("world"_s == var["hello"]); + } + + SECTION("set value, key is a char[]") { + char key[] = "hello"; + var[key] = "world"; + key[0] = '!'; // make sure the key is duplicated + + REQUIRE(1 == var.size()); + REQUIRE("world"_s == var["hello"]); + } + + SECTION("var[key].to()") { + JsonArray arr = var["hello"].to(); + REQUIRE(arr.isNull() == false); + } + + SECTION("use JsonVariant as key") { + object["a"] = "A"; + object["ab"] = "AB"; + object["ab\0c"_s] = "ABC"; + object["key1"] = "a"; + object["key2"] = "ab"; + object["key3"] = "ab\0c"_s; + object["key4"] = "foo"; + + REQUIRE(var[var["key1"]] == "A"); + REQUIRE(var[var["key2"]] == "AB"); + REQUIRE(var[var["key3"]] == "ABC"); + REQUIRE(var[var["key4"]].isNull()); + REQUIRE(var[var["key5"]].isNull()); + } + } + +#if defined(HAS_VARIABLE_LENGTH_ARRAY) && \ + !defined(SUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR) + SECTION("key is a VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + deserializeJson(doc, "{\"hello\":\"world\"}"); + JsonVariant variant = doc.as(); + + REQUIRE("world"_s == variant[vla]); + } + + SECTION("key is a VLA, const JsonVariant") { + size_t i = 16; + char vla[i]; + strcpy(vla, "hello"); + + deserializeJson(doc, "{\"hello\":\"world\"}"); + const JsonVariant variant = doc.as(); + + REQUIRE("world"_s == variant[vla]); + } +#endif +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/types.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/types.cpp new file mode 100644 index 0000000..26a6265 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/types.cpp @@ -0,0 +1,168 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +template +void checkReference(T& expected) { + JsonVariant variant = expected; + REQUIRE(expected == variant.as()); +} + +template +void checkNumericType() { + JsonDocument docMin, docMax; + JsonVariant variantMin = docMin.to(); + JsonVariant variantMax = docMax.to(); + + T min = std::numeric_limits::min(); + T max = std::numeric_limits::max(); + + variantMin.set(min); + variantMax.set(max); + + REQUIRE(min == variantMin.as()); + REQUIRE(max == variantMax.as()); +} + +TEST_CASE("JsonVariant set()/get()") { + SpyingAllocator spy; + JsonDocument doc(&spy); + JsonVariant variant = doc.to(); + +#if ARDUINOJSON_USE_LONG_LONG + SECTION("SizeOfJsonInteger") { + REQUIRE(8 == sizeof(JsonInteger)); + } +#endif + + // /!\ Most test were moved to `JsonVariant/set.cpp` + // TODO: move the remaining tests too + + SECTION("False") { + variant.set(false); + REQUIRE(variant.as() == false); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("True") { + variant.set(true); + REQUIRE(variant.as() == true); + REQUIRE(spy.log() == AllocatorLog{}); + } + + SECTION("Double") { + checkNumericType(); + } + SECTION("Float") { + checkNumericType(); + } + SECTION("SChar") { + checkNumericType(); + } + SECTION("SInt") { + checkNumericType(); + } + SECTION("SLong") { + checkNumericType(); + } + SECTION("SShort") { + checkNumericType(); + } + SECTION("UChar") { + checkNumericType(); + } + SECTION("UInt") { + checkNumericType(); + } + SECTION("ULong") { + checkNumericType(); + } + SECTION("UShort") { + checkNumericType(); + } +#if ARDUINOJSON_USE_LONG_LONG + SECTION("LongLong") { + checkNumericType(); + } + SECTION("ULongLong") { + checkNumericType(); + } +#endif + + SECTION("Int8") { + checkNumericType(); + } + SECTION("Uint8") { + checkNumericType(); + } + SECTION("Int16") { + checkNumericType(); + } + SECTION("Uint16") { + checkNumericType(); + } + SECTION("Int32") { + checkNumericType(); + } + SECTION("Uint32") { + checkNumericType(); + } +#if ARDUINOJSON_USE_LONG_LONG + SECTION("Int64") { + checkNumericType(); + } + SECTION("Uint64") { + checkNumericType(); + } +#endif + + SECTION("CanStoreObject") { + JsonDocument doc2; + JsonObject object = doc2.to(); + + variant.set(object); + REQUIRE(variant.is()); + REQUIRE(variant.as() == object); + } +} + +TEST_CASE("volatile") { + JsonDocument doc; + JsonVariant variant = doc.to(); + + SECTION("volatile bool") { // issue #2029 + volatile bool f = true; + variant.set(f); + CHECK(variant.is() == true); + CHECK(variant.as() == true); + } + + SECTION("volatile int") { + volatile int f = 42; + variant.set(f); + CHECK(variant.is() == true); + CHECK(variant.as() == 42); + } + + SECTION("volatile float") { // issue #1557 + volatile float f = 3.14f; + variant.set(f); + CHECK(variant.is() == true); + CHECK(variant.as() == 3.14f); + } + + SECTION("volatile double") { + volatile double f = 3.14; + variant.set(f); + CHECK(variant.is() == true); + CHECK(variant.as() == 3.14); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/unbound.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/unbound.cpp new file mode 100644 index 0000000..a19a8c4 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariant/unbound.cpp @@ -0,0 +1,80 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Literals.hpp" + +TEST_CASE("Unbound JsonVariant") { + JsonVariant variant; + + SECTION("as()") { + CHECK(variant.as() == false); + CHECK(variant.as() == 0); + CHECK(variant.as() == 0.0f); + CHECK(variant.as() == 0); + CHECK(variant.as() == "null"); + CHECK(variant.as().isNull()); + CHECK(variant.as().isNull()); + CHECK(variant.as().isNull()); + CHECK(variant.as().isNull()); + CHECK(variant.as().isNull()); + CHECK(variant.as().isNull()); + CHECK(variant.as().isNull()); + CHECK(variant.as().data() == nullptr); + CHECK(variant.as().size() == 0); + CHECK(variant.as().data() == nullptr); + CHECK(variant.as().size() == 0); + } + + SECTION("is()") { + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + CHECK_FALSE(variant.is()); + } + + SECTION("set()") { + CHECK_FALSE(variant.set("42")); + CHECK_FALSE(variant.set(42.0)); + CHECK_FALSE(variant.set(42L)); + CHECK_FALSE(variant.set(42U)); + CHECK_FALSE(variant.set(serialized("42"))); + CHECK_FALSE(variant.set(serialized("42"_s))); + CHECK_FALSE(variant.set(true)); + CHECK_FALSE(variant.set(MsgPackBinary("hello", 5))); + CHECK_FALSE(variant.set(MsgPackExtension(1, "hello", 5))); + } + + SECTION("add()") { + CHECK_FALSE(variant.add("42")); + CHECK_FALSE(variant.add(42.0)); + CHECK_FALSE(variant.add(42L)); + CHECK_FALSE(variant.add(42U)); + CHECK_FALSE(variant.add(serialized("42"))); + CHECK_FALSE(variant.add(true)); + } + + SECTION("operator[]") { + CHECK(variant[0].isNull()); + CHECK(variant["key"].isNull()); + CHECK_FALSE(variant[0].set(1)); + CHECK_FALSE(variant["key"].set(1)); + CHECK_FALSE(variant["key"_s].set(1)); + } + + SECTION("remove()") { + variant.remove(0); + variant.remove("hello"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/CMakeLists.txt new file mode 100644 index 0000000..1cff558 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/CMakeLists.txt @@ -0,0 +1,19 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(JsonVariantConstTests + as.cpp + is.cpp + isnull.cpp + nesting.cpp + size.cpp + subscript.cpp +) + +add_test(JsonVariantConst JsonVariantConstTests) + +set_tests_properties(JsonVariantConst + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/as.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/as.cpp new file mode 100644 index 0000000..8584ff5 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/as.cpp @@ -0,0 +1,42 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Literals.hpp" + +TEST_CASE("JsonVariantConst::as()") { + JsonDocument doc; + JsonVariantConst var = doc.to(); + + doc.set("hello"); + + REQUIRE(var.as() == true); + REQUIRE(var.as() == 0L); + REQUIRE(var.as() == "hello"_s); + REQUIRE(var.as() == "hello"_s); +} + +TEST_CASE("Invalid conversions") { + using namespace ArduinoJson::detail; + + JsonVariantConst variant; + + CHECK(is_same()), int>::value); + CHECK(is_same()), float>::value); + CHECK(is_same()), + JsonVariantConst>::value); + CHECK( + is_same()), JsonObjectConst>::value); + CHECK(is_same()), JsonArrayConst>::value); + + CHECK(is_same()), + InvalidConversion>::value); + CHECK(is_same()), + InvalidConversion>::value); + CHECK(is_same()), + InvalidConversion>::value); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/is.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/is.cpp new file mode 100644 index 0000000..32c16ac --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/is.cpp @@ -0,0 +1,162 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +enum MYENUM2 { ONE = 1, TWO = 2 }; + +TEST_CASE("JsonVariantConst::is()") { + JsonDocument doc; + JsonVariantConst var = doc.to(); + + SECTION("unbound") { + var = JsonVariantConst(); + + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + } + + SECTION("null") { + CHECK(var.is() == true); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + } + + SECTION("true") { + doc.set(true); + + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + } + + SECTION("false") { + doc.set(false); + + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + } + + SECTION("int") { + doc.set(42); + + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + } + + SECTION("double") { + doc.set(4.2); + + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + } + + SECTION("const char*") { + doc.set("4.2"); + + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + } + + SECTION("JsonArray") { + doc.to(); + + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + } + + SECTION("JsonObject") { + doc.to(); + + CHECK(var.is() == true); + CHECK(var.is() == true); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + CHECK(var.is() == false); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/isnull.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/isnull.cpp new file mode 100644 index 0000000..30996db --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/isnull.cpp @@ -0,0 +1,21 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonVariantConst::isNull()") { + JsonDocument doc; + JsonVariantConst variant = doc.to(); + + SECTION("returns true when undefined") { + REQUIRE(variant.isNull() == true); + } + + SECTION("returns false if value is integer") { + doc.set(42); + + REQUIRE(variant.isNull() == false); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/nesting.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/nesting.cpp new file mode 100644 index 0000000..4f035db --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/nesting.cpp @@ -0,0 +1,31 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonVariantConst::nesting()") { + JsonDocument doc; + JsonVariantConst var = doc.to(); + + SECTION("return 0 if unbound") { + JsonVariantConst unbound; + REQUIRE(unbound.nesting() == 0); + } + + SECTION("returns 0 for string") { + doc.set("hello"); + REQUIRE(var.nesting() == 0); + } + + SECTION("returns 1 for empty object") { + doc.to(); + REQUIRE(var.nesting() == 1); + } + + SECTION("returns 1 for empty array") { + doc.to(); + REQUIRE(var.nesting() == 1); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/size.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/size.cpp new file mode 100644 index 0000000..9a6943e --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/size.cpp @@ -0,0 +1,36 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("JsonVariantConst::size()") { + JsonDocument doc; + JsonVariantConst variant = doc.to(); + + SECTION("unbound reference") { + JsonVariantConst unbound; + + CHECK(unbound.size() == 0); + } + + SECTION("int") { + doc.set(42); + + CHECK(variant.size() == 0); + } + + SECTION("string") { + doc.set("hello"); + + CHECK(variant.size() == 0); + } + + SECTION("object") { + doc["a"] = 1; + doc["b"] = 2; + + CHECK(variant.size() == 2); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/subscript.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/subscript.cpp new file mode 100644 index 0000000..281e3d9 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/JsonVariantConst/subscript.cpp @@ -0,0 +1,104 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Literals.hpp" + +TEST_CASE("JsonVariantConst::operator[]") { + JsonDocument doc; + JsonVariantConst var = doc.to(); + + SECTION("null") { + REQUIRE(0 == var.size()); + REQUIRE(var["0"].isNull()); + REQUIRE(var[0].isNull()); + } + + SECTION("string") { + doc.set("hello world"); + REQUIRE(0 == var.size()); + REQUIRE(var["0"].isNull()); + REQUIRE(var[0].isNull()); + } + + SECTION("array") { + JsonArray array = doc.to(); + array.add("A"); + array.add("B"); + + SECTION("int") { + REQUIRE("A"_s == var[0]); + REQUIRE("B"_s == var[1]); + REQUIRE("A"_s == var[static_cast(0)]); // issue #381 + REQUIRE(var[666].isNull()); + REQUIRE(var[3].isNull()); + } + + SECTION("const char*") { + REQUIRE(var["0"].isNull()); + } + + SECTION("JsonVariant") { + array.add(1); + REQUIRE(var[var[2]] == "B"_s); + REQUIRE(var[var[3]].isNull()); + } + } + + SECTION("object") { + JsonObject object = doc.to(); + object["ab"_s] = "AB"; + object["abc"_s] = "ABC"; + object["abc\0d"_s] = "ABCD"; + + SECTION("string literal") { + REQUIRE(var["ab"] == "AB"_s); + REQUIRE(var["abc"] == "ABC"_s); + REQUIRE(var["abc\0d"] == "ABCD"_s); + REQUIRE(var["def"].isNull()); + REQUIRE(var[0].isNull()); + } + + SECTION("const char*") { + REQUIRE(var[static_cast("ab")] == "AB"_s); + REQUIRE(var[static_cast("abc")] == "ABC"_s); + REQUIRE(var[static_cast("abc\0d")] == "ABC"_s); + REQUIRE(var[static_cast("def")].isNull()); + REQUIRE(var[static_cast(0)].isNull()); + } + + SECTION("supports std::string") { + REQUIRE(var["ab"_s] == "AB"_s); + REQUIRE(var["abc"_s] == "ABC"_s); + REQUIRE(var["abc\0d"_s] == "ABCD"_s); + REQUIRE(var["def"_s].isNull()); + } + +#if defined(HAS_VARIABLE_LENGTH_ARRAY) && \ + !defined(SUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR) + SECTION("supports VLA") { + size_t i = 16; + char vla[i]; + strcpy(vla, "abc"); + + REQUIRE(var[vla] == "ABC"_s); + } +#endif + + SECTION("supports JsonVariant") { + object["key1"] = "ab"; + object["key2"] = "abc"; + object["key3"] = "abc\0d"_s; + object["key4"] = "foo"; + + REQUIRE(var[var["key1"]] == "AB"_s); + REQUIRE(var[var["key2"]] == "ABC"_s); + REQUIRE(var[var["key3"]] == "ABCD"_s); + REQUIRE(var[var["key4"]].isNull()); + REQUIRE(var[var["key5"]].isNull()); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/CMakeLists.txt new file mode 100644 index 0000000..05be1ca --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/CMakeLists.txt @@ -0,0 +1,31 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(MiscTests + arithmeticCompare.cpp + conflicts.cpp + issue1967.cpp + issue2129.cpp + issue2166.cpp + JsonString.cpp + NoArduinoHeader.cpp + printable.cpp + Readers.cpp + StringAdapters.cpp + StringWriter.cpp + TypeTraits.cpp + unsigned_char.cpp + Utf16.cpp + Utf8.cpp + version.cpp +) + +set_target_properties(MiscTests PROPERTIES UNITY_BUILD OFF) + +add_test(Misc MiscTests) + +set_tests_properties(Misc + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/JsonString.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/JsonString.cpp new file mode 100644 index 0000000..a66f771 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/JsonString.cpp @@ -0,0 +1,103 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +TEST_CASE("JsonString") { + SECTION("Default constructor creates a null JsonString") { + JsonString s; + + CHECK(s.isNull() == true); + CHECK(s.c_str() == 0); + CHECK(s.isStatic() == true); + CHECK(s == JsonString()); + CHECK(s != ""); + } + + SECTION("Null converts to false") { + JsonString s; + + CHECK(bool(s) == false); + } + + SECTION("Empty string converts to true") { + JsonString s(""); + + CHECK(bool(s) == true); + } + + SECTION("Non-empty string converts to true") { + JsonString s(""); + + CHECK(bool(s) == true); + } + + SECTION("Null strings equals each others") { + JsonString a, b; + + CHECK(a == b); + CHECK_FALSE(a != b); + } + + SECTION("Null and empty strings differ") { + JsonString a, b(""); + + CHECK_FALSE(a == b); + CHECK(a != b); + + CHECK_FALSE(b == a); + CHECK(b != a); + } + + SECTION("Null and non-empty strings differ") { + JsonString a, b("hello"); + + CHECK_FALSE(a == b); + CHECK(a != b); + + CHECK_FALSE(b == a); + CHECK(b != a); + } + + SECTION("Compare different strings") { + JsonString a("hello"), b("world"); + + CHECK_FALSE(a == b); + CHECK(a != b); + } + + SECTION("Compare identical by pointer") { + JsonString a("hello"), b("hello"); + + CHECK(a == b); + CHECK_FALSE(a != b); + } + + SECTION("Compare identical by value") { + char s1[] = "hello"; + char s2[] = "hello"; + JsonString a(s1), b(s2); + + CHECK(a == b); + CHECK_FALSE(a != b); + } + + SECTION("std::stream") { + std::stringstream ss; + ss << JsonString("hello world!"); + CHECK(ss.str() == "hello world!"); + } + + SECTION("Construct with a size") { + JsonString s("hello world", 5); + + CHECK(s.size() == 5); + CHECK(s.isStatic() == false); + CHECK(s == "hello"); + CHECK(s != "hello world"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/NoArduinoHeader.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/NoArduinoHeader.cpp new file mode 100644 index 0000000..efcd8e4 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/NoArduinoHeader.cpp @@ -0,0 +1,20 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINO 1 +#define ARDUINOJSON_ENABLE_PROGMEM 0 +#define ARDUINOJSON_ENABLE_ARDUINO_STRING 0 +#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 0 +#define ARDUINOJSON_ENABLE_ARDUINO_PRINT 0 +#include + +#include + +TEST_CASE("Arduino.h") { +#ifdef ARDUINO_H_INCLUDED + FAIL("Arduino.h should not be included"); +#else + INFO("Arduino.h not included"); +#endif +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Readers.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Readers.cpp new file mode 100644 index 0000000..4077243 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Readers.cpp @@ -0,0 +1,227 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include + +using namespace ArduinoJson::detail; + +TEST_CASE("Reader") { + SECTION("read()") { + std::istringstream src("\x01\xFF"); + Reader reader(src); + + REQUIRE(reader.read() == 0x01); + REQUIRE(reader.read() == 0xFF); + REQUIRE(reader.read() == -1); + } + + SECTION("readBytes() all at once") { + std::istringstream src("ABC"); + Reader reader(src); + + char buffer[8] = "abcd"; + REQUIRE(reader.readBytes(buffer, 4) == 3); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'd'); + } + + SECTION("readBytes() in two parts") { + std::istringstream src("ABCDEF"); + Reader reader(src); + + char buffer[12] = "abcdefg"; + REQUIRE(reader.readBytes(buffer, 4) == 4); + REQUIRE(reader.readBytes(buffer + 4, 4) == 2); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'D'); + REQUIRE(buffer[4] == 'E'); + REQUIRE(buffer[5] == 'F'); + REQUIRE(buffer[6] == 'g'); + } +} + +TEST_CASE("BoundedReader") { + SECTION("read") { + BoundedReader reader("\x01\xFF", 2); + REQUIRE(reader.read() == 0x01); + REQUIRE(reader.read() == 0xFF); + REQUIRE(reader.read() == -1); + REQUIRE(reader.read() == -1); + } + + SECTION("readBytes() all at once") { + BoundedReader reader("ABCD", 3); + + char buffer[8] = "abcd"; + REQUIRE(reader.readBytes(buffer, 4) == 3); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'd'); + } + + SECTION("readBytes() in two parts") { + BoundedReader reader("ABCDEF", 6); + + char buffer[8] = "abcdefg"; + REQUIRE(reader.readBytes(buffer, 4) == 4); + REQUIRE(reader.readBytes(buffer + 4, 4) == 2); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'D'); + REQUIRE(buffer[4] == 'E'); + REQUIRE(buffer[5] == 'F'); + REQUIRE(buffer[6] == 'g'); + } +} + +TEST_CASE("Reader") { + SECTION("read()") { + Reader reader("\x01\xFF\x00\x12"); + REQUIRE(reader.read() == 0x01); + REQUIRE(reader.read() == 0xFF); + REQUIRE(reader.read() == 0); + REQUIRE(reader.read() == 0x12); + } + + SECTION("readBytes() all at once") { + Reader reader("ABCD"); + + char buffer[8] = "abcd"; + REQUIRE(reader.readBytes(buffer, 3) == 3); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'd'); + } + + SECTION("readBytes() in two parts") { + Reader reader("ABCDEF"); + + char buffer[8] = "abcdefg"; + REQUIRE(reader.readBytes(buffer, 4) == 4); + REQUIRE(reader.readBytes(buffer + 4, 2) == 2); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'D'); + REQUIRE(buffer[4] == 'E'); + REQUIRE(buffer[5] == 'F'); + REQUIRE(buffer[6] == 'g'); + } +} + +TEST_CASE("IteratorReader") { + SECTION("read()") { + std::string src("\x01\xFF"); + IteratorReader reader(src.begin(), src.end()); + + REQUIRE(reader.read() == 0x01); + REQUIRE(reader.read() == 0xFF); + REQUIRE(reader.read() == -1); + } + + SECTION("readBytes() all at once") { + std::string src("ABC"); + IteratorReader reader(src.begin(), src.end()); + + char buffer[8] = "abcd"; + REQUIRE(reader.readBytes(buffer, 4) == 3); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'd'); + } + + SECTION("readBytes() in two parts") { + std::string src("ABCDEF"); + IteratorReader reader(src.begin(), src.end()); + + char buffer[12] = "abcdefg"; + REQUIRE(reader.readBytes(buffer, 4) == 4); + REQUIRE(reader.readBytes(buffer + 4, 4) == 2); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'D'); + REQUIRE(buffer[4] == 'E'); + REQUIRE(buffer[5] == 'F'); + REQUIRE(buffer[6] == 'g'); + } +} + +class StreamStub : public Stream { + public: + StreamStub(const char* s) : stream_(s) {} + + int read() { + return stream_.get(); + } + + size_t readBytes(char* buffer, size_t length) { + stream_.read(buffer, static_cast(length)); + return static_cast(stream_.gcount()); + } + + private: + std::istringstream stream_; +}; + +TEST_CASE("Reader") { + SECTION("read()") { + StreamStub src("\x01\xFF"); + Reader reader(src); + + REQUIRE(reader.read() == 0x01); + REQUIRE(reader.read() == 0xFF); + REQUIRE(reader.read() == -1); + } + + SECTION("readBytes() all at once") { + StreamStub src("ABC"); + Reader reader(src); + + char buffer[8] = "abcd"; + REQUIRE(reader.readBytes(buffer, 4) == 3); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'd'); + } + + SECTION("readBytes() in two parts") { + StreamStub src("ABCDEF"); + Reader reader(src); + + char buffer[12] = "abcdefg"; + REQUIRE(reader.readBytes(buffer, 4) == 4); + REQUIRE(reader.readBytes(buffer + 4, 4) == 2); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'D'); + REQUIRE(buffer[4] == 'E'); + REQUIRE(buffer[5] == 'F'); + REQUIRE(buffer[6] == 'g'); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/StringAdapters.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/StringAdapters.cpp new file mode 100644 index 0000000..9917897 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/StringAdapters.cpp @@ -0,0 +1,226 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +#include +#include +#include + +#include + +#include "custom_string.hpp" +#include "weird_strcmp.hpp" + +using ArduinoJson::JsonString; +using namespace ArduinoJson::detail; + +TEST_CASE("adaptString()") { + SECTION("string literal") { + auto s = adaptString("bravo\0alpha"); + + CHECK(s.isNull() == false); + CHECK(s.size() == 11); + CHECK(s.isStatic() == true); + } + + SECTION("null const char*") { + auto s = adaptString(static_cast(0)); + + CHECK(s.isNull() == true); + CHECK(s.size() == 0); + } + + SECTION("non-null const char*") { + const char* p = "bravo"; + auto s = adaptString(p); + + CHECK(s.isNull() == false); + CHECK(s.size() == 5); + CHECK(s.isStatic() == false); + CHECK(s.data() == p); + } + + SECTION("null const char* + size") { + auto s = adaptString(static_cast(0), 10); + + CHECK(s.isNull() == true); + CHECK(s.isStatic() == false); + } + + SECTION("non-null const char* + size") { + auto s = adaptString("bravo", 5); + + CHECK(s.isNull() == false); + CHECK(s.size() == 5); + CHECK(s.isStatic() == false); + } + + SECTION("null Flash string") { + auto s = adaptString(static_cast(0)); + + CHECK(s.isNull() == true); + CHECK(s.size() == 0); + CHECK(s.isStatic() == false); + } + + SECTION("non-null Flash string") { + auto s = adaptString(F("bravo")); + + CHECK(s.isNull() == false); + CHECK(s.size() == 5); + CHECK(s.isStatic() == false); + } + + SECTION("std::string") { + std::string orig("bravo"); + auto s = adaptString(orig); + + CHECK(s.isNull() == false); + CHECK(s.size() == 5); + CHECK(s.isStatic() == false); + } + + SECTION("Arduino String") { + ::String orig("bravo"); + auto s = adaptString(orig); + + CHECK(s.isNull() == false); + CHECK(s.size() == 5); + CHECK(s.isStatic() == false); + } + + SECTION("custom_string") { + custom_string orig("bravo"); + auto s = adaptString(orig); + + CHECK(s.isNull() == false); + CHECK(s.size() == 5); + CHECK(s.isStatic() == false); + } + + SECTION("JsonString linked") { + JsonString orig("hello", true); + auto s = adaptString(orig); + + CHECK(s.isNull() == false); + CHECK(s.size() == 5); + CHECK(s.isStatic() == true); + } + + SECTION("JsonString copied") { + JsonString orig("hello", false); + auto s = adaptString(orig); + + CHECK(s.isNull() == false); + CHECK(s.size() == 5); + CHECK(s.isStatic() == false); + } +} + +struct EmptyStruct {}; + +TEST_CASE("IsString") { + CHECK(IsString::value == true); + CHECK(IsString>::value == false); + CHECK(IsString::value == true); + CHECK(IsString::value == true); + CHECK(IsString::value == true); + CHECK(IsString::value == true); + CHECK(IsString::value == true); + CHECK(IsString<::String>::value == true); + CHECK(IsString<::StringSumHelper>::value == true); + CHECK(IsString::value == false); + CHECK(IsString::value == true); +} + +TEST_CASE("stringCompare") { + SECTION("ZeroTerminatedRamString vs ZeroTerminatedRamString") { + CHECK(stringCompare(adaptString("bravo"), adaptString("alpha")) > 0); + CHECK(stringCompare(adaptString("bravo"), adaptString("bravo")) == 0); + CHECK(stringCompare(adaptString("bravo"), adaptString("charlie")) < 0); + } + + SECTION("ZeroTerminatedRamString vs SizedRamString") { + CHECK(stringCompare(adaptString("bravo"), adaptString("alpha?", 5)) > 0); + CHECK(stringCompare(adaptString("bravo"), adaptString("bravo?", 4)) > 0); + CHECK(stringCompare(adaptString("bravo"), adaptString("bravo?", 5)) == 0); + CHECK(stringCompare(adaptString("bravo"), adaptString("bravo?", 6)) < 0); + CHECK(stringCompare(adaptString("bravo"), adaptString("charlie?", 7)) < 0); + } + + SECTION("SizedRamString vs SizedRamString") { + // clang-format off + CHECK(stringCompare(adaptString("bravo!", 5), adaptString("alpha?", 5)) > 0); + CHECK(stringCompare(adaptString("bravo!", 5), adaptString("bravo?", 5)) == 0); + CHECK(stringCompare(adaptString("bravo!", 5), adaptString("charlie?", 7)) < 0); + + CHECK(stringCompare(adaptString("bravo!", 5), adaptString("bravo!", 4)) > 0); + CHECK(stringCompare(adaptString("bravo!", 5), adaptString("bravo!", 5)) == 0); + CHECK(stringCompare(adaptString("bravo!", 5), adaptString("bravo!", 6)) < 0); + // clang-format on + } + + SECTION("FlashString vs FlashString") { + // clang-format off + CHECK(stringCompare(adaptString(F("bravo")), adaptString(F("alpha"))) > 0); + CHECK(stringCompare(adaptString(F("bravo")), adaptString(F("bravo"))) == 0); + CHECK(stringCompare(adaptString(F("bravo")), adaptString(F("charlie"))) < 0); + // clang-format on + } + + SECTION("FlashString vs SizedRamString") { + // clang-format off + CHECK(stringCompare(adaptString(F("bravo")), adaptString("alpha?", 5)) > 0); + CHECK(stringCompare(adaptString(F("bravo")), adaptString("bravo?", 5)) == 0); + CHECK(stringCompare(adaptString(F("bravo")), adaptString("charlie?", 7)) < 0); + + CHECK(stringCompare(adaptString(F("bravo")), adaptString("bravo!", 4)) > 0); + CHECK(stringCompare(adaptString(F("bravo")), adaptString("bravo!", 5)) == 0); + CHECK(stringCompare(adaptString(F("bravo")), adaptString("bravo!", 6)) < 0); + // clang-format on + } + + SECTION("ZeroTerminatedRamString vs FlashString") { + // clang-format off + CHECK(stringCompare(adaptString("bravo"), adaptString(F("alpha?"), 5)) > 0); + CHECK(stringCompare(adaptString("bravo"), adaptString(F("bravo?"), 4)) > 0); + CHECK(stringCompare(adaptString("bravo"), adaptString(F("bravo?"), 5)) == 0); + CHECK(stringCompare(adaptString("bravo"), adaptString(F("bravo?"), 6)) < 0); + CHECK(stringCompare(adaptString("bravo"), adaptString(F("charlie?"), 7)) < 0); + // clang-format on + } +} + +TEST_CASE("stringEquals()") { + SECTION("ZeroTerminatedRamString vs ZeroTerminatedRamString") { + CHECK(stringEquals(adaptString("bravo"), adaptString("brav")) == false); + CHECK(stringEquals(adaptString("bravo"), adaptString("bravo")) == true); + CHECK(stringEquals(adaptString("bravo"), adaptString("bravo!")) == false); + } + + SECTION("ZeroTerminatedRamString vs SizedRamString") { + // clang-format off + CHECK(stringEquals(adaptString("bravo"), adaptString("bravo!", 4)) == false); + CHECK(stringEquals(adaptString("bravo"), adaptString("bravo!", 5)) == true); + CHECK(stringEquals(adaptString("bravo"), adaptString("bravo!", 6)) == false); + // clang-format on + } + + SECTION("FlashString vs SizedRamString") { + // clang-format off + CHECK(stringEquals(adaptString(F("bravo")), adaptString("bravo!", 4)) == false); + CHECK(stringEquals(adaptString(F("bravo")), adaptString("bravo!", 5)) == true); + CHECK(stringEquals(adaptString(F("bravo")), adaptString("bravo!", 6)) == false); + // clang-format on + } + + SECTION("SizedRamString vs SizedRamString") { + // clang-format off + CHECK(stringEquals(adaptString("bravo?", 5), adaptString("bravo!", 4)) == false); + CHECK(stringEquals(adaptString("bravo?", 5), adaptString("bravo!", 5)) == true); + CHECK(stringEquals(adaptString("bravo?", 5), adaptString("bravo!", 6)) == false); + // clang-format on + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/StringWriter.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/StringWriter.cpp new file mode 100644 index 0000000..6c22720 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/StringWriter.cpp @@ -0,0 +1,157 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +#define ARDUINOJSON_STRING_BUFFER_SIZE 5 +#include + +#include + +#include "Literals.hpp" +#include "custom_string.hpp" + +using namespace ArduinoJson::detail; + +template +static size_t print(StringWriter& writer, const char* s) { + return writer.write(reinterpret_cast(s), strlen(s)); +} + +template +static size_t print(StringWriter& writer, char c) { + return writer.write(static_cast(c)); +} + +template +void common_tests(StringWriter& writer, const String& output) { + SECTION("InitialState") { + REQUIRE(std::string("") == output); + } + + SECTION("EmptyString") { + REQUIRE(0 == print(writer, "")); + REQUIRE(std::string("") == output); + } + + SECTION("OneString") { + REQUIRE(4 == print(writer, "ABCD")); + REQUIRE("ABCD"_s == output); + } + + SECTION("TwoStrings") { + REQUIRE(4 == print(writer, "ABCD")); + REQUIRE(4 == print(writer, "EFGH")); + REQUIRE("ABCDEFGH"_s == output); + } +} + +TEST_CASE("StaticStringWriter") { + char output[20] = {0}; + StaticStringWriter writer(output, sizeof(output)); + + common_tests(writer, static_cast(output)); + + SECTION("OverCapacity") { + REQUIRE(20 == print(writer, "ABCDEFGHIJKLMNOPQRSTUVWXYZ")); + REQUIRE(0 == print(writer, "ABC")); + REQUIRE(0 == print(writer, 'D')); + REQUIRE("ABCDEFGHIJKLMNOPQRST" == std::string(output, 20)); + } +} + +TEST_CASE("Writer") { + std::string output; + Writer writer(output); + common_tests(writer, output); +} + +TEST_CASE("Writer") { + ::String output; + Writer<::String> writer(output); + + SECTION("write(char)") { + SECTION("writes to temporary buffer") { + // accumulate in buffer + writer.write('a'); + writer.write('b'); + writer.write('c'); + writer.write('d'); + REQUIRE(output == ""); + + // flush when full + writer.write('e'); + REQUIRE(output == "abcd"); + + // flush on destruction + writer.write('f'); + writer.~Writer(); + REQUIRE(output == "abcdef"); + } + + SECTION("returns 1 on success") { + for (int i = 0; i < ARDUINOJSON_STRING_BUFFER_SIZE; i++) { + REQUIRE(writer.write('x') == 1); + } + } + + SECTION("returns 0 on error") { + output.limitCapacityTo(1); + + REQUIRE(writer.write('a') == 1); + REQUIRE(writer.write('b') == 1); + REQUIRE(writer.write('c') == 1); + REQUIRE(writer.write('d') == 1); + REQUIRE(writer.write('e') == 0); + REQUIRE(writer.write('f') == 0); + } + } + + SECTION("write(char*, size_t)") { + SECTION("empty string") { + REQUIRE(0 == print(writer, "")); + writer.flush(); + REQUIRE(output == ""); + } + + SECTION("writes to temporary buffer") { + // accumulate in buffer + print(writer, "abc"); + REQUIRE(output == ""); + + // flush when full, and continue to accumulate + print(writer, "de"); + REQUIRE(output == "abcd"); + + // flush on destruction + writer.~Writer(); + REQUIRE(output == "abcde"); + } + } +} + +TEST_CASE("Writer") { + custom_string output; + Writer writer(output); + + REQUIRE(4 == print(writer, "ABCD")); + REQUIRE("ABCD" == output); +} + +TEST_CASE("serializeJson(doc, String)") { + JsonDocument doc; + doc["hello"] = "world"; + ::String output = "erase me"; + + SECTION("sufficient capacity") { + serializeJson(doc, output); + REQUIRE(output == "{\"hello\":\"world\"}"); + } + + SECTION("unsufficient capacity") { // issue #1561 + output.limitCapacityTo(10); + serializeJson(doc, output); + REQUIRE(output == "{\"hello\""); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/TypeTraits.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/TypeTraits.cpp new file mode 100644 index 0000000..4fad799 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/TypeTraits.cpp @@ -0,0 +1,236 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +using namespace ArduinoJson::detail; + +class EmptyClass {}; +enum EmptyEnum {}; + +TEST_CASE("Polyfills/type_traits") { + SECTION("is_base_of") { + REQUIRE_FALSE( + static_cast(is_base_of::value)); + REQUIRE( + static_cast(is_base_of::value)); + } + + SECTION("is_array") { + REQUIRE_FALSE(is_array::value); + REQUIRE(is_array::value); + REQUIRE(is_array::value); + } + + SECTION("is_const") { + CHECK(is_const::value == false); + CHECK(is_const::value == true); + } + + SECTION("is_integral") { + CHECK(is_integral::value == false); + CHECK(is_integral::value == false); + CHECK(is_integral::value == false); + CHECK(is_integral::value == false); + CHECK(is_integral::value == false); + CHECK(is_integral::value == false); + CHECK(is_integral::value == false); + CHECK(is_integral::value == false); + + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + CHECK(is_integral::value == true); + + CHECK(is_integral::value == true); + } + + SECTION("is_signed") { + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == false); + + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == false); + + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == false); + + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == true); + CHECK(is_signed::value == false); + } + + SECTION("is_unsigned") { + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == false); + CHECK(is_unsigned::value == false); + CHECK(is_unsigned::value == false); + + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == false); + CHECK(is_unsigned::value == false); + CHECK(is_unsigned::value == false); + + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == false); + CHECK(is_unsigned::value == false); + CHECK(is_unsigned::value == false); + + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == true); + CHECK(is_unsigned::value == false); + CHECK(is_unsigned::value == false); + CHECK(is_unsigned::value == false); + } + + SECTION("is_floating_point") { + CHECK(is_floating_point::value == false); + CHECK(is_floating_point::value == true); + CHECK(is_floating_point::value == true); + CHECK(is_floating_point::value == true); + CHECK(is_floating_point::value == true); + CHECK(is_floating_point::value == true); + CHECK(is_floating_point::value == true); + CHECK(is_floating_point::value == true); + CHECK(is_floating_point::value == true); + } + + SECTION("is_convertible") { + CHECK(is_convertible::value == true); + CHECK(is_convertible::value == true); + CHECK(is_convertible::value == true); + CHECK(is_convertible::value == false); + CHECK(is_convertible::value == false); + + CHECK(is_convertible::value == + false); + CHECK(is_convertible::value == false); + CHECK(is_convertible::value == true); + CHECK(is_convertible::value == true); + CHECK(is_convertible::value == true); + CHECK(is_convertible, JsonVariantConst>::value == + true); + CHECK(is_convertible::value == true); + CHECK(is_convertible::value == true); + CHECK(is_convertible, + JsonVariantConst>::value == true); + CHECK(is_convertible::value == true); + CHECK(is_convertible::value == true); + } + + SECTION("is_class") { + CHECK(is_class::value == false); + CHECK(is_class::value == false); + CHECK(is_class::value == false); + CHECK(is_class::value == true); + } + + SECTION("is_enum") { + CHECK(is_enum::value == false); + CHECK(is_enum::value == true); + CHECK(is_enum::value == false); + CHECK(is_enum::value == false); + CHECK(is_enum::value == false); + CHECK(is_enum::value == false); + } + + SECTION("remove_cv") { + CHECK(is_same, int>::value); + CHECK(is_same, int>::value); + CHECK(is_same, int>::value); + CHECK(is_same, int>::value); + CHECK(is_same, decltype("toto")>::value); + } + + SECTION("decay") { + CHECK(is_same, int>::value); + CHECK(is_same, int>::value); + CHECK(is_same, int>::value); + CHECK(is_same, int*>::value); + CHECK(is_same, int*>::value); + CHECK(is_same, const char*>::value); + } +} + +TEST_CASE("is_std_string") { + REQUIRE(is_std_string::value == true); + REQUIRE(is_std_string::value == false); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Utf16.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Utf16.cpp new file mode 100644 index 0000000..39fbe3c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Utf16.cpp @@ -0,0 +1,68 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +using namespace ArduinoJson::detail; + +static void testUtf16Codepoint(uint16_t codeunit, uint32_t expectedCodepoint) { + Utf16::Codepoint cp; + REQUIRE(cp.append(codeunit) == true); + REQUIRE(cp.value() == expectedCodepoint); +} + +static void testUtf16Codepoint(uint16_t codeunit1, uint16_t codeunit2, + uint32_t expectedCodepoint) { + Utf16::Codepoint cp; + REQUIRE(cp.append(codeunit1) == false); + REQUIRE(cp.append(codeunit2) == true); + REQUIRE(cp.value() == expectedCodepoint); +} + +TEST_CASE("Utf16::Codepoint()") { + SECTION("U+0000") { + testUtf16Codepoint(0x0000, 0x000000); + } + + SECTION("U+0001") { + testUtf16Codepoint(0x0001, 0x000001); + } + + SECTION("U+D7FF") { + testUtf16Codepoint(0xD7FF, 0x00D7FF); + } + + SECTION("U+E000") { + testUtf16Codepoint(0xE000, 0x00E000); + } + + SECTION("U+FFFF") { + testUtf16Codepoint(0xFFFF, 0x00FFFF); + } + + SECTION("U+010000") { + testUtf16Codepoint(0xD800, 0xDC00, 0x010000); + } + + SECTION("U+010001") { + testUtf16Codepoint(0xD800, 0xDC01, 0x010001); + } + + SECTION("U+0103FF") { + testUtf16Codepoint(0xD800, 0xDFFF, 0x0103FF); + } + + SECTION("U+010400") { + testUtf16Codepoint(0xD801, 0xDC00, 0x010400); + } + + SECTION("U+010400") { + testUtf16Codepoint(0xDBFF, 0xDC00, 0x10FC00); + } + + SECTION("U+10FFFF") { + testUtf16Codepoint(0xDBFF, 0xDFFF, 0x10FFFF); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Utf8.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Utf8.cpp new file mode 100644 index 0000000..740046d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/Utf8.cpp @@ -0,0 +1,59 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +using namespace ArduinoJson::detail; + +static void testCodepoint(uint32_t codepoint, std::string expected) { + ResourceManager resources; + StringBuilder str(&resources); + str.startString(); + + CAPTURE(codepoint); + Utf8::encodeCodepoint(codepoint, str); + + REQUIRE(str.str().c_str() == expected); +} + +TEST_CASE("Utf8::encodeCodepoint()") { + SECTION("U+0000") { + testCodepoint(0x0000, ""); + } + + SECTION("U+0001") { + testCodepoint(0x0001, "\x01"); + } + + SECTION("U+007F") { + testCodepoint(0x007F, "\x7f"); + } + + SECTION("U+0080") { + testCodepoint(0x0080, "\xc2\x80"); + } + + SECTION("U+07FF") { + testCodepoint(0x07FF, "\xdf\xbf"); + } + + SECTION("U+0800") { + testCodepoint(0x0800, "\xe0\xa0\x80"); + } + + SECTION("U+FFFF") { + testCodepoint(0xFFFF, "\xef\xbf\xbf"); + } + + SECTION("U+10000") { + testCodepoint(0x10000, "\xf0\x90\x80\x80"); + } + + SECTION("U+10FFFF") { + testCodepoint(0x10FFFF, "\xf4\x8f\xbf\xbf"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/arithmeticCompare.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/arithmeticCompare.cpp new file mode 100644 index 0000000..e955194 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/arithmeticCompare.cpp @@ -0,0 +1,97 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +using namespace ArduinoJson::detail; + +TEST_CASE("arithmeticCompare()") { + SECTION("int vs uint8_t") { + CHECK(arithmeticCompare(256, 1) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompare(41, 42) == COMPARE_RESULT_LESS); + CHECK(arithmeticCompare(42, 42) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(43, 42) == COMPARE_RESULT_GREATER); + } + + SECTION("unsigned vs int") { + CHECK(arithmeticCompare(0, -1) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompare(42, 41) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompare(42, 42) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(42, 43) == COMPARE_RESULT_LESS); + } + + SECTION("float vs int") { + CHECK(arithmeticCompare(42, 41) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompare(42, 42) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(42, 43) == COMPARE_RESULT_LESS); + } + + SECTION("int vs unsigned") { + CHECK(arithmeticCompare(-1, 0) == COMPARE_RESULT_LESS); + CHECK(arithmeticCompare(0, 0) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(1, 0) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompare(42, 41) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompare(42, 42) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(42, 43) == COMPARE_RESULT_LESS); + } + + SECTION("unsigned vs unsigned") { + CHECK(arithmeticCompare(42, 41) == + COMPARE_RESULT_GREATER); + CHECK(arithmeticCompare(42, 42) == + COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(42, 43) == COMPARE_RESULT_LESS); + } + + SECTION("bool vs bool") { + CHECK(arithmeticCompare(false, false) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(true, true) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(false, true) == COMPARE_RESULT_LESS); + CHECK(arithmeticCompare(true, false) == COMPARE_RESULT_GREATER); + } + + SECTION("bool vs int") { + CHECK(arithmeticCompare(false, -1) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompare(false, 0) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(false, 1) == COMPARE_RESULT_LESS); + CHECK(arithmeticCompare(true, 0) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompare(true, 1) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(true, 2) == COMPARE_RESULT_LESS); + } + + SECTION("bool vs int") { + CHECK(arithmeticCompare(0, false) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(1, true) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompare(1, false) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompare(0, true) == COMPARE_RESULT_LESS); + } +} + +TEST_CASE("arithmeticCompareNegateLeft()") { + SECTION("unsigned vs int") { + CHECK(arithmeticCompareNegateLeft(0, 1) == COMPARE_RESULT_LESS); + CHECK(arithmeticCompareNegateLeft(42, -41) == COMPARE_RESULT_LESS); + CHECK(arithmeticCompareNegateLeft(42, -42) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompareNegateLeft(42, -43) == COMPARE_RESULT_GREATER); + } + + SECTION("unsigned vs unsigned") { + CHECK(arithmeticCompareNegateLeft(42, 42) == COMPARE_RESULT_LESS); + } +} + +TEST_CASE("arithmeticCompareNegateRight()") { + SECTION("int vs unsigned") { + CHECK(arithmeticCompareNegateRight(1, 0) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompareNegateRight(-41, 42) == COMPARE_RESULT_GREATER); + CHECK(arithmeticCompareNegateRight(-42, 42) == COMPARE_RESULT_EQUAL); + CHECK(arithmeticCompareNegateRight(-43, 42) == COMPARE_RESULT_LESS); + } + + SECTION("unsigned vs unsigned") { + CHECK(arithmeticCompareNegateRight(42, 42) == + COMPARE_RESULT_GREATER); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/conflicts.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/conflicts.cpp new file mode 100644 index 0000000..a00d019 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/conflicts.cpp @@ -0,0 +1,67 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +// Include any header that might use the conflicting macros +#include +#include +#include + +// All cores +#define bit() +#define constrain() +#define DEFAULT +#define DISABLED +#define HIGH +#define INPUT +#define LOW +#define max() +#define min() +#define OUTPUT +#define round() +#define sq() +#define word() +#define bitRead() +#define bitSet() +#define bitClear() +#define bitWrite() +#define interrupts() +#define lowByte() +#define highByte() +#define DEC +#define HEX +#define OCT +#define BIN +#define cbi() +#define sbi() + +// ESP8266 +#define _max() +#define _min() + +// Realtek Ameba +#define isdigit(c) (((c) >= '0') && ((c) <= '9')) +#define isprint(c) +#define isxdigit(c) +#define isspace(c) +#define isupper(c) +#define islower(c) +#define isalpha(c) + +// issue #839 +#define BLOCKSIZE +#define CAPACITY + +// issue #1905 +#define _current + +// issue #1914 +#define V7 7 + +// STM32, Mbed, Particle +#define A0 16 +#define A1 17 +#define A2 18 + +// catch.hpp mutes several warnings, this file also allows to detect them +#include "ArduinoJson.h" diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/custom_string.hpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/custom_string.hpp new file mode 100644 index 0000000..9982040 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/custom_string.hpp @@ -0,0 +1,11 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#pragma once + +#include + +struct custom_char_traits : std::char_traits {}; + +using custom_string = std::basic_string; diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue1967.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue1967.cpp new file mode 100644 index 0000000..bb067f0 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue1967.cpp @@ -0,0 +1,13 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +// we expect ArduinoJson.h to include +#define ARDUINOJSON_ENABLE_STD_STRING 1 + +// but we don't want it to included accidentally +#undef ARDUINO +#define ARDUINOJSON_ENABLE_STD_STREAM 0 +#define ARDUINOJSON_ENABLE_STRING_VIEW 0 + +#include diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue2129.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue2129.cpp new file mode 100644 index 0000000..022e232 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue2129.cpp @@ -0,0 +1,55 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +template +class Nullable { + public: + Nullable() : value_{} {} + Nullable(T value) : value_{value} {} + + operator T() const { + return value_; + } + + operator T&() { + return value_; + } + + bool is_valid() const { + return value_ != invalid_value_; + } + + T value() const { + return value_; + } + + private: + T value_; + static T invalid_value_; +}; + +template <> +float Nullable::invalid_value_ = std::numeric_limits::lowest(); + +template +void convertToJson(const Nullable& src, JsonVariant dst) { + if (src.is_valid()) { + dst.set(src.value()); + } else { + dst.clear(); + } +} + +TEST_CASE("Issue #2129") { + Nullable nullable_value = Nullable{123.4f}; + + JsonDocument doc; + + doc["value"] = nullable_value; + + REQUIRE(doc["value"].as() == Approx(123.4f)); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue2166.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue2166.cpp new file mode 100644 index 0000000..f068bd6 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/issue2166.cpp @@ -0,0 +1,22 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +struct CCLASS { + static const char mszKey[]; +}; + +TEST_CASE("Issue #2166") { + JsonDocument doc; + doc[CCLASS::mszKey] = 12; + REQUIRE(doc.as() == "{\"test3\":12}"); + + JsonObject obj = doc.to(); + obj[CCLASS::mszKey] = 12; + REQUIRE(doc.as() == "{\"test3\":12}"); +} + +const char CCLASS::mszKey[] = "test3"; diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/printable.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/printable.cpp new file mode 100644 index 0000000..3e20a5b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/printable.cpp @@ -0,0 +1,192 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 1 +#include + +#include "Allocators.hpp" + +using ArduinoJson::detail::sizeofArray; + +struct PrintOneCharacterAtATime { + static size_t printStringTo(const std::string& s, Print& p) { + size_t result = 0; + for (std::string::const_iterator it = s.begin(); it != s.end(); ++it) { + size_t n = p.write(uint8_t(*it)); + if (n == 0) + break; + result += n; + } + return result; + } +}; + +struct PrintAllAtOnce { + static size_t printStringTo(const std::string& s, Print& p) { + return p.write(s.data(), s.size()); + } +}; + +template +struct PrintableString : public Printable { + PrintableString(const char* s) : str_(s), total_(0) {} + + virtual size_t printTo(Print& p) const { + size_t result = PrintPolicy::printStringTo(str_, p); + total_ += result; + return result; + } + + size_t totalBytesWritten() const { + return total_; + } + + private: + std::string str_; + mutable size_t total_; +}; + +TEST_CASE("Printable") { + SECTION("Doesn't overflow") { + SpyingAllocator spy; + JsonDocument doc(&spy); + const char* value = "example"; + + doc.set(666); // to make sure we override the value + + SECTION("Via Print::write(char)") { + PrintableString printable(value); + CHECK(doc.set(printable) == true); + CHECK(doc.as() == value); + CHECK(printable.totalBytesWritten() == 7); + CHECK(doc.overflowed() == false); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("example")), + }); + } + + SECTION("Via Print::write(const char* size_t)") { + PrintableString printable(value); + CHECK(doc.set(printable) == true); + CHECK(doc.as() == value); + CHECK(printable.totalBytesWritten() == 7); + CHECK(doc.overflowed() == false); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("example")), + }); + } + } + + SECTION("First allocation fails") { + SpyingAllocator spy(FailingAllocator::instance()); + JsonDocument doc(&spy); + const char* value = "hello world"; + + doc.set(666); // to make sure we override the value + + SECTION("Via Print::write(char)") { + PrintableString printable(value); + + bool success = doc.set(printable); + + CHECK(success == false); + CHECK(doc.isNull()); + CHECK(printable.totalBytesWritten() == 0); + CHECK(doc.overflowed() == true); + CHECK(spy.log() == AllocatorLog{ + AllocateFail(sizeofStringBuffer()), + }); + } + + SECTION("Via Print::write(const char*, size_t)") { + PrintableString printable(value); + + bool success = doc.set(printable); + + CHECK(success == false); + CHECK(doc.isNull()); + CHECK(printable.totalBytesWritten() == 0); + CHECK(doc.overflowed() == true); + CHECK(spy.log() == AllocatorLog{ + AllocateFail(sizeofStringBuffer()), + }); + } + } + + SECTION("Reallocation fails") { + TimebombAllocator timebomb(1); + SpyingAllocator spy(&timebomb); + JsonDocument doc(&spy); + const char* value = "Lorem ipsum dolor sit amet, cons"; // > 31 chars + + doc.set(666); // to make sure we override the value + + SECTION("Via Print::write(char)") { + PrintableString printable(value); + + bool success = doc.set(printable); + + CHECK(success == false); + CHECK(doc.isNull()); + CHECK(printable.totalBytesWritten() == 31); + CHECK(doc.overflowed() == true); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + ReallocateFail(sizeofStringBuffer(), sizeofStringBuffer(2)), + Deallocate(sizeofStringBuffer()), + }); + } + + SECTION("Via Print::write(const char*, size_t)") { + PrintableString printable(value); + + bool success = doc.set(printable); + + CHECK(success == false); + CHECK(doc.isNull()); + CHECK(printable.totalBytesWritten() == 31); + CHECK(doc.overflowed() == true); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + ReallocateFail(sizeofStringBuffer(), sizeofStringBuffer(2)), + Deallocate(sizeofStringBuffer()), + }); + } + } + + SECTION("Null variant") { + JsonVariant var; + PrintableString printable = "Hello World!"; + CHECK(var.set(printable) == false); + CHECK(var.isNull()); + CHECK(printable.totalBytesWritten() == 0); + } + + SECTION("String deduplication") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc.add(PrintableString("Hello World!")); + doc.add(PrintableString("Hello World!")); + REQUIRE(doc.size() == 2); + CHECK(doc[0] == "Hello World!"); + CHECK(doc[1] == "Hello World!"); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("Hello World!")), + Allocate(sizeofStringBuffer()), + Deallocate(sizeofStringBuffer()), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/unsigned_char.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/unsigned_char.cpp new file mode 100644 index 0000000..3e95027 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/unsigned_char.cpp @@ -0,0 +1,248 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Literals.hpp" + +#if defined(__clang__) +# define CONFLICTS_WITH_BUILTIN_OPERATOR +#endif + +TEST_CASE("unsigned char[]") { + SECTION("deserializeJson()") { + unsigned char input[] = "{\"a\":42}"; + + JsonDocument doc; + DeserializationError err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("deserializeMsgPack()") { + unsigned char input[] = "\xDE\x00\x01\xA5Hello\xA5world"; + + JsonDocument doc; + DeserializationError err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("serializeMsgPack(unsigned char[])") { + unsigned char buffer[32]; + JsonDocument doc; + doc["hello"] = "world"; + + size_t n = serializeMsgPack(doc, buffer); + + REQUIRE(n == 13); + REQUIRE(memcmp(buffer, "\x81\xA5hello\xA5world", 13) == 0); + } + + SECTION("serializeMsgPack(unsigned char*)") { + unsigned char buffer[32]; + JsonDocument doc; + doc["hello"] = "world"; + + size_t n = serializeMsgPack(doc, buffer, sizeof(buffer)); + + REQUIRE(n == 13); + REQUIRE(memcmp(buffer, "\x81\xA5hello\xA5world", 13) == 0); + } + + SECTION("serializeJson(unsigned char[])") { + unsigned char buffer[32]; + JsonDocument doc; + doc["hello"] = "world"; + + size_t n = serializeJson(doc, buffer); + + REQUIRE(n == 17); + REQUIRE(memcmp(buffer, "{\"hello\":\"world\"}", n) == 0); + } + + SECTION("serializeJson(unsigned char*)") { + unsigned char buffer[32]; + JsonDocument doc; + doc["hello"] = "world"; + + size_t n = serializeJson(doc, buffer, sizeof(buffer)); + + REQUIRE(n == 17); + REQUIRE(memcmp(buffer, "{\"hello\":\"world\"}", n) == 0); + } + + SECTION("serializeJsonPretty(unsigned char[])") { + unsigned char buffer[32]; + JsonDocument doc; + doc["hello"] = "world"; + + size_t n = serializeJsonPretty(doc, buffer); + + REQUIRE(n == 24); + } + + SECTION("serializeJsonPretty(unsigned char*)") { + unsigned char buffer[32]; + JsonDocument doc; + doc["hello"] = "world"; + + size_t n = serializeJsonPretty(doc, buffer, sizeof(buffer)); + + REQUIRE(n == 24); + } + + SECTION("JsonVariant") { + JsonDocument doc; + + SECTION("set") { + unsigned char value[] = "42"; + + JsonVariant variant = doc.to(); + variant.set(value); + + REQUIRE(42 == variant.as()); + } + +#ifndef CONFLICTS_WITH_BUILTIN_OPERATOR + SECTION("operator[]") { + unsigned char key[] = "hello"; + + deserializeJson(doc, "{\"hello\":\"world\"}"); + JsonVariant variant = doc.as(); + + REQUIRE("world"_s == variant[key]); + } +#endif + +#ifndef CONFLICTS_WITH_BUILTIN_OPERATOR + SECTION("operator[] const") { + unsigned char key[] = "hello"; + + deserializeJson(doc, "{\"hello\":\"world\"}"); + const JsonVariant variant = doc.as(); + + REQUIRE("world"_s == variant[key]); + } +#endif + + SECTION("operator==") { + unsigned char comparand[] = "hello"; + + JsonVariant variant = doc.to(); + variant.set("hello"); + + REQUIRE(comparand == variant); + REQUIRE(variant == comparand); + REQUIRE_FALSE(comparand != variant); + REQUIRE_FALSE(variant != comparand); + } + + SECTION("operator!=") { + unsigned char comparand[] = "hello"; + + JsonVariant variant = doc.to(); + variant.set("world"); + + REQUIRE(comparand != variant); + REQUIRE(variant != comparand); + REQUIRE_FALSE(comparand == variant); + REQUIRE_FALSE(variant == comparand); + } + } + + SECTION("JsonObject") { +#ifndef CONFLICTS_WITH_BUILTIN_OPERATOR + SECTION("operator[]") { + unsigned char key[] = "hello"; + + JsonDocument doc; + JsonObject obj = doc.to(); + obj[key] = "world"; + + REQUIRE("world"_s == obj["hello"]); + } + + SECTION("JsonObject::operator[] const") { + unsigned char key[] = "hello"; + + JsonDocument doc; + deserializeJson(doc, "{\"hello\":\"world\"}"); + + JsonObject obj = doc.as(); + REQUIRE("world"_s == obj[key]); + } +#endif + + SECTION("remove()") { + unsigned char key[] = "hello"; + + JsonDocument doc; + deserializeJson(doc, "{\"hello\":\"world\"}"); + JsonObject obj = doc.as(); + obj.remove(key); + + REQUIRE(0 == obj.size()); + } + } + + SECTION("MemberProxy") { + SECTION("operator=") { // issue #416 + unsigned char value[] = "world"; + + JsonDocument doc; + JsonObject obj = doc.to(); + obj["hello"] = value; + + REQUIRE("world"_s == obj["hello"]); + } + + SECTION("set()") { + unsigned char value[] = "world"; + + JsonDocument doc; + JsonObject obj = doc.to(); + obj["hello"].set(value); + + REQUIRE("world"_s == obj["hello"]); + } + } + + SECTION("JsonArray") { + SECTION("add()") { + unsigned char value[] = "world"; + + JsonDocument doc; + JsonArray arr = doc.to(); + arr.add(value); + + REQUIRE("world"_s == arr[0]); + } + } + + SECTION("ElementProxy") { + SECTION("set()") { + unsigned char value[] = "world"; + + JsonDocument doc; + JsonArray arr = doc.to(); + arr.add("hello"); + arr[0].set(value); + + REQUIRE("world"_s == arr[0]); + } + + SECTION("operator=") { + unsigned char value[] = "world"; + + JsonDocument doc; + JsonArray arr = doc.to(); + arr.add("hello"); + arr[0] = value; + + REQUIRE("world"_s == arr[0]); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/version.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/version.cpp new file mode 100644 index 0000000..136dbf3 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/version.cpp @@ -0,0 +1,18 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +using Catch::Matchers::StartsWith; + +TEST_CASE("ARDUINOJSON_VERSION") { + std::stringstream version; + + version << ARDUINOJSON_VERSION_MAJOR << "." << ARDUINOJSON_VERSION_MINOR + << "." << ARDUINOJSON_VERSION_REVISION; + + REQUIRE_THAT(ARDUINOJSON_VERSION, StartsWith(version.str())); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/weird_strcmp.hpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/weird_strcmp.hpp new file mode 100644 index 0000000..dbe122f --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Misc/weird_strcmp.hpp @@ -0,0 +1,31 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +#include // strcmp, strncmp + +// Issue #1198: strcmp() implementation that returns a value larger than 8-bit + +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE + +int strcmp(const char* a, const char* b) { + int result = ::strcmp(a, b); + if (result > 0) + return 2147483647; + if (result < 0) + return -214748364; + return 0; +} + +int strncmp(const char* a, const char* b, size_t n) { + int result = ::strncmp(a, b, n); + if (result > 0) + return 2147483647; + if (result < 0) + return -214748364; + return 0; +} + +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt new file mode 100644 index 0000000..08d8888 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt @@ -0,0 +1,34 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(MixedConfigurationTests + decode_unicode_0.cpp + decode_unicode_1.cpp + enable_alignment_0.cpp + enable_alignment_1.cpp + enable_comments_0.cpp + enable_comments_1.cpp + enable_infinity_0.cpp + enable_infinity_1.cpp + enable_nan_0.cpp + enable_nan_1.cpp + enable_progmem_1.cpp + issue1707.cpp + string_length_size_1.cpp + string_length_size_2.cpp + string_length_size_4.cpp + use_double_0.cpp + use_double_1.cpp + use_long_long_0.cpp + use_long_long_1.cpp +) + +set_target_properties(MixedConfigurationTests PROPERTIES UNITY_BUILD OFF) + +add_test(MixedConfiguration MixedConfigurationTests) + +set_tests_properties(MixedConfiguration + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp new file mode 100644 index 0000000..91b03bb --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp @@ -0,0 +1,12 @@ +#define ARDUINOJSON_DECODE_UNICODE 0 +#include + +#include + +TEST_CASE("ARDUINOJSON_DECODE_UNICODE == 0") { + JsonDocument doc; + DeserializationError err = deserializeJson(doc, "\"\\uD834\\uDD1E\""); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "\\uD834\\uDD1E"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp new file mode 100644 index 0000000..0568ab5 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp @@ -0,0 +1,11 @@ +#define ARDUINOJSON_DECODE_UNICODE 1 +#include + +#include + +TEST_CASE("ARDUINOJSON_DECODE_UNICODE == 1") { + JsonDocument doc; + DeserializationError err = deserializeJson(doc, "\"\\uD834\\uDD1E\""); + + REQUIRE(err == DeserializationError::Ok); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_0.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_0.cpp new file mode 100644 index 0000000..569f84a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_0.cpp @@ -0,0 +1,41 @@ +#define ARDUINOJSON_VERSION_NAMESPACE NoAlignment +#define ARDUINOJSON_ENABLE_ALIGNMENT 0 +#include + +#include + +TEST_CASE("ARDUINOJSON_ENABLE_ALIGNMENT == 0") { + using namespace ArduinoJson::detail; + + const size_t N = sizeof(void*); + + SECTION("isAligned()") { + CHECK(isAligned(0) == true); + CHECK(isAligned(1) == true); + CHECK(isAligned(N) == true); + CHECK(isAligned(N + 1) == true); + CHECK(isAligned(2 * N) == true); + CHECK(isAligned(2 * N + 1) == true); + } + + SECTION("addPadding()") { + CHECK(addPadding(0) == 0); + CHECK(addPadding(1) == 1); + CHECK(addPadding(N) == N); + CHECK(addPadding(N + 1) == N + 1); + } + + SECTION("AddPadding<>") { + const size_t a = AddPadding<0>::value; + CHECK(a == 0); + + const size_t b = AddPadding<1>::value; + CHECK(b == 1); + + const size_t c = AddPadding::value; + CHECK(c == N); + + const size_t d = AddPadding::value; + CHECK(d == N + 1); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_1.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_1.cpp new file mode 100644 index 0000000..56d4816 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_1.cpp @@ -0,0 +1,40 @@ +#define ARDUINOJSON_ENABLE_ALIGNMENT 1 +#include + +#include + +TEST_CASE("ARDUINOJSON_ENABLE_ALIGNMENT == 1") { + using namespace ArduinoJson::detail; + + const size_t N = sizeof(void*); + + SECTION("isAligned()") { + CHECK(isAligned(0) == true); + CHECK(isAligned(1) == false); + CHECK(isAligned(N) == true); + CHECK(isAligned(N + 1) == false); + CHECK(isAligned(2 * N) == true); + CHECK(isAligned(2 * N + 1) == false); + } + + SECTION("addPadding()") { + CHECK(addPadding(0) == 0); + CHECK(addPadding(1) == N); + CHECK(addPadding(N) == N); + CHECK(addPadding(N + 1) == 2 * N); + } + + SECTION("AddPadding<>") { + const size_t a = AddPadding<0>::value; + CHECK(a == 0); + + const size_t b = AddPadding<1>::value; + CHECK(b == N); + + const size_t c = AddPadding::value; + CHECK(c == N); + + const size_t d = AddPadding::value; + CHECK(d == 2 * N); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp new file mode 100644 index 0000000..f0904c5 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp @@ -0,0 +1,54 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_ENABLE_COMMENTS 0 +#include + +#include + +TEST_CASE("Comments should produce InvalidInput") { + JsonDocument doc; + + const char* testCases[] = { + "/*COMMENT*/ [\"hello\"]", + "[/*COMMENT*/ \"hello\"]", + "[\"hello\"/*COMMENT*/]", + "[\"hello\"/*COMMENT*/,\"world\"]", + "[\"hello\",/*COMMENT*/ \"world\"]", + "[/*/\n]", + "[/*COMMENT]", + "[/*COMMENT*]", + "//COMMENT\n\t[\"hello\"]", + "[//COMMENT\n\"hello\"]", + "[\"hello\"//COMMENT\r\n]", + "[\"hello\"//COMMENT\n,\"world\"]", + "[\"hello\",//COMMENT\n\"world\"]", + "[/COMMENT\n]", + "[//COMMENT", + "/*COMMENT*/ {\"hello\":\"world\"}", + "{/*COMMENT*/\"hello\":\"world\"}", + "{\"hello\"/*COMMENT*/:\"world\"}", + "{\"hello\":/*COMMENT*/\"world\"}", + "{\"hello\":\"world\"/*COMMENT*/}", + "//COMMENT\n {\"hello\":\"world\"}", + "{//COMMENT\n\"hello\":\"world\"}", + "{\"hello\"//COMMENT\n:\"world\"}", + "{\"hello\"://COMMENT\n\"world\"}", + "{\"hello\":\"world\"//COMMENT\n}", + "/{\"hello\":\"world\"}", + "{/\"hello\":\"world\"}", + "{\"hello\"/:\"world\"}", + "{\"hello\":/\"world\"}", + "{\"hello\":\"world\"/}", + "{\"hello\":\"world\"/,\"answer\":42}", + "{\"hello\":\"world\",/\"answer\":42}", + }; + const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); + + for (size_t i = 0; i < testCount; i++) { + const char* input = testCases[i]; + CAPTURE(input); + REQUIRE(deserializeJson(doc, input) == DeserializationError::InvalidInput); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp new file mode 100644 index 0000000..7e135df --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp @@ -0,0 +1,411 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_ENABLE_COMMENTS 1 +#include + +#include + +TEST_CASE("Comments in arrays") { + JsonDocument doc; + + SECTION("Block comments") { + SECTION("Before opening bracket") { + DeserializationError err = + deserializeJson(doc, "/*COMMENT*/ [\"hello\"]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == "hello"); + } + + SECTION("After opening bracket") { + DeserializationError err = + deserializeJson(doc, "[/*COMMENT*/ \"hello\"]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == "hello"); + } + + SECTION("Before closing bracket") { + DeserializationError err = deserializeJson(doc, "[\"hello\"/*COMMENT*/]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == "hello"); + } + + SECTION("After closing bracket") { + DeserializationError err = deserializeJson(doc, "[\"hello\"]/*COMMENT*/"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == "hello"); + } + + SECTION("Before comma") { + DeserializationError err = + deserializeJson(doc, "[\"hello\"/*COMMENT*/,\"world\"]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0] == "hello"); + REQUIRE(arr[1] == "world"); + } + + SECTION("After comma") { + DeserializationError err = + deserializeJson(doc, "[\"hello\",/*COMMENT*/ \"world\"]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0] == "hello"); + REQUIRE(arr[1] == "world"); + } + + SECTION("/*/") { + DeserializationError err = deserializeJson(doc, "[/*/\n]"); + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("Unfinished comment") { + DeserializationError err = deserializeJson(doc, "[/*COMMENT]"); + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("Final slash missing") { + DeserializationError err = deserializeJson(doc, "[/*COMMENT*]"); + REQUIRE(err == DeserializationError::IncompleteInput); + } + } + + SECTION("Trailing comments") { + SECTION("Before opening bracket") { + DeserializationError err = + deserializeJson(doc, "//COMMENT\n\t[\"hello\"]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == "hello"); + } + + SECTION("After opening bracket") { + DeserializationError err = deserializeJson(doc, "[//COMMENT\n\"hello\"]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == "hello"); + } + + SECTION("Before closing bracket") { + DeserializationError err = + deserializeJson(doc, "[\"hello\"//COMMENT\r\n]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == "hello"); + } + + SECTION("After closing bracket") { + DeserializationError err = deserializeJson(doc, "[\"hello\"]//COMMENT\n"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(1 == arr.size()); + REQUIRE(arr[0] == "hello"); + } + + SECTION("Before comma") { + DeserializationError err = + deserializeJson(doc, "[\"hello\"//COMMENT\n,\"world\"]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0] == "hello"); + REQUIRE(arr[1] == "world"); + } + + SECTION("After comma") { + DeserializationError err = + deserializeJson(doc, "[\"hello\",//COMMENT\n\"world\"]"); + JsonArray arr = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(2 == arr.size()); + REQUIRE(arr[0] == "hello"); + REQUIRE(arr[1] == "world"); + } + + SECTION("Invalid comment") { + DeserializationError err = deserializeJson(doc, "[/COMMENT\n]"); + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("End document with comment") { + DeserializationError err = deserializeJson(doc, "[//COMMENT"); + REQUIRE(err == DeserializationError::IncompleteInput); + } + } +} + +TEST_CASE("Comments in objects") { + JsonDocument doc; + + SECTION("Block comments") { + SECTION("Before opening brace") { + DeserializationError err = + deserializeJson(doc, "/*COMMENT*/ {\"hello\":\"world\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("After opening brace") { + DeserializationError err = + deserializeJson(doc, "{/*COMMENT*/\"hello\":\"world\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("Before colon") { + DeserializationError err = + deserializeJson(doc, "{\"hello\"/*COMMENT*/:\"world\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("After colon") { + DeserializationError err = + deserializeJson(doc, "{\"hello\":/*COMMENT*/\"world\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("Before closing brace") { + DeserializationError err = + deserializeJson(doc, "{\"hello\":\"world\"/*COMMENT*/}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("After closing brace") { + DeserializationError err = + deserializeJson(doc, "{\"hello\":\"world\"}/*COMMENT*/"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("Before comma") { + DeserializationError err = deserializeJson( + doc, "{\"hello\":\"world\"/*COMMENT*/,\"answer\":42}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + REQUIRE(obj["answer"] == 42); + } + + SECTION("After comma") { + DeserializationError err = deserializeJson( + doc, "{\"hello\":\"world\",/*COMMENT*/\"answer\":42}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + REQUIRE(obj["answer"] == 42); + } + } + + SECTION("Trailing comments") { + SECTION("Before opening brace") { + DeserializationError err = + deserializeJson(doc, "//COMMENT\n {\"hello\":\"world\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("After opening brace") { + DeserializationError err = + deserializeJson(doc, "{//COMMENT\n\"hello\":\"world\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("Before colon") { + DeserializationError err = + deserializeJson(doc, "{\"hello\"//COMMENT\n:\"world\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("After colon") { + DeserializationError err = + deserializeJson(doc, "{\"hello\"://COMMENT\n\"world\"}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("Before closing brace") { + DeserializationError err = + deserializeJson(doc, "{\"hello\":\"world\"//COMMENT\n}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("After closing brace") { + DeserializationError err = + deserializeJson(doc, "{\"hello\":\"world\"}//COMMENT\n"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("Before comma") { + DeserializationError err = deserializeJson( + doc, "{\"hello\":\"world\"//COMMENT\n,\"answer\":42}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + REQUIRE(obj["answer"] == 42); + } + + SECTION("After comma") { + DeserializationError err = deserializeJson( + doc, "{\"hello\":\"world\",//COMMENT\n\"answer\":42}"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + REQUIRE(obj["answer"] == 42); + } + } + + SECTION("Dangling slash") { + SECTION("Before opening brace") { + DeserializationError err = deserializeJson(doc, "/{\"hello\":\"world\"}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("After opening brace") { + DeserializationError err = deserializeJson(doc, "{/\"hello\":\"world\"}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("Before colon") { + DeserializationError err = deserializeJson(doc, "{\"hello\"/:\"world\"}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("After colon") { + DeserializationError err = deserializeJson(doc, "{\"hello\":/\"world\"}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("Before closing brace") { + DeserializationError err = deserializeJson(doc, "{\"hello\":\"world\"/}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("After closing brace") { + DeserializationError err = deserializeJson(doc, "{\"hello\":\"world\"}/"); + JsonObject obj = doc.as(); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(obj["hello"] == "world"); + } + + SECTION("Before comma") { + DeserializationError err = + deserializeJson(doc, "{\"hello\":\"world\"/,\"answer\":42}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("After comma") { + DeserializationError err = + deserializeJson(doc, "{\"hello\":\"world\",/\"answer\":42}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + } +} + +TEST_CASE("Comments alone") { + JsonDocument doc; + + SECTION("Just a trailing comment with no line break") { + DeserializationError err = deserializeJson(doc, "// comment"); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("Just a trailing comment with no a break") { + DeserializationError err = deserializeJson(doc, "// comment\n"); + + REQUIRE(err == DeserializationError::EmptyInput); + } + + SECTION("Just a block comment") { + DeserializationError err = deserializeJson(doc, "/*comment*/"); + + REQUIRE(err == DeserializationError::EmptyInput); + } + + SECTION("Just a slash") { + DeserializationError err = deserializeJson(doc, "/"); + + REQUIRE(err == DeserializationError::InvalidInput); + } + + SECTION("Premature terminator") { + DeserializationError err = deserializeJson(doc, "/* comment"); + + REQUIRE(err == DeserializationError::IncompleteInput); + } + + SECTION("Premature end on sized input") { + DeserializationError err = deserializeJson(doc, "/* comment */", 10); + + REQUIRE(err == DeserializationError::IncompleteInput); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp new file mode 100644 index 0000000..41566e2 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp @@ -0,0 +1,35 @@ +#define ARDUINOJSON_ENABLE_INFINITY 0 +#include + +#include +#include + +static void assertParseFails(const char* json) { + JsonDocument doc; + DeserializationError err = deserializeJson(doc, json); + + REQUIRE(err == DeserializationError::InvalidInput); +} + +static void assertJsonEquals(const JsonDocument& doc, + std::string expectedJson) { + std::string actualJson; + serializeJson(doc, actualJson); + REQUIRE(actualJson == expectedJson); +} + +TEST_CASE("ARDUINOJSON_ENABLE_INFINITY == 0") { + SECTION("serializeJson()") { + JsonDocument doc; + doc.add(std::numeric_limits::infinity()); + doc.add(-std::numeric_limits::infinity()); + + assertJsonEquals(doc, "[null,null]"); + } + + SECTION("deserializeJson()") { + assertParseFails("{\"X\":Infinity}"); + assertParseFails("{\"X\":-Infinity}"); + assertParseFails("{\"X\":+Infinity}"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp new file mode 100644 index 0000000..99ab3fe --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp @@ -0,0 +1,39 @@ +#define ARDUINOJSON_ENABLE_INFINITY 1 +#include + +#include +#include + +namespace my { +using ArduinoJson::detail::isinf; +} // namespace my + +TEST_CASE("ARDUINOJSON_ENABLE_INFINITY == 1") { + JsonDocument doc; + + SECTION("serializeJson()") { + doc.add(std::numeric_limits::infinity()); + doc.add(-std::numeric_limits::infinity()); + + std::string json; + serializeJson(doc, json); + + REQUIRE(json == "[Infinity,-Infinity]"); + } + + SECTION("deserializeJson()") { + DeserializationError err = + deserializeJson(doc, "[Infinity,-Infinity,+Infinity]"); + float a = doc[0]; + float b = doc[1]; + float c = doc[2]; + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(my::isinf(a)); + REQUIRE(a > 0); + REQUIRE(my::isinf(b)); + REQUIRE(b < 0); + REQUIRE(my::isinf(c)); + REQUIRE(c > 0); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp new file mode 100644 index 0000000..7491e4a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp @@ -0,0 +1,25 @@ +#define ARDUINOJSON_ENABLE_NAN 0 +#include + +#include +#include + +TEST_CASE("ARDUINOJSON_ENABLE_NAN == 0") { + JsonDocument doc; + JsonObject root = doc.to(); + + SECTION("serializeJson()") { + root["X"] = std::numeric_limits::signaling_NaN(); + + std::string json; + serializeJson(doc, json); + + REQUIRE(json == "{\"X\":null}"); + } + + SECTION("deserializeJson()") { + DeserializationError err = deserializeJson(doc, "{\"X\":NaN}"); + + REQUIRE(err == DeserializationError::InvalidInput); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp new file mode 100644 index 0000000..20d0874 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp @@ -0,0 +1,31 @@ +#define ARDUINOJSON_ENABLE_NAN 1 +#include + +#include +#include + +namespace my { +using ArduinoJson::detail::isnan; +} // namespace my + +TEST_CASE("ARDUINOJSON_ENABLE_NAN == 1") { + JsonDocument doc; + JsonObject root = doc.to(); + + SECTION("serializeJson()") { + root["X"] = std::numeric_limits::signaling_NaN(); + + std::string json; + serializeJson(doc, json); + + REQUIRE(json == "{\"X\":NaN}"); + } + + SECTION("deserializeJson()") { + DeserializationError err = deserializeJson(doc, "{\"X\":NaN}"); + float x = doc["X"]; + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(my::isnan(x)); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp new file mode 100644 index 0000000..312a87f --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp @@ -0,0 +1,191 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_ENABLE_PROGMEM 1 +#include + +#include + +TEST_CASE("Flash strings") { + JsonDocument doc; + + SECTION("deserializeJson()") { + DeserializationError err = deserializeJson(doc, F("{'hello':'world'}")); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc["hello"] == "world"); + } + + SECTION("JsonDocument::operator[]") { + doc[F("hello")] = F("world"); + + REQUIRE(doc["hello"] == "world"); + } + + SECTION("JsonDocument::add()") { + doc.add(F("world")); + + REQUIRE(doc[0] == "world"); + } + + SECTION("JsonVariant::set()") { + JsonVariant var = doc.to(); + + var.set(F("world")); + + REQUIRE(var == "world"); + } + + SECTION("MemberProxy::operator==") { + doc["hello"] = "world"; + + REQUIRE(doc["hello"] == F("world")); + } + + SECTION("ElementProxy::operator==") { + doc.add("world"); + + REQUIRE(doc[0] == F("world")); + } +} + +TEST_CASE("parseNumber()") { // tables are in Flash + using ArduinoJson::detail::parseNumber; + + CHECK(parseNumber("1") == 1.f); + CHECK(parseNumber("1.23") == 1.23f); + CHECK(parseNumber("-1.23e34") == -1.23e34f); +} + +TEST_CASE("strlen_P") { + CHECK(strlen_P(PSTR("")) == 0); + CHECK(strlen_P(PSTR("a")) == 1); + CHECK(strlen_P(PSTR("ac")) == 2); +} + +TEST_CASE("strncmp_P") { + CHECK(strncmp_P("a", PSTR("b"), 0) == 0); + CHECK(strncmp_P("a", PSTR("b"), 1) == -1); + CHECK(strncmp_P("b", PSTR("a"), 1) == 1); + CHECK(strncmp_P("a", PSTR("a"), 0) == 0); + CHECK(strncmp_P("a", PSTR("b"), 2) == -1); + CHECK(strncmp_P("b", PSTR("a"), 2) == 1); + CHECK(strncmp_P("a", PSTR("a"), 2) == 0); +} + +TEST_CASE("strcmp_P") { + CHECK(strcmp_P("a", PSTR("b")) == -1); + CHECK(strcmp_P("b", PSTR("a")) == 1); + CHECK(strcmp_P("a", PSTR("a")) == 0); + CHECK(strcmp_P("aa", PSTR("ab")) == -1); + CHECK(strcmp_P("ab", PSTR("aa")) == 1); + CHECK(strcmp_P("aa", PSTR("aa")) == 0); +} + +TEST_CASE("memcpy_P") { + char dst[4]; + CHECK(memcpy_P(dst, PSTR("ABC"), 4) == dst); + CHECK(dst[0] == 'A'); + CHECK(dst[1] == 'B'); + CHECK(dst[2] == 'C'); + CHECK(dst[3] == 0); +} + +TEST_CASE("BoundedReader") { + using namespace ArduinoJson::detail; + + SECTION("read") { + BoundedReader reader(F("\x01\xFF"), 2); + REQUIRE(reader.read() == 0x01); + REQUIRE(reader.read() == 0xFF); + REQUIRE(reader.read() == -1); + REQUIRE(reader.read() == -1); + } + + SECTION("readBytes() all at once") { + BoundedReader reader(F("ABCD"), 3); + + char buffer[8] = "abcd"; + REQUIRE(reader.readBytes(buffer, 4) == 3); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'd'); + } + + SECTION("readBytes() in two parts") { + BoundedReader reader(F("ABCDEF"), 6); + + char buffer[8] = "abcdefg"; + REQUIRE(reader.readBytes(buffer, 4) == 4); + REQUIRE(reader.readBytes(buffer + 4, 4) == 2); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'D'); + REQUIRE(buffer[4] == 'E'); + REQUIRE(buffer[5] == 'F'); + REQUIRE(buffer[6] == 'g'); + } +} + +TEST_CASE("Reader") { + using namespace ArduinoJson::detail; + + SECTION("read()") { + Reader reader(F("\x01\xFF\x00\x12")); + REQUIRE(reader.read() == 0x01); + REQUIRE(reader.read() == 0xFF); + REQUIRE(reader.read() == 0); + REQUIRE(reader.read() == 0x12); + } + + SECTION("readBytes() all at once") { + Reader reader(F("ABCD")); + + char buffer[8] = "abcd"; + REQUIRE(reader.readBytes(buffer, 3) == 3); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'd'); + } + + SECTION("readBytes() in two parts") { + Reader reader(F("ABCDEF")); + + char buffer[8] = "abcdefg"; + REQUIRE(reader.readBytes(buffer, 4) == 4); + REQUIRE(reader.readBytes(buffer + 4, 2) == 2); + + REQUIRE(buffer[0] == 'A'); + REQUIRE(buffer[1] == 'B'); + REQUIRE(buffer[2] == 'C'); + REQUIRE(buffer[3] == 'D'); + REQUIRE(buffer[4] == 'E'); + REQUIRE(buffer[5] == 'F'); + REQUIRE(buffer[6] == 'g'); + } +} + +static void testStringification(DeserializationError error, + std::string expected) { + const __FlashStringHelper* s = error.f_str(); + CHECK(reinterpret_cast(convertFlashToPtr(s)) == expected); +} + +#define TEST_STRINGIFICATION(symbol) \ + testStringification(DeserializationError::symbol, #symbol) + +TEST_CASE("DeserializationError::f_str()") { + TEST_STRINGIFICATION(Ok); + TEST_STRINGIFICATION(EmptyInput); + TEST_STRINGIFICATION(IncompleteInput); + TEST_STRINGIFICATION(InvalidInput); + TEST_STRINGIFICATION(NoMemory); + TEST_STRINGIFICATION(TooDeep); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/issue1707.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/issue1707.cpp new file mode 100644 index 0000000..ff8d2ba --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/issue1707.cpp @@ -0,0 +1,17 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINO +#define memcpy_P(dest, src, n) memcpy((dest), (src), (n)) + +#include + +#include + +TEST_CASE("Issue1707") { + JsonDocument doc; + + DeserializationError err = deserializeJson(doc, F("{\"hello\":12}")); + REQUIRE(err == DeserializationError::Ok); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_1.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_1.cpp new file mode 100644 index 0000000..3263686 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_1.cpp @@ -0,0 +1,131 @@ +#define ARDUINOJSON_STRING_LENGTH_SIZE 1 +#include + +#include +#include + +#include "Literals.hpp" + +TEST_CASE("ARDUINOJSON_STRING_LENGTH_SIZE == 1") { + JsonDocument doc; + + SECTION("set(std::string)") { + SECTION("returns true if len <= 255") { + auto result = doc.set(std::string(255, '?')); + + REQUIRE(result == true); + REQUIRE(doc.overflowed() == false); + } + + SECTION("returns false if len >= 256") { + auto result = doc.set(std::string(256, '?')); + + REQUIRE(result == false); + REQUIRE(doc.overflowed() == true); + } + } + + SECTION("set(MsgPackBinary)") { + SECTION("returns true if size <= 253") { + auto str = std::string(253, '?'); + auto result = doc.set(MsgPackBinary(str.data(), str.size())); + + REQUIRE(result == true); + REQUIRE(doc.overflowed() == false); + } + + SECTION("returns false if size >= 254") { + auto str = std::string(254, '?'); + auto result = doc.set(MsgPackBinary(str.data(), str.size())); + + REQUIRE(result == false); + REQUIRE(doc.overflowed() == true); + } + } + + SECTION("set(MsgPackExtension)") { + SECTION("returns true if size <= 252") { + auto str = std::string(252, '?'); + auto result = doc.set(MsgPackExtension(1, str.data(), str.size())); + + REQUIRE(result == true); + REQUIRE(doc.overflowed() == false); + } + + SECTION("returns false if size >= 253") { + auto str = std::string(253, '?'); + auto result = doc.set(MsgPackExtension(1, str.data(), str.size())); + + REQUIRE(result == false); + REQUIRE(doc.overflowed() == true); + } + } + + SECTION("deserializeJson()") { + SECTION("returns Ok if string length <= 255") { + auto input = "\"" + std::string(255, '?') + "\""; + + auto err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("returns NoMemory if string length >= 256") { + auto input = "\"" + std::string(256, '?') + "\""; + + auto err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + } + } + + SECTION("deserializeMsgPack()") { + SECTION("returns Ok if string length <= 255") { + auto input = "\xd9\xff" + std::string(255, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("returns NoMemory if string length >= 256") { + auto input = "\xda\x01\x00"_s + std::string(256, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + } + + SECTION("returns Ok if binary size <= 253") { + auto input = "\xc4\xfd" + std::string(253, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("returns NoMemory if binary size >= 254") { + auto input = "\xc4\xfe" + std::string(254, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + } + + SECTION("returns Ok if extension size <= 252") { + auto input = "\xc7\xfc\x01" + std::string(252, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("returns NoMemory if binary size >= 253") { + auto input = "\xc7\xfd\x01" + std::string(253, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_2.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_2.cpp new file mode 100644 index 0000000..2c1315b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_2.cpp @@ -0,0 +1,140 @@ +#define ARDUINOJSON_STRING_LENGTH_SIZE 2 +#include + +#include +#include + +#include "Literals.hpp" + +TEST_CASE("ARDUINOJSON_STRING_LENGTH_SIZE == 2") { + JsonDocument doc; + + SECTION("set(std::string)") { + SECTION("returns true if len <= 65535") { + auto result = doc.set(std::string(65535, '?')); + + REQUIRE(result == true); + REQUIRE(doc.overflowed() == false); + } + + SECTION("returns false if len >= 65536") { + auto result = doc.set(std::string(65536, '?')); + + REQUIRE(result == false); + REQUIRE(doc.overflowed() == true); + } + } + + SECTION("set(MsgPackBinary)") { + SECTION("returns true if size <= 65532") { + auto str = std::string(65532, '?'); + auto result = doc.set(MsgPackBinary(str.data(), str.size())); + + REQUIRE(result == true); + REQUIRE(doc.overflowed() == false); + } + + SECTION("returns false if size >= 65533") { + auto str = std::string(65533, '?'); + auto result = doc.set(MsgPackBinary(str.data(), str.size())); + + REQUIRE(result == false); + REQUIRE(doc.overflowed() == true); + } + } + + SECTION("set(MsgPackExtension)") { + SECTION("returns true if size <= 65531") { + auto str = std::string(65531, '?'); + auto result = doc.set(MsgPackExtension(1, str.data(), str.size())); + + REQUIRE(result == true); + REQUIRE(doc.overflowed() == false); + } + + SECTION("returns false if size >= 65532") { + auto str = std::string(65532, '?'); + auto result = doc.set(MsgPackExtension(1, str.data(), str.size())); + + REQUIRE(result == false); + REQUIRE(doc.overflowed() == true); + } + } + + SECTION("deserializeJson()") { + SECTION("returns Ok if string length <= 65535") { + auto input = "\"" + std::string(65535, '?') + "\""; + + auto err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("returns NoMemory if string length >= 65536") { + auto input = "\"" + std::string(65536, '?') + "\""; + + auto err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + } + } + + SECTION("deserializeMsgPack()") { + SECTION("returns Ok if string length <= 65535") { + auto input = "\xda\xff\xff" + std::string(65535, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("returns NoMemory if string length >= 65536") { + auto input = "\xdb\x00\x01\x00\x00"_s + std::string(65536, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + } + + SECTION("returns Ok if binary size <= 65532") { + auto input = "\xc5\xff\xfc" + std::string(65532, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("returns NoMemory if binary size >= 65534") { + auto input = "\xc5\xff\xfd" + std::string(65534, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + } + + // https://oss-fuzz.com/testcase?key=5354792971993088 + SECTION("doesn't overflow if binary size == 0xFFFF") { + auto input = "\xc5\xff\xff"_s; + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + } + + SECTION("returns Ok if extension size <= 65531") { + auto input = "\xc8\xff\xfb\x01" + std::string(65531, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("returns NoMemory if extension size >= 65532") { + auto input = "\xc8\xff\xfc\x01" + std::string(65532, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_4.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_4.cpp new file mode 100644 index 0000000..4059c3d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/string_length_size_4.cpp @@ -0,0 +1,146 @@ +#define ARDUINOJSON_STRING_LENGTH_SIZE 4 +#include + +#include +#include + +#include "Literals.hpp" + +TEST_CASE("ARDUINOJSON_STRING_LENGTH_SIZE == 4") { + JsonDocument doc; + + SECTION("set(std::string)") { + SECTION("returns true if string length >= 65536") { + auto result = doc.set(std::string(65536, '?')); + + REQUIRE(result == true); + REQUIRE(doc.overflowed() == false); + } + } + + SECTION("set(MsgPackBinary)") { + SECTION("returns true if size >= 65536") { + auto str = std::string(65536, '?'); + auto result = doc.set(MsgPackBinary(str.data(), str.size())); + + REQUIRE(result == true); + REQUIRE(doc.overflowed() == false); + } + } + + SECTION("set(MsgPackExtension)") { + SECTION("returns true if size >= 65532") { + auto str = std::string(65532, '?'); + auto result = doc.set(MsgPackExtension(1, str.data(), str.size())); + + REQUIRE(result == true); + REQUIRE(doc.overflowed() == false); + } + } + + SECTION("deserializeJson()") { + SECTION("returns Ok if string length >= 65536") { + auto input = "\"" + std::string(65536, '?') + "\""; + + auto err = deserializeJson(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + } + + SECTION("deserializeMsgPack()") { + SECTION("returns Ok if string size >= 65536") { + auto input = "\xda\xff\xff" + std::string(65536, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("returns Ok if binary size >= 65536") { + auto input = "\xc5\xff\xff" + std::string(65536, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("returns Ok if extension size >= 65532") { + auto input = "\xc8\xff\xfb\x01" + std::string(65532, '?'); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + // https://oss-fuzz.com/testcase?key=5354792971993088 + SECTION("doesn't overflow if binary size == 0xFFFFFFFF") { + auto input = "\xc6\xff\xff\xff\xff"_s; + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::NoMemory); + } + + SECTION("doesn't overflow if string size == 0xFFFFFFFF") { + auto input = "\xdb\xff\xff\xff\xff???????????????????"_s; + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err != DeserializationError::Ok); + } + } + + SECTION("bin 32 deserialization") { + auto str = std::string(65536, '?'); + auto input = "\xc6\x00\x01\x00\x00"_s + str; + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + auto binary = doc.as(); + REQUIRE(binary.size() == 65536); + REQUIRE(binary.data() != nullptr); + REQUIRE(std::string(reinterpret_cast(binary.data()), + binary.size()) == str); + } + + SECTION("bin 32 serialization") { + auto str = std::string(65536, '?'); + doc.set(MsgPackBinary(str.data(), str.size())); + + std::string output; + auto result = serializeMsgPack(doc, output); + + REQUIRE(result == 5 + str.size()); + REQUIRE(output == "\xc6\x00\x01\x00\x00"_s + str); + } + + SECTION("ext 32 deserialization") { + auto str = std::string(65536, '?'); + auto input = "\xc9\x00\x01\x00\x00\x2a"_s + str; + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.is()); + auto value = doc.as(); + REQUIRE(value.type() == 42); + REQUIRE(value.size() == 65536); + REQUIRE(value.data() != nullptr); + REQUIRE(std::string(reinterpret_cast(value.data()), + value.size()) == str); + } + + SECTION("ext 32 serialization") { + auto str = std::string(65536, '?'); + doc.set(MsgPackExtension(42, str.data(), str.size())); + + std::string output; + auto result = serializeMsgPack(doc, output); + + REQUIRE(result == 6 + str.size()); + REQUIRE(output == "\xc9\x00\x01\x00\x00\x2a"_s + str); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp new file mode 100644 index 0000000..6958bc0 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp @@ -0,0 +1,67 @@ +#define ARDUINOJSON_USE_DOUBLE 0 +#include + +#include + +namespace my { +using ArduinoJson::detail::isinf; +} // namespace my + +void checkFloat(const char* input, float expected) { + using ArduinoJson::detail::NumberType; + using ArduinoJson::detail::parseNumber; + CAPTURE(input); + auto result = parseNumber(input); + REQUIRE(result.type() == NumberType::Float); + REQUIRE(result.asFloat() == Approx(expected)); +} + +TEST_CASE("ARDUINOJSON_USE_DOUBLE == 0") { + SECTION("serializeJson()") { + JsonDocument doc; + JsonObject root = doc.to(); + + root["pi"] = 3.14; + root["e"] = 2.72; + + std::string json; + serializeJson(doc, json); + + REQUIRE(json == "{\"pi\":3.14,\"e\":2.72}"); + } + + SECTION("parseNumber()") { + using ArduinoJson::detail::NumberType; + using ArduinoJson::detail::parseNumber; + + SECTION("Large positive number") { + auto result = parseNumber("1e300"); + REQUIRE(result.type() == NumberType::Float); + REQUIRE(result.asFloat() > 0); + REQUIRE(my::isinf(result.asFloat())); + } + + SECTION("Large negative number") { + auto result = parseNumber("-1e300"); + REQUIRE(result.type() == NumberType::Float); + REQUIRE(result.asFloat() < 0); + REQUIRE(my::isinf(result.asFloat())); + } + + SECTION("Too small to be represented") { + auto result = parseNumber("1e-300"); + REQUIRE(result.type() == NumberType::Float); + REQUIRE(result.asFloat() == 0); + } + + SECTION("MantissaTooLongToFit") { + checkFloat("0.340282346638528861111111111111", 0.34028234663852886f); + checkFloat("34028234663852886.11111111111111", 34028234663852886.0f); + checkFloat("34028234.66385288611111111111111", 34028234.663852886f); + + checkFloat("-0.340282346638528861111111111111", -0.34028234663852886f); + checkFloat("-34028234663852886.11111111111111", -34028234663852886.0f); + checkFloat("-34028234.66385288611111111111111", -34028234.663852886f); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp new file mode 100644 index 0000000..15c4849 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp @@ -0,0 +1,17 @@ +#define ARDUINOJSON_USE_DOUBLE 1 +#include + +#include + +TEST_CASE("ARDUINOJSON_USE_DOUBLE == 1") { + JsonDocument doc; + JsonObject root = doc.to(); + + root["pi"] = 3.14; + root["e"] = 2.72; + + std::string json; + serializeJson(doc, json); + + REQUIRE(json == "{\"pi\":3.14,\"e\":2.72}"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_0.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_0.cpp new file mode 100644 index 0000000..16c07db --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_0.cpp @@ -0,0 +1,38 @@ +#define ARDUINOJSON_USE_LONG_LONG 0 +#include + +#include + +#include "Literals.hpp" + +TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 0") { + JsonDocument doc; + + SECTION("smoke test") { + doc["A"] = 42; + doc["B"] = 84; + + std::string json; + serializeJson(doc, json); + + REQUIRE(json == "{\"A\":42,\"B\":84}"); + } + + SECTION("deserializeMsgPack()") { + SECTION("cf 00 00 00 00 ff ff ff ff") { + auto err = + deserializeMsgPack(doc, "\xcf\x00\x00\x00\x00\xff\xff\xff\xff"_s); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == 0xFFFFFFFF); + } + + SECTION("cf 00 00 00 01 00 00 00 00") { + auto err = + deserializeMsgPack(doc, "\xcf\x00\x00\x00\x01\x00\x00\x00\x00"_s); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.isNull()); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_1.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_1.cpp new file mode 100644 index 0000000..a2c4fd8 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MixedConfiguration/use_long_long_1.cpp @@ -0,0 +1,17 @@ +#define ARDUINOJSON_USE_LONG_LONG 1 +#include + +#include + +TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 1") { + JsonDocument doc; + JsonObject root = doc.to(); + + root["A"] = 123456789123456789; + root["B"] = 987654321987654321; + + std::string json; + serializeJson(doc, json); + + REQUIRE(json == "{\"A\":123456789123456789,\"B\":987654321987654321}"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt new file mode 100644 index 0000000..96b4584 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt @@ -0,0 +1,22 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(MsgPackDeserializerTests + deserializeArray.cpp + deserializeObject.cpp + deserializeVariant.cpp + destination_types.cpp + doubleToFloat.cpp + errors.cpp + filter.cpp + input_types.cpp + nestingLimit.cpp +) + +add_test(MsgPackDeserializer MsgPackDeserializerTests) + +set_tests_properties(MsgPackDeserializer + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp new file mode 100644 index 0000000..03409a9 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp @@ -0,0 +1,104 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" + +TEST_CASE("deserialize MsgPack array") { + SpyingAllocator spy; + JsonDocument doc(&spy); + + SECTION("fixarray") { + SECTION("empty") { + const char* input = "\x90"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonArray array = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(array.size() == 0); + } + + SECTION("two integers") { + const char* input = "\x92\x01\x02"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonArray array = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(array.size() == 2); + REQUIRE(array[0] == 1); + REQUIRE(array[1] == 2); + } + + SECTION("tiny strings") { + DeserializationError error = + deserializeMsgPack(doc, "\x92\xA3xxx\xA3yyy"); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(doc.size() == 2); + REQUIRE(doc[0] == "xxx"); + REQUIRE(doc[1] == "yyy"); + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Allocate(sizeofString("xxx")), + // Buffer is reused for the next string + Deallocate(sizeofString("xxx")), + Reallocate(sizeofPool(), sizeofPool(2)), + }); + } + } + + SECTION("array 16") { + SECTION("empty") { + const char* input = "\xDC\x00\x00"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonArray array = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(array.size() == 0); + } + + SECTION("two strings") { + const char* input = "\xDC\x00\x02\xA5hello\xA5world"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonArray array = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(array.size() == 2); + REQUIRE(array[0] == "hello"); + REQUIRE(array[1] == "world"); + } + } + + SECTION("array 32") { + SECTION("empty") { + const char* input = "\xDD\x00\x00\x00\x00"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonArray array = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(array.size() == 0); + } + + SECTION("two floats") { + const char* input = + "\xDD\x00\x00\x00\x02\xCA\x00\x00\x00\x00\xCA\x40\x48\xF5\xC3"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonArray array = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(array.size() == 2); + REQUIRE(array[0] == 0.0f); + REQUIRE(array[1] == 3.14f); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp new file mode 100644 index 0000000..75266f2 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp @@ -0,0 +1,130 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("deserialize MsgPack object") { + JsonDocument doc; + + SECTION("fixmap") { + SECTION("empty") { + const char* input = "\x80"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonObject obj = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 0); + } + + SECTION("two integers") { + const char* input = "\x82\xA3one\x01\xA3two\x02"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonObject obj = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["one"] == 1); + REQUIRE(obj["two"] == 2); + } + + SECTION("key is str 8") { + const char* input = "\x82\xd9\x03one\x01\xd9\x03two\x02"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonObject obj = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["one"] == 1); + REQUIRE(obj["two"] == 2); + } + + SECTION("key is str 16") { + const char* input = "\x82\xda\x00\x03one\x01\xda\x00\x03two\x02"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonObject obj = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["one"] == 1); + REQUIRE(obj["two"] == 2); + } + + SECTION("key is str 32") { + const char* input = + "\x82\xdb\x00\x00\x00\x03one\x01\xdb\x00\x00\x00\x03two\x02"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonObject obj = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["one"] == 1); + REQUIRE(obj["two"] == 2); + } + } + + SECTION("map 16") { + SECTION("empty") { + const char* input = "\xDE\x00\x00"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonObject obj = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 0); + } + + SECTION("two strings") { + const char* input = "\xDE\x00\x02\xA1H\xA5hello\xA1W\xA5world"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonObject obj = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["H"] == "hello"); + REQUIRE(obj["W"] == "world"); + } + } + + SECTION("map 32") { + SECTION("empty") { + const char* input = "\xDF\x00\x00\x00\x00"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonObject obj = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 0); + } + + SECTION("two floats") { + const char* input = + "\xDF\x00\x00\x00\x02\xA4zero\xCA\x00\x00\x00\x00\xA2pi\xCA\x40\x48" + "\xF5\xC3"; + + DeserializationError error = deserializeMsgPack(doc, input); + JsonObject obj = doc.as(); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(obj.size() == 2); + REQUIRE(obj["zero"] == 0.0f); + REQUIRE(obj["pi"] == 3.14f); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp new file mode 100644 index 0000000..bbe88ed --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp @@ -0,0 +1,395 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +template +static void checkValue(const char* input, T expected) { + JsonDocument doc; + + DeserializationError error = deserializeMsgPack(doc, input); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + REQUIRE(doc.as() == expected); +} + +static void checkError(size_t timebombCountDown, const char* input, + DeserializationError expected) { + TimebombAllocator timebomb(timebombCountDown); + JsonDocument doc(&timebomb); + + DeserializationError error = deserializeMsgPack(doc, input); + + CAPTURE(input); + REQUIRE(error == expected); +} + +TEST_CASE("deserialize MsgPack value") { + SECTION("nil") { + checkValue("\xc0", nullptr); + } + + SECTION("bool") { + checkValue("\xc2", false); + checkValue("\xc3", true); + } + + SECTION("positive fixint") { + checkValue("\x00", 0); + checkValue("\x7F", 127); + } + + SECTION("negative fixint") { + checkValue("\xe0", -32); + checkValue("\xff", -1); + } + + SECTION("uint 8") { + checkValue("\xcc\x00", 0); + checkValue("\xcc\xff", 255); + } + + SECTION("uint 16") { + checkValue("\xcd\x00\x00", 0); + checkValue("\xcd\xFF\xFF", 65535); + checkValue("\xcd\x30\x39", 12345); + } + + SECTION("uint 32") { + checkValue("\xCE\x00\x00\x00\x00", 0x00000000U); + checkValue("\xCE\xFF\xFF\xFF\xFF", 0xFFFFFFFFU); + checkValue("\xCE\x12\x34\x56\x78", 0x12345678U); + } + + SECTION("uint 64") { +#if ARDUINOJSON_USE_LONG_LONG + checkValue("\xCF\x00\x00\x00\x00\x00\x00\x00\x00", 0U); + checkValue("\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", + 0xFFFFFFFFFFFFFFFFU); + checkValue("\xCF\x12\x34\x56\x78\x9A\xBC\xDE\xF0", + 0x123456789ABCDEF0U); +#else + checkValue("\xCF\x00\x00\x00\x00\x00\x00\x00\x00", nullptr); + checkValue("\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", nullptr); + checkValue("\xCF\x12\x34\x56\x78\x9A\xBC\xDE\xF0", nullptr); +#endif + } + + SECTION("int 8") { + checkValue("\xd0\x00", 0); + checkValue("\xd0\xff", -1); + } + + SECTION("int 16") { + checkValue("\xD1\x00\x00", 0); + checkValue("\xD1\xFF\xFF", -1); + checkValue("\xD1\xCF\xC7", -12345); + } + + SECTION("int 32") { + checkValue("\xD2\x00\x00\x00\x00", 0); + checkValue("\xD2\xFF\xFF\xFF\xFF", -1); + checkValue("\xD2\xB6\x69\xFD\x2E", -1234567890); + } + + SECTION("int 64") { +#if ARDUINOJSON_USE_LONG_LONG + checkValue("\xD3\x00\x00\x00\x00\x00\x00\x00\x00", int64_t(0U)); + checkValue("\xD3\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", + int64_t(0xFFFFFFFFFFFFFFFFU)); + checkValue("\xD3\x12\x34\x56\x78\x9A\xBC\xDE\xF0", + int64_t(0x123456789ABCDEF0)); +#else + checkValue("\xD3\x00\x00\x00\x00\x00\x00\x00\x00", nullptr); + checkValue("\xD3\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", nullptr); + checkValue("\xD3\x12\x34\x56\x78\x9A\xBC\xDE\xF0", nullptr); +#endif + } + + SECTION("float 32") { + checkValue("\xCA\x00\x00\x00\x00", 0.0f); + checkValue("\xCA\x40\x48\xF5\xC3", 3.14f); + } + + SECTION("float 64") { + checkValue("\xCB\x00\x00\x00\x00\x00\x00\x00\x00", 0.0); + checkValue("\xCB\x40\x09\x21\xCA\xC0\x83\x12\x6F", 3.1415); + } + + SECTION("fixstr") { + checkValue("\xA0", std::string("")); + checkValue("\xABhello world", "hello world"_s); + checkValue("\xBFhello world hello world hello !", + "hello world hello world hello !"_s); + } + + SECTION("str 8") { + checkValue("\xd9\x05hello", "hello"_s); + } + + SECTION("str 16") { + checkValue("\xda\x00\x05hello", "hello"_s); + } + + SECTION("str 32") { + checkValue("\xdb\x00\x00\x00\x05hello", "hello"_s); + } + + SECTION("bin 8") { + JsonDocument doc; + + DeserializationError error = deserializeMsgPack(doc, "\xc4\x01?"); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + auto binary = doc.as(); + REQUIRE(binary.size() == 1); + REQUIRE(binary.data() != nullptr); + REQUIRE(reinterpret_cast(binary.data())[0] == '?'); + } + + SECTION("bin 16") { + JsonDocument doc; + auto str = std::string(256, '?'); + auto input = "\xc5\x01\x00"_s + str; + + DeserializationError error = deserializeMsgPack(doc, input); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + auto binary = doc.as(); + REQUIRE(binary.size() == 0x100); + REQUIRE(binary.data() != nullptr); + REQUIRE(std::string(reinterpret_cast(binary.data()), + binary.size()) == str); + } + + SECTION("fixext 1") { + JsonDocument doc; + + auto error = deserializeMsgPack(doc, "\xd4\x01\x02"); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + auto ext = doc.as(); + REQUIRE(ext.type() == 1); + REQUIRE(ext.size() == 1); + auto data = reinterpret_cast(ext.data()); + REQUIRE(data[0] == 2); + } + + SECTION("fixext 2") { + JsonDocument doc; + + auto error = deserializeMsgPack(doc, "\xd5\x01\x02\x03"); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + auto ext = doc.as(); + REQUIRE(ext.type() == 1); + REQUIRE(ext.size() == 2); + auto data = reinterpret_cast(ext.data()); + REQUIRE(data[0] == 2); + REQUIRE(data[1] == 3); + } + + SECTION("fixext 4") { + JsonDocument doc; + + auto error = deserializeMsgPack(doc, "\xd6\x01\x02\x03\x04\x05"); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + auto ext = doc.as(); + REQUIRE(ext.type() == 1); + REQUIRE(ext.size() == 4); + auto data = reinterpret_cast(ext.data()); + REQUIRE(data[0] == 2); + REQUIRE(data[1] == 3); + REQUIRE(data[2] == 4); + REQUIRE(data[3] == 5); + } + + SECTION("fixext 8") { + JsonDocument doc; + + auto error = deserializeMsgPack(doc, "\xd7\x01????????"); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + auto ext = doc.as(); + REQUIRE(ext.type() == 1); + REQUIRE(ext.size() == 8); + auto data = reinterpret_cast(ext.data()); + REQUIRE(data[0] == '?'); + REQUIRE(data[7] == '?'); + } + + SECTION("fixext 16") { + JsonDocument doc; + + auto error = deserializeMsgPack(doc, "\xd8\x01?????????????????"); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + auto ext = doc.as(); + REQUIRE(ext.type() == 1); + REQUIRE(ext.size() == 16); + auto data = reinterpret_cast(ext.data()); + REQUIRE(data[0] == '?'); + REQUIRE(data[15] == '?'); + } + + SECTION("ext 8") { + JsonDocument doc; + + auto error = deserializeMsgPack(doc, "\xc7\x02\x01\x03\x04"); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + auto ext = doc.as(); + REQUIRE(ext.type() == 1); + REQUIRE(ext.size() == 2); + auto data = reinterpret_cast(ext.data()); + REQUIRE(data[0] == 3); + REQUIRE(data[1] == 4); + } + + SECTION("ext 16") { + JsonDocument doc; + + auto error = deserializeMsgPack(doc, "\xc8\x00\x02\x01\x03\x04"); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + auto ext = doc.as(); + REQUIRE(ext.type() == 1); + REQUIRE(ext.size() == 2); + auto data = reinterpret_cast(ext.data()); + REQUIRE(data[0] == 3); + REQUIRE(data[1] == 4); + } + + SECTION("ext 32") { + JsonDocument doc; + + auto error = deserializeMsgPack(doc, "\xc9\x00\x00\x00\x02\x01\x03\x04"); + + REQUIRE(error == DeserializationError::Ok); + REQUIRE(doc.is()); + auto ext = doc.as(); + REQUIRE(ext.type() == 1); + REQUIRE(ext.size() == 2); + auto data = reinterpret_cast(ext.data()); + REQUIRE(data[0] == 3); + REQUIRE(data[1] == 4); + } +} + +TEST_CASE("deserializeMsgPack() under memory constaints") { + SECTION("single values always fit") { + checkError(0, "\xc0", DeserializationError::Ok); // nil + checkError(0, "\xc2", DeserializationError::Ok); // false + checkError(0, "\xc3", DeserializationError::Ok); // true + checkError(0, "\xcc\x00", DeserializationError::Ok); // uint 8 + checkError(0, "\xcd\x30\x39", DeserializationError::Ok); // uint 16 + checkError(0, "\xCE\x12\x34\x56\x78", + DeserializationError::Ok); // uint 32 + } + + SECTION("fixstr") { + checkError(2, "\xA7ZZZZZZZ", DeserializationError::Ok); + checkError(0, "\xA7ZZZZZZZ", DeserializationError::NoMemory); + } + + SECTION("str 8") { + checkError(2, "\xD9\x07ZZZZZZZ", DeserializationError::Ok); + checkError(0, "\xD9\x07ZZZZZZZ", DeserializationError::NoMemory); + } + + SECTION("str 16") { + checkError(2, "\xDA\x00\x07ZZZZZZZ", DeserializationError::Ok); + checkError(0, "\xDA\x00\x07ZZZZZZZ", DeserializationError::NoMemory); + } + + SECTION("str 32") { + checkError(2, "\xDB\x00\x00\x00\x07ZZZZZZZ", DeserializationError::Ok); + checkError(0, "\xDB\x00\x00\x00\x07ZZZZZZZ", + DeserializationError::NoMemory); + } + + SECTION("fixarray") { + checkError(0, "\x90", DeserializationError::Ok); // [] + checkError(0, "\x91\x01", + DeserializationError::NoMemory); // [1] + checkError(1, "\x91\x01", + DeserializationError::Ok); // [1] + } + + SECTION("array 16") { + checkError(0, "\xDC\x00\x00", DeserializationError::Ok); + checkError(0, "\xDC\x00\x01\x01", DeserializationError::NoMemory); + checkError(1, "\xDC\x00\x01\x01", DeserializationError::Ok); + } + + SECTION("array 32") { + checkError(0, "\xDD\x00\x00\x00\x00", DeserializationError::Ok); + checkError(0, "\xDD\x00\x00\x00\x01\x01", DeserializationError::NoMemory); + checkError(1, "\xDD\x00\x00\x00\x01\x01", DeserializationError::Ok); + } + + SECTION("fixmap") { + SECTION("{}") { + checkError(0, "\x80", DeserializationError::Ok); + } + SECTION("{Hello:1}") { + checkError(1, "\x81\xA5Hello\x01", DeserializationError::NoMemory); + checkError(2, "\x81\xA5Hello\x01", DeserializationError::Ok); + } + SECTION("{Hello:1,World:2}") { + checkError(2, "\x82\xA5Hello\x01\xA5World\x02", + DeserializationError::NoMemory); + checkError(3, "\x82\xA5Hello\x01\xA5World\x02", DeserializationError::Ok); + } + } + + SECTION("map 16") { + SECTION("{}") { + checkError(0, "\xDE\x00\x00", DeserializationError::Ok); + } + SECTION("{Hello:1}") { + checkError(1, "\xDE\x00\x01\xA5Hello\x01", + DeserializationError::NoMemory); + checkError(2, "\xDE\x00\x01\xA5Hello\x01", DeserializationError::Ok); + } + SECTION("{Hello:1,World:2}") { + checkError(2, "\xDE\x00\x02\xA5Hello\x01\xA5World\x02", + DeserializationError::NoMemory); + checkError(3, "\xDE\x00\x02\xA5Hello\x01\xA5World\x02", + DeserializationError::Ok); + } + } + + SECTION("map 32") { + SECTION("{}") { + checkError(0, "\xDF\x00\x00\x00\x00", DeserializationError::Ok); + } + SECTION("{H:1}") { + checkError(1, "\xDF\x00\x00\x00\x01\xA1H\x01", + DeserializationError::NoMemory); + checkError(2, "\xDF\x00\x00\x00\x01\xA1H\x01", DeserializationError::Ok); + } + SECTION("{Hello:1,World:2}") { + checkError(2, "\xDF\x00\x00\x00\x02\xA5Hello\x01\xA5World\x02", + DeserializationError::NoMemory); + checkError(3, "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02", + DeserializationError::Ok); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/destination_types.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/destination_types.cpp new file mode 100644 index 0000000..6b437ec --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/destination_types.cpp @@ -0,0 +1,109 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofArray; +using ArduinoJson::detail::sizeofObject; + +TEST_CASE("deserializeMsgPack(JsonDocument&)") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc.add("hello"_s); + spy.clearLog(); + + auto err = deserializeMsgPack(doc, "\x91\x2A"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "[42]"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofPool()), + Deallocate(sizeofString("hello")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofArray(1)), + }); +} + +TEST_CASE("deserializeMsgPack(JsonVariant)") { + SECTION("variant is bound") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc.add("hello"_s); + spy.clearLog(); + + JsonVariant variant = doc[0]; + + auto err = deserializeMsgPack(variant, "\x91\x2A"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "[[42]]"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("hello")), + }); + } + + SECTION("variant is unbound") { + JsonVariant variant; + + auto err = deserializeMsgPack(variant, "\x91\x2A"); + + REQUIRE(err == DeserializationError::NoMemory); + } +} + +TEST_CASE("deserializeMsgPack(ElementProxy)") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc.add("hello"_s); + spy.clearLog(); + + SECTION("element already exists") { + auto err = deserializeMsgPack(doc[0], "\x91\x2A"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "[[42]]"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("hello")), + }); + } + + SECTION("element must be created exists") { + auto err = deserializeMsgPack(doc[1], "\x91\x2A"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "[\"hello\",[42]]"); + REQUIRE(spy.log() == AllocatorLog{}); + } +} + +TEST_CASE("deserializeMsgPack(MemberProxy)") { + SpyingAllocator spy; + JsonDocument doc(&spy); + doc["hello"_s] = "world"_s; + spy.clearLog(); + + SECTION("member already exists") { + auto err = deserializeMsgPack(doc["hello"], "\x91\x2A"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "{\"hello\":[42]}"); + REQUIRE(spy.log() == AllocatorLog{ + Deallocate(sizeofString("world")), + }); + } + + SECTION("member must be created") { + auto err = deserializeMsgPack(doc["value"], "\x91\x2A"); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.as() == "{\"hello\":\"world\",\"value\":[42]}"); + REQUIRE(spy.log() == AllocatorLog{}); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp new file mode 100644 index 0000000..6eadd0e --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp @@ -0,0 +1,25 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +using namespace ArduinoJson::detail; + +template +static void check(const char* input, T expected) { + T actual; + uint8_t* f = reinterpret_cast(&actual); + const uint8_t* d = reinterpret_cast(input); + doubleToFloat(d, f); + fixEndianness(actual); + CHECK(actual == expected); +} + +TEST_CASE("doubleToFloat()") { + check("\x40\x09\x21\xCA\xC0\x83\x12\x6F", 3.1415f); + check("\x00\x00\x00\x00\x00\x00\x00\x00", 0.0f); + check("\x80\x00\x00\x00\x00\x00\x00\x00", -0.0f); + check("\xC0\x5E\xDC\xCC\xCC\xCC\xCC\xCD", -123.45f); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/errors.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/errors.cpp new file mode 100644 index 0000000..9a8119e --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/errors.cpp @@ -0,0 +1,242 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +#include "Allocators.hpp" + +TEST_CASE("deserializeMsgPack() returns InvalidInput") { + JsonDocument doc; + + SECTION("integer as key") { + auto err = deserializeMsgPack(doc, "\x81\x01\xA1H", 3); + REQUIRE(err == DeserializationError::InvalidInput); + } +} + +TEST_CASE("deserializeMsgPack() returns EmptyInput") { + JsonDocument doc; + + SECTION("from sized buffer") { + auto err = deserializeMsgPack(doc, "", 0); + + REQUIRE(err == DeserializationError::EmptyInput); + } + + SECTION("from stream") { + std::istringstream input(""); + + auto err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::EmptyInput); + } +} + +static void testIncompleteInput(const char* input, size_t len) { + JsonDocument doc; + REQUIRE(deserializeMsgPack(doc, input, len) == DeserializationError::Ok); + + while (--len) { + REQUIRE(deserializeMsgPack(doc, input, len) == + DeserializationError::IncompleteInput); + } +} + +TEST_CASE("deserializeMsgPack() returns IncompleteInput") { + SECTION("empty input") { + testIncompleteInput("\x00", 1); + } + + SECTION("fixarray") { + testIncompleteInput("\x91\x01", 2); + } + + SECTION("array 16") { + testIncompleteInput("\xDC\x00\x01\x01", 4); + } + + SECTION("array 32") { + testIncompleteInput("\xDD\x00\x00\x00\x01\x01", 6); + } + + SECTION("fixmap") { + testIncompleteInput("\x81\xA3one\x01", 6); + } + + SECTION("map 16") { + testIncompleteInput("\xDE\x00\x01\xA3one\x01", 8); + } + + SECTION("map 32") { + testIncompleteInput("\xDF\x00\x00\x00\x01\xA3one\x01", 10); + testIncompleteInput("\xDF\x00\x00\x00\x01\xd9\x03one\x01", 11); + } + + SECTION("uint 8") { + testIncompleteInput("\xcc\x01", 2); + } + + SECTION("uint 16") { + testIncompleteInput("\xcd\x00\x01", 3); + } + + SECTION("uint 32") { + testIncompleteInput("\xCE\x00\x00\x00\x01", 5); + } + +#if ARDUINOJSON_USE_LONG_LONG + SECTION("uint 64") { + testIncompleteInput("\xCF\x00\x00\x00\x00\x00\x00\x00\x00", 9); + } +#endif + + SECTION("int 8") { + testIncompleteInput("\xD0\x01", 2); + } + + SECTION("int 16") { + testIncompleteInput("\xD1\x00\x01", 3); + } + + SECTION("int 32") { + testIncompleteInput("\xD2\x00\x00\x00\x01", 5); + } + +#if ARDUINOJSON_USE_LONG_LONG + SECTION("int 64") { + testIncompleteInput("\xD3\x00\x00\x00\x00\x00\x00\x00\x00", 9); + } +#endif + + SECTION("float 32") { + testIncompleteInput("\xCA\x40\x48\xF5\xC3", 5); + } + + SECTION("float 64") { + testIncompleteInput("\xCB\x40\x09\x21\xCA\xC0\x83\x12\x6F", 9); + } + + SECTION("fixstr") { + testIncompleteInput("\xABhello world", 12); + } + + SECTION("str 8") { + testIncompleteInput("\xd9\x05hello", 7); + } + + SECTION("str 16") { + testIncompleteInput("\xda\x00\x05hello", 8); + } + + SECTION("str 32") { + testIncompleteInput("\xdb\x00\x00\x00\x05hello", 10); + } + + SECTION("bin 8") { + testIncompleteInput("\xc4\x01X", 3); + } + + SECTION("bin 16") { + testIncompleteInput("\xc5\x00\x01X", 4); + } + + SECTION("bin 32") { + testIncompleteInput("\xc6\x00\x00\x00\x01X", 6); + } + + SECTION("ext 8") { + testIncompleteInput("\xc7\x01\x01\x01", 4); + } + + SECTION("ext 16") { + testIncompleteInput("\xc8\x00\x01\x01\x01", 5); + } + + SECTION("ext 32") { + testIncompleteInput("\xc9\x00\x00\x00\x01\x01\x01", 7); + } + + SECTION("fixext 1") { + testIncompleteInput("\xd4\x01\x01", 3); + } + + SECTION("fixext 2") { + testIncompleteInput("\xd5\x01\x01\x02", 4); + } + + SECTION("fixext 4") { + testIncompleteInput("\xd6\x01\x01\x02\x03\x04", 6); + } + + SECTION("fixext 8") { + testIncompleteInput("\xd7\x01\x01\x02\x03\x04\x05\x06\x07\x08", 10); + } + + SECTION("fixext 16") { + testIncompleteInput( + "\xd8\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E" + "\x0F\x10", + 18); + } +} + +TEST_CASE( + "deserializeMsgPack() returns NoMemory when string allocation fails") { + TimebombAllocator allocator(0); + JsonDocument doc(&allocator); + + SECTION("fixstr") { + DeserializationError err = deserializeMsgPack(doc, "\xA5hello", 9); + REQUIRE(err == DeserializationError::NoMemory); + } + + SECTION("bin 8") { + DeserializationError err = deserializeMsgPack(doc, "\xC4\x01X", 3); + REQUIRE(err == DeserializationError::NoMemory); + } +} + +TEST_CASE( + "deserializeMsgPack() returns NoMemory if extension allocation fails") { + JsonDocument doc(FailingAllocator::instance()); + + SECTION("uint32_t should pass") { + auto err = deserializeMsgPack(doc, "\xceXXXX"); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("uint64_t should fail") { + auto err = deserializeMsgPack(doc, "\xcfXXXXXXXX"); + + REQUIRE(err == DeserializationError::NoMemory); + } + + SECTION("int32_t should pass") { + auto err = deserializeMsgPack(doc, "\xd2XXXX"); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("int64_t should fail") { + auto err = deserializeMsgPack(doc, "\xd3XXXXXXXX"); + + REQUIRE(err == DeserializationError::NoMemory); + } + + SECTION("float should pass") { + auto err = deserializeMsgPack(doc, "\xcaXXXX"); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("double should fail") { + auto err = deserializeMsgPack(doc, "\xcbXXXXXXXX"); + + REQUIRE(err == DeserializationError::NoMemory); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/filter.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/filter.cpp new file mode 100644 index 0000000..6bcd7b1 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/filter.cpp @@ -0,0 +1,1628 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using namespace ArduinoJson::detail; + +TEST_CASE("deserializeMsgPack() filter") { + SpyingAllocator spy; + JsonDocument doc(&spy); + DeserializationError error; + + JsonDocument filter; + DeserializationOption::Filter filterOpt(filter); + + SECTION("root is fixmap") { + SECTION("filter = {include:true,ignore:false)") { + filter["include"] = true; + filter["ignore"] = false; + + SECTION("input truncated after ignored key") { + error = deserializeMsgPack(doc, "\x82\xA6ignore", 8, filterOpt); + + CHECK(error == DeserializationError::IncompleteInput); + CHECK(doc.as() == "{}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + }); + } + + SECTION("input truncated after inside skipped uint 8") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\xCC\x2A\xA7include\x2A", + 9, filterOpt); + + CHECK(error == DeserializationError::IncompleteInput); + CHECK(doc.as() == "{}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + }); + } + + SECTION("input truncated after before skipped string size") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\xd9", 9, filterOpt); + + CHECK(error == DeserializationError::IncompleteInput); + CHECK(doc.as() == "{}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + }); + } + + SECTION("input truncated after before skipped ext size") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\xC7", 9, filterOpt); + + CHECK(error == DeserializationError::IncompleteInput); + CHECK(doc.as() == "{}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + }); + } + + SECTION("skip nil") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\xC0\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("reject 0xc1") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\xC1\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::InvalidInput); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + }); + } + + SECTION("skip false") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\xC2\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip true") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\xC3\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip positive fixint") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\x2A\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip negative fixint") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\xFF\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip uint 8") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\xCC\x2A\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip int 8") { + error = deserializeMsgPack(doc, "\x82\xA6ignore\xD0\x2A\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip uint 16") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xcd\x30\x39\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip int 16") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xD1\xCF\xC7\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip uint 32") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xCE\x12\x34\x56\x78\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip int 32") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xD2\xB6\x69\xFD\x2E\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip uint 64") { + error = deserializeMsgPack( + doc, + "\x82\xA6ignore\xCF\x12\x34\x56\x78\x9A\xBC\xDE\xF0\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip int 64") { + error = deserializeMsgPack( + doc, + "\x82\xA6ignore\xD3\x12\x34\x56\x78\x9A\xBC\xDE\xF0\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip float 32") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xCA\x40\x48\xF5\xC3\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip float 64") { + error = deserializeMsgPack( + doc, + "\x82\xA6ignore\xCB\x40\x09\x21\xCA\xC0\x83\x12\x6F\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip fixstr") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xABhello world\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip str 8") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xd9\x05hello\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip str 16") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xda\x00\x05hello\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip str 32") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xdb\x00\x00\x00\x05hello\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip bin 8") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xC4\x05hello\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip bin 16") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xC5\x00\x05hello\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip bin 32") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xC6\x00\x00\x00\x05hello\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip fixarray") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\x92\x01\x02\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip array 16") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\xDC\x00\x02\xA5hello\xA5world\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip array 32") { + error = deserializeMsgPack( + doc, + "\x82\xA6ignore" + "\xDD\x00\x00\x00\x02\xCA\x00\x00\x00\x00\xCA\x40\x48\xF5\xC3" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip fixmap") { + error = deserializeMsgPack( + doc, "\x82\xA6ignore\x82\xA3one\x01\xA3two\x02\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip map 16") { + error = deserializeMsgPack(doc, + "\x82\xA6ignore" + "\xDE\x00\x02\xA1H\xA5hello\xA1W\xA5world" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip map 32") { + error = deserializeMsgPack(doc, + "\x82\xA6ignore" + "\xDF\x00\x00\x00\x02" + "\xA4zero\xCA\x00\x00\x00\x00" + "\xA2pi\xCA\x40\x48\xF5\xC3" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip fixext 1") { + error = deserializeMsgPack(doc, + "\x82\xA6ignore" + "\xd4\x01\x02" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip fixext 2") { + error = deserializeMsgPack(doc, + "\x82\xA6ignore" + "\xd5\x01\x02\x03" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip fixext 4") { + error = deserializeMsgPack(doc, + "\x82\xA6ignore" + "\xd6\x01\x02\x03\x04\x05" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip fixext 8") { + error = deserializeMsgPack(doc, + "\x82\xA6ignore" + "\xd7\x01\x02\x03\x04\x05\x06\x07\x08\x09" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip fixext 16") { + error = + deserializeMsgPack(doc, + "\x82\xA6ignore" + "\xd8\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A" + "\x0B\x0C\x0D\x0E\x0F\x10\x11" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip ext 8") { + error = deserializeMsgPack(doc, + "\x82\xA6ignore" + "\xc7\x02\x00\x01\x02" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip ext 16") { + error = deserializeMsgPack(doc, + "\x82\xA6ignore" + "\xc8\x00\x02\x00\x01\x02" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + + SECTION("skip ext 32") { + error = deserializeMsgPack(doc, + "\x82\xA6ignore" + "\xc9\x00\x00\x00\x02\x00\x01\x02" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("ignore")), + Deallocate(sizeofString("ignore")), + Allocate(sizeofString("include")), + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofObject(1)), + }); + } + } + + SECTION("Filter = {arronly:[{measure:true}],include:true}") { + filter["onlyarr"][0]["measure"] = true; + filter["include"] = true; + + CAPTURE(filter.as()); + + SECTION("include fixarray") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyarr\x92" + "\x82\xA8location\x01\xA7measure\x02" + "\x82\xA8location\x02\xA7measure\x04" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == + "{\"onlyarr\":[{\"measure\":2},{\"measure\":4}],\"include\":42}"); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("location")), + Reallocate(sizeofString("location"), sizeofString("measure")), + Allocate(sizeofString("location")), + Reallocate(sizeofString("location"), sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2) + sizeofArray(2) + + 2 * sizeofObject(1)), + }); + } + + SECTION("include array 16") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyarr" + "\xDC\x00\x02" + "\x82\xA8location\x01\xA7measure\x02" + "\x82\xA8location\x02\xA7measure\x04" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == + "{\"onlyarr\":[{\"measure\":2},{\"measure\":4}],\"include\":42}"); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("location")), + Reallocate(sizeofString("location"), sizeofString("measure")), + Allocate(sizeofString("location")), + Reallocate(sizeofString("location"), sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2) + sizeofArray(2) + + 2 * sizeofObject(1)), + }); + } + + SECTION("include array 32") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyarr" + "\xDD\x00\x00\x00\x02" + "\x82\xA8location\x01\xA7measure\x02" + "\x82\xA8location\x02\xA7measure\x04" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == + "{\"onlyarr\":[{\"measure\":2},{\"measure\":4}],\"include\":42}"); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("location")), + Reallocate(sizeofString("location"), sizeofString("measure")), + Allocate(sizeofString("location")), + Reallocate(sizeofString("location"), sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2) + sizeofArray(2) + + 2 * sizeofObject(1)), + }); + } + + SECTION("skip null") { + error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xC0\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip false") { + error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xC2\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip true") { + error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xC3\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip positive fixint") { + error = deserializeMsgPack(doc, "\x82\xA7onlyarr\x2A\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip negative fixint") { + error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xFF\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip uint 8") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xCC\x2A\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip uint 16") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xcd\x30\x39\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip uint 32") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xCE\x12\x34\x56\x78\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip uint 64") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyarr\xCF\x12\x34\x56\x78\x9A\xBC" + "\xDE\xF0\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip int 8") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xD0\x2A\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip int 16") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xD1\xCF\xC7\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip int 32") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xD2\xB6\x69\xFD\x2E\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip int 64") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyarr\xD3\x12\x34\x56\x78\x9A\xBC" + "\xDE\xF0\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip float 32") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xCA\x40\x48\xF5\xC3\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip float 64") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyarr\xCB\x40\x09\x21\xCA\xC0\x83" + "\x12\x6F\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip fixstr") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xABhello world\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip str 8") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xd9\x05hello\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + } + + SECTION("skip str 16") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xda\x00\x05hello\xA7include\x2A", filterOpt); + + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + } + + SECTION("skip str 32") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\xdb\x00\x00\x00\x05hello\xA7include\x2A", + filterOpt); + + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip fixmap") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyarr\x82\xA3one\x01\xA3two\x02\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("one")), + Deallocate(sizeofString("one")), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip map 16") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyarr" + "\xDE\x00\x02\xA1H\xA5hello\xA1W\xA5world" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("H")), + Deallocate(sizeofString("H")), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip map 32") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyarr" + "\xDF\x00\x00\x00\x02" + "\xA4zero\xCA\x00\x00\x00\x00" + "\xA2pi\xCA\x40\x48\xF5\xC3" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("zero")), + Deallocate(sizeofString("zero")), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + } + } + + SECTION("root is fixarray") { + SECTION("filter = [false, true]") { + filter[0] = false; // only the first elment of the filter matters + filter[1] = true; // so this one is ignored + + SECTION("input = [1,2,3]") { + error = deserializeMsgPack(doc, "\x93\x01\x02\x03", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "[]"); + CHECK(spy.log() == AllocatorLog()); + } + } + + SECTION("filter = [true, false]") { + filter[0] = true; // only the first elment of the filter matters + filter[1] = false; // so this one is ignored + + SECTION("input = [1,2,3]") { + error = deserializeMsgPack(doc, "\x93\x01\x02\x03", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "[1,2,3]"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofArray(3)), + }); + } + } + } + + SECTION("Filter = {onlyobj:{measure:true},include:true}") { + filter["onlyobj"]["measure"] = true; + filter["include"] = true; + + CAPTURE(filter.as()); + + SECTION("include fixmap") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyobj" + "\x82\xA8location\x01\xA7measure\x02" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == + "{\"onlyobj\":{\"measure\":2},\"include\":42}"); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofString("onlyobj")), + Allocate(sizeofPool()), + Allocate(sizeofString("location")), + Reallocate(sizeofString("location"), sizeofString("measure")), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2) + sizeofObject(1)), + }); + } + + SECTION("include map 16") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyobj" + "\xDE\x00\x02\xA8location\x01\xA7measure\x02" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == + "{\"onlyobj\":{\"measure\":2},\"include\":42}"); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofString("onlyobj")), + Allocate(sizeofPool()), + Allocate(sizeofString("location")), + Reallocate(sizeofString("location"), sizeofString("measure")), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2) + sizeofObject(1)), + }); + } + + SECTION("include map 32") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyobj" + "\xDF\x00\x00\x00\x02" + "\xA8location\x01\xA7measure\x02" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == + "{\"onlyobj\":{\"measure\":2},\"include\":42}"); + CHECK(spy.log() == + AllocatorLog{ + Allocate(sizeofString("onlyobj")), + Allocate(sizeofPool()), + Allocate(sizeofString("location")), + Reallocate(sizeofString("location"), sizeofString("measure")), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2) + sizeofObject(1)), + }); + } + + SECTION("skip null") { + error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xC0\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip false") { + error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xC2\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip true") { + error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xC3\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip positive fixint") { + error = deserializeMsgPack(doc, "\x82\xA7onlyobj\x2A\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip negative fixint") { + error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xFF\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip uint 8") { + error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xCC\x2A\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip uint 16") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyobj\xcd\x30\x39\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip uint 32") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyobj\xCE\x12\x34\x56\x78\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip uint 64") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyobj\xCF\x12\x34\x56\x78\x9A\xBC" + "\xDE\xF0\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip int 8") { + error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xD0\x2A\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip int 16") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyobj\xD1\xCF\xC7\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip int 32") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyobj\xD2\xB6\x69\xFD\x2E\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip int 64") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyobj\xD3\x12\x34\x56\x78\x9A\xBC" + "\xDE\xF0\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip float 32") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyobj\xCA\x40\x48\xF5\xC3\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip float 64") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyobj\xCB\x40\x09\x21\xCA\xC0\x83" + "\x12\x6F\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip fixstr") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyobj\xABhello world\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip str 8") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyobj\xd9\x05hello\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + } + + SECTION("skip str 16") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyobj\xda\x00\x05hello\xA7include\x2A", filterOpt); + + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + } + + SECTION("skip str 32") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyobj\xdb\x00\x00\x00\x05hello\xA7include\x2A", + filterOpt); + + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip fixarray") { + error = deserializeMsgPack( + doc, "\x82\xA7onlyobj\x92\x01\x02\xA7include\x2A", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip array 16") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyobj\xDC\x00\x01\xA7" + "example\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + + SECTION("skip array 32") { + error = deserializeMsgPack(doc, + "\x82\xA7onlyobj" + "\xDD\x00\x00\x00\x02\x01\x02" + "\xA7include\x2A", + filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); + CHECK(spy.log() == AllocatorLog{ + Allocate(sizeofString("onlyarr")), + Allocate(sizeofPool()), + Allocate(sizeofString("include")), + Reallocate(sizeofPool(), sizeofObject(2)), + }); + } + } + + SECTION("filter = true") { + filter.set(true); + + error = deserializeMsgPack(doc, "\x90", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.is() == true); + CHECK(doc.size() == 0); + } + + SECTION("filter = false") { + filter.set(false); + + SECTION("input = fixarray") { + error = deserializeMsgPack(doc, "\x92\x01\x02", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.isNull() == true); + } + + SECTION("input = array 16") { + error = deserializeMsgPack(doc, "\xDC\x00\x02\x01\x02", filterOpt); + + CHECK(error == DeserializationError::Ok); + CHECK(doc.isNull() == true); + } + + SECTION("array too deep") { + error = deserializeMsgPack(doc, "\x91\x91\x91\x91\x91", 5, filterOpt, + DeserializationOption::NestingLimit(4)); + + CHECK(error == DeserializationError::TooDeep); + } + + SECTION("object too deep") { + error = deserializeMsgPack( + doc, "\x81\xA1z\x81\xA1z\x81\xA1z\x81\xA1z\x81\xA1z", 15, filterOpt, + DeserializationOption::NestingLimit(4)); + + CHECK(error == DeserializationError::TooDeep); + } + } +} + +TEST_CASE("Zero-copy mode") { // issue #1697 + char input[] = "\x82\xA7include\x01\xA6ignore\x02"; + + JsonDocument filter; + filter["include"] = true; + + JsonDocument doc; + DeserializationError err = + deserializeMsgPack(doc, input, 18, DeserializationOption::Filter(filter)); + + CHECK(err == DeserializationError::Ok); + CHECK(doc.as() == "{\"include\":1}"); +} + +TEST_CASE("Overloads") { + JsonDocument doc; + JsonDocument filter; + + using namespace DeserializationOption; + + // deserializeMsgPack(..., Filter) + + SECTION("const char*, Filter") { + deserializeMsgPack(doc, "{}", Filter(filter)); + } + + SECTION("const char*, size_t, Filter") { + deserializeMsgPack(doc, "{}", 2, Filter(filter)); + } + + SECTION("const std::string&, Filter") { + deserializeMsgPack(doc, "{}"_s, Filter(filter)); + } + + SECTION("std::istream&, Filter") { + std::stringstream s("{}"); + deserializeMsgPack(doc, s, Filter(filter)); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("char[n], Filter") { + size_t i = 4; + char vla[i]; + strcpy(vla, "{}"); + deserializeMsgPack(doc, vla, Filter(filter)); + } +#endif + + // deserializeMsgPack(..., Filter, NestingLimit) + + SECTION("const char*, Filter, NestingLimit") { + deserializeMsgPack(doc, "{}", Filter(filter), NestingLimit(5)); + } + + SECTION("const char*, size_t, Filter, NestingLimit") { + deserializeMsgPack(doc, "{}", 2, Filter(filter), NestingLimit(5)); + } + + SECTION("const std::string&, Filter, NestingLimit") { + deserializeMsgPack(doc, "{}"_s, Filter(filter), NestingLimit(5)); + } + + SECTION("std::istream&, Filter, NestingLimit") { + std::stringstream s("{}"); + deserializeMsgPack(doc, s, Filter(filter), NestingLimit(5)); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("char[n], Filter, NestingLimit") { + size_t i = 4; + char vla[i]; + strcpy(vla, "{}"); + deserializeMsgPack(doc, vla, Filter(filter), NestingLimit(5)); + } +#endif + + // deserializeMsgPack(..., NestingLimit, Filter) + + SECTION("const char*, NestingLimit, Filter") { + deserializeMsgPack(doc, "{}", NestingLimit(5), Filter(filter)); + } + + SECTION("const char*, size_t, NestingLimit, Filter") { + deserializeMsgPack(doc, "{}", 2, NestingLimit(5), Filter(filter)); + } + + SECTION("const std::string&, NestingLimit, Filter") { + deserializeMsgPack(doc, "{}"_s, NestingLimit(5), Filter(filter)); + } + + SECTION("std::istream&, NestingLimit, Filter") { + std::stringstream s("{}"); + deserializeMsgPack(doc, s, NestingLimit(5), Filter(filter)); + } + +#ifdef HAS_VARIABLE_LENGTH_ARRAY + SECTION("char[n], NestingLimit, Filter") { + size_t i = 4; + char vla[i]; + strcpy(vla, "{}"); + deserializeMsgPack(doc, vla, NestingLimit(5), Filter(filter)); + } +#endif +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp new file mode 100644 index 0000000..42f6137 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp @@ -0,0 +1,96 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "CustomReader.hpp" +#include "Literals.hpp" + +using ArduinoJson::detail::sizeofObject; + +TEST_CASE("deserializeMsgPack(const std::string&)") { + JsonDocument doc; + + SECTION("should accept const string") { + const std::string input("\x92\x01\x02"); + + DeserializationError err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("should accept temporary string") { + DeserializationError err = deserializeMsgPack(doc, "\x92\x01\x02"_s); + + REQUIRE(err == DeserializationError::Ok); + } + + SECTION("should duplicate content") { + std::string input("\x91\xA5hello"); + + DeserializationError err = deserializeMsgPack(doc, input); + input[2] = 'X'; // alter the string tomake sure we made a copy + + JsonArray array = doc.as(); + REQUIRE(err == DeserializationError::Ok); + REQUIRE("hello"_s == array[0]); + } + + SECTION("should accept a zero in input") { + DeserializationError err = deserializeMsgPack(doc, "\x92\x00\x02"_s); + + REQUIRE(err == DeserializationError::Ok); + JsonArray arr = doc.as(); + REQUIRE(arr[0] == 0); + REQUIRE(arr[1] == 2); + } +} + +TEST_CASE("deserializeMsgPack(std::istream&)") { + JsonDocument doc; + + SECTION("should accept a zero in input") { + std::istringstream input("\x92\x00\x02"_s); + + DeserializationError err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::Ok); + JsonArray arr = doc.as(); + REQUIRE(arr[0] == 0); + REQUIRE(arr[1] == 2); + } + + SECTION("should detect incomplete input") { + std::istringstream input("\x92\x00\x02"); + + DeserializationError err = deserializeMsgPack(doc, input); + + REQUIRE(err == DeserializationError::IncompleteInput); + } +} + +#ifdef HAS_VARIABLE_LENGTH_ARRAY +TEST_CASE("deserializeMsgPack(VLA)") { + size_t i = 16; + char vla[i]; + memcpy(vla, "\xDE\x00\x01\xA5Hello\xA5world", 15); + + JsonDocument doc; + DeserializationError err = deserializeMsgPack(doc, vla); + + REQUIRE(err == DeserializationError::Ok); +} +#endif + +TEST_CASE("deserializeMsgPack(CustomReader)") { + JsonDocument doc; + CustomReader reader("\x92\xA5Hello\xA5world"); + DeserializationError err = deserializeMsgPack(doc, reader); + + REQUIRE(err == DeserializationError::Ok); + REQUIRE(doc.size() == 2); + REQUIRE(doc[0] == "Hello"); + REQUIRE(doc[1] == "world"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp new file mode 100644 index 0000000..a41ea0a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp @@ -0,0 +1,87 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include + +#define SHOULD_WORK(expression) REQUIRE(DeserializationError::Ok == expression); +#define SHOULD_FAIL(expression) \ + REQUIRE(DeserializationError::TooDeep == expression); + +TEST_CASE("JsonDeserializer nesting") { + JsonDocument doc; + + SECTION("Input = const char*") { + SECTION("limit = 0") { + DeserializationOption::NestingLimit nesting(0); + SHOULD_WORK(deserializeMsgPack(doc, "\xA1H", nesting)); // "H" + SHOULD_FAIL(deserializeMsgPack(doc, "\x90", nesting)); // [] + SHOULD_FAIL(deserializeMsgPack(doc, "\x80", nesting)); // {} + } + + SECTION("limit = 1") { + DeserializationOption::NestingLimit nesting(1); + SHOULD_WORK(deserializeMsgPack(doc, "\x90", nesting)); // {} + SHOULD_WORK(deserializeMsgPack(doc, "\x80", nesting)); // [] + SHOULD_FAIL(deserializeMsgPack(doc, "\x81\xA1H\x80", nesting)); // {H:{}} + SHOULD_FAIL(deserializeMsgPack(doc, "\x91\x90", nesting)); // [[]] + } + } + + SECTION("char* and size_t") { + SECTION("limit = 0") { + DeserializationOption::NestingLimit nesting(0); + SHOULD_WORK(deserializeMsgPack(doc, "\xA1H", 2, nesting)); + SHOULD_FAIL(deserializeMsgPack(doc, "\x90", 1, nesting)); + SHOULD_FAIL(deserializeMsgPack(doc, "\x80", 1, nesting)); + } + + SECTION("limit = 1") { + DeserializationOption::NestingLimit nesting(1); + SHOULD_WORK(deserializeMsgPack(doc, "\x90", 1, nesting)); + SHOULD_WORK(deserializeMsgPack(doc, "\x80", 1, nesting)); + SHOULD_FAIL(deserializeMsgPack(doc, "\x81\xA1H\x80", 4, nesting)); + SHOULD_FAIL(deserializeMsgPack(doc, "\x91\x90", 2, nesting)); + } + } + + SECTION("Input = std::string") { + using std::string; + + SECTION("limit = 0") { + DeserializationOption::NestingLimit nesting(0); + SHOULD_WORK(deserializeMsgPack(doc, string("\xA1H"), nesting)); + SHOULD_FAIL(deserializeMsgPack(doc, string("\x90"), nesting)); + SHOULD_FAIL(deserializeMsgPack(doc, string("\x80"), nesting)); + } + + SECTION("limit = 1") { + DeserializationOption::NestingLimit nesting(1); + SHOULD_WORK(deserializeMsgPack(doc, string("\x90"), nesting)); + SHOULD_WORK(deserializeMsgPack(doc, string("\x80"), nesting)); + SHOULD_FAIL(deserializeMsgPack(doc, string("\x81\xA1H\x80"), nesting)); + SHOULD_FAIL(deserializeMsgPack(doc, string("\x91\x90"), nesting)); + } + } + + SECTION("Input = std::istream") { + SECTION("limit = 0") { + DeserializationOption::NestingLimit nesting(0); + std::istringstream good("\xA1H"); // "H" + std::istringstream bad("\x90"); // [] + SHOULD_WORK(deserializeMsgPack(doc, good, nesting)); + SHOULD_FAIL(deserializeMsgPack(doc, bad, nesting)); + } + + SECTION("limit = 1") { + DeserializationOption::NestingLimit nesting(1); + std::istringstream good("\x90"); // [] + std::istringstream bad("\x91\x90"); // [[]] + SHOULD_WORK(deserializeMsgPack(doc, good, nesting)); + SHOULD_FAIL(deserializeMsgPack(doc, bad, nesting)); + } + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt new file mode 100644 index 0000000..8f484bb --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt @@ -0,0 +1,19 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(MsgPackSerializerTests + destination_types.cpp + measure.cpp + misc.cpp + serializeArray.cpp + serializeObject.cpp + serializeVariant.cpp +) + +add_test(MsgPackSerializer MsgPackSerializerTests) + +set_tests_properties(MsgPackSerializer + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp new file mode 100644 index 0000000..160ca8a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp @@ -0,0 +1,59 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("serialize MsgPack to various destination types") { + JsonDocument doc; + JsonObject object = doc.to(); + object["hello"] = "world"; + const char* expected_result = "\x81\xA5hello\xA5world"; + const size_t expected_length = 13; + + SECTION("std::string") { + std::string result; + size_t len = serializeMsgPack(object, result); + + REQUIRE(expected_result == result); + REQUIRE(expected_length == len); + } + + /* SECTION("std::vector") { + std::vector result; + size_t len = serializeMsgPack(object, result); + + REQUIRE(std::vector(expected_result, expected_result + 13) == + result); + REQUIRE(expected_length == len); + } */ + + SECTION("char[] larger than needed") { + char result[64]; + memset(result, 42, sizeof(result)); + size_t len = serializeMsgPack(object, result); + + REQUIRE(expected_length == len); + REQUIRE(std::string(expected_result, len) == std::string(result, len)); + REQUIRE(result[len] == 42); + } + + SECTION("char[] of the right size") { // #1545 + char result[13]; + size_t len = serializeMsgPack(object, result); + + REQUIRE(expected_length == len); + REQUIRE(std::string(expected_result, len) == std::string(result, len)); + } + + SECTION("char*") { + char result[64]; + memset(result, 42, sizeof(result)); + size_t len = serializeMsgPack(object, result, 64); + + REQUIRE(expected_length == len); + REQUIRE(std::string(expected_result, len) == std::string(result, len)); + REQUIRE(result[len] == 42); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp new file mode 100644 index 0000000..882069b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp @@ -0,0 +1,14 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +TEST_CASE("measureMsgPack()") { + JsonDocument doc; + JsonObject object = doc.to(); + object["hello"] = "world"; + + REQUIRE(measureMsgPack(doc) == 13); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp new file mode 100644 index 0000000..bea9b24 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp @@ -0,0 +1,46 @@ +#include +#include +#include + +template +void check(T value, const std::string& expected) { + JsonDocument doc; + doc.to().set(value); + char buffer[256] = ""; + size_t returnValue = serializeMsgPack(doc, buffer, sizeof(buffer)); + REQUIRE(expected == buffer); + REQUIRE(expected.size() == returnValue); +} + +TEST_CASE("serializeMsgPack(MemberProxy)") { + JsonDocument doc; + deserializeJson(doc, "{\"hello\":42}"); + JsonObject obj = doc.as(); + std::string result; + + serializeMsgPack(obj["hello"], result); + + REQUIRE(result == "*"); +} + +TEST_CASE("serializeMsgPack(ElementProxy)") { + JsonDocument doc; + deserializeJson(doc, "[42]"); + JsonArray arr = doc.as(); + std::string result; + + serializeMsgPack(arr[0], result); + + REQUIRE(result == "*"); +} + +TEST_CASE("serializeMsgPack(JsonVariantSubscript)") { + JsonDocument doc; + deserializeJson(doc, "[42]"); + JsonVariant var = doc.as(); + std::string result; + + serializeMsgPack(var[0], result); + + REQUIRE(result == "*"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp new file mode 100644 index 0000000..9539041 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp @@ -0,0 +1,64 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_SLOT_ID_SIZE 4 // required to reach 65536 elements + +#include +#include + +#include "Literals.hpp" + +static void check(const JsonArray array, const char* expected_data, + size_t expected_len) { + std::string expected(expected_data, expected_data + expected_len); + std::string actual; + size_t len = serializeMsgPack(array, actual); + CAPTURE(array); + REQUIRE(len == expected_len); + REQUIRE(actual == expected); +} + +template +static void check(const JsonArray array, const char (&expected_data)[N]) { + const size_t expected_len = N - 1; + check(array, expected_data, expected_len); +} + +static void check(const JsonArray array, const std::string& expected) { + check(array, expected.data(), expected.length()); +} + +TEST_CASE("serialize MsgPack array") { + JsonDocument doc; + JsonArray array = doc.to(); + + SECTION("empty") { + check(array, "\x90"); + } + + SECTION("fixarray") { + array.add("hello"); + array.add("world"); + + check(array, "\x92\xA5hello\xA5world"); + } + + SECTION("array 16") { + for (int i = 0; i < 16; i++) + array.add(i); + + check(array, + "\xDC\x00\x10\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D" + "\x0E\x0F"); + } + + SECTION("array 32") { + const char* nil = 0; + for (int i = 0; i < 65536; i++) + array.add(nil); + REQUIRE(array.size() == 65536); + + check(array, "\xDD\x00\x01\x00\x00"_s + std::string(65536, '\xc0')); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp new file mode 100644 index 0000000..7dc1526 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp @@ -0,0 +1,85 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Literals.hpp" + +static void check(const JsonObject object, const char* expected_data, + size_t expected_len) { + std::string expected(expected_data, expected_data + expected_len); + std::string actual; + size_t len = serializeMsgPack(object, actual); + CAPTURE(object); + REQUIRE(len == expected_len); + REQUIRE(actual == expected); +} + +template +static void check(const JsonObject object, const char (&expected_data)[N]) { + const size_t expected_len = N - 1; + check(object, expected_data, expected_len); +} + +// TODO: used by the commented test +// static void check(const JsonObject object, const std::string& expected) { +// check(object, expected.data(), expected.length()); +//} + +TEST_CASE("serialize MsgPack object") { + JsonDocument doc; + JsonObject object = doc.to(); + + SECTION("empty") { + check(object, "\x80"); + } + + SECTION("fixmap") { + object["hello"] = "world"; + + check(object, "\x81\xA5hello\xA5world"); + } + + SECTION("map 16") { + for (int i = 0; i < 16; ++i) { + char key[16]; + snprintf(key, sizeof(key), "i%X", i); + object[key] = i; + } + + check(object, + "\xDE\x00\x10\xA2i0\x00\xA2i1\x01\xA2i2\x02\xA2i3\x03\xA2i4\x04\xA2i5" + "\x05\xA2i6\x06\xA2i7\x07\xA2i8\x08\xA2i9\x09\xA2iA\x0A\xA2iB\x0B\xA2" + "iC\x0C\xA2iD\x0D\xA2iE\x0E\xA2iF\x0F"); + } + + // TODO: improve performance and uncomment + // SECTION("map 32") { + // std::string expected("\xDF\x00\x01\x00\x00", 5); + // + // for (int i = 0; i < 65536; ++i) { + // char kv[16]; + // snprintf(kv, sizeof(kv), "%04x", i); + // object[kv] = kv; + // expected += '\xA4'; + // expected += kv; + // expected += '\xA4'; + // expected += kv; + // } + // + // check(object, expected); + // } + + SECTION("serialized(const char*)") { + object["hello"] = serialized("\xDB\x00\x01\x00\x00", 5); + check(object, "\x81\xA5hello\xDB\x00\x01\x00\x00"); + } + + SECTION("serialized(std::string)") { + object["hello"] = serialized("\xDB\x00\x01\x00\x00"_s); + check(object, "\x81\xA5hello\xDB\x00\x01\x00\x00"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp new file mode 100644 index 0000000..56faccd --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp @@ -0,0 +1,214 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Literals.hpp" + +template +static void checkVariant(T value, const char* expected_data, + size_t expected_len) { + JsonDocument doc; + JsonVariant variant = doc.to(); + variant.set(value); + std::string expected(expected_data, expected_data + expected_len); + std::string actual; + size_t len = serializeMsgPack(variant, actual); + CAPTURE(variant); + REQUIRE(len == expected_len); + REQUIRE(actual == expected); +} + +template +static void checkVariant(T value, const char (&expected_data)[N]) { + const size_t expected_len = N - 1; + checkVariant(value, expected_data, expected_len); +} + +template +static void checkVariant(T value, const std::string& expected) { + checkVariant(value, expected.data(), expected.length()); +} + +TEST_CASE("serialize MsgPack value") { + SECTION("unbound") { + checkVariant(JsonVariant(), "\xC0"); // we represent undefined as nil + } + + SECTION("nil") { + const char* nil = 0; // ArduinoJson uses a string for null + checkVariant(nil, "\xC0"); + } + + SECTION("bool") { + checkVariant(false, "\xC2"); + checkVariant(true, "\xC3"); + } + + SECTION("positive fixint") { + SECTION("signed") { + checkVariant(0, "\x00"); + checkVariant(127, "\x7F"); + } + SECTION("unsigned") { + checkVariant(0U, "\x00"); + checkVariant(127U, "\x7F"); + } + } + + SECTION("uint 8") { + checkVariant(128, "\xCC\x80"); + checkVariant(255, "\xCC\xFF"); + } + + SECTION("uint 16") { + checkVariant(256, "\xCD\x01\x00"); + checkVariant(0xFFFF, "\xCD\xFF\xFF"); + } + + SECTION("uint 32") { + checkVariant(0x00010000U, "\xCE\x00\x01\x00\x00"); + checkVariant(0x12345678U, "\xCE\x12\x34\x56\x78"); + checkVariant(0xFFFFFFFFU, "\xCE\xFF\xFF\xFF\xFF"); + } + +#if ARDUINOJSON_USE_LONG_LONG + SECTION("uint 64") { + checkVariant(0x0001000000000000U, "\xCF\x00\x01\x00\x00\x00\x00\x00\x00"); + checkVariant(0x123456789ABCDEF0U, "\xCF\x12\x34\x56\x78\x9A\xBC\xDE\xF0"); + checkVariant(0xFFFFFFFFFFFFFFFFU, "\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"); + } +#endif + + SECTION("negative fixint") { + checkVariant(-1, "\xFF"); + checkVariant(-32, "\xE0"); + } + + SECTION("int 8") { + checkVariant(-33, "\xD0\xDF"); + checkVariant(-128, "\xD0\x80"); + } + + SECTION("int 16") { + checkVariant(-129, "\xD1\xFF\x7F"); + checkVariant(-32768, "\xD1\x80\x00"); + } + + SECTION("int 32") { + checkVariant(-32769, "\xD2\xFF\xFF\x7F\xFF"); + checkVariant(-2147483647 - 1, "\xD2\x80\x00\x00\x00"); + } + +#if ARDUINOJSON_USE_LONG_LONG + SECTION("int 64") { + checkVariant(int64_t(0xFEDCBA9876543210), + "\xD3\xFE\xDC\xBA\x98\x76\x54\x32\x10"); + } +#endif + + SECTION("float 32") { + checkVariant(1.25, "\xCA\x3F\xA0\x00\x00"); + checkVariant(9.22337204e+18f, "\xca\x5f\x00\x00\x00"); + } + + SECTION("float 64") { + checkVariant(3.1415, "\xCB\x40\x09\x21\xCA\xC0\x83\x12\x6F"); + } + + SECTION("fixstr") { + checkVariant("", "\xA0"); + checkVariant("hello world hello world hello !", + "\xBFhello world hello world hello !"); + } + + SECTION("str 8") { + checkVariant("hello world hello world hello !!", + "\xD9\x20hello world hello world hello !!"); + } + + SECTION("str 16") { + std::string shortest(256, '?'); + checkVariant(shortest.c_str(), "\xDA\x01\x00"_s + shortest); + + std::string longest(65535, '?'); + checkVariant(longest.c_str(), "\xDA\xFF\xFF"_s + longest); + } + + SECTION("str 32") { + std::string shortest(65536, '?'); + checkVariant(JsonString(shortest.c_str(), true), // force store by pointer + "\xDB\x00\x01\x00\x00"_s + shortest); + } + + SECTION("serialized(const char*)") { + checkVariant(serialized("\xDA\xFF\xFF"), "\xDA\xFF\xFF"); + checkVariant(serialized("\xDB\x00\x01\x00\x00", 5), "\xDB\x00\x01\x00\x00"); + } + + SECTION("bin 8") { + checkVariant(MsgPackBinary("?", 1), "\xC4\x01?"); + } + + SECTION("bin 16") { + auto str = std::string(256, '?'); + checkVariant(MsgPackBinary(str.data(), str.size()), "\xC5\x01\x00"_s + str); + } + + // bin 32 is tested in string_length_size_4.cpp + + SECTION("fixext 1") { + checkVariant(MsgPackExtension(1, "\x02", 1), "\xD4\x01\x02"); + } + + SECTION("fixext 2") { + checkVariant(MsgPackExtension(1, "\x03\x04", 2), "\xD5\x01\x03\x04"); + } + + SECTION("fixext 4") { + checkVariant(MsgPackExtension(1, "\x05\x06\x07\x08", 4), + "\xD6\x01\x05\x06\x07\x08"); + } + + SECTION("fixext 8") { + checkVariant(MsgPackExtension(1, "????????", 8), "\xD7\x01????????"); + } + + SECTION("fixext 16") { + checkVariant(MsgPackExtension(1, "????????????????", 16), + "\xD8\x01????????????????"); + } + + SECTION("ext 8") { + checkVariant(MsgPackExtension(2, "???", 3), "\xC7\x03\x02???"); + checkVariant(MsgPackExtension(2, "?????", 5), "\xC7\x05\x02?????"); + checkVariant(MsgPackExtension(2, "???????", 7), "\xC7\x07\x02???????"); + checkVariant(MsgPackExtension(2, "?????????", 9), "\xC7\x09\x02?????????"); + checkVariant(MsgPackExtension(2, "???????????????", 15), + "\xC7\x0F\x02???????????????"); + checkVariant(MsgPackExtension(2, "?????????????????", 17), + "\xC7\x11\x02?????????????????"); + } + + SECTION("ext 16") { + auto str = std::string(256, '?'); + checkVariant(MsgPackExtension(2, str.data(), str.size()), + "\xC8\x01\x00\x02"_s + str); + } + + SECTION("serialize round double as integer") { // Issue #1718 + checkVariant(-32768.0, "\xD1\x80\x00"); + checkVariant(-129.0, "\xD1\xFF\x7F"); + checkVariant(-128.0, "\xD0\x80"); + checkVariant(-33.0, "\xD0\xDF"); + checkVariant(-32.0, "\xE0"); + checkVariant(-1.0, "\xFF"); + checkVariant(0.0, "\x00"); + checkVariant(127.0, "\x7F"); + checkVariant(128.0, "\xCC\x80"); + checkVariant(255.0, "\xCC\xFF"); + checkVariant(256.0, "\xCD\x01\x00"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/CMakeLists.txt new file mode 100644 index 0000000..6505ce7 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/CMakeLists.txt @@ -0,0 +1,19 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(NumbersTests + convertNumber.cpp + decomposeFloat.cpp + parseDouble.cpp + parseFloat.cpp + parseInteger.cpp + parseNumber.cpp +) + +add_test(Numbers NumbersTests) + +set_tests_properties(Numbers + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/convertNumber.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/convertNumber.cpp new file mode 100644 index 0000000..98cd676 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/convertNumber.cpp @@ -0,0 +1,131 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +using namespace ArduinoJson::detail; + +TEST_CASE("canConvertNumber()") { + SECTION("int8_t -> int8_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(127) == true); + CHECK(canConvertNumber(-128) == true); + } + + SECTION("int8_t -> int16_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(127) == true); + CHECK(canConvertNumber(-128) == true); + } + + SECTION("int8_t -> uint8_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(127) == true); + CHECK(canConvertNumber(-128) == false); + } + + SECTION("int8_t -> uint16_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(127) == true); + CHECK(canConvertNumber(-128) == false); + } + + SECTION("int16_t -> int8_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(127) == true); + CHECK(canConvertNumber(128) == false); + CHECK(canConvertNumber(-128) == true); + CHECK(canConvertNumber(-129) == false); + } + + SECTION("int16_t -> uint8_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(255) == true); + CHECK(canConvertNumber(256) == false); + CHECK(canConvertNumber(-1) == false); + } + + SECTION("uint8_t -> int8_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(127) == true); + CHECK(canConvertNumber(128) == false); + CHECK(canConvertNumber(255) == false); + } + + SECTION("uint8_t -> int16_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(127) == true); + CHECK(canConvertNumber(128) == true); + CHECK(canConvertNumber(255) == true); + } + + SECTION("uint8_t -> uint8_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(127) == true); + CHECK(canConvertNumber(128) == true); + CHECK(canConvertNumber(255) == true); + } + + SECTION("uint8_t -> uint16_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(127) == true); + CHECK(canConvertNumber(128) == true); + CHECK(canConvertNumber(255) == true); + } + + SECTION("float -> int32_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(-2.147483904e9f) == false); + CHECK(canConvertNumber(-2.147483648e+9f) == true); + CHECK(canConvertNumber(2.14748352e+9f) == true); + CHECK(canConvertNumber(2.14748365e+9f) == false); + } + + SECTION("double -> int32_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(-2.147483649e+9) == false); + CHECK(canConvertNumber(-2.147483648e+9) == true); + CHECK(canConvertNumber(2.147483647e+9) == true); + CHECK(canConvertNumber(2.147483648e+9) == false); + } + + SECTION("float -> uint32_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(-1.401298e-45f) == false); + CHECK(canConvertNumber(4.29496704e+9f) == true); + CHECK(canConvertNumber(4.294967296e+9f) == false); + } + + SECTION("float -> int64_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(-9.22337204e+18f) == true); + CHECK(canConvertNumber(9.22337149e+18f) == true); + CHECK(canConvertNumber(9.22337204e+18f) == false); + } + + SECTION("double -> int64_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(-9.2233720368547758e+18) == true); + CHECK(canConvertNumber(9.2233720368547748e+18) == true); + CHECK(canConvertNumber(9.2233720368547758e+18) == false); + } + + SECTION("float -> uint64_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(-1.401298e-45f) == false); + CHECK(canConvertNumber(1.84467429741979238e+19f) == true); + CHECK(canConvertNumber(1.844674407370955161e+19f) == + false); + } + + SECTION("double -> uint64_t") { + CHECK(canConvertNumber(0) == true); + CHECK(canConvertNumber(-4.9406564584124e-324) == false); + CHECK(canConvertNumber(1.844674407370954958e+19) == true); + CHECK(canConvertNumber(1.844674407370955166e+19) == + false); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/decomposeFloat.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/decomposeFloat.cpp new file mode 100644 index 0000000..e0578f6 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/decomposeFloat.cpp @@ -0,0 +1,42 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +using namespace ArduinoJson::detail; + +TEST_CASE("decomposeFloat()") { + SECTION("1.7976931348623157E+308") { + auto parts = decomposeFloat(1.7976931348623157E+308, 9); + REQUIRE(parts.integral == 1); + REQUIRE(parts.decimal == 797693135); + REQUIRE(parts.decimalPlaces == 9); + REQUIRE(parts.exponent == 308); + } + + SECTION("4.94065645841247e-324") { + auto parts = decomposeFloat(4.94065645841247e-324, 9); + REQUIRE(parts.integral == 4); + REQUIRE(parts.decimal == 940656458); + REQUIRE(parts.decimalPlaces == 9); + REQUIRE(parts.exponent == -324); + } + + SECTION("3.4E+38") { + auto parts = decomposeFloat(3.4E+38f, 6); + REQUIRE(parts.integral == 3); + REQUIRE(parts.decimal == 4); + REQUIRE(parts.decimalPlaces == 1); + REQUIRE(parts.exponent == 38); + } + + SECTION("1.17549435e−38") { + auto parts = decomposeFloat(1.17549435e-38f, 6); + REQUIRE(parts.integral == 1); + REQUIRE(parts.decimal == 175494); + REQUIRE(parts.decimalPlaces == 6); + REQUIRE(parts.exponent == -38); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseDouble.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseDouble.cpp new file mode 100644 index 0000000..a459279 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseDouble.cpp @@ -0,0 +1,96 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_USE_DOUBLE 1 +#define ARDUINOJSON_ENABLE_NAN 1 +#define ARDUINOJSON_ENABLE_INFINITY 1 + +#include +#include + +using namespace ArduinoJson::detail; + +void checkDouble(const char* input, double expected) { + CAPTURE(input); + REQUIRE(parseNumber(input) == Approx(expected)); +} + +void checkDoubleNaN(const char* input) { + CAPTURE(input); + double result = parseNumber(input); + REQUIRE(result != result); +} + +void checkDoubleInf(const char* input, bool negative) { + CAPTURE(input); + double x = parseNumber(input); + if (negative) + REQUIRE(x < 0); + else + REQUIRE(x > 0); + REQUIRE(x == x); // not a NaN + REQUIRE(x * 2 == x); // a property of infinity +} + +TEST_CASE("parseNumber()") { + SECTION("Short_NoExponent") { + checkDouble("3.14", 3.14); + checkDouble("-3.14", -3.14); + checkDouble("+3.14", +3.14); + } + + SECTION("Short_NoDot") { + checkDouble("1E+308", 1E+308); + checkDouble("-1E+308", -1E+308); + checkDouble("+1E-308", +1E-308); + checkDouble("+1e+308", +1e+308); + checkDouble("-1e-308", -1e-308); + } + + SECTION("Max") { + checkDouble(".017976931348623147e+310", 1.7976931348623147e+308); + checkDouble(".17976931348623147e+309", 1.7976931348623147e+308); + checkDouble("1.7976931348623147e+308", 1.7976931348623147e+308); + checkDouble("17.976931348623147e+307", 1.7976931348623147e+308); + checkDouble("179.76931348623147e+306", 1.7976931348623147e+308); + } + + SECTION("Min") { + checkDouble(".022250738585072014e-306", 2.2250738585072014e-308); + checkDouble(".22250738585072014e-307", 2.2250738585072014e-308); + checkDouble("2.2250738585072014e-308", 2.2250738585072014e-308); + checkDouble("22.250738585072014e-309", 2.2250738585072014e-308); + checkDouble("222.50738585072014e-310", 2.2250738585072014e-308); + } + + SECTION("VeryLong") { + checkDouble("0.00000000000000000000000000000001", 1e-32); + checkDouble("100000000000000000000000000000000.0", 1e+32); + checkDouble( + "100000000000000000000000000000000.00000000000000000000000000000", + 1e+32); + } + + SECTION("MantissaTooLongToFit") { + checkDouble("0.179769313486231571111111111111", 0.17976931348623157); + checkDouble("17976931348623157.11111111111111", 17976931348623157.0); + checkDouble("1797693.134862315711111111111111", 1797693.1348623157); + + checkDouble("-0.179769313486231571111111111111", -0.17976931348623157); + checkDouble("-17976931348623157.11111111111111", -17976931348623157.0); + checkDouble("-1797693.134862315711111111111111", -1797693.1348623157); + } + + SECTION("ExponentTooBig") { + checkDoubleInf("1e309", false); + checkDoubleInf("-1e309", true); + checkDoubleInf("1e65535", false); + checkDouble("1e-65535", 0.0); + } + + SECTION("NaN") { + checkDoubleNaN("NaN"); + checkDoubleNaN("nan"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseFloat.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseFloat.cpp new file mode 100644 index 0000000..62c0917 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseFloat.cpp @@ -0,0 +1,87 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#define ARDUINOJSON_ENABLE_NAN 1 +#define ARDUINOJSON_ENABLE_INFINITY 1 + +#include +#include + +using namespace ArduinoJson::detail; + +void checkFloat(const char* input, float expected) { + CAPTURE(input); + auto result = parseNumber(input); + REQUIRE(result.type() == NumberType::Float); + REQUIRE(result.asFloat() == Approx(expected)); +} + +void checkFloatNaN(const char* input) { + CAPTURE(input); + float result = parseNumber(input); + REQUIRE(result != result); +} + +void checkFloatInf(const char* input, bool negative) { + CAPTURE(input); + float x = parseNumber(input); + if (negative) + REQUIRE(x < 0); + else + REQUIRE(x > 0); + REQUIRE(x == x); // not a NaN + REQUIRE(x * 2 == x); // a property of infinity +} + +TEST_CASE("parseNumber()") { + SECTION("Float_Short_NoExponent") { + checkFloat("3.14", 3.14f); + checkFloat("-3.14", -3.14f); + checkFloat("+3.14", +3.14f); + } + + SECTION("Short_NoDot") { + checkFloat("1E+38", 1E+38f); + checkFloat("-1E+38", -1E+38f); + checkFloat("+1E-38", +1E-38f); + checkFloat("+1e+38", +1e+38f); + checkFloat("-1e-38", -1e-38f); + } + + SECTION("Max") { + checkFloat("340.2823e+36", 3.402823e+38f); + checkFloat("34.02823e+37", 3.402823e+38f); + checkFloat("3.402823e+38", 3.402823e+38f); + checkFloat("0.3402823e+39", 3.402823e+38f); + checkFloat("0.03402823e+40", 3.402823e+38f); + checkFloat("0.003402823e+41", 3.402823e+38f); + } + + SECTION("VeryLong") { + checkFloat("0.00000000000000000000000000000001", 1e-32f); + + // The following don't work because they have many digits so parseNumber() + // treats them as double. But it's not an issue because JsonVariant will use + // a float to store them. + // + // checkFloat("100000000000000000000000000000000.0", 1e+32f); + // checkFloat( + // "100000000000000000000000000000000.00000000000000000000000000000", + // 1e+32f); + } + + SECTION("NaN") { + checkFloatNaN("NaN"); + checkFloatNaN("nan"); + } + + SECTION("Infinity") { + checkFloatInf("Infinity", false); + checkFloatInf("+Infinity", false); + checkFloatInf("-Infinity", true); + checkFloatInf("inf", false); + checkFloatInf("+inf", false); + checkFloatInf("-inf", true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseInteger.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseInteger.cpp new file mode 100644 index 0000000..aff2358 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseInteger.cpp @@ -0,0 +1,68 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +using namespace ArduinoJson::detail; + +template +void checkInteger(const char* input, T expected) { + CAPTURE(input); + T actual = parseNumber(input); + REQUIRE(expected == actual); +} + +TEST_CASE("parseNumber()") { + checkInteger("-128", -128); + checkInteger("127", 127); + checkInteger("+127", 127); + checkInteger("3.14", 3); + checkInteger("x42", 0); + checkInteger("128", 0); // overflow + checkInteger("-129", 0); // overflow +} + +TEST_CASE("parseNumber()") { + checkInteger("-32768", -32768); + checkInteger("32767", 32767); + checkInteger("+32767", 32767); + checkInteger("3.14", 3); + checkInteger("x42", 0); + checkInteger("-32769", 0); // overflow + checkInteger("32768", 0); // overflow +} + +TEST_CASE("parseNumber()") { + checkInteger("-2147483648", (-2147483647 - 1)); + checkInteger("2147483647", 2147483647); + checkInteger("+2147483647", 2147483647); + checkInteger("3.14", 3); + checkInteger("x42", 0); + checkInteger("-2147483649", 0); // overflow + checkInteger("2147483648", 0); // overflow +} + +TEST_CASE("parseNumber()") { + checkInteger("0", 0); + checkInteger("-0", 0); + checkInteger("255", 255); + checkInteger("+255", 255); + checkInteger("3.14", 3); + checkInteger("x42", 0); + checkInteger("-1", 0); + checkInteger("256", 0); +} + +TEST_CASE("parseNumber()") { + checkInteger("0", 0); + checkInteger("65535", 65535); + checkInteger("+65535", 65535); + checkInteger("3.14", 3); + // checkInteger(" 42", 0); + checkInteger("x42", 0); + checkInteger("-1", 0); + checkInteger("65536", 0); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseNumber.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseNumber.cpp new file mode 100644 index 0000000..37b12bb --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/Numbers/parseNumber.cpp @@ -0,0 +1,63 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +using namespace ArduinoJson; +using namespace ArduinoJson::detail; + +TEST_CASE("Test unsigned integer overflow") { + Number first, second; + + // Avoids MSVC warning C4127 (conditional expression is constant) + size_t integerSize = sizeof(JsonInteger); + + if (integerSize == 8) { + first = parseNumber("18446744073709551615"); + second = parseNumber("18446744073709551616"); + } else { + first = parseNumber("4294967295"); + second = parseNumber("4294967296"); + } + + REQUIRE(first.type() == NumberType::UnsignedInteger); + REQUIRE(second.type() == NumberType::Double); +} + +TEST_CASE("Test signed integer overflow") { + Number first, second; + + // Avoids MSVC warning C4127 (conditional expression is constant) + size_t integerSize = sizeof(JsonInteger); + + if (integerSize == 8) { + first = parseNumber("-9223372036854775808"); + second = parseNumber("-9223372036854775809"); + } else { + first = parseNumber("-2147483648"); + second = parseNumber("-2147483649"); + } + + REQUIRE(first.type() == NumberType::SignedInteger); + REQUIRE(second.type() == NumberType::Double); +} + +TEST_CASE("Invalid value") { + auto result = parseNumber("6a3"); + + REQUIRE(result.type() == NumberType::Invalid); +} + +TEST_CASE("float") { + auto result = parseNumber("3.402823e38"); + + REQUIRE(result.type() == NumberType::Float); +} + +TEST_CASE("double") { + auto result = parseNumber("1.7976931348623157e308"); + + REQUIRE(result.type() == NumberType::Double); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/CMakeLists.txt new file mode 100644 index 0000000..3a0908a --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/CMakeLists.txt @@ -0,0 +1,26 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(ResourceManagerTests + allocVariant.cpp + clear.cpp + saveString.cpp + shrinkToFit.cpp + size.cpp + StringBuffer.cpp + StringBuilder.cpp + swap.cpp +) + +add_compile_definitions(ResourceManagerTests + ARDUINOJSON_SLOT_ID_SIZE=1 # require less RAM for overflow tests + ARDUINOJSON_POOL_CAPACITY=16 +) + +add_test(ResourceManager ResourceManagerTests) + +set_tests_properties(ResourceManager + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/StringBuffer.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/StringBuffer.cpp new file mode 100644 index 0000000..1fb2b01 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/StringBuffer.cpp @@ -0,0 +1,50 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" +#include "Literals.hpp" + +using namespace ArduinoJson::detail; + +TEST_CASE("StringBuffer") { + SpyingAllocator spy; + ResourceManager resources(&spy); + StringBuffer sb(&resources); + VariantData variant; + + SECTION("Tiny string") { + auto ptr = sb.reserve(3); + strcpy(ptr, "hi!"); + sb.save(&variant); + + REQUIRE(variant.type() == VariantType::TinyString); + REQUIRE(variant.asString() == "hi!"); + } + + SECTION("Tiny string can't contain NUL") { + auto ptr = sb.reserve(3); + memcpy(ptr, "a\0b", 3); + sb.save(&variant); + + REQUIRE(variant.type() == VariantType::OwnedString); + + auto str = variant.asString(); + REQUIRE(str.size() == 3); + REQUIRE(str.c_str()[0] == 'a'); + REQUIRE(str.c_str()[1] == 0); + REQUIRE(str.c_str()[2] == 'b'); + } + + SECTION("Tiny string can't have 4 characters") { + auto ptr = sb.reserve(4); + strcpy(ptr, "alfa"); + sb.save(&variant); + + REQUIRE(variant.type() == VariantType::OwnedString); + REQUIRE(variant.asString() == "alfa"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/StringBuilder.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/StringBuilder.cpp new file mode 100644 index 0000000..a63661b --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/StringBuilder.cpp @@ -0,0 +1,184 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" + +using namespace ArduinoJson; +using namespace ArduinoJson::detail; + +TEST_CASE("StringBuilder") { + KillswitchAllocator killswitch; + SpyingAllocator spyingAllocator(&killswitch); + ResourceManager resources(&spyingAllocator); + + SECTION("Empty string") { + StringBuilder str(&resources); + VariantData data; + + str.startString(); + str.save(&data); + + REQUIRE(resources.overflowed() == false); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofStringBuffer()), + }); + REQUIRE(data.type() == VariantType::TinyString); + } + + SECTION("Tiny string") { + StringBuilder str(&resources); + + str.startString(); + str.append("url"); + + REQUIRE(str.isValid() == true); + REQUIRE(str.str() == "url"); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofStringBuffer()), + }); + + VariantData data; + str.save(&data); + + REQUIRE(resources.overflowed() == false); + REQUIRE(data.type() == VariantType::TinyString); + REQUIRE(data.asString() == "url"); + } + + SECTION("Short string fits in first allocation") { + StringBuilder str(&resources); + + str.startString(); + str.append("hello"); + + REQUIRE(str.isValid() == true); + REQUIRE(str.str() == "hello"); + REQUIRE(resources.overflowed() == false); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + Allocate(sizeofStringBuffer()), + }); + } + + SECTION("Long string needs reallocation") { + StringBuilder str(&resources); + const char* lorem = + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do " + "eiusmod tempor incididunt ut labore et dolore magna aliqua."; + + str.startString(); + str.append(lorem); + + REQUIRE(str.isValid() == true); + REQUIRE(str.str() == lorem); + REQUIRE(resources.overflowed() == false); + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer(1)), + Reallocate(sizeofStringBuffer(1), sizeofStringBuffer(2)), + Reallocate(sizeofStringBuffer(2), sizeofStringBuffer(3)), + }); + } + + SECTION("Realloc fails") { + StringBuilder str(&resources); + + str.startString(); + killswitch.on(); + str.append( + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do " + "eiusmod tempor incididunt ut labore et dolore magna aliqua."); + + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + ReallocateFail(sizeofStringBuffer(), sizeofStringBuffer(2)), + Deallocate(sizeofStringBuffer()), + }); + REQUIRE(str.isValid() == false); + REQUIRE(resources.overflowed() == true); + } + + SECTION("Initial allocation fails") { + StringBuilder str(&resources); + + killswitch.on(); + str.startString(); + + REQUIRE(str.isValid() == false); + REQUIRE(resources.overflowed() == true); + REQUIRE(spyingAllocator.log() == AllocatorLog{ + AllocateFail(sizeofStringBuffer()), + }); + } +} + +static JsonString saveString(StringBuilder& builder, const char* s) { + VariantData data; + builder.startString(); + builder.append(s); + builder.save(&data); + return data.asString(); +} + +TEST_CASE("StringBuilder::save() deduplicates strings") { + SpyingAllocator spy; + ResourceManager resources(&spy); + StringBuilder builder(&resources); + + SECTION("Basic") { + auto s1 = saveString(builder, "hello"); + auto s2 = saveString(builder, "world"); + auto s3 = saveString(builder, "hello"); + + REQUIRE(s1 == "hello"); + REQUIRE(s2 == "world"); + REQUIRE(+s1.c_str() == +s3.c_str()); // same address + + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("hello")), + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("world")), + Allocate(sizeofStringBuffer()), + }); + } + + SECTION("Requires terminator") { + auto s1 = saveString(builder, "hello world"); + auto s2 = saveString(builder, "hello"); + + REQUIRE(s1 == "hello world"); + REQUIRE(s2 == "hello"); + REQUIRE(+s2.c_str() != +s1.c_str()); // different address + + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("hello world")), + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("hello")), + }); + } + + SECTION("Don't overrun") { + auto s1 = saveString(builder, "hello world"); + auto s2 = saveString(builder, "worl"); + + REQUIRE(s1 == "hello world"); + REQUIRE(s2 == "worl"); + REQUIRE(s2.c_str() != s1.c_str()); // different address + + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("hello world")), + Allocate(sizeofStringBuffer()), + Reallocate(sizeofStringBuffer(), sizeofString("worl")), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/allocVariant.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/allocVariant.cpp new file mode 100644 index 0000000..0568791 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/allocVariant.cpp @@ -0,0 +1,92 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include + +#include "Allocators.hpp" + +using namespace ArduinoJson::detail; + +TEST_CASE("ResourceManager::allocVariant()") { + SECTION("Returns different pointer") { + ResourceManager resources; + + auto s1 = resources.allocVariant(); + REQUIRE(s1.ptr() != nullptr); + auto s2 = resources.allocVariant(); + REQUIRE(s2.ptr() != nullptr); + + REQUIRE(s1.ptr() != s2.ptr()); + } + + SECTION("Returns the same slot after calling freeVariant()") { + ResourceManager resources; + + auto s1 = resources.allocVariant(); + auto s2 = resources.allocVariant(); + resources.freeVariant(s1); + resources.freeVariant(s2); + auto s3 = resources.allocVariant(); + auto s4 = resources.allocVariant(); + auto s5 = resources.allocVariant(); + + REQUIRE(s2.id() != s1.id()); + REQUIRE(s3.id() == s2.id()); + REQUIRE(s4.id() == s1.id()); + REQUIRE(s5.id() != s1.id()); + REQUIRE(s5.id() != s2.id()); + } + + SECTION("Returns aligned pointers") { + ResourceManager resources; + + REQUIRE(isAligned(resources.allocVariant().ptr())); + REQUIRE(isAligned(resources.allocVariant().ptr())); + } + + SECTION("Returns null if pool list allocation fails") { + ResourceManager resources(FailingAllocator::instance()); + + auto variant = resources.allocVariant(); + REQUIRE(variant.id() == NULL_SLOT); + REQUIRE(variant.ptr() == nullptr); + } + + SECTION("Returns null if pool allocation fails") { + ResourceManager resources(FailingAllocator::instance()); + + resources.allocVariant(); + + auto variant = resources.allocVariant(); + REQUIRE(variant.id() == NULL_SLOT); + REQUIRE(variant.ptr() == nullptr); + } + + SECTION("Try overflow pool counter") { + ResourceManager resources; + + // this test assumes SlotId is 8-bit; otherwise it consumes a lot of memory + // tyhe GitHub Workflow gets killed + REQUIRE(NULL_SLOT == 255); + + // fill all the pools + for (SlotId i = 0; i < NULL_SLOT; i++) { + auto slot = resources.allocVariant(); + REQUIRE(slot.id() == i); // or != NULL_SLOT + REQUIRE(slot.ptr() != nullptr); + } + + REQUIRE(resources.overflowed() == false); + + // now all allocations should fail + for (int i = 0; i < 10; i++) { + auto slot = resources.allocVariant(); + REQUIRE(slot.id() == NULL_SLOT); + REQUIRE(slot.ptr() == nullptr); + } + + REQUIRE(resources.overflowed() == true); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/clear.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/clear.cpp new file mode 100644 index 0000000..e770776 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/clear.cpp @@ -0,0 +1,30 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include +#include + +using namespace ArduinoJson::detail; + +TEST_CASE("ResourceManager::clear()") { + ResourceManager resources; + + SECTION("Discards allocated variants") { + resources.allocVariant(); + + resources.clear(); + REQUIRE(resources.size() == 0); + } + + SECTION("Discards allocated strings") { + resources.saveString(adaptString("123456789")); + REQUIRE(resources.size() == sizeofString(9)); + + resources.clear(); + + REQUIRE(resources.size() == 0); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/saveString.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/saveString.cpp new file mode 100644 index 0000000..3c7a228 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/saveString.cpp @@ -0,0 +1,70 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Allocators.hpp" + +using namespace ArduinoJson::detail; + +static StringNode* saveString(ResourceManager& resources, const char* s) { + return resources.saveString(adaptString(s)); +} + +static StringNode* saveString(ResourceManager& resources, const char* s, + size_t n) { + return resources.saveString(adaptString(s, n)); +} + +TEST_CASE("ResourceManager::saveString()") { + ResourceManager resources; + + SECTION("Duplicates different strings") { + auto a = saveString(resources, "hello"); + auto b = saveString(resources, "world"); + REQUIRE(+a->data != +b->data); + REQUIRE(a->length == 5); + REQUIRE(b->length == 5); + REQUIRE(a->references == 1); + REQUIRE(b->references == 1); + REQUIRE(resources.size() == sizeofString("hello") + sizeofString("world")); + } + + SECTION("Deduplicates identical strings") { + auto a = saveString(resources, "hello"); + auto b = saveString(resources, "hello"); + REQUIRE(a == b); + REQUIRE(a->length == 5); + REQUIRE(a->references == 2); + REQUIRE(resources.size() == sizeofString("hello")); + } + + SECTION("Deduplicates identical strings that contain NUL") { + auto a = saveString(resources, "hello\0world", 11); + auto b = saveString(resources, "hello\0world", 11); + REQUIRE(a == b); + REQUIRE(a->length == 11); + REQUIRE(a->references == 2); + REQUIRE(resources.size() == sizeofString("hello world")); + } + + SECTION("Don't stop on first NUL") { + auto a = saveString(resources, "hello"); + auto b = saveString(resources, "hello\0world", 11); + REQUIRE(a != b); + REQUIRE(a->length == 5); + REQUIRE(b->length == 11); + REQUIRE(a->references == 1); + REQUIRE(b->references == 1); + REQUIRE(resources.size() == + sizeofString("hello") + sizeofString("hello world")); + } + + SECTION("Returns NULL when allocation fails") { + ResourceManager pool2(FailingAllocator::instance()); + REQUIRE(saveString(pool2, "a") == nullptr); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/shrinkToFit.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/shrinkToFit.cpp new file mode 100644 index 0000000..4f1eb5d --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/shrinkToFit.cpp @@ -0,0 +1,57 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Allocators.hpp" + +using namespace ArduinoJson::detail; + +TEST_CASE("ResourceManager::shrinkToFit()") { + SpyingAllocator spyingAllocator; + ResourceManager resources(&spyingAllocator); + + SECTION("empty") { + resources.shrinkToFit(); + + REQUIRE(spyingAllocator.log() == AllocatorLog{}); + } + + SECTION("only one pool") { + resources.allocVariant(); + + resources.shrinkToFit(); + + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Allocate(sizeofPool()), + Reallocate(sizeofPool(), sizeofPool(1)), + }); + } + + SECTION("more pools than initial count") { + for (size_t i = 0; + i < ARDUINOJSON_POOL_CAPACITY * ARDUINOJSON_INITIAL_POOL_COUNT + 1; + i++) + resources.allocVariant(); + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Allocate(sizeofPool()) * ARDUINOJSON_INITIAL_POOL_COUNT, + Allocate(sizeofPoolList(ARDUINOJSON_INITIAL_POOL_COUNT * 2)), + Allocate(sizeofPool()), + }); + + spyingAllocator.clearLog(); + resources.shrinkToFit(); + + REQUIRE(spyingAllocator.log() == + AllocatorLog{ + Reallocate(sizeofPool(), sizeofPool(1)), + Reallocate(sizeofPoolList(ARDUINOJSON_INITIAL_POOL_COUNT * 2), + sizeofPoolList(ARDUINOJSON_INITIAL_POOL_COUNT + 1)), + }); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/size.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/size.cpp new file mode 100644 index 0000000..17f3f42 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/size.cpp @@ -0,0 +1,31 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include "Allocators.hpp" + +using namespace ArduinoJson::detail; + +TEST_CASE("ResourceManager::size()") { + TimebombAllocator timebomb(0); + ResourceManager resources(&timebomb); + + SECTION("Initial size is 0") { + REQUIRE(0 == resources.size()); + } + + SECTION("Doesn't grow when allocation of second pool fails") { + timebomb.setCountdown(1); + for (size_t i = 0; i < ARDUINOJSON_POOL_CAPACITY; i++) + resources.allocVariant(); + size_t size = resources.size(); + + resources.allocVariant(); + + REQUIRE(size == resources.size()); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/swap.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/swap.cpp new file mode 100644 index 0000000..f5d8fee --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/ResourceManager/swap.cpp @@ -0,0 +1,96 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include +#include + +#include "Allocators.hpp" + +using namespace ArduinoJson::detail; + +static void fullPreallocatedPools(ResourceManager& resources) { + for (int i = 0; + i < ARDUINOJSON_INITIAL_POOL_COUNT * ARDUINOJSON_POOL_CAPACITY; i++) + resources.allocVariant(); +} + +TEST_CASE("ResourceManager::swap()") { + SECTION("Both using preallocated pool list") { + SpyingAllocator spy; + ResourceManager a(&spy); + ResourceManager b(&spy); + + auto a1 = a.allocVariant(); + auto b1 = b.allocVariant(); + + swap(a, b); + + REQUIRE(a1.ptr() == b.getVariant(a1.id())); + REQUIRE(b1.ptr() == a.getVariant(b1.id())); + + REQUIRE(spy.log() == AllocatorLog{ + Allocate(sizeofPool()) * 2, + }); + } + + SECTION("Only left using preallocated pool list") { + SpyingAllocator spy; + ResourceManager a(&spy); + ResourceManager b(&spy); + fullPreallocatedPools(b); + + auto a1 = a.allocVariant(); + auto b1 = b.allocVariant(); + swap(a, b); + + REQUIRE(a1.ptr() == b.getVariant(a1.id())); + REQUIRE(b1.ptr() == a.getVariant(b1.id())); + + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofPool()) * (ARDUINOJSON_INITIAL_POOL_COUNT + 1), + Allocate(sizeofPoolList(ARDUINOJSON_INITIAL_POOL_COUNT * 2)), + Allocate(sizeofPool()), + }); + } + + SECTION("Only right using preallocated pool list") { + SpyingAllocator spy; + ResourceManager a(&spy); + fullPreallocatedPools(a); + ResourceManager b(&spy); + + auto a1 = a.allocVariant(); + auto b1 = b.allocVariant(); + swap(a, b); + + REQUIRE(a1.ptr() == b.getVariant(a1.id())); + REQUIRE(b1.ptr() == a.getVariant(b1.id())); + + REQUIRE(spy.log() == + AllocatorLog{ + Allocate(sizeofPool()) * ARDUINOJSON_INITIAL_POOL_COUNT, + Allocate(sizeofPoolList(ARDUINOJSON_INITIAL_POOL_COUNT * 2)), + Allocate(sizeofPool()) * 2, + }); + } + + SECTION("None is using preallocated pool list") { + SpyingAllocator spy; + ResourceManager a(&spy); + fullPreallocatedPools(a); + ResourceManager b(&spy); + fullPreallocatedPools(b); + + auto a1 = a.allocVariant(); + auto b1 = b.allocVariant(); + + swap(a, b); + + REQUIRE(a1.ptr() == b.getVariant(a1.id())); + REQUIRE(b1.ptr() == a.getVariant(b1.id())); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt new file mode 100644 index 0000000..79618c7 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt @@ -0,0 +1,18 @@ +# ArduinoJson - https://arduinojson.org +# Copyright © 2014-2025, Benoit BLANCHON +# MIT License + +add_executable(TextFormatterTests + writeFloat.cpp + writeInteger.cpp + writeString.cpp +) + +set_target_properties(TextFormatterTests PROPERTIES UNITY_BUILD OFF) + +add_test(TextFormatter TextFormatterTests) + +set_tests_properties(TextFormatter + PROPERTIES + LABELS "Catch" +) diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp new file mode 100644 index 0000000..1afcaec --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp @@ -0,0 +1,119 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#define ARDUINOJSON_ENABLE_NAN 1 +#define ARDUINOJSON_ENABLE_INFINITY 1 +#include +#include + +using namespace ArduinoJson::detail; + +template +void check(TFloat input, const std::string& expected) { + std::string output; + Writer sb(output); + TextFormatter> writer(sb); + writer.writeFloat(input); + REQUIRE(writer.bytesWritten() == output.size()); + CHECK(expected == output); +} + +TEST_CASE("TextFormatter::writeFloat(double)") { + SECTION("Pi") { + check(3.14159265359, "3.141592654"); + } + + SECTION("Signaling NaN") { + double nan = std::numeric_limits::signaling_NaN(); + check(nan, "NaN"); + } + + SECTION("Quiet NaN") { + double nan = std::numeric_limits::quiet_NaN(); + check(nan, "NaN"); + } + + SECTION("Infinity") { + double inf = std::numeric_limits::infinity(); + check(inf, "Infinity"); + check(-inf, "-Infinity"); + } + + SECTION("Zero") { + check(0.0, "0"); + check(-0.0, "0"); + } + + SECTION("Espilon") { + check(2.2250738585072014E-308, "2.225073859e-308"); + check(-2.2250738585072014E-308, "-2.225073859e-308"); + } + + SECTION("Max double") { + check(1.7976931348623157E+308, "1.797693135e308"); + check(-1.7976931348623157E+308, "-1.797693135e308"); + } + + SECTION("Big exponent") { + // this test increases coverage of normalize() + check(1e255, "1e255"); + check(1e-255, "1e-255"); + } + + SECTION("Exponentation when <= 1e-5") { + check(1e-4, "0.0001"); + check(1e-5, "1e-5"); + + check(-1e-4, "-0.0001"); + check(-1e-5, "-1e-5"); + } + + SECTION("Exponentation when >= 1e7") { + check(9999999.999, "9999999.999"); + check(10000000.0, "1e7"); + + check(-9999999.999, "-9999999.999"); + check(-10000000.0, "-1e7"); + } + + SECTION("Rounding when too many decimals") { + check(0.000099999999999, "0.0001"); + check(0.0000099999999999, "1e-5"); + check(0.9999999996, "1"); + } + + SECTION("9 decimal places") { + check(0.100000001, "0.100000001"); + check(0.999999999, "0.999999999"); + + check(9.000000001, "9.000000001"); + check(9.999999999, "9.999999999"); + } + + SECTION("10 decimal places") { + check(0.1000000001, "0.1"); + check(0.9999999999, "1"); + + check(9.0000000001, "9"); + check(9.9999999999, "10"); + } +} + +TEST_CASE("TextFormatter::writeFloat(float)") { + SECTION("Pi") { + check(3.14159265359f, "3.141593"); + } + + SECTION("999.9") { // issue #543 + check(999.9f, "999.9"); + } + + SECTION("24.3") { // # issue #588 + check(24.3f, "24.3"); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeInteger.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeInteger.cpp new file mode 100644 index 0000000..47a864c --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeInteger.cpp @@ -0,0 +1,55 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include +#include +#include + +#include +#include + +using namespace ArduinoJson::detail; + +template +void checkWriteInteger(T value, std::string expected) { + char output[64] = {0}; + StaticStringWriter sb(output, sizeof(output)); + TextFormatter writer(sb); + writer.writeInteger(value); + REQUIRE(expected == output); + REQUIRE(writer.bytesWritten() == expected.size()); +} + +TEST_CASE("int8_t") { + checkWriteInteger(0, "0"); + checkWriteInteger(-128, "-128"); + checkWriteInteger(127, "127"); +} + +TEST_CASE("uint8_t") { + checkWriteInteger(0, "0"); + checkWriteInteger(255, "255"); +} + +TEST_CASE("int16_t") { + checkWriteInteger(0, "0"); + checkWriteInteger(-32768, "-32768"); + checkWriteInteger(32767, "32767"); +} + +TEST_CASE("uint16_t") { + checkWriteInteger(0, "0"); + checkWriteInteger(65535, "65535"); +} + +TEST_CASE("int32_t") { + checkWriteInteger(0, "0"); + checkWriteInteger(-2147483647 - 1, "-2147483648"); + checkWriteInteger(2147483647, "2147483647"); +} + +TEST_CASE("uint32_t") { + checkWriteInteger(0, "0"); + checkWriteInteger(4294967295U, "4294967295"); +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeString.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeString.cpp new file mode 100644 index 0000000..35ae297 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/TextFormatter/writeString.cpp @@ -0,0 +1,57 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2025, Benoit BLANCHON +// MIT License + +#include + +#include +#include + +using namespace ArduinoJson::detail; + +void check(const char* input, std::string expected) { + char output[64] = {0}; + StaticStringWriter sb(output, sizeof(output)); + TextFormatter writer(sb); + writer.writeString(input); + REQUIRE(expected == output); + REQUIRE(writer.bytesWritten() == expected.size()); +} + +TEST_CASE("TextFormatter::writeString()") { + SECTION("EmptyString") { + check("", "\"\""); + } + + SECTION("QuotationMark") { + check("\"", "\"\\\"\""); + } + + SECTION("ReverseSolidus") { + check("\\", "\"\\\\\""); + } + + SECTION("Solidus") { + check("/", "\"/\""); // but the JSON format allows \/ + } + + SECTION("Backspace") { + check("\b", "\"\\b\""); + } + + SECTION("Formfeed") { + check("\f", "\"\\f\""); + } + + SECTION("Newline") { + check("\n", "\"\\n\""); + } + + SECTION("CarriageReturn") { + check("\r", "\"\\r\""); + } + + SECTION("HorizontalTab") { + check("\t", "\"\\t\""); + } +} diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/catch/.clang-format b/Raumtermostat/lib/ArduinoJson/extras/tests/catch/.clang-format new file mode 100644 index 0000000..9d15924 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/catch/.clang-format @@ -0,0 +1,2 @@ +DisableFormat: true +SortIncludes: false diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/catch/CMakeLists.txt b/Raumtermostat/lib/ArduinoJson/extras/tests/catch/CMakeLists.txt new file mode 100644 index 0000000..c5fb5fb --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/catch/CMakeLists.txt @@ -0,0 +1,21 @@ +# ArduinoJson - https://arduinojson.org +# Copyright Benoit Blanchon 2014-2021 +# MIT License + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED OFF) + +add_library(catch + catch.hpp + catch.cpp +) + +target_include_directories(catch + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +if(MINGW) + # prevent "too many sections (32837)" with MinGW + target_compile_options(catch PRIVATE -Wa,-mbig-obj) +endif() diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/catch/catch.cpp b/Raumtermostat/lib/ArduinoJson/extras/tests/catch/catch.cpp new file mode 100644 index 0000000..e6c8548 --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/catch/catch.cpp @@ -0,0 +1,6 @@ +// ArduinoJson - https://arduinojson.org +// Copyright Benoit Blanchon 2014-2021 +// MIT License + +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/Raumtermostat/lib/ArduinoJson/extras/tests/catch/catch.hpp b/Raumtermostat/lib/ArduinoJson/extras/tests/catch/catch.hpp new file mode 100644 index 0000000..9b309bd --- /dev/null +++ b/Raumtermostat/lib/ArduinoJson/extras/tests/catch/catch.hpp @@ -0,0 +1,17976 @@ +/* + * Catch v2.13.10 + * Generated: 2022-10-16 11:01:23.452308 + * ---------------------------------------------------------- + * This file has been merged from multiple headers. Please don't edit it directly + * Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved. + * + * Distributed under the Boost Software License, Version 1.0. (See accompanying + * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + */ +#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED +#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED +// start catch.hpp + + +#define CATCH_VERSION_MAJOR 2 +#define CATCH_VERSION_MINOR 13 +#define CATCH_VERSION_PATCH 10 + +#ifdef __clang__ +# pragma clang system_header +#elif defined __GNUC__ +# pragma GCC system_header +#endif + +// start catch_suppress_warnings.h + +#ifdef __clang__ +# ifdef __ICC // icpc defines the __clang__ macro +# pragma warning(push) +# pragma warning(disable: 161 1682) +# else // __ICC +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wpadded" +# pragma clang diagnostic ignored "-Wswitch-enum" +# pragma clang diagnostic ignored "-Wcovered-switch-default" +# endif +#elif defined __GNUC__ + // Because REQUIREs trigger GCC's -Wparentheses, and because still + // supported version of g++ have only buggy support for _Pragmas, + // Wparentheses have to be suppressed globally. +# pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details + +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wunused-variable" +# pragma GCC diagnostic ignored "-Wpadded" +#endif +// end catch_suppress_warnings.h +#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) +# define CATCH_IMPL +# define CATCH_CONFIG_ALL_PARTS +#endif + +// In the impl file, we want to have access to all parts of the headers +// Can also be used to sanely support PCHs +#if defined(CATCH_CONFIG_ALL_PARTS) +# define CATCH_CONFIG_EXTERNAL_INTERFACES +# if defined(CATCH_CONFIG_DISABLE_MATCHERS) +# undef CATCH_CONFIG_DISABLE_MATCHERS +# endif +# if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) +# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER +# endif +#endif + +#if !defined(CATCH_CONFIG_IMPL_ONLY) +// start catch_platform.h + +// See e.g.: +// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html +#ifdef __APPLE__ +# include +# if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \ + (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1) +# define CATCH_PLATFORM_MAC +# elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1) +# define CATCH_PLATFORM_IPHONE +# endif + +#elif defined(linux) || defined(__linux) || defined(__linux__) +# define CATCH_PLATFORM_LINUX + +#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__) +# define CATCH_PLATFORM_WINDOWS +#endif + +// end catch_platform.h + +#ifdef CATCH_IMPL +# ifndef CLARA_CONFIG_MAIN +# define CLARA_CONFIG_MAIN_NOT_DEFINED +# define CLARA_CONFIG_MAIN +# endif +#endif + +// start catch_user_interfaces.h + +namespace Catch { + unsigned int rngSeed(); +} + +// end catch_user_interfaces.h +// start catch_tag_alias_autoregistrar.h + +// start catch_common.h + +// start catch_compiler_capabilities.h + +// Detect a number of compiler features - by compiler +// The following features are defined: +// +// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported? +// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported? +// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported? +// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled? +// **************** +// Note to maintainers: if new toggles are added please document them +// in configuration.md, too +// **************** + +// In general each macro has a _NO_ form +// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature. +// Many features, at point of detection, define an _INTERNAL_ macro, so they +// can be combined, en-mass, with the _NO_ forms later. + +#ifdef __cplusplus + +# if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) +# define CATCH_CPP14_OR_GREATER +# endif + +# if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) +# define CATCH_CPP17_OR_GREATER +# endif + +#endif + +// Only GCC compiler should be used in this block, so other compilers trying to +// mask themselves as GCC should be ignored. +#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__) +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" ) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic pop" ) + +# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) + +#endif + +#if defined(__clang__) + +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" ) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic pop" ) + +// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug +// which results in calls to destructors being emitted for each temporary, +// without a matching initialization. In practice, this can result in something +// like `std::string::~string` being called on an uninitialized value. +// +// For example, this code will likely segfault under IBM XL: +// ``` +// REQUIRE(std::string("12") + "34" == "1234") +// ``` +// +// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented. +# if !defined(__ibmxl__) && !defined(__CUDACC__) +# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */ +# endif + +# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \ + _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"") + +# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wparentheses\"" ) + +# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" ) + +# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" ) + +# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \ + _Pragma( "clang diagnostic ignored \"-Wunused-template\"" ) + +#endif // __clang__ + +//////////////////////////////////////////////////////////////////////////////// +// Assume that non-Windows platforms support posix signals by default +#if !defined(CATCH_PLATFORM_WINDOWS) + #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS +#endif + +//////////////////////////////////////////////////////////////////////////////// +// We know some environments not to support full POSIX signals +#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__) + #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS +#endif + +#ifdef __OS400__ +# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS +# define CATCH_CONFIG_COLOUR_NONE +#endif + +//////////////////////////////////////////////////////////////////////////////// +// Android somehow still does not support std::to_string +#if defined(__ANDROID__) +# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING +# define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE +#endif + +//////////////////////////////////////////////////////////////////////////////// +// Not all Windows environments support SEH properly +#if defined(__MINGW32__) +# define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH +#endif + +//////////////////////////////////////////////////////////////////////////////// +// PS4 +#if defined(__ORBIS__) +# define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE +#endif + +//////////////////////////////////////////////////////////////////////////////// +// Cygwin +#ifdef __CYGWIN__ + +// Required for some versions of Cygwin to declare gettimeofday +// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin +# define _BSD_SOURCE +// some versions of cygwin (most) do not support std::to_string. Use the libstd check. +// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813 +# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ + && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) + +# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING + +# endif +#endif // __CYGWIN__ + +//////////////////////////////////////////////////////////////////////////////// +// Visual C++ +#if defined(_MSC_VER) + +// Universal Windows platform does not support SEH +// Or console colours (or console at all...) +# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) +# define CATCH_CONFIG_COLOUR_NONE +# else +# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH +# endif + +# if !defined(__clang__) // Handle Clang masquerading for msvc + +// MSVC traditional preprocessor needs some workaround for __VA_ARGS__ +// _MSVC_TRADITIONAL == 0 means new conformant preprocessor +// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor +# if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL) +# define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +# endif // MSVC_TRADITIONAL + +// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop` +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) ) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION __pragma( warning(pop) ) +# endif // __clang__ + +#endif // _MSC_VER + +#if defined(_REENTRANT) || defined(_MSC_VER) +// Enable async processing, as -pthread is specified or no additional linking is required +# define CATCH_INTERNAL_CONFIG_USE_ASYNC +#endif // _MSC_VER + +//////////////////////////////////////////////////////////////////////////////// +// Check if we are compiled with -fno-exceptions or equivalent +#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND) +# define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED +#endif + +//////////////////////////////////////////////////////////////////////////////// +// DJGPP +#ifdef __DJGPP__ +# define CATCH_INTERNAL_CONFIG_NO_WCHAR +#endif // __DJGPP__ + +//////////////////////////////////////////////////////////////////////////////// +// Embarcadero C++Build +#if defined(__BORLANDC__) + #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN +#endif + +//////////////////////////////////////////////////////////////////////////////// + +// Use of __COUNTER__ is suppressed during code analysis in +// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly +// handled by it. +// Otherwise all supported compilers support COUNTER macro, +// but user still might want to turn it off +#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L ) + #define CATCH_INTERNAL_CONFIG_COUNTER +#endif + +//////////////////////////////////////////////////////////////////////////////// + +// RTX is a special version of Windows that is real time. +// This means that it is detected as Windows, but does not provide +// the same set of capabilities as real Windows does. +#if defined(UNDER_RTSS) || defined(RTX64_BUILD) + #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH + #define CATCH_INTERNAL_CONFIG_NO_ASYNC + #define CATCH_CONFIG_COLOUR_NONE +#endif + +#if !defined(_GLIBCXX_USE_C99_MATH_TR1) +#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER +#endif + +// Various stdlib support checks that require __has_include +#if defined(__has_include) + // Check if string_view is available and usable + #if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW + #endif + + // Check if optional is available and usable + # if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL + # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) + + // Check if byte is available and usable + # if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # include + # if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0) + # define CATCH_INTERNAL_CONFIG_CPP17_BYTE + # endif + # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) + + // Check if variant is available and usable + # if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # if defined(__clang__) && (__clang_major__ < 8) + // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852 + // fix should be in clang 8, workaround in libstdc++ 8.2 + # include + # if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) + # define CATCH_CONFIG_NO_CPP17_VARIANT + # else + # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT + # endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) + # else + # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT + # endif // defined(__clang__) && (__clang_major__ < 8) + # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) +#endif // defined(__has_include) + +#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER) +# define CATCH_CONFIG_COUNTER +#endif +#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH) +# define CATCH_CONFIG_WINDOWS_SEH +#endif +// This is set by default, because we assume that unix compilers are posix-signal-compatible by default. +#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS) +# define CATCH_CONFIG_POSIX_SIGNALS +#endif +// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions. +#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR) +# define CATCH_CONFIG_WCHAR +#endif + +#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING) +# define CATCH_CONFIG_CPP11_TO_STRING +#endif + +#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL) +# define CATCH_CONFIG_CPP17_OPTIONAL +#endif + +#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW) +# define CATCH_CONFIG_CPP17_STRING_VIEW +#endif + +#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT) +# define CATCH_CONFIG_CPP17_VARIANT +#endif + +#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE) +# define CATCH_CONFIG_CPP17_BYTE +#endif + +#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT) +# define CATCH_INTERNAL_CONFIG_NEW_CAPTURE +#endif + +#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE) +# define CATCH_CONFIG_NEW_CAPTURE +#endif + +#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) +# define CATCH_CONFIG_DISABLE_EXCEPTIONS +#endif + +#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN) +# define CATCH_CONFIG_POLYFILL_ISNAN +#endif + +#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC) && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC) +# define CATCH_CONFIG_USE_ASYNC +#endif + +#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE) +# define CATCH_CONFIG_ANDROID_LOGWRITE +#endif + +#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER) +# define CATCH_CONFIG_GLOBAL_NEXTAFTER +#endif + +// Even if we do not think the compiler has that warning, we still have +// to provide a macro that can be used by the code. +#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION) +# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION +#endif +#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION) +# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION +#endif +#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS +#endif +#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS +#endif +#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS +#endif +#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS +#endif + +// The goal of this macro is to avoid evaluation of the arguments, but +// still have the compiler warn on problems inside... +#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN) +# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) +#endif + +#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10) +# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS +#elif defined(__clang__) && (__clang_major__ < 5) +# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS +#endif + +#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS) +# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS +#endif + +#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) +#define CATCH_TRY if ((true)) +#define CATCH_CATCH_ALL if ((false)) +#define CATCH_CATCH_ANON(type) if ((false)) +#else +#define CATCH_TRY try +#define CATCH_CATCH_ALL catch (...) +#define CATCH_CATCH_ANON(type) catch (type) +#endif + +#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) +#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +#endif + +// end catch_compiler_capabilities.h +#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line +#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) +#ifdef CATCH_CONFIG_COUNTER +# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ ) +#else +# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ ) +#endif + +#include +#include +#include + +// We need a dummy global operator<< so we can bring it into Catch namespace later +struct Catch_global_namespace_dummy {}; +std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy); + +namespace Catch { + + struct CaseSensitive { enum Choice { + Yes, + No + }; }; + + class NonCopyable { + NonCopyable( NonCopyable const& ) = delete; + NonCopyable( NonCopyable && ) = delete; + NonCopyable& operator = ( NonCopyable const& ) = delete; + NonCopyable& operator = ( NonCopyable && ) = delete; + + protected: + NonCopyable(); + virtual ~NonCopyable(); + }; + + struct SourceLineInfo { + + SourceLineInfo() = delete; + SourceLineInfo( char const* _file, std::size_t _line ) noexcept + : file( _file ), + line( _line ) + {} + + SourceLineInfo( SourceLineInfo const& other ) = default; + SourceLineInfo& operator = ( SourceLineInfo const& ) = default; + SourceLineInfo( SourceLineInfo&& ) noexcept = default; + SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default; + + bool empty() const noexcept { return file[0] == '\0'; } + bool operator == ( SourceLineInfo const& other ) const noexcept; + bool operator < ( SourceLineInfo const& other ) const noexcept; + + char const* file; + std::size_t line; + }; + + std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); + + // Bring in operator<< from global namespace into Catch namespace + // This is necessary because the overload of operator<< above makes + // lookup stop at namespace Catch + using ::operator<<; + + // Use this in variadic streaming macros to allow + // >> +StreamEndStop + // as well as + // >> stuff +StreamEndStop + struct StreamEndStop { + std::string operator+() const; + }; + template + T const& operator + ( T const& value, StreamEndStop ) { + return value; + } +} + +#define CATCH_INTERNAL_LINEINFO \ + ::Catch::SourceLineInfo( __FILE__, static_cast( __LINE__ ) ) + +// end catch_common.h +namespace Catch { + + struct RegistrarForTagAliases { + RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ); + }; + +} // end namespace Catch + +#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \ + CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \ + CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ + namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \ + CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION + +// end catch_tag_alias_autoregistrar.h +// start catch_test_registry.h + +// start catch_interfaces_testcase.h + +#include + +namespace Catch { + + class TestSpec; + + struct ITestInvoker { + virtual void invoke () const = 0; + virtual ~ITestInvoker(); + }; + + class TestCase; + struct IConfig; + + struct ITestCaseRegistry { + virtual ~ITestCaseRegistry(); + virtual std::vector const& getAllTests() const = 0; + virtual std::vector const& getAllTestsSorted( IConfig const& config ) const = 0; + }; + + bool isThrowSafe( TestCase const& testCase, IConfig const& config ); + bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ); + std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ); + std::vector const& getAllTestCasesSorted( IConfig const& config ); + +} + +// end catch_interfaces_testcase.h +// start catch_stringref.h + +#include +#include +#include +#include + +namespace Catch { + + /// A non-owning string class (similar to the forthcoming std::string_view) + /// Note that, because a StringRef may be a substring of another string, + /// it may not be null terminated. + class StringRef { + public: + using size_type = std::size_t; + using const_iterator = const char*; + + private: + static constexpr char const* const s_empty = ""; + + char const* m_start = s_empty; + size_type m_size = 0; + + public: // construction + constexpr StringRef() noexcept = default; + + StringRef( char const* rawChars ) noexcept; + + constexpr StringRef( char const* rawChars, size_type size ) noexcept + : m_start( rawChars ), + m_size( size ) + {} + + StringRef( std::string const& stdString ) noexcept + : m_start( stdString.c_str() ), + m_size( stdString.size() ) + {} + + explicit operator std::string() const { + return std::string(m_start, m_size); + } + + public: // operators + auto operator == ( StringRef const& other ) const noexcept -> bool; + auto operator != (StringRef const& other) const noexcept -> bool { + return !(*this == other); + } + + auto operator[] ( size_type index ) const noexcept -> char { + assert(index < m_size); + return m_start[index]; + } + + public: // named queries + constexpr auto empty() const noexcept -> bool { + return m_size == 0; + } + constexpr auto size() const noexcept -> size_type { + return m_size; + } + + // Returns the current start pointer. If the StringRef is not + // null-terminated, throws std::domain_exception + auto c_str() const -> char const*; + + public: // substrings and searches + // Returns a substring of [start, start + length). + // If start + length > size(), then the substring is [start, size()). + // If start > size(), then the substring is empty. + auto substr( size_type start, size_type length ) const noexcept -> StringRef; + + // Returns the current start pointer. May not be null-terminated. + auto data() const noexcept -> char const*; + + constexpr auto isNullTerminated() const noexcept -> bool { + return m_start[m_size] == '\0'; + } + + public: // iterators + constexpr const_iterator begin() const { return m_start; } + constexpr const_iterator end() const { return m_start + m_size; } + }; + + auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&; + auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&; + + constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { + return StringRef( rawChars, size ); + } +} // namespace Catch + +constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { + return Catch::StringRef( rawChars, size ); +} + +// end catch_stringref.h +// start catch_preprocessor.hpp + + +#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__ +#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__))) +#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__))) + +#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__ +// MSVC needs more evaluations +#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__))) +#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__)) +#else +#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL5(__VA_ARGS__) +#endif + +#define CATCH_REC_END(...) +#define CATCH_REC_OUT + +#define CATCH_EMPTY() +#define CATCH_DEFER(id) id CATCH_EMPTY() + +#define CATCH_REC_GET_END2() 0, CATCH_REC_END +#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2 +#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1 +#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT +#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0) +#define CATCH_REC_NEXT(test, next) CATCH_REC_NEXT1(CATCH_REC_GET_END test, next) + +#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST2(f, x, peek, ...) f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) + +#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ ) +#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...) f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) + +// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results, +// and passes userdata as the first parameter to each invocation, +// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c) +#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) + +#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) + +#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param) +#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__ +#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__ +#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF +#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__) +#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__ +#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) +#else +// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF +#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__) +#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__ +#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1) +#endif + +#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__ +#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name) + +#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__) + +#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR +#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper()) +#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)) +#else +#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper())) +#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))) +#endif + +#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\ + CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__) + +#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0) +#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1) +#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2) +#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3) +#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4) +#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5) +#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6) +#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7) +#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8) +#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9) +#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10) + +#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N + +#define INTERNAL_CATCH_TYPE_GEN\ + template struct TypeList {};\ + template\ + constexpr auto get_wrapper() noexcept -> TypeList { return {}; }\ + template class...> struct TemplateTypeList{};\ + template class...Cs>\ + constexpr auto get_wrapper() noexcept -> TemplateTypeList { return {}; }\ + template\ + struct append;\ + template\ + struct rewrap;\ + template class, typename...>\ + struct create;\ + template class, typename>\ + struct convert;\ + \ + template \ + struct append { using type = T; };\ + template< template class L1, typename...E1, template class L2, typename...E2, typename...Rest>\ + struct append, L2, Rest...> { using type = typename append, Rest...>::type; };\ + template< template class L1, typename...E1, typename...Rest>\ + struct append, TypeList, Rest...> { using type = L1; };\ + \ + template< template class Container, template class List, typename...elems>\ + struct rewrap, List> { using type = TypeList>; };\ + template< template class Container, template class List, class...Elems, typename...Elements>\ + struct rewrap, List, Elements...> { using type = typename append>, typename rewrap, Elements...>::type>::type; };\ + \ + template