diff --git a/docs/source/Plugin/P000_commands.repl b/docs/source/Plugin/P000_commands.repl index 4716f1a75c..a3660229be 100644 --- a/docs/source/Plugin/P000_commands.repl +++ b/docs/source/Plugin/P000_commands.repl @@ -64,6 +64,32 @@ This data is persistent as long as the node is powered and thus survives a reboot or crash. ``ClearRTCram``" + " + ClearSdkWifi"," + :red:`Internal`"," + ESP8266 only (added: 2022/11/11) + Clear the 12k SDK WiFi partition at the end of the flash memory. + This data is used by the ESP8266 Arduino SDK to keep some persistent WiFi settings. + When WiFi is performing badly, it might be useful to clear this section. + Especially when switching SDK build revisions, like when switching between regular builds and "beta" or "alt.WiFi" builds. + Please reboot after clearing this partition. + See also ``ClearWifiRFcal`` command. + + ``ClearSdkWifi``" + " + ClearWifiRFcal"," + :red:`Internal`"," + ESP8266 only (added: 2022/11/11) + Clear the 4k RFcal partition near the end of the flash memory. + This data is used by the ESP8266 Arduino SDK to keep store WiFi RF calibration data. + When WiFi is performing badly, it might be useful to clear this section. + Especially when switching SDK build revisions, like when switching between regular builds and "beta" or "alt.WiFi" builds. + Another reason to clear the RF calibration is when initial RF calibration was done with a different power supply, or when WiFi performs badly after placing the ESP in a different enclosure which may de-tune the antenna. + Please reboot after clearing this partition. + See also ``ClearSdkWifi`` command. + + ``ClearWifiRFcal``" + " Config"," :red:`Internal`"," diff --git a/lib/ArduinoJson-6.x/.clang-format b/lib/ArduinoJson-6.x/.clang-format deleted file mode 100644 index 25f529f5c2..0000000000 --- a/lib/ArduinoJson-6.x/.clang-format +++ /dev/null @@ -1,10 +0,0 @@ -# http://clang.llvm.org/docs/ClangFormatStyleOptions.html - -BasedOnStyle: Google -Standard: Cpp03 -AllowShortFunctionsOnASingleLine: Empty -IncludeBlocks: Preserve -IndentPPDirectives: AfterHash - -# Always break after if to get accurate coverage -AllowShortIfStatementsOnASingleLine: false diff --git a/lib/ArduinoJson-6.x/.gitattributes b/lib/ArduinoJson-6.x/.gitattributes deleted file mode 100644 index 526c8a38d4..0000000000 --- a/lib/ArduinoJson-6.x/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.sh text eol=lf \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/.github/FUNDING.yml b/lib/ArduinoJson-6.x/.github/FUNDING.yml deleted file mode 100644 index 0ec57d0ac7..0000000000 --- a/lib/ArduinoJson-6.x/.github/FUNDING.yml +++ /dev/null @@ -1,4 +0,0 @@ -github: bblanchon -custom: - - https://arduinojson.org/book/ - - https://donate.benoitblanchon.fr/ diff --git a/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE.md b/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index cddc522f4a..0000000000 --- a/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/bug_report.md b/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index aaa35d1679..0000000000 --- a/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,54 +0,0 @@ ---- -name: 🐛 Bug report -about: Report a bug in ArduinoJson -title: '' -labels: 'bug' -assignees: '' ---- - - - -**Describe the bug** -A clear and concise description of what the bug is. - -**Troubleshooter report** -Here is the report generated by the [ArduinoJson Troubleshooter](https://arduinojson.org/v6/troubleshooter/): -[Paste the report here] - -**Environment** -Here is the environment that I used: -* Microcontroller: [e.g. ESP8266] -* Core/runtime: [e.g. ESP8266 core for Arduino v3.0.2] -* IDE: [e.g. Arduino IDE 1.8.16] - -**Reproduction** -Here is a small snippet that reproduces the issue. - -```c++ -DynamicJsonDocument doc(1024); - -DeserializationError error = deserializeJson(doc, "{\"hello\":\"world\"}"); - -[insert repro code here] -``` - -**Compiler output** -If relevant, include the complete compiler output (i.e. not just the line that contains the error.) - - -**Program output** -If relevant, include the repro program output. - -Expected output: - -``` -[insert expected output here] -``` - -Actual output: - -``` -[insert actual output here] -``` diff --git a/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/config.yml b/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 4cfe33aee2..0000000000 --- a/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -blank_issues_enabled: true -contact_links: - - name: 👨‍🏫 ArduinoJson Assistant - url: https://arduinojson.org/v6/assistant/ - about: An online tool that computes memory requirements and generates scaffolding code for your project. - - name: 👨‍⚕️ ArduinoJson Troubleshooter - url: https://arduinojson.org/v6/troubleshooter/ - about: An online tool that helps you diagnose the most common issues with ArduinoJson. diff --git a/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/feature_request.md b/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 889baaf22c..0000000000 --- a/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: 💡 Feature request -about: Suggest an idea for ArduinoJson -title: '' -labels: enhancement -assignees: '' ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/help.md b/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/help.md deleted file mode 100644 index d367679bfa..0000000000 --- a/lib/ArduinoJson-6.x/.github/ISSUE_TEMPLATE/help.md +++ /dev/null @@ -1,51 +0,0 @@ ---- -name: 😭 Help! -about: Ask for help -title: '' -labels: 'question' -assignees: '' ---- - - - -**Describe the issue** -A clear and concise description of what you're trying to do. -You don't need to explain every aspect of your project: focus on the problem you're having. - -**Troubleshooter report** -Here is the report generated by the [ArduinoJson Troubleshooter](https://arduinojson.org/v6/troubleshooter/): -[Paste the report here] - -**Environment** -Here is the environment that I'm using': -* Microconroller: [e.g. ESP8266] -* Core/runtime: [e.g. ESP8266 core for Arduino v3.0.2] -* IDE: [e.g. Arduino IDE 1.8.16] - -**Reproduction** -Here is a small snippet that demonstrate the problem. - -```c++ -DynamicJsonDocument doc(1024); - -DeserializationError error = deserializeJson(doc, "{\"hello\":\"world\"}"); - -// insert code here -``` - -**Program output** -If relevant, include the program output. - -Expected output: - -``` -[insert expected output here] -``` - -Actual output: - -``` -[insert actual output here] -``` diff --git a/lib/ArduinoJson-6.x/.github/lock.yml b/lib/ArduinoJson-6.x/.github/lock.yml deleted file mode 100644 index 427d4dc3eb..0000000000 --- a/lib/ArduinoJson-6.x/.github/lock.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration for Lock Threads - https://github.com/dessant/lock-threads - -# Number of days of inactivity before a closed issue or pull request is locked -daysUntilLock: 30 - -# Comment to post before locking. Set to `false` to disable -lockComment: false diff --git a/lib/ArduinoJson-6.x/.github/workflows/ci.yml b/lib/ArduinoJson-6.x/.github/workflows/ci.yml deleted file mode 100644 index aacbff90ce..0000000000 --- a/lib/ArduinoJson-6.x/.github/workflows/ci.yml +++ /dev/null @@ -1,560 +0,0 @@ -name: Continuous Integration - -on: [push, pull_request] - -jobs: - lint: - name: Lint - runs-on: ubuntu-20.04 - steps: - - name: Install - run: sudo apt-get install -y clang-format - - name: Checkout - uses: actions/checkout@v2 - - name: Symlinks - run: find * -type l -printf "::error::%p is a symlink. This is forbidden by the Arduino Library Specification." -exec false {} + - - name: Clang-format - run: | - find src/ extras/ -name '*.[ch]pp' | xargs clang-format -i --verbose --style=file - git diff --exit-code - - gcc: - name: GCC - needs: lint - runs-on: ubuntu-20.04 - strategy: - fail-fast: false - matrix: - include: - - gcc: "4.4" - - gcc: "4.6" - - gcc: "4.7" - - gcc: "4.8" - - gcc: "4.9" - - gcc: "5" - - gcc: "6" - - gcc: "7" - cxxflags: -fsanitize=leak -fno-sanitize-recover=all - - gcc: "8" - cxxflags: -fsanitize=undefined -fno-sanitize-recover=all - - gcc: "9" - cxxflags: -fsanitize=address -fno-sanitize-recover=all - - gcc: "10" - cxxflags: -funsigned-char # Issue #1715 - - gcc: "11" - steps: - - name: Install - run: | - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ trusty main' - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ trusty universe' - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ xenial main' - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ xenial universe' - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ bionic main' - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ bionic universe' - sudo add-apt-repository -yn 'deb http://mirrors.kernel.org/ubuntu hirsute main universe' - sudo apt-get update - sudo apt-get install -y gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }} - - name: Checkout - uses: actions/checkout@v2 - - name: Configure - run: cmake -DCMAKE_BUILD_TYPE=Debug . - env: - CC: gcc-${{ matrix.gcc }} - CXX: g++-${{ matrix.gcc }} - CXXFLAGS: ${{ matrix.cxxflags }} - - name: Build - run: cmake --build . - - name: Test - run: ctest --output-on-failure -C Debug . - env: - UBSAN_OPTIONS: print_stacktrace=1 - - clang: - name: Clang - needs: lint - runs-on: ubuntu-20.04 - strategy: - fail-fast: false - matrix: - include: - - clang: "3.5" - cxxflags: "-stdlib=libc++" - - clang: "3.6" - cxxflags: "-stdlib=libc++" - - clang: "3.7" - cxxflags: "-stdlib=libc++" - - clang: "3.8" - cxxflags: "-stdlib=libc++" - - clang: "3.9" - cxxflags: "-stdlib=libc++" - - clang: "4.0" - cxxflags: "-stdlib=libc++" - - clang: "5.0" - - clang: "6.0" - - clang: "7" - - clang: "8" - cxxflags: -fsanitize=leak -fno-sanitize-recover=all - - clang: "9" - cxxflags: -fsanitize=undefined -fno-sanitize-recover=all - - clang: "10" - cxxflags: -fsanitize=address -fno-sanitize-recover=all - steps: - - name: Install - run: | - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ trusty main' - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ trusty universe' - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ xenial main' - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ xenial universe' - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ bionic main' - sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ bionic universe' - sudo apt-get update - sudo apt-get install -y clang-${{ matrix.clang }} - - name: Checkout - uses: actions/checkout@v2 - - name: Configure - run: cmake -DCMAKE_BUILD_TYPE=Debug . - env: - CC: clang-${{ matrix.clang }} - CXX: clang++-${{ matrix.clang }} - CXXFLAGS: >- - ${{ matrix.cxxflags }} - ${{ contains(matrix.cxxflags, 'libc++') && '-I/usr/lib/llvm-10/include/c++/v1/' || '' }} - - name: Build - run: cmake --build . - - name: Test - run: ctest --output-on-failure -C Debug . - env: - UBSAN_OPTIONS: print_stacktrace=1 - - conf_test: - name: Test configuration on Linux - needs: [gcc, clang] - runs-on: ubuntu-20.04 - steps: - - name: Install - run: | - sudo apt-get update - sudo apt-get install -y g++-multilib - - name: Checkout - uses: actions/checkout@v2 - - name: GCC 32-bit - run: g++ -std=c++11 -m32 -Isrc extras/conf_test/x86.cpp - - name: GCC 64-bit - run: g++ -std=c++11 -m64 -Isrc extras/conf_test/x64.cpp - - name: Clang 32-bit - run: clang++ -std=c++11 -m32 -Isrc extras/conf_test/x86.cpp - - name: Clang 64-bit - run: clang++ -std=c++11 -m64 -Isrc extras/conf_test/x64.cpp - - conf_test_windows: - name: Test configuration on Windows - runs-on: windows-2019 - needs: [gcc, clang] - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: 32-bit - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat" - cl /Isrc extras/conf_test/x86.cpp - shell: cmd - - name: 64-bit - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cl /Isrc extras/conf_test/x64.cpp - shell: cmd - - xcode: - name: XCode - needs: clang - runs-on: macos-10.15 - strategy: - fail-fast: false - matrix: - include: - - xcode: "10.3" - - xcode: "11.7" - - xcode: "12.4" - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Select XCode version - run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app - - name: Configure - run: cmake -DCMAKE_BUILD_TYPE=Debug . - - name: Build - run: cmake --build . - - name: Test - run: ctest --output-on-failure -C Debug . - - # DISABLED: Running on AppVeyor instead because it supports older versions of the compiler - # msvc: - # name: Visual Studio - # strategy: - # fail-fast: false - # matrix: - # include: - # - os: windows-2016 - # - os: windows-2019 - # runs-on: ${{ matrix.os }} - # steps: - # - name: Checkout - # uses: actions/checkout@v2 - # - name: Configure - # run: cmake -DCMAKE_BUILD_TYPE=Debug . - # - name: Build - # run: cmake --build . - # - name: Test - # run: ctest --output-on-failure -C Debug . - - arduino: - name: Arduino - needs: gcc - strategy: - fail-fast: false - matrix: - include: - - core: arduino:avr - board: arduino:avr:uno - - core: arduino:samd - board: arduino:samd:mkr1000 - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Install arduino-cli - run: brew update && brew install arduino-cli - - name: Install core - run: arduino-cli core install ${{ matrix.core }} - - name: Install libraries - run: arduino-cli lib install SD Ethernet - - name: Build JsonConfigFile - run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonConfigFile/JsonConfigFile.ino" - - name: Build JsonFilterExample - run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonFilterExample/JsonFilterExample.ino" - - name: Build JsonGeneratorExample - run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonGeneratorExample/JsonGeneratorExample.ino" - - name: Build JsonHttpClient - run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonHttpClient/JsonHttpClient.ino" - - name: Build JsonParserExample - run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonParserExample/JsonParserExample.ino" - - name: Build JsonServer - run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonServer/JsonServer.ino" - - name: Build JsonUdpBeacon - run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/JsonUdpBeacon/JsonUdpBeacon.ino" - - name: Build MsgPackParser - run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/MsgPackParser/MsgPackParser.ino" - - name: Build ProgmemExample - run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/ProgmemExample/ProgmemExample.ino" - - name: Build StringExample - run: arduino-cli compile --library . --warnings all -b ${{ matrix.board }} "examples/StringExample/StringExample.ino" - - platformio: - name: PlatformIO - needs: gcc - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - include: - - platform: atmelavr - board: leonardo - libraries: - - SD - - Ethernet - conf_test: avr - - platform: espressif8266 - board: huzzah - conf_test: esp8266 - - platform: espressif32 - board: esp32dev - libraries: - - Ethernet - conf_test: esp8266 - - platform: atmelsam - board: mkr1000USB - libraries: - - SD - - Ethernet - conf_test: esp8266 - - platform: teensy - board: teensy31 - conf_test: esp8266 - - platform: ststm32 - board: adafruit_feather_f405 - libraries: - - SD - - Ethernet - conf_test: esp8266 - - platform: nordicnrf52 - board: adafruit_feather_nrf52840 - libraries: - - SD - - Ethernet - conf_test: esp8266 - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up cache for pip - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip - - name: Set up Python 3.x - uses: actions/setup-python@v2 - with: - python-version: "3.x" - - name: Install PlatformIO - run: pip install platformio - - name: Install adafruit-nrfutil - if: ${{ matrix.platform == 'nordicnrf52' }} - run: pip install adafruit-nrfutil - - name: Include Adafruit_TinyUSB.h # https://github.com/adafruit/Adafruit_nRF52_Arduino/issues/653 - if: ${{ matrix.platform == 'nordicnrf52' }} - run: find examples/ -name '*.ino' -exec sed -i 's/\(#include \)/\1\n#include /' {} + - - name: Set up cache for platformio - uses: actions/cache@v2 - with: - path: ~/.platformio - key: ${{ runner.os }}-platformio-${{ matrix.platform }} - - name: Install platform "${{ matrix.platform }}" - run: platformio platform install ${{ matrix.platform }} - - name: Install libraries - if: ${{ matrix.libraries }} - run: platformio lib install arduino-libraries/${{ join(matrix.libraries, ' arduino-libraries/') }} - - name: Test configuration - run: platformio ci "extras/conf_test/${{ matrix.conf_test }}.cpp" -l '.' -b ${{ matrix.board }} - if: ${{ matrix.conf_test }} - - name: Build JsonConfigFile - run: platformio ci "examples/JsonConfigFile/JsonConfigFile.ino" -l '.' -b ${{ matrix.board }} - - name: Build JsonFilterExample - run: platformio ci "examples/JsonFilterExample/JsonFilterExample.ino" -l '.' -b ${{ matrix.board }} - - name: Build JsonGeneratorExample - run: platformio ci "examples/JsonGeneratorExample/JsonGeneratorExample.ino" -l '.' -b ${{ matrix.board }} - - name: Build JsonHttpClient - run: platformio ci "examples/JsonHttpClient/JsonHttpClient.ino" -l '.' -b ${{ matrix.board }} - - name: Build JsonParserExample - run: platformio ci "examples/JsonParserExample/JsonParserExample.ino" -l '.' -b ${{ matrix.board }} - - name: Build JsonServer - if: ${{ matrix.platform != 'espressif32' }} - run: platformio ci "examples/JsonServer/JsonServer.ino" -l '.' -b ${{ matrix.board }} - - name: Build JsonUdpBeacon - run: platformio ci "examples/JsonUdpBeacon/JsonUdpBeacon.ino" -l '.' -b ${{ matrix.board }} - - name: Build MsgPackParser - run: platformio ci "examples/MsgPackParser/MsgPackParser.ino" -l '.' -b ${{ matrix.board }} - - name: Build ProgmemExample - run: platformio ci "examples/ProgmemExample/ProgmemExample.ino" -l '.' -b ${{ matrix.board }} - - name: Build StringExample - run: platformio ci "examples/StringExample/StringExample.ino" -l '.' -b ${{ matrix.board }} - - name: PlatformIO prune - if: ${{ always() }} - run: platformio system prune -f - - particle: - name: Particle - needs: gcc - runs-on: ubuntu-latest - if: github.event_name == 'push' - strategy: - fail-fast: false - matrix: - include: - - board: argon - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Install Particle CLI - run: sudo npm install -g particle-cli - - name: Login to Particle - run: particle login -t "${{ secrets.PARTICLE_TOKEN }}" - - name: Compile - run: extras/ci/particle.sh ${{ matrix.board }} - - arm: - name: GCC for ARM processor - needs: gcc - runs-on: ubuntu-20.04 - steps: - - name: Install - run: | - sudo apt-get update - sudo apt-get install -y g++-arm-linux-gnueabihf - - name: Checkout - uses: actions/checkout@v2 - - name: Configure - run: cmake . - env: - CC: arm-linux-gnueabihf-gcc - CXX: arm-linux-gnueabihf-g++ - - name: Build - run: cmake --build . - - coverage: - needs: gcc - name: Coverage - runs-on: ubuntu-20.04 - steps: - - name: Install - run: sudo apt-get install -y lcov ninja-build - - name: Checkout - uses: actions/checkout@v2 - - name: Configure - run: cmake -G Ninja -DCOVERAGE=true . - - name: Build - run: ninja - - name: Test - run: ctest -LE 'WillFail|Fuzzing' -T test - - name: lcov --capture - run: lcov --capture --no-external --directory . --output-file coverage.info - - name: lcov --remove - run: lcov --remove coverage.info "$(pwd)/extras/*" --output-file coverage_filtered.info - - name: genhtml - run: mkdir coverage && genhtml coverage_filtered.info -o coverage -t ArduinoJson - - name: Upload HTML report - uses: actions/upload-artifact@v2 - with: - name: Coverage report - path: coverage - - name: Upload to Coveralls - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: coverage_filtered.info - - valgrind: - needs: gcc - name: Valgrind - runs-on: ubuntu-20.04 - steps: - - name: Install - run: | - sudo apt-get update - sudo apt-get install -y valgrind ninja-build - - name: Checkout - uses: actions/checkout@v2 - - name: Configure - run: cmake -G Ninja -D MEMORYCHECK_COMMAND_OPTIONS="--error-exitcode=1 --leak-check=full" . - - name: Build - run: ninja - - name: Memcheck - run: ctest -LE WillFail -T memcheck - id: memcheck - - name: MemoryChecker.*.log - run: cat Testing/Temporary/MemoryChecker.*.log - if: failure() - - clang-tidy: - needs: clang - name: Clang-Tidy - runs-on: ubuntu-20.04 - steps: - - name: Install - run: sudo apt-get install -y clang-tidy cmake ninja-build - - name: Checkout - uses: actions/checkout@v2 - - name: Configure - run: cmake -G Ninja -DCMAKE_CXX_CLANG_TIDY="clang-tidy-10;--warnings-as-errors=*" -DCMAKE_BUILD_TYPE=Debug . - env: - CC: clang-10 - CXX: clang++-10 - - name: Check - run: cmake --build . -- -k 0 - - amalgamate-h: - needs: gcc - name: Amalgamate ArduinoJson.h - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Amalgamate - id: amalgamate - run: | - if [[ $GITHUB_REF == refs/tags/* ]]; then - VERSION=${GITHUB_REF#refs/tags/} - else - VERSION=${GITHUB_SHA::7} - fi - INPUT=src/ArduinoJson.h - OUTPUT=ArduinoJson-$VERSION.h - extras/scripts/build-single-header.sh "$INPUT" "$OUTPUT" - echo ::set-output name=filename::${OUTPUT} - - name: Smoke test - run: | - g++ -x c++ - < doc; - deserializeJson(doc, "{}"); - } - END - - name: Upload artifact - uses: actions/upload-artifact@v2 - with: - name: Single headers - path: ${{ steps.amalgamate.outputs.filename }} - - amalgamate-hpp: - needs: gcc - name: Amalgamate ArduinoJson.hpp - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Amalgamate - id: amalgamate - run: | - if [[ $GITHUB_REF == refs/tags/* ]]; then - VERSION=${GITHUB_REF#refs/tags/} - else - VERSION=${GITHUB_SHA::7} - fi - INPUT=src/ArduinoJson.hpp - OUTPUT=ArduinoJson-$VERSION.hpp - extras/scripts/build-single-header.sh "$INPUT" "$OUTPUT" - echo ::set-output name=filename::${OUTPUT} - - name: Smoke test - run: | - g++ -x c++ - < doc; - deserializeJson(doc, "{}"); - } - END - - name: Upload artifact - uses: actions/upload-artifact@v2 - with: - name: Single headers - path: ${{ steps.amalgamate.outputs.filename }} - - esp-idf: - needs: gcc - name: ESP-IDF - runs-on: ubuntu-latest - steps: - - name: Setup cache - uses: actions/cache@v2 - with: - path: ~/.espressif - key: ${{ runner.os }}-esp-idf - - name: Checkout ArduinoJson - uses: actions/checkout@v2 - - name: Checkout ESP-IDF - uses: actions/checkout@v2 - with: - repository: espressif/esp-idf - path: esp-idf - submodules: true - - name: Install ESP-IDF - run: ./esp-idf/install.sh - - name: Add component - # NOTE: we cannot commit the symlink because the Arduino Library Specification forbids it. - run: | - mkdir -p extras/ci/espidf/components - ln -s $PWD extras/ci/espidf/components/ArduinoJson - - name: Build example - run: | - source esp-idf/export.sh - cd extras/ci/espidf - idf.py build diff --git a/lib/ArduinoJson-6.x/.github/workflows/lock.yml b/lib/ArduinoJson-6.x/.github/workflows/lock.yml deleted file mode 100644 index 48949abceb..0000000000 --- a/lib/ArduinoJson-6.x/.github/workflows/lock.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: 'Lock Threads' - -on: - schedule: - - cron: '0 0 * * *' - -jobs: - lock: - runs-on: ubuntu-latest - steps: - - uses: dessant/lock-threads@v2 - with: - github-token: ${{ github.token }} - issue-lock-inactive-days: 30 diff --git a/lib/ArduinoJson-6.x/.github/workflows/release.yml b/lib/ArduinoJson-6.x/.github/workflows/release.yml deleted file mode 100644 index 7d0e6f2b63..0000000000 --- a/lib/ArduinoJson-6.x/.github/workflows/release.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Release - -on: - push: - tags: - - v*.*.* - -jobs: - release: - name: Create release - runs-on: ubuntu-20.04 - steps: - - name: Set variables - id: init - run: | - echo ::set-output name=tag::${GITHUB_REF#refs/tags/} - echo ::set-output name=version::${GITHUB_REF#refs/tags/v} - - name: Checkout - uses: actions/checkout@v2 - - name: Write release body - id: body - run: | - FILENAME=RELEASE.md - extras/scripts/get-release-body.sh ${{ steps.init.outputs.tag }} CHANGELOG.md | tee $FILENAME - echo ::set-output name=filename::$FILENAME - - name: Amalgamate ArduinoJson.h - id: amalgamate_h - run: | - FILENAME=ArduinoJson-${{ steps.init.outputs.tag }}.h - extras/scripts/build-single-header.sh src/ArduinoJson.h "$FILENAME" - echo ::set-output name=filename::$FILENAME - - name: Amalgamate ArduinoJson.hpp - id: amalgamate_hpp - run: | - FILENAME=ArduinoJson-${{ steps.init.outputs.tag }}.hpp - extras/scripts/build-single-header.sh src/ArduinoJson.hpp "$FILENAME" - echo ::set-output name=filename::$FILENAME - - name: Create Arduino package - id: arduino - run: | - FILENAME=ArduinoJson-${{ steps.init.outputs.tag }}.zip - extras/scripts/build-arduino-package.sh . "$FILENAME" - echo ::set-output name=filename::$FILENAME - - name: Create release - uses: ncipollo/release-action@v1 - with: - bodyFile: ${{ steps.body.outputs.filename }} - draft: true - name: ArduinoJson ${{ steps.init.outputs.version }} - artifacts: ${{ steps.amalgamate_h.outputs.filename }},${{ steps.amalgamate_hpp.outputs.filename }},${{ steps.arduino.outputs.filename }} - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/lib/ArduinoJson-6.x/.gitignore b/lib/ArduinoJson-6.x/.gitignore deleted file mode 100644 index 2a5bc30012..0000000000 --- a/lib/ArduinoJson-6.x/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -.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 diff --git a/lib/ArduinoJson-6.x/.mbedignore b/lib/ArduinoJson-6.x/.mbedignore deleted file mode 100644 index 9a8a814f54..0000000000 --- a/lib/ArduinoJson-6.x/.mbedignore +++ /dev/null @@ -1,3 +0,0 @@ -.github/ -examples/ -extras/ \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/.prettierignore b/lib/ArduinoJson-6.x/.prettierignore deleted file mode 100644 index dd449725e1..0000000000 --- a/lib/ArduinoJson-6.x/.prettierignore +++ /dev/null @@ -1 +0,0 @@ -*.md diff --git a/lib/ArduinoJson-6.x/.travis.yml b/lib/ArduinoJson-6.x/.travis.yml deleted file mode 100644 index 6cf281f8ba..0000000000 --- a/lib/ArduinoJson-6.x/.travis.yml +++ /dev/null @@ -1,136 +0,0 @@ -sudo: false -language: cpp -matrix: - include: - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-4.4'] - env: SCRIPT=test _CC=gcc-4.4 _CXX=g++-4.4 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-4.6'] - env: SCRIPT=test _CC=gcc-4.6 _CXX=g++-4.6 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-4.7'] - env: SCRIPT=test _CC=gcc-4.7 _CXX=g++-4.7 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-4.8'] - env: SCRIPT=test _CC=gcc-4.8 _CXX=g++-4.8 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-4.9'] - env: SCRIPT=test _CC=gcc-4.9 _CXX=g++-4.9 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-5'] - env: SCRIPT=test _CC=gcc-5 _CXX=g++-5 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-6'] - env: SCRIPT=test _CC=gcc-6 _CXX=g++-6 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-7'] - env: SCRIPT=test _CC=gcc-7 _CXX=g++-7 CXXFLAGS="-fsanitize=leak" - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-8'] - env: SCRIPT=test _CC=gcc-8 _CXX=g++-8 CXXFLAGS="-fsanitize=undefined" LDFLAGS="-fuse-ld=gold" - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-9'] - env: SCRIPT=test _CC=gcc-9 _CXX=g++-9 CXXFLAGS="-fsanitize=address" - - addons: - apt: - packages: ['g++-arm-linux-gnueabihf'] - env: SCRIPT=build _CC=arm-linux-gnueabihf-gcc _CXX=arm-linux-gnueabihf-g++ - - env: SCRIPT=test _CC=clang _CXX=clang++ - - addons: - apt: - sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5'] - packages: ['clang-3.5'] - env: SCRIPT=test _CC=clang-3.5 _CXX=clang++-3.5 CXXFLAGS="-fsanitize=address" - - addons: - apt: - sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.6'] - packages: ['clang-3.6'] - env: SCRIPT=test _CC=clang-3.6 _CXX=clang++-3.6 CXXFLAGS="-fsanitize=leak" - - addons: - apt: - sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.7'] - packages: ['clang-3.7'] - env: SCRIPT=test _CC=clang-3.7 _CXX=clang++-3.7 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.8'] - packages: ['clang-3.8'] - env: SCRIPT=test _CC=clang-3.8 _CXX=clang++-3.8 CXXFLAGS="-fsanitize=undefined" - - addons: - apt: - sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-3.9'] - packages: ['clang-3.9'] - env: SCRIPT=test _CC=clang-3.9 _CXX=clang++-3.9 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-4.0'] - packages: ['clang-4.0'] - env: SCRIPT=test _CC=clang-4.0 _CXX=clang++-4.0 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['clang-5.0'] - env: SCRIPT=test _CC=clang-5.0 _CXX=clang++-5.0 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test'] - packages: ['clang-6.0'] - env: SCRIPT=test _CC=clang-6.0 _CXX=clang++-6.0 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-7'] - packages: ['clang-7'] - env: SCRIPT=test _CC=clang-7 _CXX=clang++-7 - - addons: - apt: - sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-8'] - packages: ['clang-8'] - env: SCRIPT=test _CC=clang-8 _CXX=clang++-8 - - addons: - apt: - sources: - - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main' - key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - packages: ['clang-9'] - env: SCRIPT=test _CC=clang-9 _CXX=clang++-9 - - env: SCRIPT=coverage - - os: osx - osx_image: xcode8.3 - env: SCRIPT=test - - os: osx - osx_image: xcode9.4 - env: SCRIPT=test - - os: osx - osx_image: xcode10 - env: SCRIPT=test CXXFLAGS="-fsanitize=address" - - env: SCRIPT=arduino VERSION=1.6.7 BOARD=arduino:avr:uno - - env: SCRIPT=arduino VERSION=1.8.2 BOARD=arduino:samd:mkr1000 - - env: SCRIPT=platformio BOARD=uno - - env: SCRIPT=platformio BOARD=esp01 -cache: - directories: - - "~/.platformio" - - "extras/fuzzing/json_corpus" - - "extras/fuzzing/msgpack_corpus" -script: extras/ci/$SCRIPT.sh diff --git a/lib/ArduinoJson-6.x/ArduinoJson.h b/lib/ArduinoJson-6.x/ArduinoJson.h index 7e3afa58ab..15c218f480 100644 --- a/lib/ArduinoJson-6.x/ArduinoJson.h +++ b/lib/ArduinoJson-6.x/ArduinoJson.h @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #include "src/ArduinoJson.h" diff --git a/lib/ArduinoJson-6.x/CHANGELOG.md b/lib/ArduinoJson-6.x/CHANGELOG.md index 6c768cd37f..a477dd873b 100644 --- a/lib/ArduinoJson-6.x/CHANGELOG.md +++ b/lib/ArduinoJson-6.x/CHANGELOG.md @@ -1,6 +1,68 @@ ArduinoJson: change log ======================= +v6.21.2 (2023-04-12) +------- + +* Fix compatibility with the Zephyr Project (issue #1905) +* Allow using PROGMEM outside of Arduino (issue #1903) +* Set default for `ARDUINOJSON_ENABLE_PROGMEM` to `1` on AVR + +v6.21.1 (2023-03-27) +------- + +* Double speed of `DynamicJsonDocument::garbageCollect()` +* Fix compatibility with GCC 5.2 (issue #1897) + +v6.21.0 (2023-03-14) +------- + +* Drop support for C++98/C++03. Minimum required is C++11. +* Remove `ARDUINOJSON_NAMESPACE`; use `ArduinoJson` instead. +* Make string support generic (issue #1807) + +v6.20.1 (2023-02-08) +------- + +* Remove explicit exclusion of `as()` and `as()` (issue #1860) + If you try to call them, you'll now get the same error message as any unsupported type. + You could also add a custom converter for `char*` and `char`. + +v6.20.0 (2022-12-26) +------- + +* Add `JsonVariant::shallowCopy()` (issue #1343) +* Fix `9.22337e+18 is outside the range of representable values of type 'long'` +* Fix comparison operators for `JsonArray`, `JsonArrayConst`, `JsonObject`, and `JsonObjectConst` +* Fix lax parsing of `true`, `false`, and `null` (issue #1781) +* Remove undocumented `accept()` functions +* Rename `addElement()` to `add()` +* Remove `getElement()`, `getOrAddElement()`, `getMember()`, and `getOrAddMember()` +* Remove undocumented `JsonDocument::data()` and `JsonDocument::memoryPool()` +* Remove undocumented `JsonArrayIterator::internal()` and `JsonObjectIterator::internal()` +* Rename things in `ARDUINOJSON_NAMESPACE` to match the public names +* Add documentation to most public symbols +* Remove support for naked `char` (was deprecated since 6.18.0) + +> ### BREAKING CHANGES +> +> This release hides `JsonVariant`'s functions that were only intended for internal use. +> If you were using them in your programs, you must replace with `operator[]` and `to()`, like so: +> +> ```c++ +> // before +> JsonVariant a = variant.getElement(idx); +> JsonVariant b = variant.getOrAddElement(idx); +> JsonVariant c = variant.getMember(key); +> JsonVariant d = variant.getOrAddMember(key); +> +> // after +> JsonVariant a = variant[idx]; +> JsonVariant b = idx < variant.size() ? variant[idx] : variant[idx].to(); +> JsonVariant c = variant[key]; +> JsonVariant d = variant.containsKey(key) ? variant[key] : variant[key].to(); +> ``` + v6.19.4 (2022-04-05) ------- diff --git a/lib/ArduinoJson-6.x/CMakeLists.txt b/lib/ArduinoJson-6.x/CMakeLists.txt deleted file mode 100644 index f809a58930..0000000000 --- a/lib/ArduinoJson-6.x/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, 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 6.19.4) - -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/lib/ArduinoJson-6.x/CONTRIBUTING.md b/lib/ArduinoJson-6.x/CONTRIBUTING.md deleted file mode 100644 index d32a04ff16..0000000000 --- a/lib/ArduinoJson-6.x/CONTRIBUTING.md +++ /dev/null @@ -1,10 +0,0 @@ -# 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/lib/ArduinoJson-6.x/LICENSE.md b/lib/ArduinoJson-6.x/LICENSE.txt similarity index 96% rename from lib/ArduinoJson-6.x/LICENSE.md rename to lib/ArduinoJson-6.x/LICENSE.txt index e59620d1d5..15f1b9fbb5 100644 --- a/lib/ArduinoJson-6.x/LICENSE.md +++ b/lib/ArduinoJson-6.x/LICENSE.txt @@ -1,7 +1,7 @@ The MIT License (MIT) --------------------- -Copyright © 2014-2022, Benoit BLANCHON +Copyright © 2014-2023, 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: diff --git a/lib/ArduinoJson-6.x/README.md b/lib/ArduinoJson-6.x/README.md index 37f1469219..2b3d9ebbb3 100644 --- a/lib/ArduinoJson-6.x/README.md +++ b/lib/ArduinoJson-6.x/README.md @@ -1,50 +1,53 @@ -![ArduinoJson](banner.svg) +

+ ArduinoJson +

--- -[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bblanchon/ArduinoJson/Continuous%20Integration?logo=github)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A6.x) +[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/bblanchon/ArduinoJson/ci.yml?branch=6.x&logo=github)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A6.x) [![Continuous Integration](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/6.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.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) -[![LGTM Grade](https://img.shields.io/lgtm/grade/cpp/github/bblanchon/ArduinoJson?label=quality&logo=lgtm)](https://lgtm.com/projects/g/bblanchon/ArduinoJson/) [![Coveralls branch](https://img.shields.io/coveralls/github/bblanchon/ArduinoJson/6.x?logo=coveralls)](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x) -[![Arduino Library Manager](https://img.shields.io/static/v1?label=Arduino&message=v6.19.4&logo=arduino&logoColor=white&color=blue)](https://www.ardu-badge.com/ArduinoJson/6.19.4) -[![PlatformIO Registry](https://badges.registry.platformio.org/packages/bblanchon/library/ArduinoJson.svg?version=6.19.4)](https://registry.platformio.org/packages/libraries/bblanchon/ArduinoJson?version=6.19.4) -[![GitHub stars](https://img.shields.io/github/stars/bblanchon/ArduinoJson?style=flat&logo=github)](https://github.com/bblanchon/ArduinoJson/stargazers) -[![GitHub Sponsors](https://img.shields.io/github/sponsors/bblanchon?logo=github)](https://github.com/sponsors/bblanchon) +[![Arduino Library Manager](https://img.shields.io/static/v1?label=Arduino&message=v6.21.2&logo=arduino&logoColor=white&color=blue)](https://www.ardu-badge.com/ArduinoJson/6.21.2) +[![PlatformIO Registry](https://badges.registry.platformio.org/packages/bblanchon/library/ArduinoJson.svg?version=6.21.2)](https://registry.platformio.org/packages/libraries/bblanchon/ArduinoJson?version=6.21.2) +[![ESP IDF](https://img.shields.io/static/v1?label=ESP+IDF&message=v6.21.2&logo=cpu&logoColor=white&color=blue)](https://components.espressif.com/components/bblanchon/arduinojson) +[![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/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme) - * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v6/api/config/decode_unicode/?utm_source=github&utm_medium=readme) - * [Optionally stores links to the input buffer (zero-copy)](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme) - * [Optionally supports comments in the input](https://arduinojson.org/v6/api/config/enable_comments/?utm_source=github&utm_medium=readme) - * [Optionally filters the input to keep only desired values](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme#filtering) +* [JSON deserialization](https://arduinojson.org/v6/api/json/deserializejson/) + * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v6/api/config/decode_unicode/) + * [Optionally stores links to the input buffer (zero-copy)](https://arduinojson.org/v6/api/json/deserializejson/) + * [Optionally supports comments in the input](https://arduinojson.org/v6/api/config/enable_comments/) + * [Optionally filters the input to keep only desired values](https://arduinojson.org/v6/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/v6/api/json/serializejson/?utm_source=github&utm_medium=readme) - * [Can write to a buffer or a stream](https://arduinojson.org/v6/api/json/serializejson/?utm_source=github&utm_medium=readme) - * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v6/api/json/serializejsonpretty/?utm_source=github&utm_medium=readme) -* [MessagePack serialization](https://arduinojson.org/v6/api/msgpack/serializemsgpack/?utm_source=github&utm_medium=readme) -* [MessagePack deserialization](https://arduinojson.org/v6/api/msgpack/deserializemsgpack/?utm_source=github&utm_medium=readme) +* [JSON serialization](https://arduinojson.org/v6/api/json/serializejson/) + * [Can write to a buffer or a stream](https://arduinojson.org/v6/api/json/serializejson/) + * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v6/api/json/serializejsonpretty/) +* [MessagePack serialization](https://arduinojson.org/v6/api/msgpack/serializemsgpack/) +* [MessagePack deserialization](https://arduinojson.org/v6/api/msgpack/deserializemsgpack/) * Efficient - * [Twice smaller than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/?utm_source=github&utm_medium=readme) - * [Almost 10% faster than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/?utm_source=github&utm_medium=readme) - * [Consumes roughly 10% less RAM than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/?utm_source=github&utm_medium=readme) - * [Fixed memory allocation, no heap fragmentation](https://arduinojson.org/v6/api/jsondocument/?utm_source=github&utm_medium=readme) - * [Optionally works without heap memory (zero malloc)](https://arduinojson.org/v6/api/staticjsondocument/?utm_source=github&utm_medium=readme) - * [Deduplicates strings](https://arduinojson.org/news/2020/08/01/version-6-16-0/?utm_source=github&utm_medium=readme) + * [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/) + * [Fixed memory allocation, no heap fragmentation](https://arduinojson.org/v6/api/jsondocument/) + * [Optionally works without heap memory (zero malloc)](https://arduinojson.org/v6/api/staticjsondocument/) + * [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/v6/how-to/use-external-ram-on-esp32/?utm_source=github&utm_medium=readme) - * Supports [`String`](https://arduinojson.org/v6/api/config/enable_arduino_string/?utm_source=github&utm_medium=readme), [`std::string`](https://arduinojson.org/v6/api/config/enable_std_string/?utm_source=github&utm_medium=readme), and [`std::string_view`](https://arduinojson.org/v6/api/config/enable_string_view/?utm_source=github&utm_medium=readme) - * Supports [`Stream`](https://arduinojson.org/v6/api/config/enable_arduino_stream/?utm_source=github&utm_medium=readme) and [`std::istream`/`std::ostream`](https://arduinojson.org/v6/api/config/enable_std_stream/?utm_source=github&utm_medium=readme) - * Supports [Flash strings](https://arduinojson.org/v6/api/config/enable_progmem/?utm_source=github&utm_medium=readme) - * Supports [custom readers](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme#custom-reader) and [custom writers](https://arduinojson.org/v6/api/json/serializejson/?utm_source=github&utm_medium=readme#custom-writer) - * Supports [custom converters](https://arduinojson.org/news/2021/05/04/version-6-18-0/?utm_source=github&utm_medium=readme) + * Supports [custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v6/how-to/use-external-ram-on-esp32/) + * Supports [`String`](https://arduinojson.org/v6/api/config/enable_arduino_string/), [`std::string`](https://arduinojson.org/v6/api/config/enable_std_string/), and [`std::string_view`](https://arduinojson.org/v6/api/config/enable_string_view/) + * Supports [`Stream`](https://arduinojson.org/v6/api/config/enable_arduino_stream/) and [`std::istream`/`std::ostream`](https://arduinojson.org/v6/api/config/enable_std_stream/) + * Supports [Flash strings](https://arduinojson.org/v6/api/config/enable_progmem/) + * Supports [custom readers](https://arduinojson.org/v6/api/json/deserializejson/#custom-reader) and [custom writers](https://arduinojson.org/v6/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++98, C++11, C++14 and C++17 + * 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 @@ -69,36 +72,35 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things). * [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/v6/how-to/use-arduinojson-with-cmake/?utm_source=github&utm_medium=readme) + * [CMake friendly](https://arduinojson.org/v6/how-to/use-arduinojson-with-cmake/) * Well designed - * [Elegant API](http://arduinojson.org/v6/example/?utm_source=github&utm_medium=readme) + * [Elegant API](http://arduinojson.org/v6/example/) * [Thread-safe](https://en.wikipedia.org/wiki/Thread_safety) * Self-contained (no external dependency) * `const` friendly - * [`for` friendly](https://arduinojson.org/v6/api/jsonobject/begin_end/?utm_source=github&utm_medium=readme) + * [`for` friendly](https://arduinojson.org/v6/api/jsonobject/begin_end/) * [TMP friendly](https://en.wikipedia.org/wiki/Template_metaprogramming) - * Handles [integer overflows](https://arduinojson.org/v6/api/jsonvariant/as/?utm_source=github&utm_medium=readme#integer-overflows) + * Handles [integer overflows](https://arduinojson.org/v6/api/jsonvariant/as/#integer-overflows) * Well tested * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x) * Continuously tested on - * [Visual Studio 2010, 2012, 2013, 2015, 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x) - * [GCC 4.4, 4.6, 4.7, 4.8, 4.9, 5, 6, 7, 8, 9, 10, 11](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22) - * [Clang 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22) + * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x) + * [GCC 5, 6, 7, 8, 9, 10, 11](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22) + * [Clang 3.8, 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10](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/v6/doc/deserialization/?utm_source=github&utm_medium=readme) - * [Examples](https://arduinojson.org/v6/example/?utm_source=github&utm_medium=readme) - * [How-tos](https://arduinojson.org/v6/example/?utm_source=github&utm_medium=readme) - * [FAQ](https://arduinojson.org/v6/faq/?utm_source=github&utm_medium=readme) - * [Troubleshooter](https://arduinojson.org/v6/troubleshooter/?utm_source=github&utm_medium=readme) - * [Book](https://arduinojson.org/book/?utm_source=github&utm_medium=readme) + * [Tutorials](https://arduinojson.org/v6/doc/deserialization/) + * [Examples](https://arduinojson.org/v6/example/) + * [How-tos](https://arduinojson.org/v6/example/) + * [FAQ](https://arduinojson.org/v6/faq/) + * [Troubleshooter](https://arduinojson.org/v6/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) - * [Discord server](https://discord.gg/DzN6hHHD4h) ## Quickstart @@ -118,7 +120,7 @@ double latitude = doc["data"][0]; double longitude = doc["data"][1]; ``` -See the [tutorial on arduinojson.org](https://arduinojson.org/doc/decoding/?utm_source=github&utm_medium=readme) +See the [tutorial on arduinojson.org](https://arduinojson.org/v6/doc/deserialization/) ### Serialization @@ -137,16 +139,13 @@ serializeJson(doc, Serial); // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]} ``` -See the [tutorial on arduinojson.org](https://arduinojson.org/doc/encoding/?utm_source=github&utm_medium=readme) +See the [tutorial on arduinojson.org](https://arduinojson.org/v6/doc/serialization/) ## Sponsors ArduinoJson is thankful to its sponsors. Please give them a visit; they deserve it!

- - Tech Explorations - Programming Electronics Academy diff --git a/lib/ArduinoJson-6.x/SUPPORT.md b/lib/ArduinoJson-6.x/SUPPORT.md deleted file mode 100644 index c47e1b1ba8..0000000000 --- a/lib/ArduinoJson-6.x/SUPPORT.md +++ /dev/null @@ -1,27 +0,0 @@ -# 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/lib/ArduinoJson-6.x/appveyor.yml b/lib/ArduinoJson-6.x/appveyor.yml deleted file mode 100644 index 6e3e458f1c..0000000000 --- a/lib/ArduinoJson-6.x/appveyor.yml +++ /dev/null @@ -1,37 +0,0 @@ -version: 6.19.4.{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 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - CMAKE_GENERATOR: Visual Studio 14 2015 - - CMAKE_GENERATOR: Visual Studio 12 2013 - - CMAKE_GENERATOR: Visual Studio 11 2012 - - CMAKE_GENERATOR: Visual Studio 10 2010 - - CMAKE_GENERATOR: Ninja - MINGW: MinGW # MinGW 32-bit 5.3.0 - - CMAKE_GENERATOR: Ninja - MINGW32: i686-5.3.0-posix-dwarf-rt_v4-rev0 # MinGW-w64 5.3.0 - - 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/lib/ArduinoJson-6.x/banner.svg b/lib/ArduinoJson-6.x/banner.svg deleted file mode 100644 index 5176096250..0000000000 --- a/lib/ArduinoJson-6.x/banner.svg +++ /dev/null @@ -1,367 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/ArduinoJson-6.x/component.mk b/lib/ArduinoJson-6.x/component.mk deleted file mode 100644 index dc25d1c0ef..0000000000 --- a/lib/ArduinoJson-6.x/component.mk +++ /dev/null @@ -1 +0,0 @@ -COMPONENT_ADD_INCLUDEDIRS := src diff --git a/lib/ArduinoJson-6.x/examples/JsonConfigFile/JsonConfigFile.ino b/lib/ArduinoJson-6.x/examples/JsonConfigFile/JsonConfigFile.ino index 3443ba7291..b2819d5536 100644 --- a/lib/ArduinoJson-6.x/examples/JsonConfigFile/JsonConfigFile.ino +++ b/lib/ArduinoJson-6.x/examples/JsonConfigFile/JsonConfigFile.ino @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License // // This example shows how to store your project configuration in a file. diff --git a/lib/ArduinoJson-6.x/examples/JsonFilterExample/JsonFilterExample.ino b/lib/ArduinoJson-6.x/examples/JsonFilterExample/JsonFilterExample.ino index f50187a62e..fc980aab5c 100644 --- a/lib/ArduinoJson-6.x/examples/JsonFilterExample/JsonFilterExample.ino +++ b/lib/ArduinoJson-6.x/examples/JsonFilterExample/JsonFilterExample.ino @@ -1,8 +1,8 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License // -// This example shows how to use DeserializationOpion::Filter +// This example shows how to use DeserializationOption::Filter // // https://arduinojson.org/v6/example/filter/ diff --git a/lib/ArduinoJson-6.x/examples/JsonGeneratorExample/JsonGeneratorExample.ino b/lib/ArduinoJson-6.x/examples/JsonGeneratorExample/JsonGeneratorExample.ino index e036209635..749e413b6e 100644 --- a/lib/ArduinoJson-6.x/examples/JsonGeneratorExample/JsonGeneratorExample.ino +++ b/lib/ArduinoJson-6.x/examples/JsonGeneratorExample/JsonGeneratorExample.ino @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License // // This example shows how to generate a JSON document with ArduinoJson. diff --git a/lib/ArduinoJson-6.x/examples/JsonHttpClient/JsonHttpClient.ino b/lib/ArduinoJson-6.x/examples/JsonHttpClient/JsonHttpClient.ino index 8e2e6d7ba8..72f311fea5 100644 --- a/lib/ArduinoJson-6.x/examples/JsonHttpClient/JsonHttpClient.ino +++ b/lib/ArduinoJson-6.x/examples/JsonHttpClient/JsonHttpClient.ino @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License // // This example shows how to parse a JSON document in an HTTP response. diff --git a/lib/ArduinoJson-6.x/examples/JsonParserExample/JsonParserExample.ino b/lib/ArduinoJson-6.x/examples/JsonParserExample/JsonParserExample.ino index d6492df404..1d2bd16cca 100644 --- a/lib/ArduinoJson-6.x/examples/JsonParserExample/JsonParserExample.ino +++ b/lib/ArduinoJson-6.x/examples/JsonParserExample/JsonParserExample.ino @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License // // This example shows how to deserialize a JSON document with ArduinoJson. diff --git a/lib/ArduinoJson-6.x/examples/JsonServer/JsonServer.ino b/lib/ArduinoJson-6.x/examples/JsonServer/JsonServer.ino index 52d55c5bd7..a897fce6da 100644 --- a/lib/ArduinoJson-6.x/examples/JsonServer/JsonServer.ino +++ b/lib/ArduinoJson-6.x/examples/JsonServer/JsonServer.ino @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License // // This example shows how to implement an HTTP server that sends a JSON document diff --git a/lib/ArduinoJson-6.x/examples/JsonUdpBeacon/JsonUdpBeacon.ino b/lib/ArduinoJson-6.x/examples/JsonUdpBeacon/JsonUdpBeacon.ino index 87965a3cc1..6c369faa48 100644 --- a/lib/ArduinoJson-6.x/examples/JsonUdpBeacon/JsonUdpBeacon.ino +++ b/lib/ArduinoJson-6.x/examples/JsonUdpBeacon/JsonUdpBeacon.ino @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License // // This example shows how to send a JSON document to a UDP socket. diff --git a/lib/ArduinoJson-6.x/examples/MsgPackParser/MsgPackParser.ino b/lib/ArduinoJson-6.x/examples/MsgPackParser/MsgPackParser.ino index a14245b5d2..1a54c3b3a1 100644 --- a/lib/ArduinoJson-6.x/examples/MsgPackParser/MsgPackParser.ino +++ b/lib/ArduinoJson-6.x/examples/MsgPackParser/MsgPackParser.ino @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License // // This example shows how to deserialize a MessagePack document with diff --git a/lib/ArduinoJson-6.x/examples/ProgmemExample/ProgmemExample.ino b/lib/ArduinoJson-6.x/examples/ProgmemExample/ProgmemExample.ino index 8cb4ddd0ea..68b8ec562b 100644 --- a/lib/ArduinoJson-6.x/examples/ProgmemExample/ProgmemExample.ino +++ b/lib/ArduinoJson-6.x/examples/ProgmemExample/ProgmemExample.ino @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License // // This example shows the different ways you can use Flash strings with @@ -20,28 +20,27 @@ void setup() { // WARNING: the strings in the input will be duplicated in the JsonDocument. deserializeJson(doc, F("{\"sensor\":\"gps\",\"time\":1351824120," "\"data\":[48.756080,2.302038]}")); - JsonObject obj = doc.as(); - // You can use a Flash String to get an element of a JsonObject + // You can use a Flash String as a key to get a member from JsonDocument // No duplication is done. - long time = obj[F("time")]; + long time = doc[F("time")]; - // You can use a Flash String to set an element of a JsonObject + // 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. - obj[F("time")] = time; + doc[F("time")] = time; - // You can set a Flash String to a JsonObject or JsonArray: + // 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. - obj["sensor"] = F("gps"); + doc["sensor"] = F("gps"); // It works with serialized() too: - obj["sensor"] = serialized(F("\"gps\"")); - obj["sensor"] = serialized(F("\xA3gps"), 3); + doc["sensor"] = serialized(F("\"gps\"")); + doc["sensor"] = serialized(F("\xA3gps"), 3); // You can compare the content of a JsonVariant to a Flash String - if (obj["sensor"] == F("gps")) { + if (doc["sensor"] == F("gps")) { // ... } } diff --git a/lib/ArduinoJson-6.x/examples/StringExample/StringExample.ino b/lib/ArduinoJson-6.x/examples/StringExample/StringExample.ino index 0fd30684c3..3e51b915b8 100644 --- a/lib/ArduinoJson-6.x/examples/StringExample/StringExample.ino +++ b/lib/ArduinoJson-6.x/examples/StringExample/StringExample.ino @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License // // This example shows the different ways you can use String with ArduinoJson. @@ -20,42 +20,42 @@ void setup() { String input = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}"; deserializeJson(doc, input); - JsonObject obj = doc.as(); - // You can use a String to get an element of a JsonObject + // You can use a String as a key to get a member from JsonDocument // No duplication is done. - long time = obj[String("time")]; + long time = doc[String("time")]; - // You can use a String to set an element of a JsonObject + // 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. - obj[String("time")] = time; + doc[String("time")] = time; - // You can get a String from a JsonObject or JsonArray: + // You can get the content of a JsonVariant as a String // No duplication is done, at least not in the JsonDocument. - String sensor = obj["sensor"]; + String sensor = doc["sensor"]; // Unfortunately, the following doesn't work (issue #118): - // sensor = obj["sensor"]; // <- error "ambiguous overload for 'operator='" + // sensor = doc["sensor"]; // <- error "ambiguous overload for 'operator='" // As a workaround, you need to replace by: - sensor = obj["sensor"].as(); + sensor = doc["sensor"].as(); - // You can set a String to a JsonObject or JsonArray: + // You can set a String as the content of a JsonVariant // WARNING: the content of the String will be duplicated in the JsonDocument. - obj["sensor"] = sensor; + doc["sensor"] = sensor; // It works with serialized() too: - obj["sensor"] = serialized(sensor); + doc["sensor"] = serialized(sensor); // You can also concatenate strings // WARNING: the content of the String will be duplicated in the JsonDocument. - obj[String("sen") + "sor"] = String("gp") + "s"; + doc[String("sen") + "sor"] = String("gp") + "s"; // You can compare the content of a JsonObject with a String - if (obj["sensor"] == sensor) { + if (doc["sensor"] == sensor) { // ... } // Lastly, you can print the resulting JSON to a String + // WARNING: it doesn't replace the content but appends to it String output; serializeJson(doc, output); } diff --git a/lib/ArduinoJson-6.x/extras/ArduinoJsonConfig.cmake.in b/lib/ArduinoJson-6.x/extras/ArduinoJsonConfig.cmake.in deleted file mode 100644 index 9c15f36a29..0000000000 --- a/lib/ArduinoJson-6.x/extras/ArduinoJsonConfig.cmake.in +++ /dev/null @@ -1,4 +0,0 @@ -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -check_required_components("@PROJECT_NAME@") diff --git a/lib/ArduinoJson-6.x/extras/CompileOptions.cmake b/lib/ArduinoJson-6.x/extras/CompileOptions.cmake deleted file mode 100644 index 82a750a122..0000000000 --- a/lib/ArduinoJson-6.x/extras/CompileOptions.cmake +++ /dev/null @@ -1,101 +0,0 @@ -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.8) AND (NOT ${COVERAGE})) - add_compile_options(-g -Og) - else() - add_compile_options(-g -O0) - 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") - 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. - ) - - if (NOT MSVC_VERSION LESS 1910) # >= Visual Studio 2017 - add_compile_options( - /Zc:__cplusplus # Enable updated __cplusplus macro - ) - endif() -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/lib/ArduinoJson-6.x/extras/ci/arduino.sh b/lib/ArduinoJson-6.x/extras/ci/arduino.sh deleted file mode 100644 index f4c168a5d2..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/arduino.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -eux - -/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16 -sleep 3 -export DISPLAY=:1.0 - -mkdir -p /tmp/arduino -curl -sS http://downloads.arduino.cc/arduino-$VERSION-linux64.tar.xz | tar xJ -C /tmp/arduino --strip 1 || -curl -sS http://downloads.arduino.cc/arduino-$VERSION-linux64.tgz | tar xz -C /tmp/arduino --strip 1 -export PATH=$PATH:/tmp/arduino/ - -if [[ "$BOARD" =~ "arduino:samd:" ]]; then - arduino --install-boards arduino:samd -fi - -ln -s $PWD /tmp/arduino/libraries/ArduinoJson - -for EXAMPLE in $PWD/examples/*/*.ino; do - arduino --verify --board $BOARD $EXAMPLE -done diff --git a/lib/ArduinoJson-6.x/extras/ci/build.sh b/lib/ArduinoJson-6.x/extras/ci/build.sh deleted file mode 100644 index 4741963bd3..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -ex - -export CC="$_CC" -export CXX="$_CXX" - -cmake -DCMAKE_BUILD_TYPE=Release . -cmake --build . diff --git a/lib/ArduinoJson-6.x/extras/ci/coverage.sh b/lib/ArduinoJson-6.x/extras/ci/coverage.sh deleted file mode 100644 index 3e155b92d2..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/coverage.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -eux - -cmake -DCOVERAGE=true . -make -make test - -pip install --user cpp-coveralls 'requests[security]' -pwd -coveralls --include 'src' --gcov-options '\-lp' diff --git a/lib/ArduinoJson-6.x/extras/ci/espidf/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/ci/espidf/CMakeLists.txt deleted file mode 100644 index e3c4475a49..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/espidf/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -cmake_minimum_required(VERSION 3.5) - -include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(example) diff --git a/lib/ArduinoJson-6.x/extras/ci/espidf/main/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/ci/espidf/main/CMakeLists.txt deleted file mode 100644 index f06bfda644..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/espidf/main/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -idf_component_register(SRCS "main.cpp" - INCLUDE_DIRS "") diff --git a/lib/ArduinoJson-6.x/extras/ci/espidf/main/component.mk b/lib/ArduinoJson-6.x/extras/ci/espidf/main/component.mk deleted file mode 100644 index a98f634eae..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/espidf/main/component.mk +++ /dev/null @@ -1,4 +0,0 @@ -# -# "main" pseudo-component makefile. -# -# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.) diff --git a/lib/ArduinoJson-6.x/extras/ci/espidf/main/main.cpp b/lib/ArduinoJson-6.x/extras/ci/espidf/main/main.cpp deleted file mode 100644 index 50d7ec072b..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/espidf/main/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include - -extern "C" void app_main() { - char buffer[256]; - StaticJsonDocument<200> doc; - - doc["hello"] = "world"; - serializeJson(doc, buffer); - deserializeJson(doc, buffer); - serializeMsgPack(doc, buffer); - deserializeMsgPack(doc, buffer); -} diff --git a/lib/ArduinoJson-6.x/extras/ci/fuzz.sh b/lib/ArduinoJson-6.x/extras/ci/fuzz.sh deleted file mode 100644 index 6e69980451..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/fuzz.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -eux - -ROOT_DIR=$(dirname $0)/../../ -FUZZING_DIR=${ROOT_DIR}/extras/fuzzing/ - -export CC="clang-${CLANG}" -export CXX="clang++-${CLANG}" -cmake -DCMAKE_BUILD_TYPE=Debug . - -FUZZER_TARGET="${FUZZER}_fuzzer" -FUZZER_PATH="extras/fuzzing/${FUZZER_TARGET}" -CORPUS_DIR="${FUZZING_DIR}/${FUZZER}_corpus" -SEED_CORPUS_DIR="${FUZZING_DIR}/${FUZZER}_seed_corpus" - -cmake --build . --target $FUZZER_TARGET - -export ASAN_OPTIONS="detect_leaks=0" -export LLVM_PROFILE_FILE="${FUZZER_TARGET}.profraw" -${FUZZER_PATH} "$CORPUS_DIR" "$SEED_CORPUS_DIR" -max_total_time=60 -timeout=1 - -llvm-profdata-${CLANG} merge -sparse ${LLVM_PROFILE_FILE} -o ${FUZZER_TARGET}.profdata -llvm-cov-${CLANG} report ./${FUZZER_PATH} -instr-profile=${FUZZER_TARGET}.profdata diff --git a/lib/ArduinoJson-6.x/extras/ci/particle.sh b/lib/ArduinoJson-6.x/extras/ci/particle.sh deleted file mode 100644 index 556635305a..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/particle.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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/lib/ArduinoJson-6.x/extras/ci/platformio.sh b/lib/ArduinoJson-6.x/extras/ci/platformio.sh deleted file mode 100644 index 905e1bb12c..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/platformio.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -eux - -pip install --user platformio - -case $BOARD in -uno) - platformio lib install 868 # SD library - platformio lib install 872 # Ethernet library - ;; -esp01) - platformio lib uninstall 161 || true - platformio lib uninstall 868 || true - platformio lib uninstall 872 || true - ;; -esac - -for EXAMPLE in $PWD/examples/*/*.ino; -do - platformio ci $EXAMPLE -l '.' -b $BOARD -done diff --git a/lib/ArduinoJson-6.x/extras/ci/test.sh b/lib/ArduinoJson-6.x/extras/ci/test.sh deleted file mode 100644 index 6616230602..0000000000 --- a/lib/ArduinoJson-6.x/extras/ci/test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -ex - -export CC="$_CC" -export CXX="$_CXX" - -cmake -DCMAKE_BUILD_TYPE=Debug . -cmake --build . -ctest --output-on-failure . diff --git a/lib/ArduinoJson-6.x/extras/conf_test/avr.cpp b/lib/ArduinoJson-6.x/extras/conf_test/avr.cpp deleted file mode 100644 index cd0b4bdc48..0000000000 --- a/lib/ArduinoJson-6.x/extras/conf_test/avr.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include - -static_assert(ARDUINOJSON_USE_LONG_LONG == 0, "ARDUINOJSON_USE_LONG_LONG"); - -static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 1, - "ARDUINOJSON_SLOT_OFFSET_SIZE"); - -static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); - -static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); - -static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 8, - "sizeof(VariantSlot)"); - -void setup() {} -void loop() {} diff --git a/lib/ArduinoJson-6.x/extras/conf_test/esp8266.cpp b/lib/ArduinoJson-6.x/extras/conf_test/esp8266.cpp deleted file mode 100644 index bb9988bd7f..0000000000 --- a/lib/ArduinoJson-6.x/extras/conf_test/esp8266.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include - -static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); - -static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 2, - "ARDUINOJSON_SLOT_OFFSET_SIZE"); - -static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); - -static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); - -static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 16, - "sizeof(VariantSlot)"); - -void setup() {} -void loop() {} diff --git a/lib/ArduinoJson-6.x/extras/conf_test/x64.cpp b/lib/ArduinoJson-6.x/extras/conf_test/x64.cpp deleted file mode 100644 index 8cd6c06e08..0000000000 --- a/lib/ArduinoJson-6.x/extras/conf_test/x64.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include - -static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); - -static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 4, - "ARDUINOJSON_SLOT_OFFSET_SIZE"); - -static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); - -static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); - -static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 32, - "sizeof(VariantSlot)"); - -int main() {} diff --git a/lib/ArduinoJson-6.x/extras/conf_test/x86.cpp b/lib/ArduinoJson-6.x/extras/conf_test/x86.cpp deleted file mode 100644 index dab9da6100..0000000000 --- a/lib/ArduinoJson-6.x/extras/conf_test/x86.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include - -static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); - -static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 2, - "ARDUINOJSON_SLOT_OFFSET_SIZE"); - -static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); - -static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); - -static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 16, - "sizeof(VariantSlot)"); - -int main() {} diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/fuzzing/CMakeLists.txt deleted file mode 100644 index e5d6a36e6c..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -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() - -if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6) - add_fuzzer(json) - add_fuzzer(msgpack) -endif() diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/Makefile b/lib/ArduinoJson-6.x/extras/fuzzing/Makefile deleted file mode 100644 index d3c574e18d..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# CAUTION: this file is invoked by https://github.com/google/oss-fuzz - -CXXFLAGS += -I../../src -DARDUINOJSON_DEBUG=1 - -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/lib/ArduinoJson-6.x/extras/fuzzing/json_corpus/.gitignore b/lib/ArduinoJson-6.x/extras/fuzzing/json_corpus/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_corpus/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/json_fuzzer.cpp b/lib/ArduinoJson-6.x/extras/fuzzing/json_fuzzer.cpp deleted file mode 100644 index db9a3d6c15..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_fuzzer.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include - -extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - DynamicJsonDocument doc(4096); - DeserializationError error = deserializeJson(doc, data, size); - if (!error) { - std::string json; - serializeJson(doc, json); - } - return 0; -} diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/Comments.json b/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/Comments.json deleted file mode 100644 index bcc4cece6c..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/Comments.json +++ /dev/null @@ -1,10 +0,0 @@ -//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/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/EmptyArray.json b/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/EmptyArray.json deleted file mode 100644 index 0637a088a0..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/EmptyArray.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/EmptyObject.json b/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/EmptyObject.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/EmptyObject.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json b/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json deleted file mode 100644 index 9285019af4..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json +++ /dev/null @@ -1 +0,0 @@ -[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/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/IntegerOverflow.json b/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/IntegerOverflow.json deleted file mode 100644 index 3a33cb89d3..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/IntegerOverflow.json +++ /dev/null @@ -1 +0,0 @@ -9720730739393920739 diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/Numbers.json b/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/Numbers.json deleted file mode 100644 index f6b9419422..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/Numbers.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - 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/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json b/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json deleted file mode 100644 index 27d6bafd46..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "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/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/Strings.json b/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/Strings.json deleted file mode 100644 index 3ffa235e64..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/Strings.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - "hello", - 'hello', - hello, - {"hello":"world"}, - {'hello':'world'}, - {hello:world} -] \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/WeatherUnderground.json b/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/WeatherUnderground.json deleted file mode 100644 index d53ce0064a..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/json_seed_corpus/WeatherUnderground.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "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/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_corpus/.gitignore b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_corpus/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_corpus/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_fuzzer.cpp b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_fuzzer.cpp deleted file mode 100644 index e62359114a..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_fuzzer.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include - -extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - DynamicJsonDocument doc(4096); - DeserializationError error = deserializeMsgPack(doc, data, size); - if (!error) { - std::string json; - serializeMsgPack(doc, json); - } - return 0; -} diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/array16 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/array16 deleted file mode 100644 index 714ba99e70..0000000000 Binary files a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/array16 and /dev/null differ diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/array32 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/array32 deleted file mode 100644 index 6e3ed7b1b8..0000000000 Binary files a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/array32 and /dev/null differ diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/false b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/false deleted file mode 100644 index 5277188383..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/false +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixarray b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixarray deleted file mode 100644 index 95d54b199f..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixarray +++ /dev/null @@ -1 +0,0 @@ -helloworld \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixint_negative b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixint_negative deleted file mode 100644 index eda5949cbe..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixint_negative +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixint_positive b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixint_positive deleted file mode 100644 index 16e0e90df0..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixint_positive +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixmap b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixmap deleted file mode 100644 index df26118e4a..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixmap +++ /dev/null @@ -1 +0,0 @@ -onetwo \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixstr b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixstr deleted file mode 100644 index 2ff7b3f3e9..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/fixstr +++ /dev/null @@ -1 +0,0 @@ -hello world \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/float32 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/float32 deleted file mode 100644 index a574220c5d..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/float32 +++ /dev/null @@ -1 +0,0 @@ -@H \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/float64 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/float64 deleted file mode 100644 index 36088bcdc5..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/float64 +++ /dev/null @@ -1 +0,0 @@ -@ !o \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int16 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int16 deleted file mode 100644 index 9ffc705e49..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int16 +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int32 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int32 deleted file mode 100644 index d735e2175b..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int32 +++ /dev/null @@ -1 +0,0 @@ -Ҷi. \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int64 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int64 deleted file mode 100644 index 9d2cd3b991..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int64 +++ /dev/null @@ -1 +0,0 @@ -4Vx \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int8 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int8 deleted file mode 100644 index ae2ca9cc14..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/int8 +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/map16 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/map16 deleted file mode 100644 index 836a71874d..0000000000 Binary files a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/map16 and /dev/null differ diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/map32 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/map32 deleted file mode 100644 index 97ab162ebd..0000000000 Binary files a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/map32 and /dev/null differ diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/nil b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/nil deleted file mode 100644 index e7754cae5a..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/nil +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/str16 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/str16 deleted file mode 100644 index 91c1396de2..0000000000 Binary files a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/str16 and /dev/null differ diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/str32 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/str32 deleted file mode 100644 index 50cac52adc..0000000000 Binary files a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/str32 and /dev/null differ diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/str8 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/str8 deleted file mode 100644 index ff5a2c0ee8..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/str8 +++ /dev/null @@ -1 +0,0 @@ -hello \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/true b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/true deleted file mode 100644 index 6b10f95843..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/true +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint16 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint16 deleted file mode 100644 index 7f4c2e826d..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint16 +++ /dev/null @@ -1 +0,0 @@ -09 \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint32 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint32 deleted file mode 100644 index 864826fbc1..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint32 +++ /dev/null @@ -1 +0,0 @@ -4Vx \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint64 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint64 deleted file mode 100644 index 20ede759d5..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint64 +++ /dev/null @@ -1 +0,0 @@ -4Vx \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint8 b/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint8 deleted file mode 100644 index 6a96120724..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/msgpack_seed_corpus/uint8 +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/ArduinoJson-6.x/extras/fuzzing/reproducer.cpp b/lib/ArduinoJson-6.x/extras/fuzzing/reproducer.cpp deleted file mode 100644 index 86818012f3..0000000000 --- a/lib/ArduinoJson-6.x/extras/fuzzing/reproducer.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -// This file is NOT use by Google's OSS fuzz -// I only use it to reproduce the bugs found - -#include // 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/lib/ArduinoJson-6.x/extras/particle/project.properties b/lib/ArduinoJson-6.x/extras/particle/project.properties deleted file mode 100644 index d39555ad5a..0000000000 --- a/lib/ArduinoJson-6.x/extras/particle/project.properties +++ /dev/null @@ -1 +0,0 @@ -name=ArduinoJsonCI diff --git a/lib/ArduinoJson-6.x/extras/particle/src/smocktest.ino b/lib/ArduinoJson-6.x/extras/particle/src/smocktest.ino deleted file mode 100644 index ca17189eaf..0000000000 --- a/lib/ArduinoJson-6.x/extras/particle/src/smocktest.ino +++ /dev/null @@ -1,5 +0,0 @@ -#include "ArduinoJson.h" - -void setup() {} - -void loop() {} diff --git a/lib/ArduinoJson-6.x/extras/scripts/build-arduino-package.sh b/lib/ArduinoJson-6.x/extras/scripts/build-arduino-package.sh deleted file mode 100644 index 339db2f624..0000000000 --- a/lib/ArduinoJson-6.x/extras/scripts/build-arduino-package.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -set -eu - -INPUT=$1 -OUTPUT=$2 - -cd "$INPUT" - -# remove existing file -rm -f "$OUTPUT" - -# create zip -7z a "$OUTPUT" \ - -xr!.vs \ - CHANGELOG.md \ - examples \ - src \ - keywords.txt \ - library.properties \ - LICENSE.md \ - README.md \ - ArduinoJson.h diff --git a/lib/ArduinoJson-6.x/extras/scripts/build-single-header.sh b/lib/ArduinoJson-6.x/extras/scripts/build-single-header.sh deleted file mode 100644 index 09d91d419b..0000000000 --- a/lib/ArduinoJson-6.x/extras/scripts/build-single-header.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/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|\} // namespace ARDUINOJSON_NAMESPACE\r?\nnamespace ARDUINOJSON_NAMESPACE \{\r?\n||igs' "$1" - rm -f "$1.bak" -} - -INCLUDED=() -INPUT=$1 -OUTPUT=$2 -process "$INPUT" true > "$OUTPUT" -simplify_namespaces "$OUTPUT" diff --git a/lib/ArduinoJson-6.x/extras/scripts/get-release-body.sh b/lib/ArduinoJson-6.x/extras/scripts/get-release-body.sh deleted file mode 100644 index 7c842c2379..0000000000 --- a/lib/ArduinoJson-6.x/extras/scripts/get-release-body.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -eu - -TAG="$1" -CHANGELOG="$2" - -cat << END -## Changes - -$(awk '/\* /{ FOUND=1 } /^[[:space:]]*$/ { if(FOUND) exit } { if(FOUND) print }' "$CHANGELOG") - -[View version history](https://github.com/bblanchon/ArduinoJson/blob/$TAG/CHANGELOG.md) -END diff --git a/lib/ArduinoJson-6.x/extras/scripts/get-release-page.sh b/lib/ArduinoJson-6.x/extras/scripts/get-release-page.sh deleted file mode 100644 index 2acb8d8e43..0000000000 --- a/lib/ArduinoJson-6.x/extras/scripts/get-release-page.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -eu - -VERSION="$1" -CHANGELOG="$2" -FRONTMATTER="$3" - -cat << END ---- -branch: v6 -version: $VERSION -date: '$(date +'%Y-%m-%d')' -$(cat "$FRONTMATTER") ---- - -$(awk '/\* /{ FOUND=1; print; next } { if (FOUND) exit}' "$CHANGELOG") -END diff --git a/lib/ArduinoJson-6.x/extras/scripts/publish-particle-library.sh b/lib/ArduinoJson-6.x/extras/scripts/publish-particle-library.sh deleted file mode 100644 index 62c3140f5c..0000000000 --- a/lib/ArduinoJson-6.x/extras/scripts/publish-particle-library.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/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.md" "$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/lib/ArduinoJson-6.x/extras/scripts/publish.sh b/lib/ArduinoJson-6.x/extras/scripts/publish.sh deleted file mode 100644 index c5a4eefd35..0000000000 --- a/lib/ArduinoJson-6.x/extras/scripts/publish.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env bash - -set -eu - -which awk sed jq 7z 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]+)?' - -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 "s/\"version\":.*$/\"version\": \"$VERSION\",/" library.json - rm library.json~ - - sed -i~ -bE "s/version=.*$/version=$VERSION/" library.properties - rm library.properties~ - - sed -i~ -bE "s/version: .*$/version: $VERSION.{build}/" appveyor.yml - rm appveyor.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/" \ - 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 - 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-arduino-package.sh . "../ArduinoJson-$TAG.zip" -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/wandbox/publish.sh "../ArduinoJson-$TAG.h" > "../ArduinoJson-$TAG-wandbox.txt" || echo "Wandbox failed!" -extras/scripts/get-release-page.sh "$VERSION" "CHANGELOG.md" "../ArduinoJson-$TAG-wandbox.txt" > "../ArduinoJson-$TAG.md" - -echo "You can now copy ../ArduinoJson-$TAG.md into arduinojson.org/collections/_versions/$VERSION.md" diff --git a/lib/ArduinoJson-6.x/extras/scripts/wandbox/JsonGeneratorExample.cpp b/lib/ArduinoJson-6.x/extras/scripts/wandbox/JsonGeneratorExample.cpp deleted file mode 100644 index 0090c849f1..0000000000 --- a/lib/ArduinoJson-6.x/extras/scripts/wandbox/JsonGeneratorExample.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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 - // - // Inside the brackets, 200 is the RAM allocated to this document. - // Don't forget to change this value to match your requirement. - // Use https://arduinojson.org/v6/assistant to compute the capacity. - StaticJsonDocument<200> doc; - - // StaticJsonObject allocates memory on the stack, it can be - // replaced by DynamicJsonDocument which allocates in the heap. - // - // DynamicJsonDocument doc(200); - - // StaticJsonObject allocates memory on the stack, it can be - // replaced by DynamicJsonDocument which allocates in the heap. - // - // DynamicJsonDocument doc(200); - - // Add values in the document - // - doc["sensor"] = "gps"; - doc["time"] = 1351824120; - - // Add an array. - // - JsonArray data = doc.createNestedArray("data"); - 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/lib/ArduinoJson-6.x/extras/scripts/wandbox/JsonParserExample.cpp b/lib/ArduinoJson-6.x/extras/scripts/wandbox/JsonParserExample.cpp deleted file mode 100644 index f513caff23..0000000000 --- a/lib/ArduinoJson-6.x/extras/scripts/wandbox/JsonParserExample.cpp +++ /dev/null @@ -1,59 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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 - // - // Inside the brackets, 200 is the capacity of the memory pool in bytes. - // Don't forget to change this value to match your JSON document. - // Use https://arduinojson.org/v6/assistant to compute the capacity. - StaticJsonDocument<300> doc; - - // StaticJsonDocument allocates memory on the stack, it can be - // replaced by DynamicJsonDocument which allocates in the heap. - // - // DynamicJsonDocument doc(200); - - // JSON input string. - // - // Using a char[], as shown here, enables the "zero-copy" mode. This mode uses - // the minimal amount of memory because the JsonDocument stores pointers to - // the input buffer. - // If you use another type of input, ArduinoJson must copy the strings from - // the input to the JsonDocument, so you need to increase the capacity of the - // JsonDocument. - 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 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 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/lib/ArduinoJson-6.x/extras/scripts/wandbox/MsgPackParserExample.cpp b/lib/ArduinoJson-6.x/extras/scripts/wandbox/MsgPackParserExample.cpp deleted file mode 100644 index 186816e610..0000000000 --- a/lib/ArduinoJson-6.x/extras/scripts/wandbox/MsgPackParserExample.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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 - // - // Inside the brackets, 300 is the size of the memory pool in bytes. - // Don't forget to change this value to match your JSON document. - // Use https://arduinojson.org/assistant to compute the capacity. - StaticJsonDocument<300> doc; - - // StaticJsonObject allocates memory on the stack, it can be - // replaced by DynamicJsonObject which allocates in the heap. - // - // DynamicJsonObject doc(200); - - // MessagePack input string. - // - // It's better to use a char[] as shown here. - // If you use a const char* or a String, ArduinoJson will - // have to make a copy of the input in the JsonBuffer. - 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] - // } - - // doc of the object tree. - // - // It's a reference to the JsonObject, the actual bytes are inside the - // JsonBuffer with all the other nodes of the object tree. - // Memory is freed when jsonBuffer goes out of scope. - DeserializationError error = deserializeMsgPack(doc, input); - - // Test if parsing succeeds. - if (error) { - std::cerr << "deserializeMsgPack() failed: " << error.c_str() << std::endl; - return 1; - } - - // Fetch 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 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/lib/ArduinoJson-6.x/extras/scripts/wandbox/publish.sh b/lib/ArduinoJson-6.x/extras/scripts/wandbox/publish.sh deleted file mode 100644 index 0900cb009a..0000000000 --- a/lib/ArduinoJson-6.x/extras/scripts/wandbox/publish.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 < - -#include - -TEST_CASE("Issue #1120") { - StaticJsonDocument<500> doc; - constexpr char str[] = - "{\"contents\":[{\"module\":\"Packet\"},{\"module\":\"Analog\"}]}"; - deserializeJson(doc, str); - - SECTION("MemberProxy::isNull()") { - SECTION("returns false") { - auto value = doc[std::string("contents")]; - CHECK(value.isNull() == false); - } - - SECTION("returns true") { - auto value = doc[std::string("zontents")]; - CHECK(value.isNull() == true); - } - } - - SECTION("ElementProxy >::isNull()") { - SECTION("returns false") { // Issue #1120 - auto value = doc["contents"][1]; - CHECK(value.isNull() == false); - } - - SECTION("returns true") { - auto value = doc["contents"][2]; - CHECK(value.isNull() == true); - } - } - - SECTION("MemberProxy, const char*>::isNull()") { - SECTION("returns false") { - auto value = doc["contents"][1]["module"]; - CHECK(value.isNull() == false); - } - - SECTION("returns true") { - auto value = doc["contents"][1]["zodule"]; - CHECK(value.isNull() == true); - } - } - - SECTION("MemberProxy, std::string>::isNull()") { - SECTION("returns false") { - auto value = doc["contents"][1][std::string("module")]; - CHECK(value.isNull() == false); - } - - SECTION("returns true") { - auto value = doc["contents"][1][std::string("zodule")]; - CHECK(value.isNull() == true); - } - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Cpp11/nullptr.cpp b/lib/ArduinoJson-6.x/extras/tests/Cpp11/nullptr.cpp deleted file mode 100644 index 813b9cc2af..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Cpp11/nullptr.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include - -#include - -#if !ARDUINOJSON_HAS_NULLPTR -# error ARDUINOJSON_HAS_NULLPTR must be set to 1 -#endif - -TEST_CASE("nullptr") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/Cpp11/use_long_long_0.cpp b/lib/ArduinoJson-6.x/extras/tests/Cpp11/use_long_long_0.cpp deleted file mode 100644 index f467aabdd6..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Cpp11/use_long_long_0.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#define ARDUINOJSON_USE_LONG_LONG 0 -#include - -#include - -TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 0") { - DynamicJsonDocument doc(4096); - - doc["A"] = 42; - doc["B"] = 84; - - std::string json; - serializeJson(doc, json); - - REQUIRE(json == "{\"A\":42,\"B\":84}"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Cpp11/use_long_long_1.cpp b/lib/ArduinoJson-6.x/extras/tests/Cpp11/use_long_long_1.cpp deleted file mode 100644 index 5127a55a72..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Cpp11/use_long_long_1.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#define ARDUINOJSON_USE_LONG_LONG 1 -#include - -#include - -TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 1") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/Cpp17/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/Cpp17/CMakeLists.txt deleted file mode 100644 index 05af200769..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Cpp17/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, 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 5) - return() -endif() - -if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7) - return() -endif() - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -add_executable(Cpp17Tests - string_view.cpp -) - -add_test(Cpp17 Cpp17Tests) - -set_tests_properties(Cpp17 - PROPERTIES - LABELS "Catch" -) diff --git a/lib/ArduinoJson-6.x/extras/tests/Cpp17/string_view.cpp b/lib/ArduinoJson-6.x/extras/tests/Cpp17/string_view.cpp deleted file mode 100644 index 729c59ae9f..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Cpp17/string_view.cpp +++ /dev/null @@ -1,100 +0,0 @@ -#include - -#include -#include - -#if !ARDUINOJSON_ENABLE_STRING_VIEW -# error ARDUINOJSON_ENABLE_STRING_VIEW must be set to 1 -#endif - -TEST_CASE("string_view") { - StaticJsonDocument<256> doc; - 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)); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(1) + 8); - - doc.add(std::string_view("example two", 7)); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8); - - doc.add(std::string_view("example\0tree", 12)); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(3) + 21); - - doc.add(std::string_view("example\0tree and a half", 12)); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(4) + 21); - } - - 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(std::string("hello\0world", 11)); - REQUIRE(doc.as().size() == 11); - REQUIRE(doc.as() == std::string_view("hello\0world", 11)); - } -} - -using ARDUINOJSON_NAMESPACE::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/lib/ArduinoJson-6.x/extras/tests/Cpp20/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/Cpp20/CMakeLists.txt deleted file mode 100644 index 2c9a72b050..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Cpp20/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, 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/lib/ArduinoJson-6.x/extras/tests/Cpp20/smoke_test.cpp b/lib/ArduinoJson-6.x/extras/tests/Cpp20/smoke_test.cpp deleted file mode 100644 index dc41e87570..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Cpp20/smoke_test.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include - -#include -#include - -TEST_CASE("C++20 smoke test") { - StaticJsonDocument<128> doc; - - deserializeJson(doc, "{\"hello\":\"world\"}"); - REQUIRE(doc["hello"] == "world"); - - std::string json; - serializeJson(doc, json); - REQUIRE(json == "{\"hello\":\"world\"}"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/ElementProxy/CMakeLists.txt deleted file mode 100644 index d0c3f45315..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# ArduinoJson - arduinojson.org -# Copyright Benoit Blanchon 2014-2020 -# MIT License - -add_executable(ElementProxyTests - add.cpp - clear.cpp - compare.cpp - remove.cpp - set.cpp - size.cpp - subscript.cpp -) - -add_test(ElementProxy ElementProxyTests) diff --git a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/add.cpp b/lib/ArduinoJson-6.x/extras/tests/ElementProxy/add.cpp deleted file mode 100644 index 705b3e186e..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/add.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("ElementProxy::add()") { - DynamicJsonDocument doc(4096); - doc.addElement(); - ElementProxy ep = doc[0]; - - SECTION("add(int)") { - ep.add(42); - - REQUIRE(doc.as() == "[[42]]"); - } - - SECTION("add(const char*)") { - ep.add("world"); - - REQUIRE(doc.as() == "[[\"world\"]]"); - } - - SECTION("set(char[])") { - char s[] = "world"; - ep.add(s); - strcpy(s, "!!!!!"); - - REQUIRE(doc.as() == "[[\"world\"]]"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/clear.cpp b/lib/ArduinoJson-6.x/extras/tests/ElementProxy/clear.cpp deleted file mode 100644 index 0c795a8271..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/clear.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("ElementProxy::clear()") { - DynamicJsonDocument doc(4096); - doc.addElement(); - 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); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/compare.cpp b/lib/ArduinoJson-6.x/extras/tests/ElementProxy/compare.cpp deleted file mode 100644 index 0023bf2c7c..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/compare.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("ElementProxy::operator==()") { - DynamicJsonDocument doc(4096); - - 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]); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/remove.cpp b/lib/ArduinoJson-6.x/extras/tests/ElementProxy/remove.cpp deleted file mode 100644 index c6917cb480..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/remove.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("ElementProxy::remove()") { - DynamicJsonDocument doc(4096); - doc.addElement(); - 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(std::string("b")); - - REQUIRE(ep.as() == "{\"a\":1}"); - } - -#ifdef HAS_VARIABLE_LENGTH_ARRAY - SECTION("remove(vla)") { - ep["a"] = 1; - ep["b"] = 2; - - int i = 4; - char vla[i]; - strcpy(vla, "b"); - ep.remove(vla); - - REQUIRE(ep.as() == "{\"a\":1}"); - } -#endif -} diff --git a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/set.cpp b/lib/ArduinoJson-6.x/extras/tests/ElementProxy/set.cpp deleted file mode 100644 index bb99e15d97..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/set.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("ElementProxy::set()") { - DynamicJsonDocument doc(4096); - 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\"]"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/size.cpp b/lib/ArduinoJson-6.x/extras/tests/ElementProxy/size.cpp deleted file mode 100644 index d5176c018c..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/size.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("ElementProxy::size()") { - DynamicJsonDocument doc(4096); - doc.addElement(); - 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); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/subscript.cpp b/lib/ArduinoJson-6.x/extras/tests/ElementProxy/subscript.cpp deleted file mode 100644 index 04034f5365..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/ElementProxy/subscript.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("ElementProxy::operator[]") { - DynamicJsonDocument doc(4096); - 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]]"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/CMakeLists.txt deleted file mode 100644 index dc76c9108a..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -macro(build_should_fail target) - 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;Catch" - ) -endmacro() - - -add_executable(Issue978 Issue978.cpp) -build_should_fail(Issue978) - -add_executable(Issue1189 Issue1189.cpp) -build_should_fail(Issue1189) - -add_executable(read_long_long read_long_long.cpp) -set_property(TARGET read_long_long PROPERTY CXX_STANDARD 11) -build_should_fail(read_long_long) - -add_executable(write_long_long write_long_long.cpp) -set_property(TARGET write_long_long PROPERTY CXX_STANDARD 11) -build_should_fail(write_long_long) - -add_executable(delete_jsondocument delete_jsondocument.cpp) -build_should_fail(delete_jsondocument) - -add_executable(variant_as_char variant_as_char.cpp) -build_should_fail(variant_as_char) - -add_executable(assign_char assign_char.cpp) -build_should_fail(assign_char) diff --git a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/Issue1189.cpp b/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/Issue1189.cpp deleted file mode 100644 index e86bb99260..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/Issue1189.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include - -// a function should not be able to get a JsonDocument by value -void f(JsonDocument) {} - -int main() { - DynamicJsonDocument doc(1024); - f(doc); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/Issue978.cpp b/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/Issue978.cpp deleted file mode 100644 index 112d36d820..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/Issue978.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include - -struct Stream {}; - -int main() { - Stream* stream = 0; - DynamicJsonDocument doc(1024); - deserializeJson(doc, stream); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/assign_char.cpp b/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/assign_char.cpp deleted file mode 100644 index 633b54de37..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/assign_char.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include - -// See issue #1498 - -int main() { - DynamicJsonDocument doc(1024); - doc["dummy"] = 'A'; -} diff --git a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/delete_jsondocument.cpp b/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/delete_jsondocument.cpp deleted file mode 100644 index ef2b0e86bf..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/delete_jsondocument.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include - -struct Stream {}; - -int main() { - JsonDocument* doc = new DynamicJsonDocument(42); - delete doc; -} diff --git a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/read_long_long.cpp b/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/read_long_long.cpp deleted file mode 100644 index d900a7f340..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/read_long_long.cpp +++ /dev/null @@ -1,20 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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 - -#if !ARDUINOJSON_HAS_LONG_LONG -# error This test requires C++11 -#endif - -ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(long long) -int main() { - DynamicJsonDocument doc(1024); - doc["dummy"].as(); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/variant_as_char.cpp b/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/variant_as_char.cpp deleted file mode 100644 index 41885cf6fb..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/variant_as_char.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include - -// See issue #1498 - -int main() { - DynamicJsonDocument doc(1024); - doc["dummy"].as(); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/write_long_long.cpp b/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/write_long_long.cpp deleted file mode 100644 index 2213a4dc04..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/FailingBuilds/write_long_long.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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 - -#if !ARDUINOJSON_HAS_LONG_LONG -# error This test requires C++11 -#endif - -int main() { - DynamicJsonDocument doc(1024); - doc["dummy"] = static_cast(42); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Helpers/Arduino.h b/lib/ArduinoJson-6.x/extras/tests/Helpers/Arduino.h deleted file mode 100644 index 4f24b263ef..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Helpers/Arduino.h +++ /dev/null @@ -1,12 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#pragma once - -#include "api/Print.h" -#include "api/Stream.h" -#include "api/String.h" -#include "progmem_emulation.hpp" - -#define ARDUINO_H_INCLUDED 1 diff --git a/lib/ArduinoJson-6.x/extras/tests/Helpers/CustomReader.hpp b/lib/ArduinoJson-6.x/extras/tests/Helpers/CustomReader.hpp deleted file mode 100644 index 8a97b50343..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Helpers/CustomReader.hpp +++ /dev/null @@ -1,26 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#pragma once - -#include - -class CustomReader { - std::stringstream _stream; - - public: - CustomReader(const char* input) : _stream(input) {} - - 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: - CustomReader(const CustomReader&); -}; diff --git a/lib/ArduinoJson-6.x/extras/tests/Helpers/api/Print.h b/lib/ArduinoJson-6.x/extras/tests/Helpers/api/Print.h deleted file mode 100644 index 864fb41a00..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Helpers/api/Print.h +++ /dev/null @@ -1,33 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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/lib/ArduinoJson-6.x/extras/tests/Helpers/api/Stream.h b/lib/ArduinoJson-6.x/extras/tests/Helpers/api/Stream.h deleted file mode 100644 index 8cc18d2b4d..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Helpers/api/Stream.h +++ /dev/null @@ -1,14 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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/lib/ArduinoJson-6.x/extras/tests/Helpers/api/String.h b/lib/ArduinoJson-6.x/extras/tests/Helpers/api/String.h deleted file mode 100644 index b2d5ac5f88..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Helpers/api/String.h +++ /dev/null @@ -1,69 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#pragma once - -#include - -// Reproduces Arduino's String class -class String { - public: - String() : _maxCapacity(1024) {} - explicit String(const char* s) : _str(s), _maxCapacity(1024) {} - - 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) { - _str.assign(s); - 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; -}; - -class StringSumHelper; - -inline bool operator==(const std::string& lhs, const ::String& rhs) { - return lhs == rhs.c_str(); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Helpers/progmem_emulation.hpp b/lib/ArduinoJson-6.x/extras/tests/Helpers/progmem_emulation.hpp deleted file mode 100644 index 41597dca88..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Helpers/progmem_emulation.hpp +++ /dev/null @@ -1,29 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#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, value) \ - static type const ARDUINOJSON_CONCAT2(name, _progmem)[] = value; \ - static type const* name = reinterpret_cast( \ - convertPtrToFlash(ARDUINOJSON_CONCAT2(name, _progmem))); diff --git a/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/CMakeLists.txt deleted file mode 100644 index 88b5ba689b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -add_executable(IntegrationTests - gbathree.cpp - issue772.cpp - round_trip.cpp - openweathermap.cpp -) - -if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") - 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/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/gbathree.cpp b/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/gbathree.cpp deleted file mode 100644 index 2190eb10d6..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/gbathree.cpp +++ /dev/null @@ -1,210 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("Gbathree") { - DynamicJsonDocument doc(4096); - - 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/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/issue772.cpp b/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/issue772.cpp deleted file mode 100644 index 4984b43a6a..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/issue772.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -// https://github.com/bblanchon/ArduinoJson/issues/772 - -TEST_CASE("Issue772") { - DynamicJsonDocument doc1(4096); - DynamicJsonDocument doc2(4096); - 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/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/openweathermap.cpp b/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/openweathermap.cpp deleted file mode 100644 index 44e2f76054..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/openweathermap.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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 - - StaticJsonDocument<512> filter; - filter["list"][0]["dt"] = true; - filter["list"][0]["main"]["temp"] = true; - filter["list"][0]["weather"][0]["description"] = true; - - DynamicJsonDocument doc(16384); - - REQUIRE( - deserializeJson(doc, input_json, DeserializationOption::Filter(filter)) == - DeserializationError::Ok); - - REQUIRE(doc.as() == expected_json); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/round_trip.cpp b/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/round_trip.cpp deleted file mode 100644 index edc5538553..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/IntegrationTests/round_trip.cpp +++ /dev/null @@ -1,82 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -void check(std::string originalJson) { - DynamicJsonDocument doc(16384); - - 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/lib/ArduinoJson-6.x/extras/tests/JsonArray/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/JsonArray/CMakeLists.txt deleted file mode 100644 index e67971848b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -add_executable(JsonArrayTests - add.cpp - clear.cpp - copyArray.cpp - createNested.cpp - equals.cpp - get.cpp - isNull.cpp - iterator.cpp - memoryUsage.cpp - nesting.cpp - remove.cpp - size.cpp - std_string.cpp - subscript.cpp - unbound.cpp -) - -add_test(JsonArray JsonArrayTests) - -set_tests_properties(JsonArray - PROPERTIES - LABELS "Catch" -) diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/add.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/add.cpp deleted file mode 100644 index 369bcf2da2..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/add.cpp +++ /dev/null @@ -1,138 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonArray::add()") { - DynamicJsonDocument doc(4096); - JsonArray array = doc.to(); - - SECTION("int") { - array.add(123); - REQUIRE(123 == array[0].as()); - REQUIRE(array[0].is()); - REQUIRE(array[0].is()); - } - - SECTION("double") { - array.add(123.45); - REQUIRE(123.45 == array[0].as()); - REQUIRE(array[0].is()); - REQUIRE_FALSE(array[0].is()); - } - - SECTION("bool") { - array.add(true); - REQUIRE(true == array[0].as()); - REQUIRE(array[0].is()); - REQUIRE_FALSE(array[0].is()); - } - - SECTION("const char*") { - const char* str = "hello"; - array.add(str); - REQUIRE(str == array[0].as()); - REQUIRE(array[0].is()); - REQUIRE_FALSE(array[0].is()); - } - -#ifdef HAS_VARIABLE_LENGTH_ARRAY - SECTION("vla") { - size_t i = 16; - char vla[i]; - strcpy(vla, "world"); - - array.add(vla); - - REQUIRE(std::string("world") == array[0]); - } -#endif - - SECTION("nested array") { - DynamicJsonDocument doc2(4096); - JsonArray arr = doc2.to(); - - array.add(arr); - - REQUIRE(arr == array[0].as()); - REQUIRE(array[0].is()); - REQUIRE_FALSE(array[0].is()); - } - - SECTION("nested object") { - DynamicJsonDocument doc2(4096); - 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"; - DynamicJsonDocument doc2(4096); - JsonArray arr = doc2.to(); - arr.add(str); - - array.add(arr[0]); - - REQUIRE(str == array[0]); - } - - SECTION("object subscript") { - const char* str = "hello"; - DynamicJsonDocument doc2(4096); - JsonObject obj = doc2.to(); - obj["x"] = str; - - array.add(obj["x"]); - - REQUIRE(str == array[0]); - } - - SECTION("should not duplicate const char*") { - array.add("world"); - const size_t expectedSize = JSON_ARRAY_SIZE(1); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate char*") { - array.add(const_cast("world")); - const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate std::string") { - array.add(std::string("world")); - const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should not duplicate serialized(const char*)") { - array.add(serialized("{}")); - const size_t expectedSize = JSON_ARRAY_SIZE(1); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate serialized(char*)") { - array.add(serialized(const_cast("{}"))); - const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(2); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate serialized(std::string)") { - array.add(serialized(std::string("{}"))); - const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(2); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate serialized(std::string)") { - array.add(serialized(std::string("\0XX", 3))); - const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(3); - REQUIRE(expectedSize == doc.memoryUsage()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/clear.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/clear.cpp deleted file mode 100644 index baeb022292..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/clear.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -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") { - StaticJsonDocument<64> doc; - JsonArray array = doc.to(); - array.add(1); - array.add(2); - array.clear(); - REQUIRE(array.size() == 0); - REQUIRE(array.isNull() == false); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/copyArray.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/copyArray.cpp deleted file mode 100644 index 599821df82..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/copyArray.cpp +++ /dev/null @@ -1,346 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("copyArray()") { - SECTION("int[] -> JsonArray") { - DynamicJsonDocument doc(4096); - JsonArray array = doc.to(); - char json[32]; - int source[] = {1, 2, 3}; - - bool ok = copyArray(source, array); - CHECK(ok); - - serializeJson(array, json); - CHECK(std::string("[1,2,3]") == json); - } - - SECTION("std::string[] -> JsonArray") { - DynamicJsonDocument doc(4096); - JsonArray array = doc.to(); - char json[32]; - std::string source[] = {"a", "b", "c"}; - - bool ok = copyArray(source, array); - CHECK(ok); - - serializeJson(array, json); - CHECK(std::string("[\"a\",\"b\",\"c\"]") == json); - } - - SECTION("const char*[] -> JsonArray") { - DynamicJsonDocument doc(4096); - JsonArray array = doc.to(); - char json[32]; - const char* source[] = {"a", "b", "c"}; - - bool ok = copyArray(source, array); - CHECK(ok); - - serializeJson(array, json); - CHECK(std::string("[\"a\",\"b\",\"c\"]") == json); - } - - SECTION("const char[][] -> JsonArray") { - DynamicJsonDocument doc(4096); - JsonArray array = doc.to(); - char json[32]; - char source[][2] = {"a", "b", "c"}; - - bool ok = copyArray(source, array); - CHECK(ok); - - serializeJson(array, json); - CHECK(std::string("[\"a\",\"b\",\"c\"]") == json); - } - - SECTION("const char[][] -> JsonDocument") { - DynamicJsonDocument doc(4096); - char json[32]; - char source[][2] = {"a", "b", "c"}; - - bool ok = copyArray(source, doc); - CHECK(ok); - - serializeJson(doc, json); - CHECK(std::string("[\"a\",\"b\",\"c\"]") == json); - } - - SECTION("const char[][] -> MemberProxy") { - DynamicJsonDocument doc(4096); - char json[32]; - char source[][2] = {"a", "b", "c"}; - - bool ok = copyArray(source, doc["data"]); - CHECK(ok); - - serializeJson(doc, json); - CHECK(std::string("{\"data\":[\"a\",\"b\",\"c\"]}") == json); - } - - SECTION("int[] -> JsonDocument") { - DynamicJsonDocument doc(4096); - char json[32]; - int source[] = {1, 2, 3}; - - bool ok = copyArray(source, doc); - CHECK(ok); - - serializeJson(doc, json); - CHECK(std::string("[1,2,3]") == json); - } - - SECTION("int[] -> MemberProxy") { - DynamicJsonDocument doc(4096); - char json[32]; - int source[] = {1, 2, 3}; - - bool ok = copyArray(source, doc["data"]); - CHECK(ok); - - serializeJson(doc, json); - CHECK(std::string("{\"data\":[1,2,3]}") == json); - } - - SECTION("int[] -> JsonArray, but not enough memory") { - const size_t SIZE = JSON_ARRAY_SIZE(2); - StaticJsonDocument doc; - JsonArray array = doc.to(); - char json[32]; - int source[] = {1, 2, 3}; - - bool ok = copyArray(source, array); - REQUIRE_FALSE(ok); - - serializeJson(array, json); - CHECK(std::string("[1,2]") == json); - } - - SECTION("int[][] -> JsonArray") { - DynamicJsonDocument doc(4096); - 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(std::string("[[1,2,3],[4,5,6]]") == json); - } - - SECTION("int[][] -> MemberProxy") { - DynamicJsonDocument doc(4096); - char json[32]; - int source[][3] = {{1, 2, 3}, {4, 5, 6}}; - - bool ok = copyArray(source, doc["data"]); - CHECK(ok); - - serializeJson(doc, json); - CHECK(std::string("{\"data\":[[1,2,3],[4,5,6]]}") == json); - } - - SECTION("int[][] -> JsonDocument") { - DynamicJsonDocument doc(4096); - char json[32]; - int source[][3] = {{1, 2, 3}, {4, 5, 6}}; - - bool ok = copyArray(source, doc); - CHECK(ok); - - serializeJson(doc, json); - CHECK(std::string("[[1,2,3],[4,5,6]]") == json); - } - - SECTION("int[][] -> JsonArray, but not enough memory") { - const size_t SIZE = - JSON_ARRAY_SIZE(2) + JSON_ARRAY_SIZE(3) + JSON_ARRAY_SIZE(2); - StaticJsonDocument doc; - JsonArray array = doc.to(); - char json[32] = ""; - int source[][3] = {{1, 2, 3}, {4, 5, 6}}; - - CAPTURE(SIZE) - - bool ok = copyArray(source, array); - CAPTURE(doc.memoryUsage()); - CHECK_FALSE(ok); - - serializeJson(array, json); - CHECK(std::string("[[1,2,3],[4,5]]") == json); - } - - SECTION("JsonArray -> int[], with more space than needed") { - DynamicJsonDocument doc(4096); - 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") { - DynamicJsonDocument doc(4096); - 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[]") { - DynamicJsonDocument doc(4096); - 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][]") { - DynamicJsonDocument doc(4096); - 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(std::string("a12345") == destination[0]); - CHECK(std::string("b123456") == destination[1]); - CHECK(std::string("c123456") == destination[2]); // truncated - CHECK(std::string("") == destination[3]); - } - - SECTION("JsonDocument -> int[]") { - DynamicJsonDocument doc(4096); - 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[]") { - DynamicJsonDocument doc(4096); - 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[]") { - DynamicJsonDocument doc(4096); - 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[][]") { - DynamicJsonDocument doc(4096); - 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[][]") { - DynamicJsonDocument doc(4096); - 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[][]") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/JsonArray/createNested.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/createNested.cpp deleted file mode 100644 index dbc4c304fe..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/createNested.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonArray basics") { - DynamicJsonDocument doc(4096); - JsonArray array = doc.to(); - - SECTION("CreateNestedArray") { - JsonArray arr = array.createNestedArray(); - REQUIRE(arr == array[0].as()); - } - - SECTION("CreateNestedObject") { - JsonObject obj = array.createNestedObject(); - REQUIRE(obj == array[0].as()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/equals.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/equals.cpp deleted file mode 100644 index f4f9b521a7..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/equals.cpp +++ /dev/null @@ -1,69 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonArray::operator==()") { - DynamicJsonDocument doc1(4096); - JsonArray array1 = doc1.to(); - JsonArrayConst array1c = array1; - - DynamicJsonDocument doc2(4096); - JsonArray array2 = doc2.to(); - JsonArrayConst array2c = array2; - - SECTION("should return false when arrays differ") { - array1.add("coucou"); - array2.add(1); - - REQUIRE_FALSE(array1 == array2); - REQUIRE_FALSE(array1c == array2c); - } - - SECTION("should return false when LHS has more elements") { - array1.add(1); - array1.add(2); - array2.add(1); - - REQUIRE_FALSE(array1 == array2); - REQUIRE_FALSE(array1c == array2c); - } - - SECTION("should return false when RHS has more elements") { - array1.add(1); - array2.add(1); - array2.add(2); - - REQUIRE_FALSE(array1 == array2); - REQUIRE_FALSE(array1c == array2c); - } - - SECTION("should return true when arrays equal") { - array1.add("coucou"); - array2.add("coucou"); - - REQUIRE(array1 == array2); - REQUIRE(array1c == array2c); - } - - 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/lib/ArduinoJson-6.x/extras/tests/JsonArray/get.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/get.cpp deleted file mode 100644 index 895a2f6552..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/get.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonArray::get()") { - DynamicJsonDocument doc(4096); - deserializeJson(doc, "[1,2,3]"); - JsonArray array = doc.as(); - - SECTION("Overflow") { - REQUIRE(array.getElement(3).isNull()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/isNull.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/isNull.cpp deleted file mode 100644 index ad953b9160..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/isNull.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonArray::isNull()") { - SECTION("returns true") { - JsonArray arr; - REQUIRE(arr.isNull() == true); - } - - SECTION("returns false") { - DynamicJsonDocument doc(4096); - JsonArray arr = doc.to(); - REQUIRE(arr.isNull() == false); - } -} - -TEST_CASE("JsonArrayConst::isNull()") { - SECTION("returns true") { - JsonArrayConst arr; - REQUIRE(arr.isNull() == true); - } - - SECTION("returns false") { - DynamicJsonDocument doc(4096); - JsonArrayConst 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") { - DynamicJsonDocument doc(4096); - JsonArray arr = doc.to(); - REQUIRE(static_cast(arr) == true); - } -} - -TEST_CASE("JsonArrayConst::operator bool()") { - SECTION("returns false") { - JsonArrayConst arr; - REQUIRE(static_cast(arr) == false); - } - - SECTION("returns true") { - DynamicJsonDocument doc(4096); - JsonArrayConst arr = doc.to(); - REQUIRE(static_cast(arr) == true); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/iterator.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/iterator.cpp deleted file mode 100644 index 435a5bb9d9..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/iterator.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -template -static void run_iterator_test() { - StaticJsonDocument doc; - JsonArray tmp = doc.to(); - tmp.add(12); - tmp.add(34); - - TArray array = tmp; - typename TArray::iterator it = array.begin(); - typename TArray::iterator end = array.end(); - - REQUIRE(end != it); - REQUIRE(12 == it->template as()); - REQUIRE(12 == static_cast(*it)); - ++it; - REQUIRE(end != it); - REQUIRE(34 == it->template as()); - REQUIRE(34 == static_cast(*it)); - ++it; - REQUIRE(end == it); -} - -TEST_CASE("JsonArray::begin()/end()") { - SECTION("Non null JsonArray") { - run_iterator_test(); - } - - SECTION("Null JsonArray") { - JsonArray array; - - REQUIRE(array.begin() == array.end()); - } -} - -TEST_CASE("JsonArrayConst::begin()/end()") { - SECTION("Non null JsonArrayConst") { - run_iterator_test(); - } - - SECTION("Null JsonArrayConst") { - JsonArrayConst array; - - REQUIRE(array.begin() == array.end()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/memoryUsage.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/memoryUsage.cpp deleted file mode 100644 index 05b743f1ce..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/memoryUsage.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonArray::memoryUsage()") { - DynamicJsonDocument doc(4096); - JsonArray arr = doc.to(); - - SECTION("return 0 if uninitialized") { - JsonArray unitialized; - REQUIRE(unitialized.memoryUsage() == 0); - } - - SECTION("JSON_ARRAY_SIZE(0) if empty") { - REQUIRE(arr.memoryUsage() == JSON_ARRAY_SIZE(0)); - } - - SECTION("JSON_ARRAY_SIZE(1) after add") { - arr.add("hello"); - REQUIRE(arr.memoryUsage() == JSON_ARRAY_SIZE(1)); - } - - SECTION("includes the size of the string") { - arr.add(std::string("hello")); - REQUIRE(arr.memoryUsage() == JSON_ARRAY_SIZE(1) + 6); - } - - SECTION("includes the size of the nested array") { - JsonArray nested = arr.createNestedArray(); - nested.add(42); - REQUIRE(arr.memoryUsage() == 2 * JSON_ARRAY_SIZE(1)); - } - - SECTION("includes the size of the nested arrect") { - JsonObject nested = arr.createNestedObject(); - nested["hello"] = "world"; - REQUIRE(arr.memoryUsage() == JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(1)); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/nesting.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/nesting.cpp deleted file mode 100644 index 2118f5f758..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/nesting.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonArray::nesting()") { - DynamicJsonDocument doc(4096); - 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.createNestedArray(); - REQUIRE(arr.nesting() == 2); - } - - SECTION("returns 2 with nested object") { - arr.createNestedObject(); - REQUIRE(arr.nesting() == 2); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/remove.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/remove.cpp deleted file mode 100644 index b9e86fddaf..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/remove.cpp +++ /dev/null @@ -1,89 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonArray::remove()") { - DynamicJsonDocument doc(4096); - 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("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()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/size.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/size.cpp deleted file mode 100644 index 68b10de7a9..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/size.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonArray::size()") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/JsonArray/std_string.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/std_string.cpp deleted file mode 100644 index b7de0efb03..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/std_string.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -static void eraseString(std::string &str) { - char *p = const_cast(str.c_str()); - while (*p) *p++ = '*'; -} - -TEST_CASE("std::string") { - DynamicJsonDocument doc(4096); - JsonArray array = doc.to(); - - SECTION("add()") { - std::string value("hello"); - array.add(value); - eraseString(value); - REQUIRE(std::string("hello") == array[0]); - } - - SECTION("operator[]") { - std::string value("world"); - array.add("hello"); - array[0] = value; - eraseString(value); - REQUIRE(std::string("world") == array[0]); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/subscript.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/subscript.cpp deleted file mode 100644 index 57bbe140d5..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/subscript.cpp +++ /dev/null @@ -1,174 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -TEST_CASE("JsonArray::operator[]") { - DynamicJsonDocument doc(4096); - 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("const char*") { - const char* str = "hello"; - - array[0] = str; - REQUIRE(str == array[0].as()); - REQUIRE(true == array[0].is()); - REQUIRE(false == array[0].is()); - } - - SECTION("nested array") { - DynamicJsonDocument doc2(4096); - 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") { - DynamicJsonDocument doc2(4096); - 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") { - DynamicJsonDocument doc2(4096); - 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"; - DynamicJsonDocument doc2(4096); - JsonObject obj = doc2.to(); - - obj["x"] = str; - - array[0] = obj["x"]; - - REQUIRE(str == array[0]); - } - - SECTION("should not duplicate const char*") { - array[0] = "world"; - const size_t expectedSize = JSON_ARRAY_SIZE(1); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate char*") { - array[0] = const_cast("world"); - const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate std::string") { - array[0] = std::string("world"); - const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("array[0].to()") { - JsonObject obj = array[0].to(); - REQUIRE(obj.isNull() == false); - } - -#ifdef HAS_VARIABLE_LENGTH_ARRAY - SECTION("set(VLA)") { - size_t i = 16; - char vla[i]; - strcpy(vla, "world"); - - array.add("hello"); - array[0].set(vla); - - REQUIRE(std::string("world") == array[0]); - } - - SECTION("operator=(VLA)") { - size_t i = 16; - char vla[i]; - strcpy(vla, "world"); - - array.add("hello"); - array[0] = vla; - - REQUIRE(std::string("world") == array[0]); - } -#endif -} - -TEST_CASE("JsonArrayConst::operator[]") { - DynamicJsonDocument doc(4096); - JsonArray array = doc.to(); - array.add(0); - - SECTION("int") { - array[0] = 123; - JsonArrayConst carr = array; - - REQUIRE(123 == carr[0].as()); - REQUIRE(true == carr[0].is()); - REQUIRE(false == carr[0].is()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/unbound.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/unbound.cpp deleted file mode 100644 index 792feec3e7..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/unbound.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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("CreateNestedArrayFails") { - REQUIRE(array.createNestedArray().isNull()); - } - - SECTION("CreateNestedObjectFails") { - REQUIRE(array.createNestedObject().isNull()); - } - - SECTION("PrintToWritesBrackets") { - char buffer[32]; - serializeJson(array, buffer, sizeof(buffer)); - REQUIRE_THAT(buffer, Equals("null")); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonArray/undefined.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonArray/undefined.cpp deleted file mode 100644 index b9eb379498..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonArray/undefined.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace Catch::Matchers; - -TEST_CASE("Undefined JsonArray") { - JsonArray array; - - SECTION("SubscriptFails") { - REQUIRE(array[0].isNull()); - } - - SECTION("AddFails") { - array.add(1); - REQUIRE(0 == array.size()); - } - - SECTION("CreateNestedArrayFails") { - REQUIRE(array.createNestedArray().isNull()); - } - - SECTION("CreateNestedObjectFails") { - REQUIRE(array.createNestedObject().isNull()); - } - - SECTION("PrintToWritesBrackets") { - char buffer[32]; - serializeJson(array, buffer, sizeof(buffer)); - REQUIRE_THAT(buffer, Equals("null")); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/CMakeLists.txt deleted file mode 100644 index 429c37552d..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -add_executable(JsonDeserializerTests - array.cpp - array_static.cpp - DeserializationError.cpp - filter.cpp - incomplete_input.cpp - input_types.cpp - invalid_input.cpp - misc.cpp - nestingLimit.cpp - number.cpp - object.cpp - object_static.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/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/DeserializationError.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/DeserializationError.cpp deleted file mode 100644 index 01ddaf69ea..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/DeserializationError.cpp +++ /dev/null @@ -1,120 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#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/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/array.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/array.cpp deleted file mode 100644 index 2e0038ee4f..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/array.cpp +++ /dev/null @@ -1,253 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("deserialize JSON array") { - DynamicJsonDocument doc(4096); - - 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("Double") { - DeserializationError err = deserializeJson(doc, "[4.2,1e2]"); - JsonArray arr = doc.as(); - - REQUIRE(err == DeserializationError::Ok); - REQUIRE(2 == arr.size()); - REQUIRE(arr[0] == 4.2); - REQUIRE(arr[1] == 1e2); - } - - 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]"); - deserializeJson(doc, "[]"); - JsonArray arr = doc.as(); - - REQUIRE(arr.size() == 0); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0)); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/array_static.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/array_static.cpp deleted file mode 100644 index d828518fcd..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/array_static.cpp +++ /dev/null @@ -1,89 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("deserialize JSON array with a StaticJsonDocument") { - SECTION("BufferOfTheRightSizeForEmptyArray") { - StaticJsonDocument doc; - char input[] = "[]"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::Ok); - } - - SECTION("TooSmallBufferForArrayWithOneValue") { - StaticJsonDocument doc; - char input[] = "[1]"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::NoMemory); - } - - SECTION("BufferOfTheRightSizeForArrayWithOneValue") { - StaticJsonDocument doc; - char input[] = "[1]"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::Ok); - } - - SECTION("TooSmallBufferForArrayWithNestedObject") { - StaticJsonDocument doc; - char input[] = "[{}]"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::NoMemory); - } - - SECTION("BufferOfTheRightSizeForArrayWithNestedObject") { - StaticJsonDocument doc; - char input[] = "[{}]"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::Ok); - } - - SECTION("CopyStringNotSpaces") { - StaticJsonDocument<100> doc; - - deserializeJson(doc, " [ \"1234567\" ] "); - - REQUIRE(JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(7) == doc.memoryUsage()); - // note: we use a string of 8 bytes to be sure that the StaticMemoryPool - // will not insert bytes to enforce alignement - } - - SECTION("Should clear the JsonArray") { - StaticJsonDocument doc; - char input[] = "[1,2,3,4]"; - - deserializeJson(doc, input); - deserializeJson(doc, "[]"); - - JsonArray arr = doc.as(); - REQUIRE(arr.size() == 0); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0)); - } - - SECTION("Array") { - StaticJsonDocument doc; - char input[] = "[1,2]"; - - DeserializationError err = deserializeJson(doc, input); - JsonArray arr = doc.as(); - - REQUIRE(err == DeserializationError::Ok); - REQUIRE(doc.is()); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(2)); - REQUIRE(arr[0] == 1); - REQUIRE(arr[1] == 2); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/filter.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/filter.cpp deleted file mode 100644 index 9cf85d27a5..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/filter.cpp +++ /dev/null @@ -1,773 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_ENABLE_COMMENTS 1 -#include -#include - -#include -#include - -TEST_CASE("Filtering") { - struct TestCase { - const char* input; - const char* filter; - uint8_t nestingLimit; - DeserializationError error; - const char* output; - size_t memoryUsage; - }; - - // clang-format off - TestCase testCases[] = { - { - "{\"hello\":\"world\"}", // 1. input - "null", // 2. filter - 10, // 3. nestingLimit - DeserializationError::Ok, // 4. error - "null", // 5. output - 0 // 6. memoryUsage - }, - { - "{\"hello\":\"world\"}", - "false", - 10, - DeserializationError::Ok, - "null", - 0 - }, - { - "{\"abcdefg\":\"hijklmn\"}", - "true", - 10, - DeserializationError::Ok, - "{\"abcdefg\":\"hijklmn\"}", - JSON_OBJECT_SIZE(1) + 16 - }, - { - "{\"hello\":\"world\"}", - "{}", - 10, - DeserializationError::Ok, - "{}", - JSON_OBJECT_SIZE(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}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // 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}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // skip a float - "{\"a_float\":12.34e-6,example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // can skip a boolean - "{\"a_bool\":false,example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // can skip a double-quoted string - "{\"a_double_quoted_string\":\"hello\",example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // can skip a single-quoted string - "{\"a_single_quoted_string\":'hello',example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // can skip an empty array - "{\"an_empty_array\":[],example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // can skip an empty array with spaces in it - "{\"an_empty_array\":[\t],example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // can skip an array - "{\"an_array\":[1,2,3],example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // can skip an array with spaces in it - "{\"an_array\": [ 1 , 2 , 3 ] ,example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // can skip an empty object - "{\"an_empty_object\":{},example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // can skip an empty object with spaces in it - "{\"an_empty_object\":{ },example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // can skip an object - "{\"an_object\":{a:1,'b':2,\"c\":3},example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // skip an object with spaces in it - "{\"an_object\" : { a : 1 , 'b' : 2 , \"c\" : 3 } ,example:42}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{\"example\":42}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - "{\"an_integer\": 0,\"example\":{\"type\":\"int\",\"outcome\":42}}", - "{\"example\":{\"outcome\":true}}", - 10, - DeserializationError::Ok, - "{\"example\":{\"outcome\":42}}", - 2 * JSON_OBJECT_SIZE(1) + 16 - }, - { - // wildcard - "{\"example\":{\"type\":\"int\",\"outcome\":42}}", - "{\"*\":{\"outcome\":true}}", - 10, - DeserializationError::Ok, - "{\"example\":{\"outcome\":42}}", - 2 * JSON_OBJECT_SIZE(1) + 16 - }, - { - // exclusion filter (issue #1628) - "{\"example\":1,\"ignored\":2}", - "{\"*\":true,\"ignored\":false}", - 10, - DeserializationError::Ok, - "{\"example\":1}", - JSON_OBJECT_SIZE(1) + 8 - }, - { - // only the first element of array counts - "[1,2,3]", - "[true, false]", - 10, - DeserializationError::Ok, - "[1,2,3]", - JSON_ARRAY_SIZE(3) - }, - { - // only the first element of array counts - "[1,2,3]", - "[false, true]", - 10, - DeserializationError::Ok, - "[]", - JSON_ARRAY_SIZE(0) - }, - { - // filter members of object in array - "[{\"example\":1,\"ignore\":2},{\"example\":3,\"ignore\":4}]", - "[{\"example\":true}]", - 10, - DeserializationError::Ok, - "[{\"example\":1},{\"example\":3}]", - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 8 - }, - { - "[',2,3]", - "[false,true]", - 10, - DeserializationError::IncompleteInput, - "[]", - JSON_ARRAY_SIZE(0) - }, - { - "[\",2,3]", - "[false,true]", - 10, - DeserializationError::IncompleteInput, - "[]", - JSON_ARRAY_SIZE(0) - }, - { - // detect errors in skipped value - "[!,2,\\]", - "[false]", - 10, - DeserializationError::InvalidInput, - "[]", - JSON_ARRAY_SIZE(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, - "{}", - JSON_OBJECT_SIZE(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, - "[]", - JSON_ARRAY_SIZE(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, - "[]", - JSON_ARRAY_SIZE(0) - }, - { - // incomplete comment at the begining of an array - "[/*]", - "[false]", - 10, - DeserializationError::IncompleteInput, - "[]", - JSON_ARRAY_SIZE(0) - }, - { - // invalid comment before key - "{/1:2}", - "{}", - 10, - DeserializationError::InvalidInput, - "{}", - JSON_OBJECT_SIZE(0) - }, - { - // incomplete comment before key - "{/*:2}", - "{}", - 10, - DeserializationError::IncompleteInput, - "{}", - JSON_OBJECT_SIZE(0) - }, - { - // invalid comment after key - "{\"example\"/1:2}", - "{}", - 10, - DeserializationError::InvalidInput, - "{}", - JSON_OBJECT_SIZE(0) - }, - { - // incomplete comment after key - "{\"example\"/*:2}", - "{}", - 10, - DeserializationError::IncompleteInput, - "{}", - JSON_OBJECT_SIZE(0) - }, - { - // invalid comment after colon - "{\"example\":/12}", - "{}", - 10, - DeserializationError::InvalidInput, - "{}", - JSON_OBJECT_SIZE(0) - }, - { - // incomplete comment after colon - "{\"example\":/*2}", - "{}", - 10, - DeserializationError::IncompleteInput, - "{}", - JSON_OBJECT_SIZE(0) - }, - { - // comment next to an integer - "{\"ignore\":1//,\"example\":2\n}", - "{\"example\":true}", - 10, - DeserializationError::Ok, - "{}", - JSON_OBJECT_SIZE(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 after 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 after after value of a skipped object - "{\"example\":2/*}", - "false", - 10, - DeserializationError::IncompleteInput, - "null", - 0 - }, - }; // clang-format on - - for (size_t i = 0; i < sizeof(testCases) / sizeof(testCases[0]); i++) { - CAPTURE(i); - - DynamicJsonDocument filter(256); - DynamicJsonDocument doc(256); - TestCase& tc = testCases[i]; - - CAPTURE(tc.filter); - REQUIRE(deserializeJson(filter, tc.filter) == DeserializationError::Ok); - - CAPTURE(tc.input); - CAPTURE(tc.nestingLimit); - CHECK(deserializeJson(doc, tc.input, DeserializationOption::Filter(filter), - DeserializationOption::NestingLimit( - tc.nestingLimit)) == tc.error); - - CHECK(doc.as() == tc.output); - CHECK(doc.memoryUsage() == tc.memoryUsage); - } -} - -TEST_CASE("Zero-copy mode") { // issue #1697 - char input[] = "{\"include\":42,\"exclude\":666}"; - - StaticJsonDocument<256> filter; - filter["include"] = true; - - StaticJsonDocument<256> doc; - DeserializationError err = - deserializeJson(doc, input, DeserializationOption::Filter(filter)); - - REQUIRE(err == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); -} - -TEST_CASE("Overloads") { - StaticJsonDocument<256> doc; - StaticJsonDocument<256> 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, std::string("{}"), 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, std::string("{}"), 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, std::string("{}"), 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 -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/incomplete_input.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/incomplete_input.cpp deleted file mode 100644 index 4e5bcdbd3c..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/incomplete_input.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_DECODE_UNICODE 1 -#include -#include - -TEST_CASE("Truncated JSON input") { - const char* testCases[] = {"\"hello", "\'hello", "'\\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,"}; - const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); - - DynamicJsonDocument doc(4096); - - for (size_t i = 0; i < testCount; i++) { - const char* input = testCases[i]; - CAPTURE(input); - REQUIRE(deserializeJson(doc, input) == - DeserializationError::IncompleteInput); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/input_types.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/input_types.cpp deleted file mode 100644 index 04054c6a7b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/input_types.cpp +++ /dev/null @@ -1,198 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include - -#include -#include - -#include "CustomReader.hpp" - -TEST_CASE("deserializeJson(char*)") { - StaticJsonDocument<1024> doc; - - SECTION("should not duplicate strings") { - char input[] = "{\"hello\":\"world\"}"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::Ok); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1)); - CHECK(doc.as().memoryUsage() == - JSON_OBJECT_SIZE(1)); // issue #1318 - } -} - -TEST_CASE("deserializeJson(const std::string&)") { - DynamicJsonDocument doc(4096); - - 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, std::string("[42]")); - - 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(std::string("hello") == array[0]); - } -} - -TEST_CASE("deserializeJson(std::istream&)") { - DynamicJsonDocument doc(4096); - - 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(std::string("world") == 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}"); - - StaticJsonDocument doc; - DeserializationError err = deserializeJson(doc, vla); - - REQUIRE(err == DeserializationError::Ok); -} -#endif - -TEST_CASE("deserializeJson(CustomReader)") { - DynamicJsonDocument doc(4096); - 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)") { - DynamicJsonDocument doc1(4096); - doc1["payload"] = "[4,2]"; - - DynamicJsonDocument doc2(4096); - 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)") { - DynamicJsonDocument doc1(4096); - doc1["payload"] = "[4,2]"; - - DynamicJsonDocument doc2(4096); - 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)") { - DynamicJsonDocument doc1(4096); - doc1["payload"] = "[4,2]"; - - DynamicJsonDocument doc2(4096); - 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)") { - DynamicJsonDocument doc1(4096); - doc1[0] = "[4,2]"; - - DynamicJsonDocument doc2(4096); - 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/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/invalid_input.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/invalid_input.cpp deleted file mode 100644 index f358008626..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/invalid_input.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_DECODE_UNICODE 1 -#include -#include - -TEST_CASE("Invalid JSON input") { - const char* testCases[] = {"'\\u'", "'\\u000g'", "'\\u000'", "'\\u000G'", - "'\\u000/'", "\\x1234", "6a9", "1,", - "2]", "3}"}; - const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); - - DynamicJsonDocument doc(4096); - - for (size_t i = 0; i < testCount; i++) { - const char* input = testCases[i]; - CAPTURE(input); - REQUIRE(deserializeJson(doc, input) == DeserializationError::InvalidInput); - } -} - -TEST_CASE("Invalid JSON input that should pass") { - const char* testCases[] = { - "nulL", - "tru3", - "fals3", - "'\\ud83d'", // leading surrogate without a trailing surrogate - "'\\udda4'", // trailing surrogate without a leading surrogate - "'\\ud83d\\ud83d'", // two leading surrogates - }; - const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); - - DynamicJsonDocument doc(4096); - - for (size_t i = 0; i < testCount; i++) { - const char* input = testCases[i]; - CAPTURE(input); - REQUIRE(deserializeJson(doc, input) == DeserializationError::Ok); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/misc.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/misc.cpp deleted file mode 100644 index dc8083c473..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/misc.cpp +++ /dev/null @@ -1,117 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace Catch::Matchers; - -TEST_CASE("deserializeJson(DynamicJsonDocument&)") { - DynamicJsonDocument doc(4096); - - SECTION("Edge cases") { - SECTION("null char*") { - DeserializationError err = deserializeJson(doc, static_cast(0)); - - REQUIRE(err != DeserializationError::Ok); - } - - SECTION("null const char*") { - DeserializationError err = - deserializeJson(doc, static_cast(0)); - - REQUIRE(err != DeserializationError::Ok); - } - - SECTION("Empty input") { - DeserializationError err = deserializeJson(doc, ""); - - REQUIRE(err == DeserializationError::EmptyInput); - } - - SECTION("Only spaces") { - DeserializationError err = deserializeJson(doc, " \t\n\r"); - - REQUIRE(err == DeserializationError::EmptyInput); - } - - SECTION("issue #628") { - DeserializationError err = deserializeJson(doc, "null"); - REQUIRE(err == DeserializationError::Ok); - REQUIRE(doc.is() == false); - } - - SECTION("Garbage") { - DeserializationError err = deserializeJson(doc, "%*$£¤"); - - REQUIRE(err == DeserializationError::InvalidInput); - } - } - - SECTION("Booleans") { - 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("Premature null-terminator") { - SECTION("In escape sequence") { - DeserializationError err = deserializeJson(doc, "\"\\"); - - REQUIRE(err == DeserializationError::IncompleteInput); - } - - SECTION("In double quoted string") { - DeserializationError err = deserializeJson(doc, "\"hello"); - - REQUIRE(err == DeserializationError::IncompleteInput); - } - - SECTION("In single quoted string") { - DeserializationError err = deserializeJson(doc, "'hello"); - - REQUIRE(err == DeserializationError::IncompleteInput); - } - } - - SECTION("Premature end of input") { - SECTION("In escape sequence") { - DeserializationError err = deserializeJson(doc, "\"\\n\"", 2); - - REQUIRE(err == DeserializationError::IncompleteInput); - } - - SECTION("In double quoted string") { - DeserializationError err = deserializeJson(doc, "\"hello\"", 6); - - REQUIRE(err == DeserializationError::IncompleteInput); - } - - SECTION("In single quoted string") { - DeserializationError err = deserializeJson(doc, "'hello'", 6); - - REQUIRE(err == DeserializationError::IncompleteInput); - } - } - - SECTION("Should clear the JsonVariant") { - deserializeJson(doc, "[1,2,3]"); - deserializeJson(doc, "{}"); - - REQUIRE(doc.is()); - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0)); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/nestingLimit.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/nestingLimit.cpp deleted file mode 100644 index 0cdcb3e549..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/nestingLimit.cpp +++ /dev/null @@ -1,101 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -#define SHOULD_WORK(expression) REQUIRE(DeserializationError::Ok == expression); -#define SHOULD_FAIL(expression) \ - REQUIRE(DeserializationError::TooDeep == expression); - -TEST_CASE("JsonDeserializer nesting") { - DynamicJsonDocument doc(4096); - - 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, std::string("\"toto\""), nesting)); - SHOULD_WORK(deserializeJson(doc, std::string("123"), nesting)); - SHOULD_WORK(deserializeJson(doc, std::string("true"), nesting)); - SHOULD_FAIL(deserializeJson(doc, std::string("[]"), nesting)); - SHOULD_FAIL(deserializeJson(doc, std::string("{}"), nesting)); - SHOULD_FAIL(deserializeJson(doc, std::string("[\"toto\"]"), nesting)); - SHOULD_FAIL(deserializeJson(doc, std::string("{\"toto\":1}"), nesting)); - } - - SECTION("limit = 1") { - DeserializationOption::NestingLimit nesting(1); - SHOULD_WORK(deserializeJson(doc, std::string("[\"toto\"]"), nesting)); - SHOULD_WORK(deserializeJson(doc, std::string("{\"toto\":1}"), nesting)); - SHOULD_FAIL(deserializeJson(doc, std::string("{\"toto\":{}}"), nesting)); - SHOULD_FAIL(deserializeJson(doc, std::string("{\"toto\":[]}"), nesting)); - SHOULD_FAIL(deserializeJson(doc, std::string("[[\"toto\"]]"), nesting)); - SHOULD_FAIL(deserializeJson(doc, std::string("[{\"toto\":1}]"), 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/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/number.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/number.cpp deleted file mode 100644 index 44e24cbedf..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/number.cpp +++ /dev/null @@ -1,133 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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_NAMESPACE::isinf; -using ARDUINOJSON_NAMESPACE::isnan; -} // namespace my - -TEST_CASE("deserialize an integer") { - DynamicJsonDocument doc(4096); - - 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/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/object.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/object.cpp deleted file mode 100644 index e5d5de7f4e..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/object.cpp +++ /dev/null @@ -1,315 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("deserialize JSON object") { - DynamicJsonDocument doc(4096); - - 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 colon") { - 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 colon") { - 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("Double") { - DeserializationError err = - deserializeJson(doc, "{\"key1\":12.345,\"key2\":-7E89}"); - JsonObject obj = doc.as(); - - REQUIRE(err == DeserializationError::Ok); - REQUIRE(doc.is()); - REQUIRE(obj.size() == 2); - REQUIRE(obj["key1"] == 12.345); - 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, "{a:{b:{c:1}},a:2}"); - - REQUIRE(err == DeserializationError::Ok); - REQUIRE(doc["a"] == 2); - } - - 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") { // we don't support NULs in keys - DeserializationError err = - deserializeJson(doc, "{\"x\\u0000a\":1,\"x\\u0000b\":2}"); - - REQUIRE(err == DeserializationError::Ok); - REQUIRE(doc.as() == "{\"x\":2}"); - } - } - - SECTION("Should clear the JsonObject") { - deserializeJson(doc, "{\"hello\":\"world\"}"); - deserializeJson(doc, "{}"); - JsonObject obj = doc.as(); - - REQUIRE(doc.is()); - REQUIRE(obj.size() == 0); - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0)); - } - - SECTION("Issue #1335") { - std::string json("{\"a\":{},\"b\":{}}"); - deserializeJson(doc, json); - CHECK(doc.as() == json); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/object_static.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/object_static.cpp deleted file mode 100644 index a326afe609..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/object_static.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("deserialize JSON object with StaticJsonDocument") { - SECTION("BufferOfTheRightSizeForEmptyObject") { - StaticJsonDocument doc; - char input[] = "{}"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::Ok); - } - - SECTION("TooSmallBufferForObjectWithOneValue") { - StaticJsonDocument doc; - char input[] = "{\"a\":1}"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::NoMemory); - } - - SECTION("BufferOfTheRightSizeForObjectWithOneValue") { - StaticJsonDocument doc; - char input[] = "{\"a\":1}"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::Ok); - } - - SECTION("TooSmallBufferForObjectWithNestedObject") { - StaticJsonDocument doc; - char input[] = "{\"a\":[]}"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::NoMemory); - } - - SECTION("BufferOfTheRightSizeForObjectWithNestedObject") { - StaticJsonDocument doc; - char input[] = "{\"a\":[]}"; - - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::Ok); - } - - SECTION("Should clear the JsonObject") { - StaticJsonDocument doc; - char input[] = "{\"hello\":\"world\"}"; - - deserializeJson(doc, input); - deserializeJson(doc, "{}"); - - REQUIRE(doc.as().size() == 0); - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0)); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/string.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/string.cpp deleted file mode 100644 index 8f93ac63d9..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDeserializer/string.cpp +++ /dev/null @@ -1,132 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_DECODE_UNICODE 1 -#include -#include - -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]); - - DynamicJsonDocument doc(4096); - - 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") { - StaticJsonDocument<200> 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]); - - DynamicJsonDocument doc(4096); - - for (size_t i = 0; i < testCount; i++) { - const char* input = testCases[i]; - CAPTURE(input); - REQUIRE(deserializeJson(doc, input) == - DeserializationError::IncompleteInput); - } -} - -TEST_CASE("Invalid JSON string") { - const char* testCases[] = {"'\\u'", "'\\u000g'", "'\\u000'", - "'\\u000G'", "'\\u000/'", "'\\x1234'"}; - const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); - - DynamicJsonDocument doc(4096); - - for (size_t i = 0; i < testCount; i++) { - const char* input = testCases[i]; - CAPTURE(input); - REQUIRE(deserializeJson(doc, input) == DeserializationError::InvalidInput); - } -} - -TEST_CASE("Not enough room to save the key") { - DynamicJsonDocument doc(JSON_OBJECT_SIZE(1) + 8); - - SECTION("Quoted string") { - REQUIRE(deserializeJson(doc, "{\"example\":1}") == - DeserializationError::Ok); - REQUIRE(deserializeJson(doc, "{\"accuracy\":1}") == - DeserializationError::NoMemory); - REQUIRE(deserializeJson(doc, "{\"hello\":1,\"world\"}") == - DeserializationError::NoMemory); // fails in the second string - } - - SECTION("Non-quoted string") { - REQUIRE(deserializeJson(doc, "{example:1}") == DeserializationError::Ok); - REQUIRE(deserializeJson(doc, "{accuracy:1}") == - DeserializationError::NoMemory); - REQUIRE(deserializeJson(doc, "{hello:1,world}") == - DeserializationError::NoMemory); // fails in the second string - } -} - -TEST_CASE("Empty memory pool") { - // NOLINTNEXTLINE(clang-analyzer-optin.portability.UnixAPI) - DynamicJsonDocument doc(0); - - SECTION("Input is const char*") { - REQUIRE(deserializeJson(doc, "\"hello\"") == - DeserializationError::NoMemory); - REQUIRE(deserializeJson(doc, "\"\"") == DeserializationError::NoMemory); - } - - SECTION("Input is const char*") { - char hello[] = "\"hello\""; - REQUIRE(deserializeJson(doc, hello) == DeserializationError::Ok); - char empty[] = "\"hello\""; - REQUIRE(deserializeJson(doc, empty) == DeserializationError::Ok); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/BasicJsonDocument.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/BasicJsonDocument.cpp deleted file mode 100644 index d2074401a4..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/BasicJsonDocument.cpp +++ /dev/null @@ -1,187 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include // malloc, free -#include -#include -#include - -using ARDUINOJSON_NAMESPACE::addPadding; - -class SpyingAllocator { - public: - SpyingAllocator(const SpyingAllocator& src) : _log(src._log) {} - SpyingAllocator(std::ostream& log) : _log(log) {} - - void* allocate(size_t n) { - _log << "A" << n; - return malloc(n); - } - void deallocate(void* p) { - _log << "F"; - free(p); - } - - private: - SpyingAllocator& operator=(const SpyingAllocator& src); - - std::ostream& _log; -}; - -class ControllableAllocator { - public: - ControllableAllocator() : _enabled(true) {} - - void* allocate(size_t n) { - return _enabled ? malloc(n) : 0; - } - - void deallocate(void* p) { - free(p); - } - - void disable() { - _enabled = false; - } - - private: - bool _enabled; -}; - -TEST_CASE("BasicJsonDocument") { - std::stringstream log; - - SECTION("Construct/Destruct") { - { BasicJsonDocument doc(4096, log); } - REQUIRE(log.str() == "A4096F"); - } - - SECTION("Copy construct") { - { - BasicJsonDocument doc1(4096, log); - doc1.set(std::string("The size of this string is 32!!")); - - BasicJsonDocument doc2(doc1); - - REQUIRE(doc1.as() == "The size of this string is 32!!"); - REQUIRE(doc2.as() == "The size of this string is 32!!"); - REQUIRE(doc2.capacity() == 4096); - } - REQUIRE(log.str() == "A4096A4096FF"); - } - -#if ARDUINOJSON_HAS_RVALUE_REFERENCES - SECTION("Move construct") { - { - BasicJsonDocument doc1(4096, log); - doc1.set(std::string("The size of this string is 32!!")); - - BasicJsonDocument doc2(std::move(doc1)); - - REQUIRE(doc2.as() == "The size of this string is 32!!"); - REQUIRE(doc1.as() == "null"); - REQUIRE(doc1.capacity() == 0); - REQUIRE(doc2.capacity() == 4096); - } - REQUIRE(log.str() == "A4096F"); - } -#endif - - SECTION("Copy assign larger") { - { - BasicJsonDocument doc1(4096, log); - doc1.set(std::string("The size of this string is 32!!")); - BasicJsonDocument doc2(8, log); - - doc2 = doc1; - - REQUIRE(doc1.as() == "The size of this string is 32!!"); - REQUIRE(doc2.as() == "The size of this string is 32!!"); - REQUIRE(doc2.capacity() == 4096); - } - REQUIRE(log.str() == "A4096A8FA4096FF"); - } - - SECTION("Copy assign smaller") { - { - BasicJsonDocument doc1(1024, log); - doc1.set(std::string("The size of this string is 32!!")); - BasicJsonDocument doc2(4096, log); - - doc2 = doc1; - - REQUIRE(doc1.as() == "The size of this string is 32!!"); - REQUIRE(doc2.as() == "The size of this string is 32!!"); - REQUIRE(doc2.capacity() == 1024); - } - REQUIRE(log.str() == "A1024A4096FA1024FF"); - } - - SECTION("Copy assign same size") { - { - BasicJsonDocument doc1(1024, log); - doc1.set(std::string("The size of this string is 32!!")); - BasicJsonDocument doc2(1024, log); - - doc2 = doc1; - - REQUIRE(doc1.as() == "The size of this string is 32!!"); - REQUIRE(doc2.as() == "The size of this string is 32!!"); - REQUIRE(doc2.capacity() == 1024); - } - REQUIRE(log.str() == "A1024A1024FF"); - } - -#if ARDUINOJSON_HAS_RVALUE_REFERENCES - SECTION("Move assign") { - { - BasicJsonDocument doc1(4096, log); - doc1.set(std::string("The size of this string is 32!!")); - BasicJsonDocument doc2(8, log); - - doc2 = std::move(doc1); - - REQUIRE(doc2.as() == "The size of this string is 32!!"); - REQUIRE(doc1.as() == "null"); - REQUIRE(doc1.capacity() == 0); - REQUIRE(doc2.capacity() == 4096); - } - REQUIRE(log.str() == "A4096A8FF"); - } -#endif - - SECTION("garbageCollect()") { - BasicJsonDocument doc(4096); - - SECTION("when allocation succeeds") { - deserializeJson(doc, "{\"blanket\":1,\"dancing\":2}"); - REQUIRE(doc.capacity() == 4096); - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - doc.remove("blanket"); - - bool result = doc.garbageCollect(); - - REQUIRE(result == true); - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - REQUIRE(doc.capacity() == 4096); - REQUIRE(doc.as() == "{\"dancing\":2}"); - } - - SECTION("when allocation fails") { - deserializeJson(doc, "{\"blanket\":1,\"dancing\":2}"); - REQUIRE(doc.capacity() == 4096); - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - doc.remove("blanket"); - doc.allocator().disable(); - - bool result = doc.garbageCollect(); - - REQUIRE(result == false); - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - REQUIRE(doc.capacity() == 4096); - REQUIRE(doc.as() == "{\"dancing\":2}"); - } - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/CMakeLists.txt deleted file mode 100644 index 535678033e..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -add_executable(JsonDocumentTests - add.cpp - BasicJsonDocument.cpp - cast.cpp - compare.cpp - containsKey.cpp - createNested.cpp - DynamicJsonDocument.cpp - ElementProxy.cpp - isNull.cpp - MemberProxy.cpp - nesting.cpp - overflowed.cpp - remove.cpp - shrinkToFit.cpp - size.cpp - StaticJsonDocument.cpp - subscript.cpp - swap.cpp -) - -add_test(JsonDocument JsonDocumentTests) - -set_tests_properties(JsonDocument - PROPERTIES - LABELS "Catch" -) diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/DynamicJsonDocument.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/DynamicJsonDocument.cpp deleted file mode 100644 index ce050f17ba..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/DynamicJsonDocument.cpp +++ /dev/null @@ -1,230 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using ARDUINOJSON_NAMESPACE::addPadding; - -static void REQUIRE_JSON(JsonDocument& doc, const std::string& expected) { - std::string json; - serializeJson(doc, json); - REQUIRE(json == expected); -} - -TEST_CASE("DynamicJsonDocument") { - DynamicJsonDocument doc(4096); - - SECTION("serializeJson()") { - JsonObject obj = doc.to(); - obj["hello"] = "world"; - - std::string json; - serializeJson(doc, json); - - REQUIRE(json == "{\"hello\":\"world\"}"); - } - - SECTION("memoryUsage()") { - SECTION("starts at zero") { - REQUIRE(doc.memoryUsage() == 0); - } - - SECTION("JSON_ARRAY_SIZE(0)") { - doc.to(); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0)); - } - - SECTION("JSON_ARRAY_SIZE(1)") { - doc.to().add(42); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(1)); - } - - SECTION("JSON_ARRAY_SIZE(1) + JSON_ARRAY_SIZE(0)") { - doc.to().createNestedArray(); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(1) + JSON_ARRAY_SIZE(0)); - } - } - - SECTION("capacity()") { - SECTION("matches constructor argument") { - DynamicJsonDocument doc2(256); - REQUIRE(doc2.capacity() == 256); - } - - SECTION("rounds up constructor argument") { - DynamicJsonDocument doc2(253); - REQUIRE(doc2.capacity() == 256); - } - } - - SECTION("memoryUsage()") { - SECTION("Increases after adding value to array") { - JsonArray arr = doc.to(); - - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0)); - arr.add(42); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(1)); - arr.add(43); - REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(2)); - } - - SECTION("Increases after adding value to object") { - JsonObject obj = doc.to(); - - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0)); - obj["a"] = 1; - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1)); - obj["b"] = 2; - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2)); - } - } -} - -TEST_CASE("DynamicJsonDocument constructor") { - SECTION("Copy constructor") { - DynamicJsonDocument doc1(1234); - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - DynamicJsonDocument doc2 = doc1; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - - REQUIRE(doc2.capacity() == doc1.capacity()); - } - - SECTION("Construct from StaticJsonDocument") { - StaticJsonDocument<200> doc1; - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - DynamicJsonDocument doc2 = doc1; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - REQUIRE(doc2.capacity() == doc1.capacity()); - } - - SECTION("Construct from JsonObject") { - StaticJsonDocument<200> doc1; - JsonObject obj = doc1.to(); - obj["hello"] = "world"; - - DynamicJsonDocument doc2 = obj; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - REQUIRE(doc2.capacity() == addPadding(doc1.memoryUsage())); - } - - SECTION("Construct from JsonArray") { - StaticJsonDocument<200> doc1; - JsonArray arr = doc1.to(); - arr.add("hello"); - - DynamicJsonDocument doc2 = arr; - - REQUIRE_JSON(doc2, "[\"hello\"]"); - REQUIRE(doc2.capacity() == addPadding(doc1.memoryUsage())); - } - - SECTION("Construct from JsonVariant") { - StaticJsonDocument<200> doc1; - deserializeJson(doc1, "42"); - - DynamicJsonDocument doc2 = doc1.as(); - - REQUIRE_JSON(doc2, "42"); - REQUIRE(doc2.capacity() == addPadding(doc1.memoryUsage())); - } -} - -TEST_CASE("DynamicJsonDocument assignment") { - SECTION("Copy assignment reallocates when capacity is smaller") { - DynamicJsonDocument doc1(1234); - deserializeJson(doc1, "{\"hello\":\"world\"}"); - DynamicJsonDocument doc2(8); - - doc2 = doc1; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - REQUIRE(doc2.capacity() == doc1.capacity()); - } - - SECTION("Copy assignment reallocates when capacity is larger") { - DynamicJsonDocument doc1(100); - deserializeJson(doc1, "{\"hello\":\"world\"}"); - DynamicJsonDocument doc2(1234); - - doc2 = doc1; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - REQUIRE(doc2.capacity() == doc1.capacity()); - } - - SECTION("Assign from StaticJsonDocument") { - StaticJsonDocument<200> doc1; - deserializeJson(doc1, "{\"hello\":\"world\"}"); - DynamicJsonDocument doc2(4096); - doc2.to().set(666); - - doc2 = doc1; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Assign from JsonObject") { - StaticJsonDocument<200> doc1; - JsonObject obj = doc1.to(); - obj["hello"] = "world"; - - DynamicJsonDocument doc2(4096); - doc2 = obj; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - REQUIRE(doc2.capacity() == 4096); - } - - SECTION("Assign from JsonArray") { - StaticJsonDocument<200> doc1; - JsonArray arr = doc1.to(); - arr.add("hello"); - - DynamicJsonDocument doc2(4096); - doc2 = arr; - - REQUIRE_JSON(doc2, "[\"hello\"]"); - REQUIRE(doc2.capacity() == 4096); - } - - SECTION("Assign from JsonVariant") { - StaticJsonDocument<200> doc1; - deserializeJson(doc1, "42"); - - DynamicJsonDocument doc2(4096); - doc2 = doc1.as(); - - REQUIRE_JSON(doc2, "42"); - REQUIRE(doc2.capacity() == 4096); - } - - SECTION("Assign from MemberProxy") { - StaticJsonDocument<200> doc1; - doc1["value"] = 42; - - DynamicJsonDocument doc2(4096); - doc2 = doc1["value"]; - - REQUIRE_JSON(doc2, "42"); - REQUIRE(doc2.capacity() == 4096); - } - - SECTION("Assign from ElementProxy") { - StaticJsonDocument<200> doc1; - doc1[0] = 42; - - DynamicJsonDocument doc2(4096); - doc2 = doc1[0]; - - REQUIRE_JSON(doc2, "42"); - REQUIRE(doc2.capacity() == 4096); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/ElementProxy.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/ElementProxy.cpp deleted file mode 100644 index 0fe3c4713e..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/ElementProxy.cpp +++ /dev/null @@ -1,247 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("ElementProxy::add()") { - DynamicJsonDocument doc(4096); - doc.addElement(); - ElementProxy ep = doc[0]; - - SECTION("add(int)") { - ep.add(42); - - REQUIRE(doc.as() == "[[42]]"); - } - - SECTION("add(const char*)") { - ep.add("world"); - - REQUIRE(doc.as() == "[[\"world\"]]"); - } - - SECTION("set(char[])") { - char s[] = "world"; - ep.add(s); - strcpy(s, "!!!!!"); - - REQUIRE(doc.as() == "[[\"world\"]]"); - } -} - -TEST_CASE("ElementProxy::clear()") { - DynamicJsonDocument doc(4096); - doc.addElement(); - 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==()") { - DynamicJsonDocument doc(4096); - - 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()") { - DynamicJsonDocument doc(4096); - doc.addElement(); - 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(std::string("b")); - - 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()") { - DynamicJsonDocument doc(4096); - 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\"]"); - } -} - -TEST_CASE("ElementProxy::size()") { - DynamicJsonDocument doc(4096); - doc.addElement(); - 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::memoryUsage()") { - DynamicJsonDocument doc(4096); - doc.addElement(); - ElementProxy ep = doc[0]; - - SECTION("returns 0 for null") { - REQUIRE(ep.memoryUsage() == 0); - } - - SECTION("returns size for string") { - ep.set(std::string("hello")); - REQUIRE(ep.memoryUsage() == 6); - } -} - -TEST_CASE("ElementProxy::operator[]") { - DynamicJsonDocument doc(4096); - 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]]"); - } -} - -TEST_CASE("ElementProxy cast to JsonVariantConst") { - DynamicJsonDocument doc(4096); - doc[0] = "world"; - - const ElementProxy ep = doc[0]; - - JsonVariantConst var = ep; - - CHECK(var.as() == "world"); -} - -TEST_CASE("ElementProxy cast to JsonVariant") { - DynamicJsonDocument doc(4096); - doc[0] = "world"; - - ElementProxy ep = doc[0]; - - JsonVariant var = ep; - - CHECK(var.as() == "world"); - - var.set("toto"); - - CHECK(doc.as() == "[\"toto\"]"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/MemberProxy.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/MemberProxy.cpp deleted file mode 100644 index 64cd06a053..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/MemberProxy.cpp +++ /dev/null @@ -1,287 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemberProxy::add()") { - DynamicJsonDocument doc(4096); - MemberProxy mp = doc["hello"]; - - SECTION("add(int)") { - mp.add(42); - - REQUIRE(doc.as() == "{\"hello\":[42]}"); - } - - SECTION("add(const char*)") { - mp.add("world"); - - REQUIRE(doc.as() == "{\"hello\":[\"world\"]}"); - } -} - -TEST_CASE("MemberProxy::clear()") { - DynamicJsonDocument doc(4096); - MemberProxy 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==()") { - DynamicJsonDocument doc(4096); - - 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::containsKey()") { - DynamicJsonDocument doc(4096); - MemberProxy 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(std::string("key")) == true); - REQUIRE(mp.containsKey(std::string("key")) == true); - } -} - -TEST_CASE("MemberProxy::operator|()") { - DynamicJsonDocument doc(4096); - - SECTION("const char*") { - doc["a"] = "hello"; - - REQUIRE((doc["a"] | "world") == std::string("hello")); - REQUIRE((doc["b"] | "world") == std::string("world")); - } - - 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 == std::string("gps")); - } - - SECTION("Issue #1415") { - JsonObject object = doc.to(); - object["hello"] = "world"; - - StaticJsonDocument<0> emptyDoc; - JsonObject anotherObject = object["hello"] | emptyDoc.to(); - - REQUIRE(anotherObject.isNull() == false); - REQUIRE(anotherObject.size() == 0); - } -} - -TEST_CASE("MemberProxy::remove()") { - DynamicJsonDocument doc(4096); - MemberProxy 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(std::string("b")); - - 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()") { - DynamicJsonDocument doc(4096); - MemberProxy 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\"}"); - } -} - -TEST_CASE("MemberProxy::size()") { - DynamicJsonDocument doc(4096); - MemberProxy 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::memoryUsage()") { - DynamicJsonDocument doc(4096); - MemberProxy mp = doc["hello"]; - - SECTION("returns 0 when null") { - REQUIRE(mp.memoryUsage() == 0); - } - - SECTION("return the size for a string") { - mp.set(std::string("hello")); - REQUIRE(mp.memoryUsage() == 6); - } -} - -TEST_CASE("MemberProxy::operator[]") { - DynamicJsonDocument doc(4096); - MemberProxy 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") { - DynamicJsonDocument doc(4096); - doc["hello"] = "world"; - - const MemberProxy mp = doc["hello"]; - - JsonVariantConst var = mp; - - CHECK(var.as() == "world"); -} - -TEST_CASE("MemberProxy cast to JsonVariant") { - DynamicJsonDocument doc(4096); - doc["hello"] = "world"; - - MemberProxy mp = doc["hello"]; - - JsonVariant var = mp; - - CHECK(var.as() == "world"); - - var.set("toto"); - - CHECK(doc.as() == "{\"hello\":\"toto\"}"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/StaticJsonDocument.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/StaticJsonDocument.cpp deleted file mode 100644 index fe193e4b1d..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/StaticJsonDocument.cpp +++ /dev/null @@ -1,224 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -static void REQUIRE_JSON(JsonDocument& doc, const std::string& expected) { - std::string json; - serializeJson(doc, json); - REQUIRE(json == expected); -} - -TEST_CASE("StaticJsonDocument") { - SECTION("capacity()") { - SECTION("matches template argument") { - StaticJsonDocument<256> doc; - REQUIRE(doc.capacity() == 256); - } - - SECTION("rounds up template argument") { - StaticJsonDocument<253> doc; - REQUIRE(doc.capacity() == 256); - } - } - - SECTION("serializeJson()") { - StaticJsonDocument<200> doc; - JsonObject obj = doc.to(); - obj["hello"] = "world"; - - std::string json; - serializeJson(doc, json); - - REQUIRE(json == "{\"hello\":\"world\"}"); - } - - SECTION("Copy assignment") { - StaticJsonDocument<200> doc1, doc2; - doc1.to().set(666); - deserializeJson(doc2, "{\"hello\":\"world\"}"); - - doc1 = doc2; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Contructor") { - SECTION("Copy constructor") { - StaticJsonDocument<200> doc1; - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - StaticJsonDocument<200> doc2 = doc1; - - deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}"); - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Construct from StaticJsonDocument of different size") { - StaticJsonDocument<300> doc1; - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - StaticJsonDocument<200> doc2 = doc1; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Construct from DynamicJsonDocument") { - DynamicJsonDocument doc1(4096); - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - StaticJsonDocument<200> doc2 = doc1; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Construct from JsonObject") { - DynamicJsonDocument doc1(4096); - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - StaticJsonDocument<200> doc2 = doc1.as(); - - deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}"); - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Construct from JsonArray") { - DynamicJsonDocument doc1(4096); - deserializeJson(doc1, "[\"hello\",\"world\"]"); - - StaticJsonDocument<200> doc2 = doc1.as(); - - deserializeJson(doc1, "[\"HELLO\",\"WORLD\"]"); - REQUIRE_JSON(doc2, "[\"hello\",\"world\"]"); - } - - SECTION("Construct from JsonVariant") { - DynamicJsonDocument doc1(4096); - deserializeJson(doc1, "42"); - - StaticJsonDocument<200> doc2 = doc1.as(); - - REQUIRE_JSON(doc2, "42"); - } - } - - SECTION("Assignment") { - SECTION("Copy assignment") { - StaticJsonDocument<200> doc1, doc2; - doc1.to().set(666); - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - doc2 = doc1; - - deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}"); - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Assign from StaticJsonDocument of different capacity") { - StaticJsonDocument<200> doc1; - StaticJsonDocument<300> doc2; - doc1.to().set(666); - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - doc2 = doc1; - - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Assign from DynamicJsonDocument") { - StaticJsonDocument<200> doc1; - DynamicJsonDocument doc2(4096); - doc1.to().set(666); - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - doc2 = doc1; - - deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}"); - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Assign from JsonArray") { - StaticJsonDocument<200> doc1; - DynamicJsonDocument doc2(4096); - doc1.to().set(666); - deserializeJson(doc1, "[\"hello\",\"world\"]"); - - doc2 = doc1.as(); - - deserializeJson(doc1, "[\"HELLO\",\"WORLD\"]"); - REQUIRE_JSON(doc2, "[\"hello\",\"world\"]"); - } - - SECTION("Assign from JsonArrayConst") { - StaticJsonDocument<200> doc1; - DynamicJsonDocument doc2(4096); - doc1.to().set(666); - deserializeJson(doc1, "[\"hello\",\"world\"]"); - - doc2 = doc1.as(); - - deserializeJson(doc1, "[\"HELLO\",\"WORLD\"]"); - REQUIRE_JSON(doc2, "[\"hello\",\"world\"]"); - } - - SECTION("Assign from JsonObject") { - StaticJsonDocument<200> doc1; - DynamicJsonDocument doc2(4096); - doc1.to().set(666); - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - doc2 = doc1.as(); - - deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}"); - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Assign from JsonObjectConst") { - StaticJsonDocument<200> doc1; - DynamicJsonDocument doc2(4096); - doc1.to().set(666); - deserializeJson(doc1, "{\"hello\":\"world\"}"); - - doc2 = doc1.as(); - - deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}"); - REQUIRE_JSON(doc2, "{\"hello\":\"world\"}"); - } - - SECTION("Assign from JsonVariant") { - DynamicJsonDocument doc1(4096); - doc1.to().set(666); - deserializeJson(doc1, "42"); - - StaticJsonDocument<200> doc2; - doc2 = doc1.as(); - - REQUIRE_JSON(doc2, "42"); - } - - SECTION("Assign from JsonVariantConst") { - DynamicJsonDocument doc1(4096); - doc1.to().set(666); - deserializeJson(doc1, "42"); - - StaticJsonDocument<200> doc2; - doc2 = doc1.as(); - - REQUIRE_JSON(doc2, "42"); - } - } - - SECTION("garbageCollect()") { - StaticJsonDocument<256> doc; - doc[std::string("example")] = std::string("jukebox"); - doc.remove("example"); - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 16); - - doc.garbageCollect(); - - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0)); - REQUIRE_JSON(doc, "{}"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/add.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/add.cpp deleted file mode 100644 index 109bd08bc3..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/add.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonDocument::add()") { - DynamicJsonDocument doc(4096); - - SECTION("integer") { - doc.add(42); - - REQUIRE(doc.as() == "[42]"); - } - - SECTION("const char*") { - doc.add("hello"); - - REQUIRE(doc.as() == "[\"hello\"]"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/cast.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/cast.cpp deleted file mode 100644 index e538f4bbf6..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/cast.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -#include - -TEST_CASE("Implicit cast to JsonVariant") { - StaticJsonDocument<128> doc; - - doc["hello"] = "world"; - - JsonVariant var = doc; - - CHECK(var.as() == "{\"hello\":\"world\"}"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/compare.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/compare.cpp deleted file mode 100644 index 7e9b95008b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/compare.cpp +++ /dev/null @@ -1,103 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("DynamicJsonDocument::operator==(const DynamicJsonDocument&)") { - DynamicJsonDocument doc1(4096); - DynamicJsonDocument doc2(4096); - - 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); - } -} - -TEST_CASE("DynamicJsonDocument::operator==(const StaticJsonDocument&)") { - DynamicJsonDocument doc1(4096); - StaticJsonDocument<256> 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); - } -} - -TEST_CASE("StaticJsonDocument::operator==(const DynamicJsonDocument&)") { - StaticJsonDocument<256> doc1; - DynamicJsonDocument doc2(4096); - - 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); - } -} - -TEST_CASE("JsonDocument::operator==(const JsonDocument&)") { - StaticJsonDocument<256> doc1; - StaticJsonDocument<256> doc2; - const JsonDocument& ref1 = doc1; - const JsonDocument& ref2 = doc2; - - SECTION("Empty") { - REQUIRE(ref1 == ref2); - REQUIRE_FALSE(ref1 != ref2); - } - - SECTION("With same object") { - doc1["hello"] = "world"; - doc2["hello"] = "world"; - REQUIRE(ref1 == ref2); - REQUIRE_FALSE(ref1 != ref2); - } - - SECTION("With different object") { - doc1["hello"] = "world"; - doc2["world"] = "hello"; - REQUIRE_FALSE(ref1 == ref2); - REQUIRE(ref1 != ref2); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/containsKey.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/containsKey.cpp deleted file mode 100644 index 6936043751..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/containsKey.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonDocument::containsKey()") { - DynamicJsonDocument doc(4096); - - 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(std::string("hello")) == 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); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/createNested.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/createNested.cpp deleted file mode 100644 index 258f05179f..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/createNested.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonDocument::createNestedArray()") { - DynamicJsonDocument doc(4096); - - SECTION("promotes to array") { - doc.createNestedArray(); - - REQUIRE(doc.is()); - } -} - -TEST_CASE("JsonDocument::createNestedArray(key)") { - DynamicJsonDocument doc(4096); - - SECTION("key is const char*") { - SECTION("promotes to object") { - doc.createNestedArray("hello"); - - REQUIRE(doc.is()); - } - } - - SECTION("key is std::string") { - SECTION("promotes to object") { - doc.createNestedArray(std::string("hello")); - - REQUIRE(doc.is()); - } - } -} - -TEST_CASE("JsonDocument::createNestedObject()") { - DynamicJsonDocument doc(4096); - - SECTION("promotes to array") { - doc.createNestedObject(); - - REQUIRE(doc.is()); - } -} - -TEST_CASE("JsonDocument::createNestedObject(key)") { - DynamicJsonDocument doc(4096); - - SECTION("key is const char*") { - SECTION("promotes to object") { - doc.createNestedObject("hello"); - - REQUIRE(doc.is()); - } - } - - SECTION("key is std::string") { - SECTION("promotes to object") { - doc.createNestedObject(std::string("hello")); - - REQUIRE(doc.is()); - } - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/isNull.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/isNull.cpp deleted file mode 100644 index cfb70dd62a..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/isNull.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonDocument::isNull()") { - DynamicJsonDocument doc(4096); - - 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/lib/ArduinoJson-6.x/extras/tests/JsonDocument/nesting.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/nesting.cpp deleted file mode 100644 index 3284dd1c26..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/nesting.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonDocument::nesting()") { - DynamicJsonDocument doc(4096); - - 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/lib/ArduinoJson-6.x/extras/tests/JsonDocument/overflowed.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/overflowed.cpp deleted file mode 100644 index cea0db9d5f..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/overflowed.cpp +++ /dev/null @@ -1,85 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonDocument::overflowed()") { - SECTION("returns false on a fresh object") { - StaticJsonDocument<0> doc; - CHECK(doc.overflowed() == false); - } - - SECTION("returns true after a failed insertion") { - StaticJsonDocument<0> doc; - doc.add(0); - CHECK(doc.overflowed() == true); - } - - SECTION("returns false after successful insertion") { - StaticJsonDocument doc; - doc.add(0); - CHECK(doc.overflowed() == false); - } - - SECTION("returns true after a failed string copy") { - StaticJsonDocument doc; - doc.add(std::string("example")); - CHECK(doc.overflowed() == true); - } - - SECTION("returns false after a successful string copy") { - StaticJsonDocument doc; - doc.add(std::string("example")); - CHECK(doc.overflowed() == false); - } - - SECTION("returns true after a failed member add") { - StaticJsonDocument<1> doc; - doc["example"] = true; - CHECK(doc.overflowed() == true); - } - - SECTION("returns true after a failed deserialization") { - StaticJsonDocument doc; - deserializeJson(doc, "[\"example\"]"); - CHECK(doc.overflowed() == true); - } - - SECTION("returns false after a successful deserialization") { - StaticJsonDocument doc; - deserializeJson(doc, "[\"example\"]"); - CHECK(doc.overflowed() == false); - } - - SECTION("returns false after clear()") { - StaticJsonDocument<0> doc; - doc.add(0); - doc.clear(); - CHECK(doc.overflowed() == false); - } - - SECTION("remains false after shrinkToFit()") { - DynamicJsonDocument doc(JSON_ARRAY_SIZE(1)); - doc.add(0); - doc.shrinkToFit(); - CHECK(doc.overflowed() == false); - } - - SECTION("remains true after shrinkToFit()") { - DynamicJsonDocument doc(JSON_ARRAY_SIZE(1)); - doc.add(0); - doc.add(0); - doc.shrinkToFit(); - CHECK(doc.overflowed() == true); - } - - SECTION("return false after garbageCollect()") { - DynamicJsonDocument doc(JSON_ARRAY_SIZE(1)); - doc.add(0); - doc.add(0); - doc.garbageCollect(); - CHECK(doc.overflowed() == false); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/remove.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/remove.cpp deleted file mode 100644 index b777073396..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/remove.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonDocument::remove()") { - DynamicJsonDocument doc(4096); - - SECTION("remove(int)") { - doc.add(1); - doc.add(2); - doc.add(3); - - doc.remove(1); - - REQUIRE(doc.as() == "[1,3]"); - } - - SECTION("remove(const char *)") { - doc["a"] = 1; - doc["b"] = 2; - - doc.remove("a"); - - REQUIRE(doc.as() == "{\"b\":2}"); - } - - SECTION("remove(std::string)") { - doc["a"] = 1; - doc["b"] = 2; - - doc.remove(std::string("b")); - - 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 -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/shrinkToFit.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/shrinkToFit.cpp deleted file mode 100644 index 0eb34e8167..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/shrinkToFit.cpp +++ /dev/null @@ -1,154 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -#include // malloc, free -#include - -using ARDUINOJSON_NAMESPACE::addPadding; - -class ArmoredAllocator { - public: - ArmoredAllocator() : _ptr(0), _size(0) {} - - void* allocate(size_t size) { - _ptr = malloc(size); - _size = size; - return _ptr; - } - - void deallocate(void* ptr) { - REQUIRE(ptr == _ptr); - free(ptr); - _ptr = 0; - _size = 0; - } - - void* reallocate(void* ptr, size_t new_size) { - REQUIRE(ptr == _ptr); - // 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); - memcpy(new_ptr, _ptr, std::min(new_size, _size)); - memset(_ptr, '#', _size); // erase - free(_ptr); - _ptr = new_ptr; - return new_ptr; - } - - private: - void* _ptr; - size_t _size; -}; - -typedef BasicJsonDocument ShrinkToFitTestDocument; - -void testShrinkToFit(ShrinkToFitTestDocument& doc, std::string expected_json, - size_t expected_size) { - // test twice: shrinkToFit() should be idempotent - for (int i = 0; i < 2; i++) { - doc.shrinkToFit(); - - REQUIRE(doc.capacity() == expected_size); - REQUIRE(doc.memoryUsage() == expected_size); - - std::string json; - serializeJson(doc, json); - REQUIRE(json == expected_json); - } -} - -TEST_CASE("BasicJsonDocument::shrinkToFit()") { - ShrinkToFitTestDocument doc(4096); - - SECTION("null") { - testShrinkToFit(doc, "null", 0); - } - - SECTION("empty object") { - deserializeJson(doc, "{}"); - testShrinkToFit(doc, "{}", JSON_OBJECT_SIZE(0)); - } - - SECTION("empty array") { - deserializeJson(doc, "[]"); - testShrinkToFit(doc, "[]", JSON_ARRAY_SIZE(0)); - } - - SECTION("linked string") { - doc.set("hello"); - testShrinkToFit(doc, "\"hello\"", 0); - } - - SECTION("owned string") { - doc.set(std::string("abcdefg")); - testShrinkToFit(doc, "\"abcdefg\"", 8); - } - - SECTION("linked raw") { - doc.set(serialized("[{},123]")); - testShrinkToFit(doc, "[{},123]", 0); - } - - SECTION("owned raw") { - doc.set(serialized(std::string("[{},12]"))); - testShrinkToFit(doc, "[{},12]", 8); - } - - SECTION("linked key") { - doc["key"] = 42; - testShrinkToFit(doc, "{\"key\":42}", JSON_OBJECT_SIZE(1)); - } - - SECTION("owned key") { - doc[std::string("abcdefg")] = 42; - testShrinkToFit(doc, "{\"abcdefg\":42}", JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("linked string in array") { - doc.add("hello"); - testShrinkToFit(doc, "[\"hello\"]", JSON_ARRAY_SIZE(1)); - } - - SECTION("owned string in array") { - doc.add(std::string("abcdefg")); - testShrinkToFit(doc, "[\"abcdefg\"]", JSON_ARRAY_SIZE(1) + 8); - } - - SECTION("linked string in object") { - doc["key"] = "hello"; - testShrinkToFit(doc, "{\"key\":\"hello\"}", JSON_OBJECT_SIZE(1)); - } - - SECTION("owned string in object") { - doc["key"] = std::string("abcdefg"); - testShrinkToFit(doc, "{\"key\":\"abcdefg\"}", JSON_ARRAY_SIZE(1) + 8); - } - - SECTION("unaligned") { - doc.add(std::string("?")); // two bytes in the string pool - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 2); - - doc.shrinkToFit(); - - // the new capacity should be padded to align the pointers - REQUIRE(doc.capacity() == JSON_OBJECT_SIZE(1) + sizeof(void*)); - REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 2); - REQUIRE(doc[0] == "?"); - } -} - -TEST_CASE("DynamicJsonDocument::shrinkToFit()") { - DynamicJsonDocument doc(4096); - - deserializeJson(doc, "{\"hello\":[\"world\"]"); - - doc.shrinkToFit(); - - std::string json; - serializeJson(doc, json); - REQUIRE(json == "{\"hello\":[\"world\"]}"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/size.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/size.cpp deleted file mode 100644 index 4fbb6e23ca..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/size.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonDocument::size()") { - DynamicJsonDocument doc(4096); - - 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/lib/ArduinoJson-6.x/extras/tests/JsonDocument/subscript.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/subscript.cpp deleted file mode 100644 index 4ba6ff8466..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/subscript.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonDocument::operator[]") { - DynamicJsonDocument doc(4096); - const JsonDocument& cdoc = doc; - - SECTION("object") { - deserializeJson(doc, "{\"hello\":\"world\"}"); - - SECTION("const char*") { - REQUIRE(doc["hello"] == "world"); - REQUIRE(cdoc["hello"] == "world"); - } - - SECTION("std::string") { - REQUIRE(doc[std::string("hello")] == "world"); - REQUIRE(cdoc[std::string("hello")] == "world"); - } - - SECTION("supports operator|") { - REQUIRE((doc["hello"] | "nope") == std::string("world")); - REQUIRE((doc["world"] | "nope") == std::string("nope")); - } - } - - SECTION("array") { - deserializeJson(doc, "[\"hello\",\"world\"]"); - - REQUIRE(doc[1] == "world"); - REQUIRE(cdoc[1] == "world"); - } -} - -TEST_CASE("JsonDocument automatically promotes to object") { - DynamicJsonDocument doc(4096); - - doc["one"]["two"]["three"] = 4; - - REQUIRE(doc["one"]["two"]["three"] == 4); -} - -TEST_CASE("JsonDocument automatically promotes to array") { - DynamicJsonDocument doc(4096); - - doc[2] = 2; - - REQUIRE(doc.as() == "[null,null,2]"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/swap.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonDocument/swap.cpp deleted file mode 100644 index 60d672f889..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonDocument/swap.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include - -#include -#include -#include - -using namespace std; - -TEST_CASE("std::swap") { - SECTION("DynamicJsonDocument*") { - DynamicJsonDocument *p1, *p2; - swap(p1, p2); // issue #1678 - } - - SECTION("DynamicJsonDocument") { - DynamicJsonDocument doc1(0x10), doc2(0x20); - doc1.set("hello"); - doc2.set("world"); - - swap(doc1, doc2); - - CHECK(doc1.capacity() == 0x20); - CHECK(doc1.as() == "world"); - CHECK(doc2.capacity() == 0x10); - CHECK(doc2.as() == "hello"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/JsonObject/CMakeLists.txt deleted file mode 100644 index 9e5ac48238..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -add_executable(JsonObjectTests - clear.cpp - containsKey.cpp - copy.cpp - createNestedArray.cpp - createNestedObject.cpp - equals.cpp - invalid.cpp - isNull.cpp - iterator.cpp - memoryUsage.cpp - nesting.cpp - remove.cpp - size.cpp - std_string.cpp - subscript.cpp -) - -add_test(JsonObject JsonObjectTests) - -set_tests_properties(JsonObject - PROPERTIES - LABELS "Catch" -) diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/clear.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/clear.cpp deleted file mode 100644 index da17b2cffa..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/clear.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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") { - StaticJsonDocument<64> doc; - JsonObject obj = doc.to(); - obj["hello"] = 1; - obj["world"] = 2; - obj.clear(); - REQUIRE(obj.size() == 0); - REQUIRE(obj.isNull() == false); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/containsKey.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/containsKey.cpp deleted file mode 100644 index 4f37f7e644..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/containsKey.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonObject::containsKey()") { - DynamicJsonDocument doc(4096); - 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("works with JsonObjectConst") { - JsonObjectConst cobj = obj; - REQUIRE(false == cobj.containsKey("world")); - REQUIRE(true == cobj.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 -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/copy.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/copy.cpp deleted file mode 100644 index c5514a21fb..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/copy.cpp +++ /dev/null @@ -1,115 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonObject::set()") { - DynamicJsonDocument doc1(4096); - DynamicJsonDocument doc2(4096); - - JsonObject obj1 = doc1.to(); - JsonObject obj2 = doc2.to(); - - SECTION("doesn't copy static string in key or value") { - obj1["hello"] = "world"; - - bool success = obj2.set(obj1); - - REQUIRE(success == true); - REQUIRE(doc1.memoryUsage() == doc2.memoryUsage()); - REQUIRE(obj2["hello"] == std::string("world")); - } - - SECTION("copy local string value") { - obj1["hello"] = std::string("world"); - - bool success = obj2.set(obj1); - - REQUIRE(success == true); - REQUIRE(doc1.memoryUsage() == doc2.memoryUsage()); - REQUIRE(obj2["hello"] == std::string("world")); - } - - SECTION("copy local key") { - obj1[std::string("hello")] = "world"; - - bool success = obj2.set(obj1); - - REQUIRE(success == true); - REQUIRE(doc1.memoryUsage() == doc2.memoryUsage()); - REQUIRE(obj2["hello"] == std::string("world")); - } - - SECTION("copy string from deserializeJson()") { - deserializeJson(doc1, "{'hello':'world'}"); - - bool success = obj2.set(obj1); - - REQUIRE(success == true); - REQUIRE(doc1.memoryUsage() == doc2.memoryUsage()); - REQUIRE(obj2["hello"] == std::string("world")); - } - - SECTION("copy string from deserializeMsgPack()") { - deserializeMsgPack(doc1, "\x81\xA5hello\xA5world"); - - bool success = obj2.set(obj1); - - REQUIRE(success == true); - REQUIRE(doc1.memoryUsage() == doc2.memoryUsage()); - REQUIRE(obj2["hello"] == std::string("world")); - } - - SECTION("should work with JsonObjectConst") { - obj1["hello"] = "world"; - - obj2.set(static_cast(obj1)); - - REQUIRE(doc1.memoryUsage() == doc2.memoryUsage()); - REQUIRE(obj2["hello"] == std::string("world")); - } - - SECTION("destination too small to store the key") { - StaticJsonDocument doc3; - JsonObject obj3 = doc3.to(); - - obj1[std::string("hello")] = "world"; - - bool success = obj3.set(obj1); - - REQUIRE(success == false); - REQUIRE(doc3.as() == "{}"); - } - - SECTION("destination too small to store the value") { - StaticJsonDocument doc3; - JsonObject obj3 = doc3.to(); - - obj1["hello"] = std::string("world"); - - bool success = obj3.set(obj1); - - REQUIRE(success == false); - REQUIRE(doc3.as() == "{\"hello\":null}"); - } - - 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/lib/ArduinoJson-6.x/extras/tests/JsonObject/createNestedArray.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/createNestedArray.cpp deleted file mode 100644 index 4d43038fae..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/createNestedArray.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonObject::createNestedArray()") { - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - - SECTION("key is a const char*") { - JsonArray arr = obj.createNestedArray("hello"); - REQUIRE(arr.isNull() == false); - } - -#ifdef HAS_VARIABLE_LENGTH_ARRAY - SECTION("key is a VLA") { - size_t i = 16; - char vla[i]; - strcpy(vla, "hello"); - - JsonArray arr = obj.createNestedArray(vla); - REQUIRE(arr.isNull() == false); - } -#endif -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/createNestedObject.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/createNestedObject.cpp deleted file mode 100644 index 29f4d39dfb..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/createNestedObject.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonObject::createNestedObject()") { - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - - SECTION("key is a const char*") { - obj.createNestedObject("hello"); - } - -#ifdef HAS_VARIABLE_LENGTH_ARRAY - SECTION("key is a VLA") { - size_t i = 16; - char vla[i]; - strcpy(vla, "hello"); - - obj.createNestedObject(vla); - } -#endif -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/equals.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/equals.cpp deleted file mode 100644 index 101c61262d..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/equals.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonObject::operator==()") { - DynamicJsonDocument doc1(4096); - JsonObject obj1 = doc1.to(); - JsonObjectConst obj1c = obj1; - - DynamicJsonDocument doc2(4096); - JsonObject obj2 = doc2.to(); - JsonObjectConst obj2c = obj2; - - SECTION("should return false when objs differ") { - obj1["hello"] = "coucou"; - obj2["world"] = 1; - - REQUIRE_FALSE(obj1 == obj2); - REQUIRE_FALSE(obj1c == obj2c); - } - - SECTION("should return false when LHS has more elements") { - obj1["hello"] = "coucou"; - obj1["world"] = 666; - obj2["hello"] = "coucou"; - - REQUIRE_FALSE(obj1 == obj2); - REQUIRE_FALSE(obj1c == obj2c); - } - - SECTION("should return false when RKS has more elements") { - obj1["hello"] = "coucou"; - obj2["hello"] = "coucou"; - obj2["world"] = 666; - - REQUIRE_FALSE(obj1 == obj2); - REQUIRE_FALSE(obj1c == obj2c); - } - - 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); - REQUIRE(obj1c == obj2c); - } - - SECTION("should return false when RHS is null") { - JsonObject null; - - REQUIRE_FALSE(obj1 == null); - REQUIRE_FALSE(obj1c == null); - } - - SECTION("should return false when LHS is null") { - JsonObject null; - - REQUIRE_FALSE(null == obj2); - REQUIRE_FALSE(null == obj2c); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/invalid.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/invalid.cpp deleted file mode 100644 index 199c8f03e8..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/invalid.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace Catch::Matchers; - -TEST_CASE("JsonObject::invalid()") { - JsonObject obj; - - SECTION("SubscriptFails") { - REQUIRE(obj["key"].isNull()); - } - - SECTION("AddFails") { - obj["hello"] = "world"; - REQUIRE(0 == obj.size()); - } - - SECTION("CreateNestedArrayFails") { - REQUIRE(obj.createNestedArray("hello").isNull()); - } - - SECTION("CreateNestedObjectFails") { - REQUIRE(obj.createNestedObject("world").isNull()); - } - - SECTION("serialize to 'null'") { - char buffer[32]; - serializeJson(obj, buffer, sizeof(buffer)); - REQUIRE_THAT(buffer, Equals("null")); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/isNull.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/isNull.cpp deleted file mode 100644 index 44403481f0..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/isNull.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonObject::isNull()") { - SECTION("returns true") { - JsonObject obj; - REQUIRE(obj.isNull() == true); - } - - SECTION("returns false") { - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - REQUIRE(obj.isNull() == false); - } -} - -TEST_CASE("JsonObjectConst::isNull()") { - SECTION("returns true") { - JsonObjectConst obj; - REQUIRE(obj.isNull() == true); - } - - SECTION("returns false") { - DynamicJsonDocument doc(4096); - JsonObjectConst 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") { - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - REQUIRE(static_cast(obj) == true); - } -} - -TEST_CASE("JsonObjectConst::operator bool()") { - SECTION("returns false") { - JsonObjectConst obj; - REQUIRE(static_cast(obj) == false); - } - - SECTION("returns true") { - DynamicJsonDocument doc(4096); - JsonObjectConst obj = doc.to(); - REQUIRE(static_cast(obj) == true); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/iterator.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/iterator.cpp deleted file mode 100644 index e9f2cd2935..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/iterator.cpp +++ /dev/null @@ -1,73 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace Catch::Matchers; - -TEST_CASE("JsonObject::begin()/end()") { - StaticJsonDocument 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()); - } -} - -TEST_CASE("JsonObjectConst::begin()/end()") { - StaticJsonDocument doc; - JsonObject obj = doc.to(); - obj["ab"] = 12; - obj["cd"] = 34; - - JsonObjectConst cobj = obj; - - SECTION("Iteration") { - JsonObjectConst::iterator it = cobj.begin(); - REQUIRE(cobj.end() != it); - REQUIRE(it->key() == "ab"); - REQUIRE(12 == it->value()); - - ++it; - REQUIRE(cobj.end() != it); - JsonPairConst pair = *it; - REQUIRE(pair.key() == "cd"); - REQUIRE(34 == pair.value()); - - ++it; - REQUIRE(cobj.end() == it); - } - - SECTION("Dereferencing end() is safe") { - REQUIRE(cobj.end()->key().isNull()); - REQUIRE(cobj.end()->value().isNull()); - } - - SECTION("null JsonObjectConst") { - JsonObjectConst null; - REQUIRE(null.begin() == null.end()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/memoryUsage.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/memoryUsage.cpp deleted file mode 100644 index 835ee4a7ed..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/memoryUsage.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -TEST_CASE("JsonObject::memoryUsage()") { - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - - SECTION("return 0 if uninitialized") { - JsonObject unitialized; - REQUIRE(unitialized.memoryUsage() == 0); - } - - SECTION("JSON_OBJECT_SIZE(0) for empty object") { - REQUIRE(obj.memoryUsage() == JSON_OBJECT_SIZE(0)); - } - - SECTION("JSON_OBJECT_SIZE(1) after add") { - obj["hello"] = 42; - REQUIRE(obj.memoryUsage() == JSON_OBJECT_SIZE(1)); - } - - SECTION("includes the size of the key") { - obj[std::string("hello")] = 42; - REQUIRE(obj.memoryUsage() == JSON_OBJECT_SIZE(1) + 6); - } - - SECTION("includes the size of the nested array") { - JsonArray nested = obj.createNestedArray("nested"); - nested.add(42); - REQUIRE(obj.memoryUsage() == JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(1)); - } - - SECTION("includes the size of the nested object") { - JsonObject nested = obj.createNestedObject("nested"); - nested["hello"] = "world"; - REQUIRE(obj.memoryUsage() == 2 * JSON_OBJECT_SIZE(1)); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/nesting.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/nesting.cpp deleted file mode 100644 index 7937c289e9..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/nesting.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonObject::nesting()") { - DynamicJsonDocument doc(4096); - 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.createNestedArray("nested"); - REQUIRE(obj.nesting() == 2); - } - - SECTION("returns 2 with nested object") { - obj.createNestedObject("nested"); - REQUIRE(obj.nesting() == 2); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/remove.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/remove.cpp deleted file mode 100644 index f1cb20cb79..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/remove.cpp +++ /dev/null @@ -1,82 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -TEST_CASE("JsonObject::remove()") { - DynamicJsonDocument doc(4096); - 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 += 2; - 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()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/size.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/size.cpp deleted file mode 100644 index 0d82cfb8cd..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/size.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -TEST_CASE("JsonObject::size()") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/JsonObject/std_string.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/std_string.cpp deleted file mode 100644 index e985421e99..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/std_string.cpp +++ /dev/null @@ -1,109 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -static void eraseString(std::string &str) { - char *p = const_cast(str.c_str()); - while (*p) *p++ = '*'; -} - -TEST_CASE("std::string") { - DynamicJsonDocument doc(4096); - - SECTION("operator[]") { - char json[] = "{\"key\":\"value\"}"; - - deserializeJson(doc, json); - JsonObject obj = doc.as(); - - REQUIRE(std::string("value") == obj[std::string("key")]); - } - - SECTION("operator[] const") { - char json[] = "{\"key\":\"value\"}"; - - deserializeJson(doc, json); - JsonObject obj = doc.as(); - - REQUIRE(std::string("value") == obj[std::string("key")]); - } - - SECTION("createNestedObject()") { - JsonObject obj = doc.to(); - std::string key = "key"; - char json[64]; - obj.createNestedObject(key); - eraseString(key); - serializeJson(doc, json, sizeof(json)); - REQUIRE(std::string("{\"key\":{}}") == json); - } - - SECTION("createNestedArray()") { - JsonObject obj = doc.to(); - std::string key = "key"; - char json[64]; - obj.createNestedArray(key); - eraseString(key); - serializeJson(doc, json, sizeof(json)); - REQUIRE(std::string("{\"key\":[]}") == json); - } - - SECTION("containsKey()") { - char json[] = "{\"key\":\"value\"}"; - deserializeJson(doc, json); - JsonObject obj = doc.as(); - REQUIRE(true == obj.containsKey(std::string("key"))); - } - - SECTION("remove()") { - JsonObject obj = doc.to(); - obj["key"] = "value"; - - obj.remove(std::string("key")); - - REQUIRE(0 == obj.size()); - } - - SECTION("operator[], set key") { - std::string key("hello"); - JsonObject obj = doc.to(); - obj[key] = "world"; - eraseString(key); - REQUIRE(std::string("world") == obj["hello"]); - } - - SECTION("operator[], set value") { - std::string value("world"); - JsonObject obj = doc.to(); - obj["hello"] = value; - eraseString(value); - REQUIRE(std::string("world") == obj["hello"]); - } - - SECTION("memoryUsage() increases when adding a new key") { - std::string key1("hello"), key2("world"); - JsonObject obj = doc.to(); - - obj[key1] = 1; - size_t sizeBefore = doc.memoryUsage(); - obj[key2] = 2; - size_t sizeAfter = doc.memoryUsage(); - - REQUIRE(sizeAfter - sizeBefore >= key2.size()); - } - - SECTION("memoryUsage() remains when adding the same key") { - std::string key("hello"); - JsonObject obj = doc.to(); - - obj[key] = 1; - size_t sizeBefore = doc.memoryUsage(); - obj[key] = 2; - size_t sizeAfter = doc.memoryUsage(); - - REQUIRE(sizeBefore == sizeAfter); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonObject/subscript.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonObject/subscript.cpp deleted file mode 100644 index e8242f632d..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonObject/subscript.cpp +++ /dev/null @@ -1,233 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonObject::operator[]") { - DynamicJsonDocument doc(4096); - 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(std::string("h3110") == obj["hello"].as()); - } - - SECTION("array") { - DynamicJsonDocument doc2(4096); - JsonArray arr = doc2.to(); - - obj["hello"] = arr; - - REQUIRE(arr == obj["hello"].as()); - REQUIRE(true == obj["hello"].is()); - REQUIRE(false == obj["hello"].is()); - } - - SECTION("object") { - DynamicJsonDocument doc2(4096); - 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") { - DynamicJsonDocument doc2(4096); - JsonArray arr = doc2.to(); - arr.add(42); - - obj["a"] = arr[0]; - - REQUIRE(42 == obj["a"]); - } - - SECTION("object subscript") { - DynamicJsonDocument doc2(4096); - 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"; - const size_t expectedSize = JSON_OBJECT_SIZE(1); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate char* value") { - obj["hello"] = const_cast("world"); - const size_t expectedSize = JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(5); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate char* key") { - obj[const_cast("hello")] = "world"; - const size_t expectedSize = JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(5); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate char* key&value") { - obj[const_cast("hello")] = const_cast("world"); - const size_t expectedSize = JSON_OBJECT_SIZE(1) + 2 * JSON_STRING_SIZE(5); - REQUIRE(expectedSize <= doc.memoryUsage()); - } - - SECTION("should duplicate std::string value") { - obj["hello"] = std::string("world"); - const size_t expectedSize = JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(5); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate std::string key") { - obj[std::string("hello")] = "world"; - const size_t expectedSize = JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(5); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should duplicate std::string key&value") { - obj[std::string("hello")] = std::string("world"); - const size_t expectedSize = JSON_OBJECT_SIZE(1) + 2 * JSON_STRING_SIZE(5); - REQUIRE(expectedSize <= doc.memoryUsage()); - } - - SECTION("should duplicate a non-static JsonString key") { - obj[JsonString("hello", JsonString::Copied)] = "world"; - const size_t expectedSize = JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(5); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - SECTION("should not duplicate a static JsonString key") { - obj[JsonString("hello", JsonString::Linked)] = "world"; - const size_t expectedSize = JSON_OBJECT_SIZE(1); - REQUIRE(expectedSize == doc.memoryUsage()); - } - - 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(std::string("world") == obj["hello"]); - } - - SECTION("obj[str] = VLA") { // issue #416 - size_t i = 32; - char vla[i]; - strcpy(vla, "world"); - - obj["hello"] = vla; - - REQUIRE(std::string("world") == obj["hello"].as()); - } - - SECTION("obj.set(VLA, str)") { - size_t i = 16; - char vla[i]; - strcpy(vla, "hello"); - - obj[vla] = "world"; - - REQUIRE(std::string("world") == obj["hello"]); - } - - SECTION("obj.set(str, VLA)") { - size_t i = 32; - char vla[i]; - strcpy(vla, "world"); - - obj["hello"].set(vla); - - REQUIRE(std::string("world") == obj["hello"].as()); - } - - SECTION("obj[VLA]") { - size_t i = 16; - char vla[i]; - strcpy(vla, "hello"); - - deserializeJson(doc, "{\"hello\":\"world\"}"); - - obj = doc.as(); - REQUIRE(std::string("world") == obj[vla]); - } -#endif - - SECTION("chain") { - obj.createNestedObject("hello")["world"] = 123; - - REQUIRE(123 == obj["hello"]["world"].as()); - REQUIRE(true == obj["hello"]["world"].is()); - REQUIRE(false == obj["hello"]["world"].is()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/CMakeLists.txt deleted file mode 100644 index ece6dbc259..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, 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/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/CustomWriter.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/CustomWriter.cpp deleted file mode 100644 index 05d870409f..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/CustomWriter.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -class CustomWriter { - public: - CustomWriter() {} - - 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: - CustomWriter(const CustomWriter &); // non-copiable - CustomWriter &operator=(const CustomWriter &); - - std::string _str; -}; - -TEST_CASE("CustomWriter") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonArray.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonArray.cpp deleted file mode 100644 index e018de73c9..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonArray.cpp +++ /dev/null @@ -1,129 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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)") { - StaticJsonDocument 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("OneStringOverCapacity") { - array.add("hello"); - array.add("world"); - array.add("lost"); - - 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("OneIntegerOverCapacity") { - array.add(1); - array.add(2); - array.add(3); - - check(array, "[1,2]"); - } - - 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("OneBooleanOverCapacity") { - array.add(false); - array.add(true); - array.add(false); - - check(array, "[false,true]"); - } - - SECTION("OneEmptyNestedArray") { - array.createNestedArray(); - - check(array, "[[]]"); - } - - SECTION("OneEmptyNestedHash") { - array.createNestedObject(); - - check(array, "[{}]"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonArrayPretty.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonArrayPretty.cpp deleted file mode 100644 index 8c319fc0b1..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonArrayPretty.cpp +++ /dev/null @@ -1,75 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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)") { - DynamicJsonDocument doc(4096); - 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.createNestedArray(); - array.createNestedArray(); - - checkArray(array, - "[\r\n" - " [],\r\n" - " []\r\n" - "]"); - } - - SECTION("NestedArrays") { - JsonArray nested1 = array.createNestedArray(); - nested1.add(1); - nested1.add(2); - - JsonObject nested2 = array.createNestedObject(); - 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/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonObject.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonObject.cpp deleted file mode 100644 index b457c6656a..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonObject.cpp +++ /dev/null @@ -1,119 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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)") { - DynamicJsonDocument doc(4096); - 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") { - DynamicJsonDocument b(4096); - DynamicJsonDocument c(4096); - - obj.createNestedArray("a"); - obj["b"] = b.to(); - obj["c"] = c.to(); - - checkObject(obj, "{\"a\":[],\"b\":[],\"c\":[]}"); - } - - SECTION("ThreeNestedObjects") { - DynamicJsonDocument b(4096); - DynamicJsonDocument c(4096); - - obj.createNestedObject("a"); - obj["b"] = b.to(); - obj["c"] = c.to(); - - checkObject(obj, "{\"a\":{},\"b\":{},\"c\":{}}"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonObjectPretty.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonObjectPretty.cpp deleted file mode 100644 index ec4ae71b8b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonObjectPretty.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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)") { - DynamicJsonDocument doc(4096); - 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.createNestedObject("key1"); - obj.createNestedArray("key2"); - - checkObjectPretty(obj, - "{\r\n" - " \"key1\": {},\r\n" - " \"key2\": []\r\n" - "}"); - } - - SECTION("NestedContainers") { - JsonObject nested1 = obj.createNestedObject("key1"); - nested1["a"] = 1; - - JsonArray nested2 = obj.createNestedArray("key2"); - 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/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonVariant.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonVariant.cpp deleted file mode 100644 index 18d51f5850..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/JsonVariant.cpp +++ /dev/null @@ -1,121 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -template -void check(T value, const std::string &expected) { - DynamicJsonDocument doc(4096); - 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(std::string("hello"), "\"hello\""); - - SECTION("Escape quotation mark") { - check(std::string("hello \"world\""), "\"hello \\\"world\\\"\""); - } - - SECTION("Escape reverse solidus") { - check(std::string("hello\\world"), "\"hello\\\\world\""); - } - - SECTION("Don't escape solidus") { - check(std::string("fifty/fifty"), "\"fifty/fifty\""); - } - - SECTION("Escape backspace") { - check(std::string("hello\bworld"), "\"hello\\bworld\""); - } - - SECTION("Escape formfeed") { - check(std::string("hello\fworld"), "\"hello\\fworld\""); - } - - SECTION("Escape linefeed") { - check(std::string("hello\nworld"), "\"hello\\nworld\""); - } - - SECTION("Escape carriage return") { - check(std::string("hello\rworld"), "\"hello\\rworld\""); - } - - SECTION("Escape tab") { - check(std::string("hello\tworld"), "\"hello\\tworld\""); - } - - SECTION("NUL char") { - check(std::string("hello\0world", 11), "\"hello\\u0000world\""); - } - } - - SECTION("SerializedValue") { - check(serialized("[1,2]"), "[1,2]"); - } - - SECTION("SerializedValue") { - check(serialized(std::string("[1,2]")), "[1,2]"); - } - - SECTION("Double") { - check(3.1415927, "3.1415927"); - } - - 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/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/misc.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/misc.cpp deleted file mode 100644 index 59c09ebacf..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/misc.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include -#include - -TEST_CASE("serializeJson(MemberProxy)") { - DynamicJsonDocument doc(4096); - deserializeJson(doc, "{\"hello\":42}"); - JsonObject obj = doc.as(); - std::string result; - - serializeJson(obj["hello"], result); - - REQUIRE(result == "42"); -} - -TEST_CASE("serializeJson(ElementProxy)") { - DynamicJsonDocument doc(4096); - deserializeJson(doc, "[42]"); - JsonArray arr = doc.as(); - std::string result; - - serializeJson(arr[0], result); - - REQUIRE(result == "42"); -} - -TEST_CASE("serializeJson(JsonVariantSubscript)") { - DynamicJsonDocument doc(4096); - deserializeJson(doc, "[42]"); - JsonVariant var = doc.as(); - std::string result; - - serializeJson(var[0], result); - - REQUIRE(result == "42"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/std_stream.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/std_stream.cpp deleted file mode 100644 index 74520286a9..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/std_stream.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -TEST_CASE("operator<<(std::ostream)") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/std_string.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/std_string.cpp deleted file mode 100644 index 7a145da8ec..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonSerializer/std_string.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("serialize JsonArray to std::string") { - DynamicJsonDocument doc(4096); - JsonArray array = doc.to(); - array.add(4); - array.add(2); - - SECTION("serializeJson()") { - std::string json; - serializeJson(array, json); - - REQUIRE("[4,2]" == json); - } - - SECTION("serializeJsonPretty") { - std::string json; - serializeJsonPretty(array, json); - - REQUIRE("[\r\n 4,\r\n 2\r\n]" == json); - } -} - -TEST_CASE("serialize JsonObject to std::string") { - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - obj["key"] = "value"; - - SECTION("object") { - std::string json; - serializeJson(doc, json); - - REQUIRE("{\"key\":\"value\"}" == json); - } - - SECTION("serializeJsonPretty") { - std::string json; - serializeJsonPretty(doc, json); - - REQUIRE("{\r\n \"key\": \"value\"\r\n}" == json); - } -} - -TEST_CASE("serialize an std::string containing a NUL") { - StaticJsonDocument<256> doc; - doc.set(std::string("hello\0world", 11)); - CHECK(doc.memoryUsage() == 12); - - std::string json; - serializeJson(doc, json); - CHECK("\"hello\\u0000world\"" == json); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/CMakeLists.txt deleted file mode 100644 index 134c675111..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -add_executable(JsonVariantTests - add.cpp - as.cpp - clear.cpp - compare.cpp - containsKey.cpp - copy.cpp - converters.cpp - createNested.cpp - is.cpp - isnull.cpp - memoryUsage.cpp - misc.cpp - nesting.cpp - or.cpp - overflow.cpp - remove.cpp - set.cpp - subscript.cpp - types.cpp - unbound.cpp -) - -add_test(JsonVariant JsonVariantTests) - -set_tests_properties(JsonVariant - PROPERTIES - LABELS "Catch" -) diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/add.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/add.cpp deleted file mode 100644 index 526e914d83..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/add.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -TEST_CASE("JsonVariant::add()") { - DynamicJsonDocument doc(4096); - 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(std::string("hello")); - - 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}"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/as.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/as.cpp deleted file mode 100644 index c9956778b6..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/as.cpp +++ /dev/null @@ -1,270 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -namespace my { -using ARDUINOJSON_NAMESPACE::isinf; -} // namespace my - -enum MY_ENUM { ONE = 1, TWO = 2 }; - -TEST_CASE("JsonVariant::as()") { - static const char* null = 0; - - DynamicJsonDocument doc(4096); - 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()); - } - - SECTION("set(4.2)") { - variant.set(4.2); - - REQUIRE(variant.as()); - REQUIRE(0 == variant.as()); - REQUIRE(variant.as() == "4.2"); - REQUIRE(variant.as() == 4L); - REQUIRE(variant.as() == 4U); - REQUIRE(variant.as().isNull()); - } - - SECTION("set(0.0)") { - variant.set(0.0); - - REQUIRE(variant.as() == false); - REQUIRE(variant.as() == 0L); - REQUIRE(variant.as().isNull()); - } - - 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()); - } - - 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()); - } - - SECTION("set(42)") { - variant.set(42); - - REQUIRE(variant.as() == true); - REQUIRE(variant.as() == 42.0); - REQUIRE(variant.as() == 42); - REQUIRE(variant.as() == 42U); // issue #1601 - REQUIRE(variant.as() == "42"); - REQUIRE(variant.as().isNull()); - } - - SECTION("set(42L)") { - variant.set(42L); - - REQUIRE(variant.as() == true); - REQUIRE(variant.as() == 42.0); - REQUIRE(variant.as() == "42"); - REQUIRE(variant.as().isNull()); - } - - SECTION("set(-42L)") { - variant.set(-42L); - - REQUIRE(variant.as() == -42.0); - REQUIRE(variant.as() == "-42"); - REQUIRE(variant.as().isNull()); - } - - SECTION("set(42UL)") { - variant.set(42UL); - - REQUIRE(variant.as() == true); - REQUIRE(variant.as() == 42.0); - REQUIRE(variant.as() == "42"); - REQUIRE(variant.as().isNull()); - } - - 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().isLinked() == true); - } - - SECTION("set(\"hello\")") { - variant.set("hello"); - - REQUIRE(variant.as() == true); - REQUIRE(variant.as() == 0L); - REQUIRE(variant.as() == std::string("hello")); - REQUIRE(variant.as() == std::string("hello")); - REQUIRE(variant.as() == std::string("hello")); - REQUIRE(variant.as() == "hello"); - } - - SECTION("set(std::string(\"4.2\"))") { - variant.set(std::string("4.2")); - - REQUIRE(variant.as() == true); - REQUIRE(variant.as() == 4L); - REQUIRE(variant.as() == 4.2); - REQUIRE(variant.as() == std::string("4.2")); - REQUIRE(variant.as() == std::string("4.2")); - REQUIRE(variant.as() == "4.2"); - REQUIRE(variant.as().isLinked() == 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("to()") { - JsonObject obj = variant.to(); - obj["key"] = "value"; - - SECTION("as()") { - REQUIRE(variant.as() == true); - } - - SECTION("as()") { - REQUIRE(variant.as() == std::string("{\"key\":\"value\"}")); - } - - SECTION("ObjectAsJsonObject") { - JsonObject o = variant.as(); - REQUIRE(o.size() == 1); - REQUIRE(o["key"] == std::string("value")); - } - } - - SECTION("to()") { - JsonArray arr = variant.to(); - arr.add(4); - arr.add(2); - - SECTION("as()") { - REQUIRE(variant.as() == true); - } - - SECTION("as()") { - REQUIRE(variant.as() == std::string("[4,2]")); - } - - 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("Biggerst int64 positive") { - variant.set("9223372036854775807"); - REQUIRE(variant.as() == 9223372036854775807); - } -#endif - - SECTION("should work on JsonVariantConst") { - variant.set("hello"); - - JsonVariantConst cvar = variant; - - REQUIRE(cvar.as() == true); - REQUIRE(cvar.as() == 0L); - REQUIRE(cvar.as() == std::string("hello")); - REQUIRE(cvar.as() == std::string("hello")); - } - - SECTION("as()") { - variant.set(1); - - REQUIRE(variant.as() == ONE); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/clear.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/clear.cpp deleted file mode 100644 index 2b40e324dd..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/clear.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -TEST_CASE("JsonVariant::clear()") { - DynamicJsonDocument doc(4096); - 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); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/compare.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/compare.cpp deleted file mode 100644 index 63adbc261f..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/compare.cpp +++ /dev/null @@ -1,316 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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") { - StaticJsonDocument<256> doc; - JsonVariant a = doc.addElement(); - - 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") { - StaticJsonDocument<256> doc; - JsonVariant a = doc.addElement(); - JsonVariant b = doc.addElement(); - - 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("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/lib/ArduinoJson-6.x/extras/tests/JsonVariant/containsKey.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/containsKey.cpp deleted file mode 100644 index 51bf500f05..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/containsKey.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -static const char* null = 0; - -TEST_CASE("JsonVariant::containsKey()") { - DynamicJsonDocument doc(4096); - JsonVariant var = doc.to(); - - SECTION("containsKey(const char*) returns true") { - var["hello"] = "world"; - - REQUIRE(var.containsKey("hello") == true); - REQUIRE(var.containsKey("world") == false); - } - - SECTION("containsKey(std::string) returns true") { - var["hello"] = "world"; - - REQUIRE(var.containsKey(std::string("hello")) == true); - REQUIRE(var.containsKey(std::string("world")) == false); - } -} - -TEST_CASE("JsonVariantConst::containsKey()") { - DynamicJsonDocument doc(4096); - doc["hello"] = "world"; - JsonVariantConst cvar = doc.as(); - - SECTION("containsKey(const char*) returns true") { - REQUIRE(cvar.containsKey("hello") == true); - REQUIRE(cvar.containsKey("world") == false); - } - - SECTION("containsKey(std::string) returns true") { - REQUIRE(cvar.containsKey(std::string("hello")) == true); - REQUIRE(cvar.containsKey(std::string("world")) == false); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/converters.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/converters.cpp deleted file mode 100644 index 3c4ad6d3e4..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/converters.cpp +++ /dev/null @@ -1,142 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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") { - DynamicJsonDocument doc(4096); - - 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_NAMESPACE { -template <> -struct Converter { - static void toJson(const Complex& src, VariantRef dst) { - dst["real"] = src.real(); - dst["imag"] = src.imag(); - } - - static Complex fromJson(VariantConstRef src) { - return Complex(src["real"], src["imag"]); - } - - static bool checkJson(VariantConstRef src) { - return src["real"].is() && src["imag"].is(); - } -}; -} // namespace ARDUINOJSON_NAMESPACE - -TEST_CASE("Custom converter with specialization") { - DynamicJsonDocument doc(4096); - - 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/lib/ArduinoJson-6.x/extras/tests/JsonVariant/copy.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/copy.cpp deleted file mode 100644 index 7784f0cada..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/copy.cpp +++ /dev/null @@ -1,95 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonVariant::set(JsonVariant)") { - DynamicJsonDocument doc1(4096); - DynamicJsonDocument doc2(4096); - JsonVariant var1 = doc1.to(); - JsonVariant var2 = doc2.to(); - - SECTION("stores JsonArray by copy") { - JsonArray arr = doc2.to(); - JsonObject obj = arr.createNestedObject(); - 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.createNestedArray("value"); - arr.add(42); - - var1.set(obj); - - obj["value"] = 666; - REQUIRE(var1.as() == "{\"value\":[42]}"); - } - - SECTION("stores const char* by reference") { - var1.set("hello!!"); - var2.set(var1); - - REQUIRE(doc1.memoryUsage() == 0); - REQUIRE(doc2.memoryUsage() == 0); - } - - SECTION("stores char* by copy") { - char str[] = "hello!!"; - - var1.set(str); - var2.set(var1); - - REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(7)); - REQUIRE(doc2.memoryUsage() == JSON_STRING_SIZE(7)); - } - - SECTION("stores std::string by copy") { - var1.set(std::string("hello!!")); - var2.set(var1); - - REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(7)); - REQUIRE(doc2.memoryUsage() == JSON_STRING_SIZE(7)); - } - - SECTION("stores Serialized by reference") { - var1.set(serialized("hello!!", 8)); - var2.set(var1); - - REQUIRE(doc1.memoryUsage() == 0); - REQUIRE(doc2.memoryUsage() == 0); - } - - SECTION("stores Serialized by copy") { - char str[] = "hello!!"; - var1.set(serialized(str, 7)); - var2.set(var1); - - REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(7)); - REQUIRE(doc2.memoryUsage() == JSON_STRING_SIZE(7)); - } - - SECTION("stores Serialized by copy") { - var1.set(serialized(std::string("hello!!"))); - var2.set(var1); - - REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(7)); - REQUIRE(doc2.memoryUsage() == JSON_STRING_SIZE(7)); - } - - SECTION("destination is unbound") { - JsonVariant unboundVariant; - - unboundVariant.set(var1); - - REQUIRE(unboundVariant.isUnbound()); - REQUIRE(unboundVariant.isNull()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/createNested.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/createNested.cpp deleted file mode 100644 index 34c74c4707..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/createNested.cpp +++ /dev/null @@ -1,86 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -TEST_CASE("JsonVariant::createNestedObject()") { - DynamicJsonDocument doc(4096); - JsonVariant variant = doc.to(); - - SECTION("promotes to array") { - JsonObject obj = variant.createNestedObject(); - obj["value"] = 42; - - REQUIRE(variant.is() == true); - REQUIRE(variant[0]["value"] == 42); - REQUIRE(obj.isNull() == false); - } - - SECTION("works on MemberProxy") { - JsonObject obj = variant["items"].createNestedObject(); - obj["value"] = 42; - - REQUIRE(variant["items"][0]["value"] == 42); - } -} - -TEST_CASE("JsonVariant::createNestedArray()") { - DynamicJsonDocument doc(4096); - JsonVariant variant = doc.to(); - - SECTION("promotes to array") { - JsonArray arr = variant.createNestedArray(); - - REQUIRE(variant.is() == true); - REQUIRE(arr.isNull() == false); - } - - SECTION("works on MemberProxy") { - JsonArray arr = variant["items"].createNestedArray(); - arr.add(42); - - REQUIRE(variant["items"][0][0] == 42); - } -} - -TEST_CASE("JsonVariant::createNestedObject(key)") { - DynamicJsonDocument doc(4096); - JsonVariant variant = doc.to(); - - SECTION("promotes to object") { - JsonObject obj = variant.createNestedObject("weather"); - obj["temp"] = 42; - - REQUIRE(variant.is() == true); - REQUIRE(variant["weather"]["temp"] == 42); - } - - SECTION("works on MemberProxy") { - JsonObject obj = variant["status"].createNestedObject("weather"); - obj["temp"] = 42; - - REQUIRE(variant["status"]["weather"]["temp"] == 42); - } -} - -TEST_CASE("JsonVariant::createNestedArray(key)") { - DynamicJsonDocument doc(4096); - JsonVariant variant = doc.to(); - - SECTION("promotes to object") { - JsonArray arr = variant.createNestedArray("items"); - - REQUIRE(variant.is() == true); - REQUIRE(arr.isNull() == false); - } - - SECTION("works on MemberProxy") { - JsonArray arr = variant["weather"].createNestedArray("temp"); - arr.add(42); - - REQUIRE(variant["weather"]["temp"][0] == 42); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/is.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/is.cpp deleted file mode 100644 index 6d04f0afe6..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/is.cpp +++ /dev/null @@ -1,319 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -enum MYENUM2 { ONE = 1, TWO = 2 }; - -TEST_CASE("JsonVariant::is()") { - DynamicJsonDocument doc(4096); - 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); - } -} - -TEST_CASE("JsonVariantConst::is()") { - DynamicJsonDocument doc(4096); - JsonVariant variant = doc.to(); - JsonVariantConst cvariant = variant; - - SECTION("unbound") { - cvariant = JsonVariantConst(); - - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - } - - SECTION("null") { - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - } - - SECTION("true") { - variant.set(true); - - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - } - - SECTION("false") { - variant.set(false); - - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - } - - SECTION("int") { - variant.set(42); - - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - } - - SECTION("double") { - variant.set(4.2); - - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - } - - SECTION("const char*") { - variant.set("4.2"); - - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - } - - SECTION("JsonArray") { - variant.to(); - - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - } - - SECTION("JsonObject") { - variant.to(); - - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == true); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - CHECK(cvariant.is() == false); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/isnull.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/isnull.cpp deleted file mode 100644 index 7e29039f5b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/isnull.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonVariant::isNull()") { - DynamicJsonDocument doc(4096); - JsonVariant variant = doc.to(); - - SECTION("return true when Undefined") { - REQUIRE(variant.isNull() == true); - } - - SECTION("return false when Integer") { - variant.set(42); - - REQUIRE(variant.isNull() == false); - } - - SECTION("return false when EmptyArray") { - DynamicJsonDocument doc2(4096); - JsonArray array = doc2.to(); - - variant.set(array); - REQUIRE(variant.isNull() == false); - } - - SECTION("return false when EmptyObject") { - DynamicJsonDocument doc2(4096); - JsonObject obj = doc2.to(); - - variant.set(obj); - REQUIRE(variant.isNull() == false); - } - - SECTION("return true after set(JsonArray())") { - variant.set(JsonArray()); - REQUIRE(variant.isNull() == true); - } - - SECTION("return true after set(JsonObject())") { - variant.set(JsonObject()); - REQUIRE(variant.isNull() == true); - } - - SECTION("return false after set('hello')") { - variant.set("hello"); - REQUIRE(variant.isNull() == false); - } - - SECTION("return true after set((char*)0)") { - variant.set(static_cast(0)); - REQUIRE(variant.isNull() == true); - } - - SECTION("return true after set((const char*)0)") { - variant.set(static_cast(0)); - REQUIRE(variant.isNull() == true); - } - - SECTION("return true after set(serialized((char*)0))") { - variant.set(serialized(static_cast(0))); - REQUIRE(variant.isNull() == true); - } - - SECTION("return true after set(serialized((const char*)0))") { - variant.set(serialized(static_cast(0))); - REQUIRE(variant.isNull() == true); - } - - SECTION("works with JsonVariantConst") { - variant.set(42); - - JsonVariantConst cvar = variant; - - REQUIRE(cvar.isNull() == false); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/memoryUsage.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/memoryUsage.cpp deleted file mode 100644 index 59587dbbab..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/memoryUsage.cpp +++ /dev/null @@ -1,41 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -TEST_CASE("JsonVariant::memoryUsage()") { - DynamicJsonDocument doc(4096); - JsonVariant var = doc.to(); - - SECTION("returns 0 if uninitialized") { - JsonVariant unitialized; - REQUIRE(unitialized.memoryUsage() == 0); - } - - SECTION("returns size of object") { - JsonObject obj = var.to(); - obj["hello"] = 42; - REQUIRE(var.memoryUsage() == JSON_OBJECT_SIZE(1)); - } - - SECTION("returns size of array") { - JsonArray arr = var.to(); - arr.add(42); - REQUIRE(var.memoryUsage() == JSON_ARRAY_SIZE(1)); - } - - SECTION("returns size of owned string") { - var.set(std::string("hello")); - REQUIRE(var.memoryUsage() == 6); - REQUIRE(var.memoryUsage() == doc.memoryUsage()); - } - - SECTION("returns size of owned raw") { - var.set(serialized(std::string("hello"))); - REQUIRE(var.memoryUsage() == 6); - REQUIRE(var.memoryUsage() == doc.memoryUsage()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/misc.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/misc.cpp deleted file mode 100644 index 05976c3777..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/misc.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonVariant from JsonArray") { - SECTION("JsonArray is null") { - JsonArray arr; - JsonVariant v = arr; - REQUIRE(v.isNull() == true); - } - - SECTION("JsonArray is not null") { - DynamicJsonDocument doc(4096); - 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") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/JsonVariant/nesting.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/nesting.cpp deleted file mode 100644 index 3e936fbe49..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/nesting.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonVariant::nesting()") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/JsonVariant/or.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/or.cpp deleted file mode 100644 index 7d1c190b8a..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/or.cpp +++ /dev/null @@ -1,159 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonVariant::operator|()") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/JsonVariant/overflow.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/overflow.cpp deleted file mode 100644 index ff0e3aa50e..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/overflow.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -template -void shouldBeOk(TIn value) { - StaticJsonDocument<1> doc; - JsonVariant var = doc.to(); - var.set(value); - REQUIRE(var.as() == TOut(value)); -} - -template -void shouldOverflow(TIn value) { - StaticJsonDocument<1> 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/lib/ArduinoJson-6.x/extras/tests/JsonVariant/remove.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/remove.cpp deleted file mode 100644 index c744e19bbb..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/remove.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -static const char* null = 0; - -TEST_CASE("JsonVariant::remove()") { - DynamicJsonDocument doc(4096); - JsonVariant var = doc.to(); - - SECTION("remove(int)") { - var.add(1); - var.add(2); - var.add(3); - - var.remove(1); - - REQUIRE(var.as() == "[1,3]"); - } - - SECTION("remove(const char *)") { - var["a"] = 1; - var["b"] = 2; - - var.remove("a"); - - REQUIRE(var.as() == "{\"b\":2}"); - } - - SECTION("remove(std::string)") { - var["a"] = 1; - var["b"] = 2; - - var.remove(std::string("b")); - - REQUIRE(var.as() == "{\"a\":1}"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/set.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/set.cpp deleted file mode 100644 index 899ef6a556..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/set.cpp +++ /dev/null @@ -1,172 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -enum ErrorCode { ERROR_01 = 1, ERROR_10 = 10 }; - -TEST_CASE("JsonVariant::set() when there is enough memory") { - DynamicJsonDocument doc(4096); - JsonVariant variant = doc.to(); - - SECTION("const char*") { - char str[16]; - - strcpy(str, "hello"); - bool result = variant.set(static_cast(str)); - strcpy(str, "world"); - - REQUIRE(result == true); - REQUIRE(variant == "world"); // stores by pointer - } - - SECTION("(const char*)0") { - bool result = variant.set(static_cast(0)); - - REQUIRE(result == true); - REQUIRE(variant.isNull()); - } - - 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 - } - - SECTION("(char*)0") { - bool result = variant.set(static_cast(0)); - - REQUIRE(result == true); - REQUIRE(variant.isNull()); - } - - 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 - } - - 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 - } - -#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 - } -#endif - - SECTION("std::string") { - std::string str; - - str = "hello"; - bool result = variant.set(str); - str.replace(0, 5, "world"); - - REQUIRE(result == true); - REQUIRE(variant == "hello"); // stores by copy - } - - SECTION("static JsonString") { - char str[16]; - - strcpy(str, "hello"); - bool result = variant.set(JsonString(str, JsonString::Linked)); - strcpy(str, "world"); - - REQUIRE(result == true); - REQUIRE(variant == "world"); // stores by pointer - } - - SECTION("non-static JsonString") { - char str[16]; - - strcpy(str, "hello"); - bool result = variant.set(JsonString(str, JsonString::Copied)); - strcpy(str, "world"); - - REQUIRE(result == true); - REQUIRE(variant == "hello"); // stores by copy - } - - SECTION("enum") { - ErrorCode code = ERROR_10; - - bool result = variant.set(code); - - REQUIRE(result == true); - REQUIRE(variant.is() == true); - REQUIRE(variant.as() == 10); - } -} - -TEST_CASE("JsonVariant::set() with not enough memory") { - StaticJsonDocument<1> doc; - - JsonVariant v = doc.to(); - - SECTION("std::string") { - bool result = v.set(std::string("hello world!!")); - - REQUIRE(result == false); - REQUIRE(v.isNull()); - } - - SECTION("Serialized") { - bool result = v.set(serialized(std::string("hello world!!"))); - - REQUIRE(result == false); - REQUIRE(v.isNull()); - } - - SECTION("char*") { - char s[] = "hello world!!"; - bool result = v.set(s); - - REQUIRE(result == false); - REQUIRE(v.isNull()); - } -} - -TEST_CASE("JsonVariant::set(DynamicJsonDocument)") { - DynamicJsonDocument doc1(1024); - doc1["hello"] = "world"; - - DynamicJsonDocument doc2(1024); - JsonVariant v = doc2.to(); - - // Should copy the doc - v.set(doc1); - doc1.clear(); - - std::string json; - serializeJson(doc2, json); - REQUIRE(json == "{\"hello\":\"world\"}"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/subscript.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/subscript.cpp deleted file mode 100644 index f466cd275c..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/subscript.cpp +++ /dev/null @@ -1,204 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("JsonVariant::operator[]") { - DynamicJsonDocument doc(4096); - 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(std::string("element at index 0") == ); - REQUIRE(std::string("element at index 1") == var[1]); - REQUIRE(std::string("element at index 0") == - 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(std::string("world") == var[1]); - } - - SECTION("set value in a nested object") { - array.createNestedObject(); - - var[0]["hello"] = "world"; - - REQUIRE(1 == var.size()); - REQUIRE(1 == var[0].size()); - REQUIRE(std::string("world") == 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("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(std::string("element at key \"a\"") == var["a"]); - REQUIRE(std::string("element at key \"b\"") == 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(std::string("world") == 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(std::string("world") == var["hello"]); - } - - SECTION("var[key].to()") { - JsonArray arr = var["hello"].to(); - REQUIRE(arr.isNull() == false); - } - } - -#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(std::string("world") == 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(std::string("world") == variant[vla]); - } -#endif -} - -TEST_CASE("JsonVariantConst::operator[]") { - DynamicJsonDocument doc(4096); - JsonVariant var = doc.to(); - JsonVariantConst cvar = var; - - SECTION("The JsonVariant is null") { - REQUIRE(0 == cvar.size()); - REQUIRE(cvar["0"].isNull()); - REQUIRE(cvar[0].isNull()); - } - - SECTION("The JsonVariant is a string") { - var.set("hello world"); - REQUIRE(0 == cvar.size()); - REQUIRE(cvar["0"].isNull()); - REQUIRE(cvar[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 == cvar.size()); - REQUIRE(std::string("element at index 0") == cvar[0]); - REQUIRE(std::string("element at index 1") == cvar[1]); - REQUIRE(std::string("element at index 0") == - var[static_cast(0)]); // issue #381 - REQUIRE(cvar[666].isNull()); - REQUIRE(cvar[3].isNull()); - REQUIRE(cvar["0"].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 == cvar.size()); - REQUIRE(std::string("element at key \"a\"") == cvar["a"]); - REQUIRE(std::string("element at key \"b\"") == cvar["b"]); - REQUIRE(cvar["c"].isNull()); - REQUIRE(cvar[0].isNull()); - } - } - - SECTION("Auto promote null JsonVariant to JsonObject") { - var["hello"] = "world"; - - REQUIRE(var.is() == true); - } - - SECTION("Don't auto promote non-null JsonVariant to JsonObject") { - var.set(42); - var["hello"] = "world"; - - REQUIRE(var.is() == false); - } - - SECTION("Don't auto promote null JsonVariant to JsonObject when reading") { - const char* value = var["hello"]; - - REQUIRE(var.is() == false); - REQUIRE(value == 0); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/types.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/types.cpp deleted file mode 100644 index 448d41aba0..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/types.cpp +++ /dev/null @@ -1,163 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include -#include - -template -void checkValue(T expected) { - DynamicJsonDocument doc(4096); - JsonVariant variant = doc.to(); - - variant.set(expected); - REQUIRE(expected == variant.as()); -} - -template -void checkReference(T &expected) { - JsonVariant variant = expected; - REQUIRE(expected == variant.as()); -} - -template -void checkNumericType() { - DynamicJsonDocument docMin(4096), docMax(4096); - 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()") { -#if ARDUINOJSON_USE_LONG_LONG - SECTION("SizeOfJsonInteger") { - REQUIRE(8 == sizeof(JsonInteger)); - } -#endif - - SECTION("Null") { - checkValue(NULL); - } - SECTION("const char*") { - checkValue("hello"); - } - SECTION("std::string") { - checkValue("hello"); - } - - SECTION("False") { - checkValue(false); - } - SECTION("True") { - checkValue(true); - } - - 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") { - DynamicJsonDocument doc(4096); - JsonObject object = doc.to(); - - checkValue(object); - } -} - -TEST_CASE("volatile") { - DynamicJsonDocument doc(4096); - JsonVariant variant = doc.to(); - - 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/lib/ArduinoJson-6.x/extras/tests/JsonVariant/unbound.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/unbound.cpp deleted file mode 100644 index 8089e1cca6..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/unbound.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -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()); - } - - 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(true)); - } - - 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[std::string("key")].set(1)); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/undefined.cpp b/lib/ArduinoJson-6.x/extras/tests/JsonVariant/undefined.cpp deleted file mode 100644 index 64f1d1412e..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/JsonVariant/undefined.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -TEST_CASE("JsonVariant undefined") { - JsonVariant variant; - - SECTION("as()") { - SECTION("long") { - REQUIRE(variant.as() == 0); - } - - SECTION("unsigned") { - REQUIRE(variant.as() == 0); - } - - SECTION("char*") { - REQUIRE(variant.as() == 0); - } - - SECTION("double") { - REQUIRE(variant.as() == 0); - } - - SECTION("bool") { - REQUIRE(variant.as() == false); - } - - SECTION("JsonArray") { - REQUIRE(variant.as().isNull()); - } - - SECTION("JsonObject") { - REQUIRE(variant.as().isNull()); - } - } - - SECTION("is()") { - SECTION("long") { - REQUIRE(variant.is() == false); - } - - SECTION("unsigned") { - REQUIRE(variant.is() == false); - } - - SECTION("char*") { - REQUIRE(variant.is() == false); - } - - SECTION("double") { - REQUIRE(variant.is() == false); - } - - SECTION("bool") { - REQUIRE(variant.is() == false); - } - - SECTION("JsonArray") { - REQUIRE(variant.is() == false); - } - - SECTION("JsonObject") { - REQUIRE(variant.is() == false); - } - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/MemberProxy/CMakeLists.txt deleted file mode 100644 index 6d4c0f6f72..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# ArduinoJson - arduinojson.org -# Copyright Benoit Blanchon 2014-2020 -# MIT License - -add_executable(MemberProxyTests - add.cpp - clear.cpp - compare.cpp - containsKey.cpp - remove.cpp - set.cpp - size.cpp - subscript.cpp -) - -add_test(MemberProxy MemberProxyTests) diff --git a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/add.cpp b/lib/ArduinoJson-6.x/extras/tests/MemberProxy/add.cpp deleted file mode 100644 index 6b73474641..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/add.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemberProxy::add()") { - DynamicJsonDocument doc(4096); - MemberProxy mp = doc["hello"]; - - SECTION("add(int)") { - mp.add(42); - - REQUIRE(doc.as() == "{\"hello\":[42]}"); - } - - SECTION("add(const char*)") { - mp.add("world"); - - REQUIRE(doc.as() == "{\"hello\":[\"world\"]}"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/clear.cpp b/lib/ArduinoJson-6.x/extras/tests/MemberProxy/clear.cpp deleted file mode 100644 index f644df212c..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/clear.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemberProxy::clear()") { - DynamicJsonDocument doc(4096); - MemberProxy 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); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/compare.cpp b/lib/ArduinoJson-6.x/extras/tests/MemberProxy/compare.cpp deleted file mode 100644 index 2c3c3ef223..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/compare.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemberProxy::operator==()") { - DynamicJsonDocument doc(4096); - - 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"]); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/containsKey.cpp b/lib/ArduinoJson-6.x/extras/tests/MemberProxy/containsKey.cpp deleted file mode 100644 index b07431ea32..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/containsKey.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemberProxy::containsKey()") { - DynamicJsonDocument doc(4096); - MemberProxy 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(std::string("key")) == true); - REQUIRE(mp.containsKey(std::string("key")) == true); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/remove.cpp b/lib/ArduinoJson-6.x/extras/tests/MemberProxy/remove.cpp deleted file mode 100644 index a790d29550..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/remove.cpp +++ /dev/null @@ -1,55 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemberProxy::remove()") { - DynamicJsonDocument doc(4096); - MemberProxy 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(std::string("b")); - - REQUIRE(mp.as() == "{\"a\":1}"); - } - -#ifdef HAS_VARIABLE_LENGTH_ARRAY - SECTION("remove(vla)") { - mp["a"] = 1; - mp["b"] = 2; - - int i = 4; - char vla[i]; - strcpy(vla, "b"); - mp.remove(vla); - - REQUIRE(mp.as() == "{\"a\":1}"); - } -#endif -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/set.cpp b/lib/ArduinoJson-6.x/extras/tests/MemberProxy/set.cpp deleted file mode 100644 index 467361e454..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/set.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemberProxy::set()") { - DynamicJsonDocument doc(4096); - MemberProxy 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\"}"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/size.cpp b/lib/ArduinoJson-6.x/extras/tests/MemberProxy/size.cpp deleted file mode 100644 index 8018b5c3bf..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/size.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemberProxy::size()") { - DynamicJsonDocument doc(4096); - MemberProxy 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); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/subscript.cpp b/lib/ArduinoJson-6.x/extras/tests/MemberProxy/subscript.cpp deleted file mode 100644 index 876a28e875..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemberProxy/subscript.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// ArduinoJson - arduinojson.org -// Copyright Benoit Blanchon 2014-2020 -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemberProxy::operator[]") { - DynamicJsonDocument doc(4096); - MemberProxy 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]}"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/MemoryPool/CMakeLists.txt deleted file mode 100644 index 80ba3c6de4..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -add_executable(MemoryPoolTests - allocVariant.cpp - clear.cpp - saveString.cpp - size.cpp - StringCopier.cpp -) - -add_test(MemoryPool MemoryPoolTests) - -set_tests_properties(MemoryPool - PROPERTIES - LABELS "Catch" -) diff --git a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/StringCopier.cpp b/lib/ArduinoJson-6.x/extras/tests/MemoryPool/StringCopier.cpp deleted file mode 100644 index ba39cfd98c..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/StringCopier.cpp +++ /dev/null @@ -1,93 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("StringCopier") { - char buffer[4096]; - - SECTION("Works when buffer is big enough") { - MemoryPool pool(buffer, addPadding(JSON_STRING_SIZE(5))); - StringCopier str(pool); - - str.startString(); - str.append("hello"); - - REQUIRE(str.isValid() == true); - REQUIRE(str.str() == "hello"); - REQUIRE(pool.overflowed() == false); - } - - SECTION("Returns null when too small") { - MemoryPool pool(buffer, sizeof(void*)); - StringCopier str(pool); - - str.startString(); - str.append("hello world!"); - - REQUIRE(str.isValid() == false); - REQUIRE(pool.overflowed() == true); - } - - SECTION("Increases size of memory pool") { - MemoryPool pool(buffer, addPadding(JSON_STRING_SIZE(6))); - StringCopier str(pool); - - str.startString(); - str.save(); - - REQUIRE(1 == pool.size()); - REQUIRE(pool.overflowed() == false); - } - - SECTION("Works when memory pool is 0 bytes") { - MemoryPool pool(buffer, 0); - StringCopier str(pool); - - str.startString(); - REQUIRE(str.isValid() == false); - REQUIRE(pool.overflowed() == true); - } -} - -static const char* addStringToPool(MemoryPool& pool, const char* s) { - StringCopier str(pool); - str.startString(); - str.append(s); - return str.save().c_str(); -} - -TEST_CASE("StringCopier::save() deduplicates strings") { - char buffer[4096]; - MemoryPool pool(buffer, 4096); - - SECTION("Basic") { - const char* s1 = addStringToPool(pool, "hello"); - const char* s2 = addStringToPool(pool, "world"); - const char* s3 = addStringToPool(pool, "hello"); - - REQUIRE(s1 == s3); - REQUIRE(s2 != s3); - REQUIRE(pool.size() == 12); - } - - SECTION("Requires terminator") { - const char* s1 = addStringToPool(pool, "hello world"); - const char* s2 = addStringToPool(pool, "hello"); - - REQUIRE(s2 != s1); - REQUIRE(pool.size() == 12 + 6); - } - - SECTION("Don't overrun") { - const char* s1 = addStringToPool(pool, "hello world"); - const char* s2 = addStringToPool(pool, "wor"); - - REQUIRE(s2 != s1); - REQUIRE(pool.size() == 12 + 4); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/allocVariant.cpp b/lib/ArduinoJson-6.x/extras/tests/MemoryPool/allocVariant.cpp deleted file mode 100644 index 606d6d7b99..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/allocVariant.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemoryPool::allocVariant()") { - char buffer[4096]; - - SECTION("Returns different pointer") { - MemoryPool pool(buffer, sizeof(buffer)); - - VariantSlot* s1 = pool.allocVariant(); - REQUIRE(s1 != 0); - VariantSlot* s2 = pool.allocVariant(); - REQUIRE(s2 != 0); - - REQUIRE(s1 != s2); - } - - SECTION("Returns aligned pointers") { - MemoryPool pool(buffer, sizeof(buffer)); - - REQUIRE(isAligned(pool.allocVariant())); - REQUIRE(isAligned(pool.allocVariant())); - } - - SECTION("Returns zero if capacity is 0") { - MemoryPool pool(buffer, 0); - - REQUIRE(pool.allocVariant() == 0); - } - - SECTION("Returns zero if buffer is null") { - MemoryPool pool(0, sizeof(buffer)); - - REQUIRE(pool.allocVariant() == 0); - } - - SECTION("Returns zero if capacity is insufficient") { - MemoryPool pool(buffer, sizeof(VariantSlot)); - - pool.allocVariant(); - - REQUIRE(pool.allocVariant() == 0); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/clear.cpp b/lib/ArduinoJson-6.x/extras/tests/MemoryPool/clear.cpp deleted file mode 100644 index f4ab796c59..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/clear.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -static const size_t poolCapacity = 512; - -TEST_CASE("MemoryPool::clear()") { - char buffer[poolCapacity]; - MemoryPool pool(buffer, sizeof(buffer)); - - SECTION("Discards allocated variants") { - pool.allocVariant(); - - pool.clear(); - REQUIRE(pool.size() == 0); - } - - SECTION("Discards allocated strings") { - pool.saveString(adaptString(const_cast("123456789"))); - REQUIRE(pool.size() == 10); - - pool.clear(); - - REQUIRE(pool.size() == 0); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/saveString.cpp b/lib/ArduinoJson-6.x/extras/tests/MemoryPool/saveString.cpp deleted file mode 100644 index 0c16b67753..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/saveString.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -static const char *saveString(MemoryPool &pool, const char *s) { - return pool.saveString(adaptString(const_cast(s))); -} - -static const char *saveString(MemoryPool &pool, const char *s, size_t n) { - return pool.saveString(adaptString(s, n)); -} - -TEST_CASE("MemoryPool::saveString()") { - char buffer[32]; - MemoryPool pool(buffer, 32); - - SECTION("Duplicates different strings") { - const char *a = saveString(pool, "hello"); - const char *b = saveString(pool, "world"); - REQUIRE(a != b); - REQUIRE(pool.size() == 6 + 6); - } - - SECTION("Deduplicates identical strings") { - const char *a = saveString(pool, "hello"); - const char *b = saveString(pool, "hello"); - REQUIRE(a == b); - REQUIRE(pool.size() == 6); - } - - SECTION("Deduplicates identical strings that contain NUL") { - const char *a = saveString(pool, "hello\0world", 11); - const char *b = saveString(pool, "hello\0world", 11); - REQUIRE(a == b); - REQUIRE(pool.size() == 12); - } - - SECTION("Reuse part of a string if it ends with NUL") { - const char *a = saveString(pool, "hello\0world", 11); - const char *b = saveString(pool, "hello"); - REQUIRE(a == b); - REQUIRE(pool.size() == 12); - } - - SECTION("Don't stop on first NUL") { - const char *a = saveString(pool, "hello"); - const char *b = saveString(pool, "hello\0world", 11); - REQUIRE(a != b); - REQUIRE(pool.size() == 18); - } - - SECTION("Returns NULL when full") { - REQUIRE(pool.capacity() == 32); - - const void *p1 = saveString(pool, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); - REQUIRE(p1 != 0); - REQUIRE(pool.size() == 32); - - const void *p2 = saveString(pool, "b"); - REQUIRE(p2 == 0); - } - - SECTION("Returns NULL when pool is too small") { - const void *p = saveString(pool, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); - REQUIRE(0 == p); - } - - SECTION("Returns NULL when buffer is NULL") { - MemoryPool pool2(0, 32); - REQUIRE(0 == saveString(pool2, "a")); - } - - SECTION("Returns NULL when capacity is 0") { - MemoryPool pool2(buffer, 0); - REQUIRE(0 == saveString(pool2, "a")); - } - - SECTION("Returns same address after clear()") { - const void *a = saveString(pool, "hello"); - pool.clear(); - const void *b = saveString(pool, "world"); - - REQUIRE(a == b); - } - - SECTION("Can use full capacity when fresh") { - const void *a = saveString(pool, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); - - REQUIRE(a != 0); - } - - SECTION("Can use full capacity after clear") { - saveString(pool, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); - pool.clear(); - - const void *a = saveString(pool, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); - - REQUIRE(a != 0); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/size.cpp b/lib/ArduinoJson-6.x/extras/tests/MemoryPool/size.cpp deleted file mode 100644 index 47603fe285..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MemoryPool/size.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("MemoryPool::capacity()") { - char buffer[4096]; - const size_t capacity = 64; - MemoryPool pool(buffer, capacity); - REQUIRE(capacity == pool.capacity()); -} - -TEST_CASE("MemoryPool::size()") { - char buffer[4096]; - MemoryPool pool(buffer, sizeof(buffer)); - - SECTION("Initial size is 0") { - REQUIRE(0 == pool.size()); - } - - SECTION("Doesn't grow when memory pool is full") { - const size_t variantCount = sizeof(buffer) / sizeof(VariantSlot); - - for (size_t i = 0; i < variantCount; i++) pool.allocVariant(); - size_t size = pool.size(); - - pool.allocVariant(); - - REQUIRE(size == pool.size()); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Misc/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/Misc/CMakeLists.txt deleted file mode 100644 index 114ebb746f..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -add_executable(MiscTests - arithmeticCompare.cpp - conflicts.cpp - deprecated.cpp - FloatParts.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/lib/ArduinoJson-6.x/extras/tests/Misc/FloatParts.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/FloatParts.cpp deleted file mode 100644 index 736b176cbe..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/FloatParts.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("FloatParts") { - SECTION("1.7976931348623157E+308") { - FloatParts parts(1.7976931348623157E+308); - REQUIRE(parts.integral == 1); - REQUIRE(parts.decimal == 797693135); - REQUIRE(parts.decimalPlaces == 9); - REQUIRE(parts.exponent == 308); - } - - SECTION("4.94065645841247e-324") { - FloatParts parts(4.94065645841247e-324); - REQUIRE(parts.integral == 4); - REQUIRE(parts.decimal == 940656458); - REQUIRE(parts.decimalPlaces == 9); - REQUIRE(parts.exponent == -324); - } -} - -TEST_CASE("FloatParts") { - SECTION("3.4E+38") { - FloatParts parts(3.4E+38f); - REQUIRE(parts.integral == 3); - REQUIRE(parts.decimal == 4); - REQUIRE(parts.decimalPlaces == 1); - REQUIRE(parts.exponent == 38); - } - - SECTION("1.17549435e−38") { - FloatParts parts(1.17549435e-38f); - REQUIRE(parts.integral == 1); - REQUIRE(parts.decimal == 175494); - REQUIRE(parts.decimalPlaces == 6); - REQUIRE(parts.exponent == -38); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Misc/JsonString.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/JsonString.cpp deleted file mode 100644 index 557f993662..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/JsonString.cpp +++ /dev/null @@ -1,103 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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.isLinked() == 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.isLinked() == true); - CHECK(s == "hello"); - CHECK(s != "hello world"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Misc/NoArduinoHeader.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/NoArduinoHeader.cpp deleted file mode 100644 index 43a82b2491..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/NoArduinoHeader.cpp +++ /dev/null @@ -1,20 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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/lib/ArduinoJson-6.x/extras/tests/Misc/Readers.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/Readers.cpp deleted file mode 100644 index e46ad1e72c..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/Readers.cpp +++ /dev/null @@ -1,225 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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/lib/ArduinoJson-6.x/extras/tests/Misc/StringAdapters.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/StringAdapters.cpp deleted file mode 100644 index 82139eecfc..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/StringAdapters.cpp +++ /dev/null @@ -1,202 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_ENABLE_PROGMEM 1 -#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1 - -#include "custom_string.hpp" -#include "weird_strcmp.hpp" - -#include - -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("ZeroTerminatedRamString") { - SECTION("null") { - ZeroTerminatedRamString s = adaptString(static_cast(0)); - - CHECK(s.isNull() == true); - CHECK(s.size() == 0); - } - - SECTION("non-null") { - ZeroTerminatedRamString s = adaptString("bravo"); - - CHECK(s.isNull() == false); - CHECK(s.size() == 5); - } -} - -TEST_CASE("SizedRamString") { - SECTION("null") { - SizedRamString s = adaptString(static_cast(0), 10); - - CHECK(s.isNull() == true); - } - - SECTION("non-null") { - SizedRamString s = adaptString("bravo", 5); - - CHECK(s.isNull() == false); - CHECK(s.size() == 5); - } -} - -TEST_CASE("FlashString") { - SECTION("null") { - FlashString s = adaptString(static_cast(0)); - - CHECK(s.isNull() == true); - CHECK(s.size() == 0); - } - - SECTION("non-null") { - FlashString s = adaptString(F("bravo")); - - CHECK(s.isNull() == false); - CHECK(s.size() == 5); - } -} - -TEST_CASE("std::string") { - std::string orig("bravo"); - SizedRamString s = adaptString(orig); - - CHECK(s.isNull() == false); - CHECK(s.size() == 5); -} - -TEST_CASE("Arduino String") { - ::String orig("bravo"); - SizedRamString s = adaptString(orig); - - CHECK(s.isNull() == false); - CHECK(s.size() == 5); -} - -TEST_CASE("custom_string") { - custom_string orig("bravo"); - SizedRamString s = adaptString(orig); - - CHECK(s.isNull() == false); - CHECK(s.size() == 5); -} - -TEST_CASE("IsString") { - SECTION("std::string") { - CHECK(IsString::value == true); - } - - SECTION("basic_string") { - CHECK(IsString >::value == false); - } - - SECTION("custom_string") { - CHECK(IsString::value == true); - } - - SECTION("const __FlashStringHelper*") { - CHECK(IsString::value == true); - } - - SECTION("const char*") { - CHECK(IsString::value == true); - } - - SECTION("const char[]") { - 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/lib/ArduinoJson-6.x/extras/tests/Misc/StringWriter.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/StringWriter.cpp deleted file mode 100644 index bdb5bdb1fb..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/StringWriter.cpp +++ /dev/null @@ -1,153 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1 -#define ARDUINOJSON_STRING_BUFFER_SIZE 5 -#include -#include -#include "custom_string.hpp" - -using namespace ARDUINOJSON_NAMESPACE; - -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(std::string("ABCD") == output); - } - - SECTION("TwoStrings") { - REQUIRE(4 == print(writer, "ABCD")); - REQUIRE(4 == print(writer, "EFGH")); - REQUIRE(std::string("ABCDEFGH") == 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)") { - StaticJsonDocument<1024> doc; - doc["hello"] = "world"; - ::String output; - - 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/lib/ArduinoJson-6.x/extras/tests/Misc/TypeTraits.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/TypeTraits.cpp deleted file mode 100644 index 0b2b1ced3c..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/TypeTraits.cpp +++ /dev/null @@ -1,212 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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)); - } - - 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("IsVisitable") { - CHECK(IsVisitable::value == false); - CHECK(IsVisitable::value == false); - CHECK(IsVisitable::value == true); - CHECK(IsVisitable::value == true); - CHECK(IsVisitable::value == true); - CHECK(IsVisitable >::value == true); - CHECK(IsVisitable::value == true); - CHECK(IsVisitable::value == true); - CHECK((IsVisitable >::value == true)); - CHECK(IsVisitable::value == true); - CHECK(IsVisitable::value == true); - CHECK(IsVisitable >::value == true); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Misc/Utf16.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/Utf16.cpp deleted file mode 100644 index 31ab7ec5e6..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/Utf16.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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/lib/ArduinoJson-6.x/extras/tests/Misc/Utf8.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/Utf8.cpp deleted file mode 100644 index 38e839ac3b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/Utf8.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -#include - -using namespace ARDUINOJSON_NAMESPACE; - -static void testCodepoint(uint32_t codepoint, std::string expected) { - char buffer[4096]; - MemoryPool pool(buffer, 4096); - StringCopier str(pool); - 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/lib/ArduinoJson-6.x/extras/tests/Misc/arithmeticCompare.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/arithmeticCompare.cpp deleted file mode 100644 index a67943e8a7..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/arithmeticCompare.cpp +++ /dev/null @@ -1,103 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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/lib/ArduinoJson-6.x/extras/tests/Misc/conflicts.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/conflicts.cpp deleted file mode 100644 index 991a94ef7b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/conflicts.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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 - -// catch.hpp mutes several warnings, this file also allows to detect them -#include "ArduinoJson.h" diff --git a/lib/ArduinoJson-6.x/extras/tests/Misc/custom_string.hpp b/lib/ArduinoJson-6.x/extras/tests/Misc/custom_string.hpp deleted file mode 100644 index 3c5b7c1457..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/custom_string.hpp +++ /dev/null @@ -1,12 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#pragma once - -#include - -struct custom_char_traits : std::char_traits {}; -struct custom_allocator : std::allocator {}; -typedef std::basic_string - custom_string; diff --git a/lib/ArduinoJson-6.x/extras/tests/Misc/deprecated.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/deprecated.cpp deleted file mode 100644 index 646ca0566d..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/deprecated.cpp +++ /dev/null @@ -1,115 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_DEPRECATED(msg) // nothing - -#include -#include - -TEST_CASE("Deprecated features") { - StaticJsonDocument<256> doc; - const char* s = "hello"; - doc["s"] = s; - doc["c"] = 42; - doc["a"].add(s); - doc["a"].add(42); - - SECTION("JsonVariant::add(char)") { - JsonVariant v = doc.to(); - v.add('*'); - REQUIRE(v[0] == 42); - } - - SECTION("JsonVariant::as()") { - JsonVariant v = doc["s"]; - REQUIRE(v.as() == s); - } - - SECTION("JsonVariant::as()") { - JsonVariant v = doc["c"]; - REQUIRE(v.as() == '*'); - } - - SECTION("JsonVariant::is()") { - JsonVariant v = doc["s"]; - REQUIRE(v.is() == true); - } - - SECTION("JsonVariant::is()") { - JsonVariant v = doc["c"]; - REQUIRE(v.is() == true); - } - - SECTION("JsonVariant::set(char)") { - JsonVariant v = doc.to(); - v.set('*'); - REQUIRE(v.as() == 42); - } - - SECTION("JsonVariantConst::as()") { - JsonVariantConst v = doc["s"]; - REQUIRE(v.as() == s); - } - - SECTION("JsonVariantConst::as()") { - JsonVariantConst v = doc["c"]; - REQUIRE(v.as() == '*'); - } - - SECTION("JsonVariantConst::is()") { - JsonVariantConst v = doc["s"]; - REQUIRE(v.is() == true); - } - - SECTION("JsonVariantConst::is()") { - JsonVariantConst v = doc["c"]; - REQUIRE(v.is() == true); - } - - SECTION("MemberProxy::as()") { - REQUIRE(doc["s"].as() == s); - } - - SECTION("MemberProxy::as()") { - REQUIRE(doc["c"].as() == '*'); - } - - SECTION("MemberProxy::as()") { - doc["x"].set('*'); - REQUIRE(doc["x"] == 42); - } - - SECTION("MemberProxy::is()") { - REQUIRE(doc["s"].is() == true); - REQUIRE(doc["c"].is() == false); - } - - SECTION("MemberProxy::is()") { - REQUIRE(doc["c"].is() == true); - REQUIRE(doc["s"].is() == false); - } - - SECTION("ElementProxy::as()") { - REQUIRE(doc["a"][0].as() == s); - } - - SECTION("ElementProxy::as()") { - REQUIRE(doc["a"][1].as() == '*'); - } - - SECTION("ElementProxy::as()") { - doc["a"][0].set('*'); - REQUIRE(doc["a"][0] == 42); - } - - SECTION("ElementProxy::is()") { - REQUIRE(doc["a"][0].is() == true); - REQUIRE(doc["a"][1].is() == false); - } - - SECTION("ElementProxy::is()") { - REQUIRE(doc["a"][1].is() == true); - REQUIRE(doc["a"][0].is() == false); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Misc/printable.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/printable.cpp deleted file mode 100644 index 7cec8f9349..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/printable.cpp +++ /dev/null @@ -1,144 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 1 -#include - -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") { - StaticJsonDocument<8> doc; - const char* value = "example"; // == 7 chars - - 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(doc.memoryUsage() == 8); - CHECK(doc.as().memoryUsage() == 8); - } - - 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(doc.memoryUsage() == 8); - CHECK(doc.as().memoryUsage() == 8); - } - } - - SECTION("Overflows early") { - StaticJsonDocument<8> doc; - const char* value = "hello world"; // > 8 chars - - doc.set(666); // to make sure we override the value - - SECTION("Via Print::write(char)") { - PrintableString printable(value); - CHECK(doc.set(printable) == false); - CHECK(doc.isNull()); - CHECK(printable.totalBytesWritten() == 8); - CHECK(doc.overflowed() == true); - CHECK(doc.memoryUsage() == 0); - } - - SECTION("Via Print::write(const char*, size_t)") { - PrintableString printable(value); - CHECK(doc.set(printable) == false); - CHECK(doc.isNull()); - CHECK(printable.totalBytesWritten() == 0); - CHECK(doc.overflowed() == true); - CHECK(doc.memoryUsage() == 0); - } - } - - SECTION("Overflows adding terminator") { - StaticJsonDocument<8> doc; - const char* value = "overflow"; // == 8 chars - - doc.set(666); // to make sure we override the value - - SECTION("Via Print::write(char)") { - PrintableString printable(value); - CHECK(doc.set(printable) == false); - CHECK(doc.isNull()); - CHECK(printable.totalBytesWritten() == 8); - CHECK(doc.overflowed() == true); - CHECK(doc.memoryUsage() == 0); - } - - SECTION("Via Print::write(const char*, size_t)") { - PrintableString printable(value); - CHECK(doc.set(printable) == false); - CHECK(doc.isNull()); - CHECK(printable.totalBytesWritten() == 0); - CHECK(doc.overflowed() == true); - CHECK(doc.memoryUsage() == 0); - } - } - - SECTION("Null variant") { - JsonVariant var; - PrintableString printable = "Hello World!"; - CHECK(var.set(printable) == false); - CHECK(var.isNull()); - CHECK(printable.totalBytesWritten() == 0); - } - - SECTION("String deduplication") { - StaticJsonDocument<128> doc; - 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(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 13); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Misc/unsigned_char.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/unsigned_char.cpp deleted file mode 100644 index 7a5e3eefaa..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/unsigned_char.cpp +++ /dev/null @@ -1,271 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -#if defined(__clang__) -# define CONFLICTS_WITH_BUILTIN_OPERATOR -#endif - -TEST_CASE("unsigned char[]") { - SECTION("deserializeJson()") { - unsigned char input[] = "{\"a\":42}"; - - StaticJsonDocument doc; - DeserializationError err = deserializeJson(doc, input); - - REQUIRE(err == DeserializationError::Ok); - } - - SECTION("deserializeMsgPack()") { - unsigned char input[] = "\xDE\x00\x01\xA5Hello\xA5world"; - - StaticJsonDocument doc; - DeserializationError err = deserializeMsgPack(doc, input); - - REQUIRE(err == DeserializationError::Ok); - } - - SECTION("serializeMsgPack(unsigned char[])") { - unsigned char buffer[32]; - StaticJsonDocument 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]; - StaticJsonDocument 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]; - StaticJsonDocument 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]; - StaticJsonDocument 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]; - StaticJsonDocument doc; - doc["hello"] = "world"; - - size_t n = serializeJsonPretty(doc, buffer); - - REQUIRE(n == 24); - } - - SECTION("serializeJsonPretty(unsigned char*)") { - unsigned char buffer[32]; - StaticJsonDocument doc; - doc["hello"] = "world"; - - size_t n = serializeJsonPretty(doc, buffer, sizeof(buffer)); - - REQUIRE(n == 24); - } - - SECTION("JsonVariant") { - DynamicJsonDocument doc(4096); - - 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(std::string("world") == 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(std::string("world") == 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"; - - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - obj[key] = "world"; - - REQUIRE(std::string("world") == obj["hello"]); - } - - SECTION("JsonObject::operator[] const") { - unsigned char key[] = "hello"; - - DynamicJsonDocument doc(4096); - deserializeJson(doc, "{\"hello\":\"world\"}"); - - JsonObject obj = doc.as(); - REQUIRE(std::string("world") == obj[key]); - } -#endif - - SECTION("containsKey()") { - unsigned char key[] = "hello"; - - DynamicJsonDocument doc(4096); - deserializeJson(doc, "{\"hello\":\"world\"}"); - JsonObject obj = doc.as(); - REQUIRE(true == obj.containsKey(key)); - } - - SECTION("remove()") { - unsigned char key[] = "hello"; - - DynamicJsonDocument doc(4096); - deserializeJson(doc, "{\"hello\":\"world\"}"); - JsonObject obj = doc.as(); - obj.remove(key); - - REQUIRE(0 == obj.size()); - } - - SECTION("createNestedArray()") { - unsigned char key[] = "hello"; - - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - obj.createNestedArray(key); - } - - SECTION("createNestedObject()") { - unsigned char key[] = "hello"; - - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - obj.createNestedObject(key); - } - } - - SECTION("MemberProxy") { - SECTION("operator=") { // issue #416 - unsigned char value[] = "world"; - - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - obj["hello"] = value; - - REQUIRE(std::string("world") == obj["hello"]); - } - - SECTION("set()") { - unsigned char value[] = "world"; - - DynamicJsonDocument doc(4096); - JsonObject obj = doc.to(); - obj["hello"].set(value); - - REQUIRE(std::string("world") == obj["hello"]); - } - } - - SECTION("JsonArray") { - SECTION("add()") { - unsigned char value[] = "world"; - - DynamicJsonDocument doc(4096); - JsonArray arr = doc.to(); - arr.add(value); - - REQUIRE(std::string("world") == arr[0]); - } - } - - SECTION("ElementProxy") { - SECTION("set()") { - unsigned char value[] = "world"; - - DynamicJsonDocument doc(4096); - JsonArray arr = doc.to(); - arr.add("hello"); - arr[0].set(value); - - REQUIRE(std::string("world") == arr[0]); - } - - SECTION("operator=") { - unsigned char value[] = "world"; - - DynamicJsonDocument doc(4096); - JsonArray arr = doc.to(); - arr.add("hello"); - arr[0] = value; - - REQUIRE(std::string("world") == arr[0]); - } - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Misc/version.cpp b/lib/ArduinoJson-6.x/extras/tests/Misc/version.cpp deleted file mode 100644 index 486a867025..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/version.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, 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/lib/ArduinoJson-6.x/extras/tests/Misc/weird_strcmp.hpp b/lib/ArduinoJson-6.x/extras/tests/Misc/weird_strcmp.hpp deleted file mode 100644 index ff755ef548..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Misc/weird_strcmp.hpp +++ /dev/null @@ -1,29 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include - -#include // strcmp, strncmp - -// Issue #1198: strcmp() implementation that returns a value larger than 8-bit - -namespace ARDUINOJSON_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; -} -} // namespace ARDUINOJSON_NAMESPACE diff --git a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/CMakeLists.txt deleted file mode 100644 index 01d1216e3a..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, 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 - enable_string_deduplication_0.cpp - enable_string_deduplication_1.cpp - issue1707.cpp - use_double_0.cpp - use_double_1.cpp -) - -set_target_properties(MixedConfigurationTests PROPERTIES UNITY_BUILD OFF) - -add_test(MixedConfiguration MixedConfigurationTests) - -set_tests_properties(MixedConfiguration - PROPERTIES - LABELS "Catch" -) diff --git a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/cpp11.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/cpp11.cpp deleted file mode 100644 index df81e35c02..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/cpp11.cpp +++ /dev/null @@ -1,94 +0,0 @@ -#include - -#include - -#if __cplusplus >= 201103L - -TEST_CASE("nullptr") { - DynamicJsonDocument doc(4096); - 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.is()") { - variant.set(42); - REQUIRE(variant.is() == false); - - variant.clear(); - REQUIRE(variant.is() == true); - } -} - -TEST_CASE("Issue #1120") { - StaticJsonDocument<500> doc; - constexpr char str[] = - "{\"contents\":[{\"module\":\"Packet\"},{\"module\":\"Analog\"}]}"; - deserializeJson(doc, str); - - SECTION("MemberProxy::isNull()") { - SECTION("returns false") { - auto value = doc[std::string("contents")]; - CHECK(value.isNull() == false); - } - - SECTION("returns true") { - auto value = doc[std::string("zontents")]; - CHECK(value.isNull() == true); - } - } - - SECTION("ElementProxy >::isNull()") { - SECTION("returns false") { // Issue #1120 - auto value = doc["contents"][1]; - CHECK(value.isNull() == false); - } - - SECTION("returns true") { - auto value = doc["contents"][2]; - CHECK(value.isNull() == true); - } - } - - SECTION("MemberProxy, const char*>::isNull()") { - SECTION("returns false") { - auto value = doc["contents"][1]["module"]; - CHECK(value.isNull() == false); - } - - SECTION("returns true") { - auto value = doc["contents"][1]["zodule"]; - CHECK(value.isNull() == true); - } - } - - SECTION("MemberProxy, std::string>::isNull()") { - SECTION("returns false") { - auto value = doc["contents"][1][std::string("module")]; - CHECK(value.isNull() == false); - } - - SECTION("returns true") { - auto value = doc["contents"][1][std::string("zodule")]; - CHECK(value.isNull() == true); - } - } -} - -#endif diff --git a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/decode_unicode_0.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/decode_unicode_0.cpp deleted file mode 100644 index b5dc1f179b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/decode_unicode_0.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#define ARDUINOJSON_DECODE_UNICODE 0 -#include - -#include - -TEST_CASE("ARDUINOJSON_DECODE_UNICODE == 0") { - DynamicJsonDocument doc(2048); - DeserializationError err = deserializeJson(doc, "\"\\uD834\\uDD1E\""); - - REQUIRE(err == DeserializationError::Ok); - REQUIRE(doc.as() == "\\uD834\\uDD1E"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/decode_unicode_1.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/decode_unicode_1.cpp deleted file mode 100644 index 2b5b65236b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/decode_unicode_1.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#define ARDUINOJSON_DECODE_UNICODE 1 -#include - -#include - -TEST_CASE("ARDUINOJSON_DECODE_UNICODE == 1") { - DynamicJsonDocument doc(2048); - DeserializationError err = deserializeJson(doc, "\"\\uD834\\uDD1E\""); - - REQUIRE(err == DeserializationError::Ok); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_alignment_0.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_alignment_0.cpp deleted file mode 100644 index 426f516a1e..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_alignment_0.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#define ARDUINOJSON_NAMESPACE ArduinoJson_NoAlignment -#define ARDUINOJSON_ENABLE_ALIGNMENT 0 -#include - -#include - -TEST_CASE("ARDUINOJSON_ENABLE_ALIGNMENT == 0") { - using namespace ARDUINOJSON_NAMESPACE; - - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_alignment_1.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_alignment_1.cpp deleted file mode 100644 index 9abf50c84e..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_alignment_1.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#define ARDUINOJSON_ENABLE_ALIGNMENT 1 -#include - -#include - -TEST_CASE("ARDUINOJSON_ENABLE_ALIGNMENT == 1") { - using namespace ARDUINOJSON_NAMESPACE; - - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_comments_0.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_comments_0.cpp deleted file mode 100644 index 6329021ae0..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_comments_0.cpp +++ /dev/null @@ -1,54 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_ENABLE_COMMENTS 0 -#include - -#include - -TEST_CASE("Comments should produce InvalidInput") { - DynamicJsonDocument doc(2048); - - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_comments_1.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_comments_1.cpp deleted file mode 100644 index 18462922d4..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_comments_1.cpp +++ /dev/null @@ -1,411 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_ENABLE_COMMENTS 1 -#include - -#include - -TEST_CASE("Comments in arrays") { - DynamicJsonDocument doc(2048); - - 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") { - DynamicJsonDocument doc(2048); - - 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") { - DynamicJsonDocument doc(2048); - - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_infinity_0.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_infinity_0.cpp deleted file mode 100644 index 521fb847f0..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_infinity_0.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#define ARDUINOJSON_ENABLE_INFINITY 0 -#include - -#include -#include - -static void assertParseFails(const char* json) { - DynamicJsonDocument doc(4096); - 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()") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_infinity_1.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_infinity_1.cpp deleted file mode 100644 index 19e0d5bfdf..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_infinity_1.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#define ARDUINOJSON_ENABLE_INFINITY 1 -#include - -#include -#include - -namespace my { -using ARDUINOJSON_NAMESPACE::isinf; -} // namespace my - -TEST_CASE("ARDUINOJSON_ENABLE_INFINITY == 1") { - DynamicJsonDocument doc(4096); - - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_nan_0.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_nan_0.cpp deleted file mode 100644 index e015a0dbad..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_nan_0.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#define ARDUINOJSON_ENABLE_NAN 0 -#include - -#include -#include - -TEST_CASE("ARDUINOJSON_ENABLE_NAN == 0") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_nan_1.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_nan_1.cpp deleted file mode 100644 index 34d94fcaef..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_nan_1.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#define ARDUINOJSON_ENABLE_NAN 1 -#include - -#include -#include - -namespace my { -using ARDUINOJSON_NAMESPACE::isnan; -} // namespace my - -TEST_CASE("ARDUINOJSON_ENABLE_NAN == 1") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_progmem_1.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_progmem_1.cpp deleted file mode 100644 index 9ddf7f2636..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_progmem_1.cpp +++ /dev/null @@ -1,191 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_ENABLE_PROGMEM 1 -#include - -#include - -TEST_CASE("Flash strings") { - DynamicJsonDocument doc(2048); - - 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_NAMESPACE::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_NAMESPACE; - - 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_NAMESPACE; - - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_string_deduplication_0.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_string_deduplication_0.cpp deleted file mode 100644 index d9ca166e2f..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_string_deduplication_0.cpp +++ /dev/null @@ -1,123 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1 -#define ARDUINOJSON_ENABLE_PROGMEM 1 -#define ARDUINOJSON_ENABLE_STRING_DEDUPLICATION 0 -#include - -#include - -TEST_CASE("ARDUINOJSON_ENABLE_STRING_DEDUPLICATION = 0") { - StaticJsonDocument<1024> doc; - - SECTION("deserializeJson()") { - SECTION("Deduplicate values") { - deserializeJson(doc, "[\"example\",\"example\"]"); - - CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 16); - CHECK(doc[0].as() != doc[1].as()); - } - - SECTION("Deduplicate keys") { - deserializeJson(doc, "[{\"example\":1},{\"example\":2}]"); - - CHECK(doc.memoryUsage() == - 2 * JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(2) + 16); - - const char* key1 = doc[0].as().begin()->key().c_str(); - const char* key2 = doc[1].as().begin()->key().c_str(); - - CHECK(key1 != key2); - } - } - - SECTION("JsonDocument") { - SECTION("values") { - SECTION("std::string") { - doc.add(std::string("example")); - doc.add(std::string("example")); - - CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 16); - CHECK(doc[0].as() != doc[1].as()); - } - - SECTION("char*") { - char value[] = "example"; - doc.add(value); - doc.add(value); - - CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 16); - CHECK(doc[0].as() != doc[1].as()); - } - - SECTION("Arduino String") { - doc.add(String("example")); - doc.add(String("example")); - - CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 16); - CHECK(doc[0].as() != doc[1].as()); - } - - SECTION("Flash string") { - doc.add(F("example")); - doc.add(F("example")); - - CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 16); - CHECK(doc[0].as() != doc[1].as()); - } - } - - SECTION("keys") { - SECTION("std::string") { - doc[0][std::string("example")] = 1; - doc[1][std::string("example")] = 2; - - CHECK(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 16); - - const char* key1 = doc[0].as().begin()->key().c_str(); - const char* key2 = doc[1].as().begin()->key().c_str(); - CHECK(key1 != key2); - } - - SECTION("char*") { - char key[] = "example"; - doc[0][key] = 1; - doc[1][key] = 2; - - CHECK(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 16); - - const char* key1 = doc[0].as().begin()->key().c_str(); - const char* key2 = doc[1].as().begin()->key().c_str(); - CHECK(key1 != key2); - } - - SECTION("Arduino String") { - doc[0][String("example")] = 1; - doc[1][String("example")] = 2; - - CHECK(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 16); - - const char* key1 = doc[0].as().begin()->key().c_str(); - const char* key2 = doc[1].as().begin()->key().c_str(); - CHECK(key1 != key2); - } - - SECTION("Flash string") { - doc[0][F("example")] = 1; - doc[1][F("example")] = 2; - - CHECK(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 16); - - const char* key1 = doc[0].as().begin()->key().c_str(); - const char* key2 = doc[1].as().begin()->key().c_str(); - CHECK(key1 != key2); - } - } - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_string_deduplication_1.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_string_deduplication_1.cpp deleted file mode 100644 index 27fc18d684..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/enable_string_deduplication_1.cpp +++ /dev/null @@ -1,122 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1 -#define ARDUINOJSON_ENABLE_PROGMEM 1 -#define ARDUINOJSON_ENABLE_STRING_DEDUPLICATION 1 -#include - -#include - -TEST_CASE("ARDUINOJSON_ENABLE_STRING_DEDUPLICATION = 1") { - StaticJsonDocument<1024> doc; - - SECTION("deserializeJson()") { - SECTION("Deduplicate values") { - deserializeJson(doc, "[\"example\",\"example\"]"); - - CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8); - CHECK(doc[0].as() == doc[1].as()); - } - - SECTION("Deduplicate keys") { - deserializeJson(doc, "[{\"example\":1},{\"example\":2}]"); - - CHECK(doc.memoryUsage() == - 2 * JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(2) + 8); - - const char* key1 = doc[0].as().begin()->key().c_str(); - const char* key2 = doc[1].as().begin()->key().c_str(); - CHECK(key1 == key2); - } - } - - SECTION("JsonDocument") { - SECTION("values") { - SECTION("std::string") { - doc.add(std::string("example")); - doc.add(std::string("example")); - - CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8); - CHECK(doc[0].as() == doc[1].as()); - } - - SECTION("char*") { - char value[] = "example"; - doc.add(value); - doc.add(value); - - CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8); - CHECK(doc[0].as() == doc[1].as()); - } - - SECTION("Arduino String") { - doc.add(String("example")); - doc.add(String("example")); - - CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8); - CHECK(doc[0].as() == doc[1].as()); - } - - SECTION("Flash string") { - doc.add(F("example")); - doc.add(F("example")); - - CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8); - CHECK(doc[0].as() == doc[1].as()); - } - } - - SECTION("keys") { - SECTION("std::string") { - doc[0][std::string("example")] = 1; - doc[1][std::string("example")] = 2; - - CHECK(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 8); - - const char* key1 = doc[0].as().begin()->key().c_str(); - const char* key2 = doc[1].as().begin()->key().c_str(); - CHECK(key1 == key2); - } - - SECTION("char*") { - char key[] = "example"; - doc[0][key] = 1; - doc[1][key] = 2; - - CHECK(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 8); - - const char* key1 = doc[0].as().begin()->key().c_str(); - const char* key2 = doc[1].as().begin()->key().c_str(); - CHECK(key1 == key2); - } - - SECTION("Arduino String") { - doc[0][String("example")] = 1; - doc[1][String("example")] = 2; - - CHECK(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 8); - - const char* key1 = doc[0].as().begin()->key().c_str(); - const char* key2 = doc[1].as().begin()->key().c_str(); - CHECK(key1 == key2); - } - - SECTION("Flash string") { - doc[0][F("example")] = 1; - doc[1][F("example")] = 2; - - CHECK(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 8); - - const char* key1 = doc[0].as().begin()->key().c_str(); - const char* key2 = doc[1].as().begin()->key().c_str(); - CHECK(key1 == key2); - } - } - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/issue1707.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/issue1707.cpp deleted file mode 100644 index befdee5360..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/issue1707.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINO -#define memcpy_P(dest, src, n) memcpy((dest), (src), (n)) - -#include - -#include - -TEST_CASE("Issue1707") { - StaticJsonDocument<128> doc; - - DeserializationError err = deserializeJson(doc, F("{\"hello\":12}")); - REQUIRE(err == DeserializationError::Ok); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_double_0.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_double_0.cpp deleted file mode 100644 index f38ee1f539..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_double_0.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#define ARDUINOJSON_USE_DOUBLE 0 -#include - -#include - -TEST_CASE("ARDUINOJSON_USE_DOUBLE == 0") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_double_1.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_double_1.cpp deleted file mode 100644 index ff4a0e353f..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_double_1.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#define ARDUINOJSON_USE_DOUBLE 1 -#include - -#include - -TEST_CASE("ARDUINOJSON_USE_DOUBLE == 1") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_long_long_0.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_long_long_0.cpp deleted file mode 100644 index f467aabdd6..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_long_long_0.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#define ARDUINOJSON_USE_LONG_LONG 0 -#include - -#include - -TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 0") { - DynamicJsonDocument doc(4096); - - doc["A"] = 42; - doc["B"] = 84; - - std::string json; - serializeJson(doc, json); - - REQUIRE(json == "{\"A\":42,\"B\":84}"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_long_long_1.cpp b/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_long_long_1.cpp deleted file mode 100644 index 5127a55a72..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MixedConfiguration/use_long_long_1.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#define ARDUINOJSON_USE_LONG_LONG 1 -#include - -#include - -TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 1") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/CMakeLists.txt deleted file mode 100644 index f2435279cb..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -add_executable(MsgPackDeserializerTests - deserializeArray.cpp - deserializeObject.cpp - deserializeStaticVariant.cpp - deserializeVariant.cpp - doubleToFloat.cpp - filter.cpp - incompleteInput.cpp - input_types.cpp - misc.cpp - nestingLimit.cpp - notSupported.cpp -) - -add_test(MsgPackDeserializer MsgPackDeserializerTests) - -set_tests_properties(MsgPackDeserializer - PROPERTIES - LABELS "Catch" -) diff --git a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeArray.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeArray.cpp deleted file mode 100644 index 4540bd0527..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeArray.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("deserialize MsgPack array") { - DynamicJsonDocument doc(4096); - - 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("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/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeObject.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeObject.cpp deleted file mode 100644 index 7a0e7b8425..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeObject.cpp +++ /dev/null @@ -1,130 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("deserialize MsgPack object") { - DynamicJsonDocument doc(4096); - - 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/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp deleted file mode 100644 index 2d4093ca49..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp +++ /dev/null @@ -1,152 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -template -static void check(const char* input, DeserializationError expected) { - StaticJsonDocument doc; - - DeserializationError error = deserializeMsgPack(doc, input); - - CAPTURE(input); - REQUIRE(error == expected); -} - -template -static void checkString(const char* input, DeserializationError expected) { - check(input, expected); -} - -TEST_CASE("deserializeMsgPack(StaticJsonDocument&)") { - SECTION("single values always fit") { - check<0>("\xc0", DeserializationError::Ok); // nil - check<0>("\xc2", DeserializationError::Ok); // false - check<0>("\xc3", DeserializationError::Ok); // true - check<0>("\xcc\x00", DeserializationError::Ok); // uint 8 - check<0>("\xcd\x30\x39", DeserializationError::Ok); // uint 16 - check<0>("\xCE\x12\x34\x56\x78", DeserializationError::Ok); // uint 32 - } - - SECTION("fixstr") { - checkString<8>("\xA0", DeserializationError::Ok); - checkString<8>("\xA7ZZZZZZZ", DeserializationError::Ok); - checkString<8>("\xA8ZZZZZZZZ", DeserializationError::NoMemory); - checkString<16>("\xAFZZZZZZZZZZZZZZZ", DeserializationError::Ok); - checkString<16>("\xB0ZZZZZZZZZZZZZZZZ", DeserializationError::NoMemory); - } - - SECTION("str 8") { - checkString<8>("\xD9\x00", DeserializationError::Ok); - checkString<8>("\xD9\x07ZZZZZZZ", DeserializationError::Ok); - checkString<8>("\xD9\x08ZZZZZZZZ", DeserializationError::NoMemory); - checkString<16>("\xD9\x0FZZZZZZZZZZZZZZZ", DeserializationError::Ok); - checkString<16>("\xD9\x10ZZZZZZZZZZZZZZZZ", DeserializationError::NoMemory); - } - - SECTION("str 16") { - checkString<8>("\xDA\x00\x00", DeserializationError::Ok); - checkString<8>("\xDA\x00\x07ZZZZZZZ", DeserializationError::Ok); - checkString<8>("\xDA\x00\x08ZZZZZZZZ", DeserializationError::NoMemory); - checkString<16>("\xDA\x00\x0FZZZZZZZZZZZZZZZ", DeserializationError::Ok); - checkString<16>("\xDA\x00\x10ZZZZZZZZZZZZZZZZ", - DeserializationError::NoMemory); - } - - SECTION("str 32") { - checkString<8>("\xDB\x00\x00\x00\x00", DeserializationError::Ok); - checkString<8>("\xDB\x00\x00\x00\x07ZZZZZZZ", DeserializationError::Ok); - checkString<8>("\xDB\x00\x00\x00\x08ZZZZZZZZ", - DeserializationError::NoMemory); - checkString<16>("\xDB\x00\x00\x00\x0FZZZZZZZZZZZZZZZ", - DeserializationError::Ok); - checkString<16>("\xDB\x00\x00\x00\x10ZZZZZZZZZZZZZZZZ", - DeserializationError::NoMemory); - } - - SECTION("fixarray") { - check("\x90", DeserializationError::Ok); // [] - check("\x91\x01", - DeserializationError::NoMemory); // [1] - check("\x91\x01", DeserializationError::Ok); // [1] - check("\x92\x01\x02", - DeserializationError::NoMemory); // [1,2] - } - - SECTION("array 16") { - check("\xDC\x00\x00", DeserializationError::Ok); - check("\xDC\x00\x01\x01", - DeserializationError::NoMemory); - check("\xDC\x00\x01\x01", DeserializationError::Ok); - check("\xDC\x00\x02\x01\x02", - DeserializationError::NoMemory); - } - - SECTION("array 32") { - check("\xDD\x00\x00\x00\x00", DeserializationError::Ok); - check("\xDD\x00\x00\x00\x01\x01", - DeserializationError::NoMemory); - check("\xDD\x00\x00\x00\x01\x01", - DeserializationError::Ok); - check("\xDD\x00\x00\x00\x02\x01\x02", - DeserializationError::NoMemory); - } - - SECTION("fixmap") { - SECTION("{}") { - check("\x80", DeserializationError::Ok); - } - SECTION("{H:1}") { - check("\x81\xA1H\x01", - DeserializationError::NoMemory); - check( - "\x81\xA1H\x01", DeserializationError::Ok); - } - SECTION("{H:1,W:2}") { - check( - "\x82\xA1H\x01\xA1W\x02", DeserializationError::NoMemory); - check( - "\x82\xA1H\x01\xA1W\x02", DeserializationError::Ok); - } - } - - SECTION("map 16") { - SECTION("{}") { - check("\xDE\x00\x00", DeserializationError::Ok); - } - SECTION("{H:1}") { - check("\xDE\x00\x01\xA1H\x01", - DeserializationError::NoMemory); - check( - "\xDE\x00\x01\xA1H\x01", DeserializationError::Ok); - } - SECTION("{H:1,W:2}") { - check( - "\xDE\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::NoMemory); - check( - "\xDE\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::Ok); - } - } - - SECTION("map 32") { - SECTION("{}") { - check("\xDF\x00\x00\x00\x00", - DeserializationError::Ok); - } - SECTION("{H:1}") { - check("\xDF\x00\x00\x00\x01\xA1H\x01", - DeserializationError::NoMemory); - check( - "\xDF\x00\x00\x00\x01\xA1H\x01", DeserializationError::Ok); - } - SECTION("{H:1,W:2}") { - check( - "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02", - DeserializationError::NoMemory); - check( - "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::Ok); - } - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeVariant.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeVariant.cpp deleted file mode 100644 index be20b9cae5..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/deserializeVariant.cpp +++ /dev/null @@ -1,147 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -template -static void check(const char* input, U expected) { - DynamicJsonDocument doc(4096); - - DeserializationError error = deserializeMsgPack(doc, input); - - REQUIRE(error == DeserializationError::Ok); - REQUIRE(doc.is()); - REQUIRE(doc.as() == expected); -} - -#if ARDUINOJSON_USE_LONG_LONG == 0 -static void checkNotSupported(const char* input) { - DynamicJsonDocument doc(4096); - DeserializationError error = deserializeMsgPack(doc, input); - REQUIRE(error == DeserializationError::Ok); - REQUIRE(doc.isNull()); -} -#endif - -static void checkIsNull(const char* input) { - DynamicJsonDocument doc(4096); - - DeserializationError error = deserializeMsgPack(doc, input); - - REQUIRE(error == DeserializationError::Ok); - REQUIRE(doc.as().isNull()); -} - -TEST_CASE("deserialize MsgPack value") { - SECTION("nil") { - checkIsNull("\xc0"); - } - - SECTION("bool") { - check("\xc2", false); - check("\xc3", true); - } - - SECTION("positive fixint") { - check("\x00", 0); - check("\x7F", 127); - } - - SECTION("negative fixint") { - check("\xe0", -32); - check("\xff", -1); - } - - SECTION("uint 8") { - check("\xcc\x00", 0); - check("\xcc\xff", 255); - } - - SECTION("uint 16") { - check("\xcd\x00\x00", 0); - check("\xcd\xFF\xFF", 65535); - check("\xcd\x30\x39", 12345); - } - - SECTION("uint 32") { - check("\xCE\x00\x00\x00\x00", 0x00000000U); - check("\xCE\xFF\xFF\xFF\xFF", 0xFFFFFFFFU); - check("\xCE\x12\x34\x56\x78", 0x12345678U); - } - - SECTION("uint 64") { -#if ARDUINOJSON_USE_LONG_LONG - check("\xCF\x00\x00\x00\x00\x00\x00\x00\x00", 0U); - check("\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", - 0xFFFFFFFFFFFFFFFFU); - check("\xCF\x12\x34\x56\x78\x9A\xBC\xDE\xF0", - 0x123456789ABCDEF0U); -#else - checkNotSupported("\xCF\x00\x00\x00\x00\x00\x00\x00\x00"); - checkNotSupported("\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"); - checkNotSupported("\xCF\x12\x34\x56\x78\x9A\xBC\xDE\xF0"); -#endif - } - - SECTION("int 8") { - check("\xd0\x00", 0); - check("\xd0\xff", -1); - } - - SECTION("int 16") { - check("\xD1\x00\x00", 0); - check("\xD1\xFF\xFF", -1); - check("\xD1\xCF\xC7", -12345); - } - - SECTION("int 32") { - check("\xD2\x00\x00\x00\x00", 0); - check("\xD2\xFF\xFF\xFF\xFF", -1); - check("\xD2\xB6\x69\xFD\x2E", -1234567890); - } - - SECTION("int 64") { -#if ARDUINOJSON_USE_LONG_LONG - check("\xD3\x00\x00\x00\x00\x00\x00\x00\x00", int64_t(0U)); - check("\xD3\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", - int64_t(0xFFFFFFFFFFFFFFFFU)); - check("\xD3\x12\x34\x56\x78\x9A\xBC\xDE\xF0", - int64_t(0x123456789ABCDEF0)); -#else - checkNotSupported("\xD3\x00\x00\x00\x00\x00\x00\x00\x00"); - checkNotSupported("\xD3\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"); - checkNotSupported("\xD3\x12\x34\x56\x78\x9A\xBC\xDE\xF0"); -#endif - } - - SECTION("float 32") { - check("\xCA\x00\x00\x00\x00", 0.0f); - check("\xCA\x40\x48\xF5\xC3", 3.14f); - } - - SECTION("float 64") { - check("\xCB\x00\x00\x00\x00\x00\x00\x00\x00", 0.0); - check("\xCB\x40\x09\x21\xCA\xC0\x83\x12\x6F", 3.1415); - } - - SECTION("fixstr") { - check("\xA0", std::string("")); - check("\xABhello world", std::string("hello world")); - check("\xBFhello world hello world hello !", - std::string("hello world hello world hello !")); - } - - SECTION("str 8") { - check("\xd9\x05hello", std::string("hello")); - } - - SECTION("str 16") { - check("\xda\x00\x05hello", std::string("hello")); - } - - SECTION("str 32") { - check("\xdb\x00\x00\x00\x05hello", std::string("hello")); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/doubleToFloat.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/doubleToFloat.cpp deleted file mode 100644 index b0470de5b3..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/doubleToFloat.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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); - fixEndianess(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/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/filter.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/filter.cpp deleted file mode 100644 index 57dd7bea98..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/filter.cpp +++ /dev/null @@ -1,1133 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("deserializeMsgPack() filter") { - StaticJsonDocument<4096> doc; - DeserializationError error; - - StaticJsonDocument<200> 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(doc.memoryUsage() == JSON_OBJECT_SIZE(0)); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(0)); - } - - SECTION("input truncated after before skipped string size") { - error = deserializeMsgPack(doc, "\x82\xA6ignore\xd9", 9, filterOpt); - - CHECK(error == DeserializationError::IncompleteInput); - CHECK(doc.as() == "{}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(0)); - } - - SECTION("input truncated after before skipped ext size") { - error = deserializeMsgPack(doc, "\x82\xA6ignore\xC7", 9, filterOpt); - - CHECK(error == DeserializationError::IncompleteInput); - CHECK(doc.as() == "{}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(0)); - } - - SECTION("skip nil") { - error = deserializeMsgPack(doc, "\x82\xA6ignore\xC0\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("reject 0xc1") { - error = deserializeMsgPack(doc, "\x82\xA6ignore\xC1\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::InvalidInput); - } - - SECTION("skip false") { - error = deserializeMsgPack(doc, "\x82\xA6ignore\xC2\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("skip true") { - error = deserializeMsgPack(doc, "\x82\xA6ignore\xC3\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("skip positive fixint") { - error = deserializeMsgPack(doc, "\x82\xA6ignore\x2A\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("skip negative fixint") { - error = deserializeMsgPack(doc, "\x82\xA6ignore\xFF\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("skip uint 8") { - error = deserializeMsgPack(doc, "\x82\xA6ignore\xCC\x2A\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("skip int 8") { - error = deserializeMsgPack(doc, "\x82\xA6ignore\xD0\x2A\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("skip fixstr") { - error = deserializeMsgPack( - doc, "\x82\xA6ignore\xABhello world\xA7include\x2A", filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("skip str 8") { - error = deserializeMsgPack( - doc, "\x82\xA6ignore\xd9\x05hello\xA7include\x2A", filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("skip bin 8") { - error = deserializeMsgPack( - doc, "\x82\xA6ignore\xC4\x05hello\xA7include\x2A", filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - SECTION("skip fixarray") { - error = deserializeMsgPack( - doc, "\x82\xA6ignore\x92\x01\x02\xA7include\x2A", filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8); - } - } - - 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(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(2) + 24); - } - - 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(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(2) + 24); - } - - 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(doc.memoryUsage() == - JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(2) + 24); - } - - SECTION("skip null") { - error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xC0\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - SECTION("skip false") { - error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xC2\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - SECTION("skip true") { - error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xC3\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"onlyarr\":null,\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - } - } - - 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(doc.memoryUsage() == JSON_ARRAY_SIZE(0)); - } - } - - 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(doc.memoryUsage() == JSON_ARRAY_SIZE(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(doc.memoryUsage() == - JSON_OBJECT_SIZE(2) + JSON_OBJECT_SIZE(1) + 24); - } - - 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(doc.memoryUsage() == - JSON_OBJECT_SIZE(2) + JSON_OBJECT_SIZE(1) + 24); - } - - 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(doc.memoryUsage() == - JSON_OBJECT_SIZE(2) + JSON_OBJECT_SIZE(1) + 24); - } - - SECTION("skip null") { - error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xC0\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - SECTION("skip false") { - error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xC2\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - SECTION("skip true") { - error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xC3\xA7include\x2A", - filterOpt); - - CHECK(error == DeserializationError::Ok); - CHECK(doc.as() == "{\"onlyobj\":null,\"include\":42}"); - CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - - 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(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16); - } - } - - 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"; - - StaticJsonDocument<256> filter; - filter["include"] = true; - - StaticJsonDocument<256> doc; - DeserializationError err = - deserializeMsgPack(doc, input, 18, DeserializationOption::Filter(filter)); - - CHECK(err == DeserializationError::Ok); - CHECK(doc.as() == "{\"include\":1}"); -} - -TEST_CASE("Overloads") { - StaticJsonDocument<256> doc; - StaticJsonDocument<256> 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, std::string("{}"), 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, std::string("{}"), 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, std::string("{}"), 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/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/incompleteInput.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/incompleteInput.cpp deleted file mode 100644 index 029facfc04..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/incompleteInput.cpp +++ /dev/null @@ -1,158 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -DeserializationError deserialize(const char* input, size_t len) { - DynamicJsonDocument doc(4096); - - return deserializeMsgPack(doc, input, len); -} - -void checkAllSizes(const char* input, size_t len) { - REQUIRE(deserialize(input, len) == DeserializationError::Ok); - - while (--len) { - REQUIRE(deserialize(input, len) == DeserializationError::IncompleteInput); - } -} - -TEST_CASE("deserializeMsgPack() returns IncompleteInput") { - SECTION("empty input") { - checkAllSizes("\x00", 1); - } - - SECTION("fixarray") { - checkAllSizes("\x91\x01", 2); - } - - SECTION("array 16") { - checkAllSizes("\xDC\x00\x01\x01", 4); - } - - SECTION("array 32") { - checkAllSizes("\xDD\x00\x00\x00\x01\x01", 6); - } - - SECTION("fixmap") { - checkAllSizes("\x81\xA3one\x01", 6); - } - - SECTION("map 16") { - checkAllSizes("\xDE\x00\x01\xA3one\x01", 8); - } - - SECTION("map 32") { - checkAllSizes("\xDF\x00\x00\x00\x01\xA3one\x01", 10); - checkAllSizes("\xDF\x00\x00\x00\x01\xd9\x03one\x01", 11); - } - - SECTION("uint 8") { - checkAllSizes("\xcc\x01", 2); - } - - SECTION("uint 16") { - checkAllSizes("\xcd\x00\x01", 3); - } - - SECTION("uint 32") { - checkAllSizes("\xCE\x00\x00\x00\x01", 5); - } - -#if ARDUINOJSON_USE_LONG_LONG - SECTION("uint 64") { - checkAllSizes("\xCF\x00\x00\x00\x00\x00\x00\x00\x00", 9); - } -#endif - - SECTION("int 8") { - checkAllSizes("\xD0\x01", 2); - } - - SECTION("int 16") { - checkAllSizes("\xD1\x00\x01", 3); - } - - SECTION("int 32") { - checkAllSizes("\xD2\x00\x00\x00\x01", 5); - } - -#if ARDUINOJSON_USE_LONG_LONG - SECTION("int 64") { - checkAllSizes("\xD3\x00\x00\x00\x00\x00\x00\x00\x00", 9); - } -#endif - - SECTION("float 32") { - checkAllSizes("\xCA\x40\x48\xF5\xC3", 5); - } - - SECTION("float 64") { - checkAllSizes("\xCB\x40\x09\x21\xCA\xC0\x83\x12\x6F", 9); - } - - SECTION("fixstr") { - checkAllSizes("\xABhello world", 12); - } - - SECTION("str 8") { - checkAllSizes("\xd9\x05hello", 7); - } - - SECTION("str 16") { - checkAllSizes("\xda\x00\x05hello", 8); - } - - SECTION("str 32") { - checkAllSizes("\xdb\x00\x00\x00\x05hello", 10); - } - - SECTION("bin 8") { - checkAllSizes("\xc4\x01X", 3); - } - - SECTION("bin 16") { - checkAllSizes("\xc5\x00\x01X", 4); - } - - SECTION("bin 32") { - checkAllSizes("\xc6\x00\x00\x00\x01X", 6); - } - - SECTION("ext 8") { - checkAllSizes("\xc7\x01\x01\x01", 4); - } - - SECTION("ext 16") { - checkAllSizes("\xc8\x00\x01\x01\x01", 5); - } - - SECTION("ext 32") { - checkAllSizes("\xc9\x00\x00\x00\x01\x01\x01", 7); - } - - SECTION("fixext 1") { - checkAllSizes("\xd4\x01\x01", 3); - } - - SECTION("fixext 2") { - checkAllSizes("\xd5\x01\x01\x02", 4); - } - - SECTION("fixext 4") { - checkAllSizes("\xd6\x01\x01\x02\x03\x04", 6); - } - - SECTION("fixext 8") { - checkAllSizes("\xd7\x01\x01\x02\x03\x04\x05\x06\x07\x08", 10); - } - - SECTION("fixext 16") { - checkAllSizes( - "\xd8\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E" - "\x0F\x10", - 18); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/input_types.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/input_types.cpp deleted file mode 100644 index f46d4691e6..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/input_types.cpp +++ /dev/null @@ -1,95 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -#include "CustomReader.hpp" - -TEST_CASE("deserializeMsgPack(const std::string&)") { - DynamicJsonDocument doc(4096); - - 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, std::string("\x92\x01\x02")); - - 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(std::string("hello") == array[0]); - } - - SECTION("should accept a zero in input") { - DeserializationError err = - deserializeMsgPack(doc, std::string("\x92\x00\x02", 3)); - - REQUIRE(err == DeserializationError::Ok); - JsonArray arr = doc.as(); - REQUIRE(arr[0] == 0); - REQUIRE(arr[1] == 2); - } -} - -TEST_CASE("deserializeMsgPack(std::istream&)") { - DynamicJsonDocument doc(4096); - - SECTION("should accept a zero in input") { - std::istringstream input(std::string("\x92\x00\x02", 3)); - - 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); - - StaticJsonDocument doc; - DeserializationError err = deserializeMsgPack(doc, vla); - - REQUIRE(err == DeserializationError::Ok); -} -#endif - -TEST_CASE("deserializeMsgPack(CustomReader)") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/misc.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/misc.cpp deleted file mode 100644 index 071717164b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/misc.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("deserializeMsgPack() returns EmptyInput") { - StaticJsonDocument<100> doc; - - SECTION("from sized buffer") { - DeserializationError err = deserializeMsgPack(doc, "", 0); - - REQUIRE(err == DeserializationError::EmptyInput); - } - - SECTION("from stream") { - std::istringstream input(""); - - DeserializationError err = deserializeMsgPack(doc, input); - - REQUIRE(err == DeserializationError::EmptyInput); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/nestingLimit.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/nestingLimit.cpp deleted file mode 100644 index 6005f55bb4..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/nestingLimit.cpp +++ /dev/null @@ -1,85 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -#define SHOULD_WORK(expression) REQUIRE(DeserializationError::Ok == expression); -#define SHOULD_FAIL(expression) \ - REQUIRE(DeserializationError::TooDeep == expression); - -TEST_CASE("JsonDeserializer nesting") { - DynamicJsonDocument doc(4096); - - 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/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/notSupported.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/notSupported.cpp deleted file mode 100644 index 5e204cdf0e..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackDeserializer/notSupported.cpp +++ /dev/null @@ -1,82 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -static void checkMsgPackDocument(const char* input, size_t inputSize, - const char* expectedJson) { - DynamicJsonDocument doc(4096); - - DeserializationError error = deserializeMsgPack(doc, input, inputSize); - - REQUIRE(error == DeserializationError::Ok); - std::string actualJson; - serializeJson(doc, actualJson); - REQUIRE(actualJson == expectedJson); -} - -static void checkMsgPackError(const char* input, size_t inputSize, - DeserializationError expectedError) { - DynamicJsonDocument doc(4096); - - DeserializationError error = deserializeMsgPack(doc, input, inputSize); - - REQUIRE(error == expectedError); -} - -TEST_CASE("deserializeMsgPack() return NotSupported") { - SECTION("bin 8") { - checkMsgPackDocument("\x92\xc4\x01X\x2A", 5, "[null,42]"); - } - - SECTION("bin 16") { - checkMsgPackDocument("\x92\xc5\x00\x01X\x2A", 6, "[null,42]"); - } - - SECTION("bin 32") { - checkMsgPackDocument("\x92\xc6\x00\x00\x00\x01X\x2A", 8, "[null,42]"); - } - - SECTION("ext 8") { - checkMsgPackDocument("\x92\xc7\x01\x01\x01\x2A", 6, "[null,42]"); - } - - SECTION("ext 16") { - checkMsgPackDocument("\x92\xc8\x00\x01\x01\x01\x2A", 7, "[null,42]"); - } - - SECTION("ext 32") { - checkMsgPackDocument("\x92\xc9\x00\x00\x00\x01\x01\x01\x2A", 9, - "[null,42]"); - } - - SECTION("fixext 1") { - checkMsgPackDocument("\x92\xd4\x01\x01\x2A", 5, "[null,42]"); - } - - SECTION("fixext 2") { - checkMsgPackDocument("\x92\xd5\x01\x01\x02\x2A", 6, "[null,42]"); - } - - SECTION("fixext 4") { - checkMsgPackDocument("\x92\xd6\x01\x01\x02\x03\x04\x2A", 8, "[null,42]"); - } - - SECTION("fixext 8") { - checkMsgPackDocument("\x92\xd7\x01\x01\x02\x03\x04\x05\x06\x07\x08\x2A", 12, - "[null,42]"); - } - - SECTION("fixext 16") { - checkMsgPackDocument( - "\x92\xd8\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E" - "\x0F\x10\x2A", - 20, "[null,42]"); - } - - SECTION("integer as key") { - checkMsgPackError("\x81\x01\xA1H", 3, DeserializationError::InvalidInput); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/CMakeLists.txt deleted file mode 100644 index 9a7721e9d6..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, 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/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/destination_types.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/destination_types.cpp deleted file mode 100644 index ae58063617..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/destination_types.cpp +++ /dev/null @@ -1,59 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("serialize MsgPack to various destination types") { - DynamicJsonDocument doc(4096); - 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/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/measure.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/measure.cpp deleted file mode 100644 index d49bcd9bac..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/measure.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -TEST_CASE("measureMsgPack()") { - DynamicJsonDocument doc(4096); - JsonObject object = doc.to(); - object["hello"] = "world"; - - REQUIRE(measureMsgPack(doc) == 13); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/misc.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/misc.cpp deleted file mode 100644 index 52c53a7bd5..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/misc.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include -#include -#include - -template -void check(T value, const std::string &expected) { - DynamicJsonDocument doc(4096); - 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)") { - DynamicJsonDocument doc(4096); - deserializeJson(doc, "{\"hello\":42}"); - JsonObject obj = doc.as(); - std::string result; - - serializeMsgPack(obj["hello"], result); - - REQUIRE(result == "*"); -} - -TEST_CASE("serializeMsgPack(ElementProxy)") { - DynamicJsonDocument doc(4096); - deserializeJson(doc, "[42]"); - JsonArray arr = doc.as(); - std::string result; - - serializeMsgPack(arr[0], result); - - REQUIRE(result == "*"); -} - -TEST_CASE("serializeMsgPack(JsonVariantSubscript)") { - DynamicJsonDocument doc(4096); - deserializeJson(doc, "[42]"); - JsonVariant var = doc.as(); - std::string result; - - serializeMsgPack(var[0], result); - - REQUIRE(result == "*"); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/serializeArray.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/serializeArray.cpp deleted file mode 100644 index 74de8f173b..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/serializeArray.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -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") { - DynamicJsonDocument doc(JSON_ARRAY_SIZE(65536)); - 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); - - check(array, - std::string("\xDD\x00\x01\x00\x00", 5) + std::string(65536, '\xc0')); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/serializeObject.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/serializeObject.cpp deleted file mode 100644 index e5c167a619..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/serializeObject.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -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") { - DynamicJsonDocument doc(4096); - 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]; - sprintf(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]; - // sprintf(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(std::string("\xDB\x00\x01\x00\x00", 5)); - check(object, "\x81\xA5hello\xDB\x00\x01\x00\x00"); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/serializeVariant.cpp b/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/serializeVariant.cpp deleted file mode 100644 index 1fd8ba1809..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/MsgPackSerializer/serializeVariant.cpp +++ /dev/null @@ -1,161 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -template -static void checkVariant(T value, const char* expected_data, - size_t expected_len) { - DynamicJsonDocument doc(4096); - 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"); - } - - 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(), std::string("\xDA\x01\x00", 3) + shortest); - - std::string longest(65535, '?'); - checkVariant(longest.c_str(), std::string("\xDA\xFF\xFF", 3) + longest); - } - - SECTION("str 32") { - std::string shortest(65536, '?'); - checkVariant(shortest.c_str(), - std::string("\xDB\x00\x01\x00\x00", 5) + 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("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/lib/ArduinoJson-6.x/extras/tests/Numbers/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/Numbers/CMakeLists.txt deleted file mode 100644 index 9bcf334132..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Numbers/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, Benoit BLANCHON -# MIT License - -add_executable(NumbersTests - convertNumber.cpp - parseFloat.cpp - parseDouble.cpp - parseInteger.cpp - parseNumber.cpp -) - - -add_test(Numbers NumbersTests) - -set_tests_properties(Numbers - PROPERTIES - LABELS "Catch" -) diff --git a/lib/ArduinoJson-6.x/extras/tests/Numbers/convertNumber.cpp b/lib/ArduinoJson-6.x/extras/tests/Numbers/convertNumber.cpp deleted file mode 100644 index 1c36aa0687..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Numbers/convertNumber.cpp +++ /dev/null @@ -1,78 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Numbers/parseDouble.cpp b/lib/ArduinoJson-6.x/extras/tests/Numbers/parseDouble.cpp deleted file mode 100644 index 1ce9a02e7c..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Numbers/parseDouble.cpp +++ /dev/null @@ -1,96 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_USE_DOUBLE 1 -#define ARDUINOJSON_ENABLE_NAN 1 -#define ARDUINOJSON_ENABLE_INFINITY 1 - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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/lib/ArduinoJson-6.x/extras/tests/Numbers/parseFloat.cpp b/lib/ArduinoJson-6.x/extras/tests/Numbers/parseFloat.cpp deleted file mode 100644 index ec69cab9fd..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Numbers/parseFloat.cpp +++ /dev/null @@ -1,101 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#define ARDUINOJSON_USE_DOUBLE 0 -#define ARDUINOJSON_ENABLE_NAN 1 -#define ARDUINOJSON_ENABLE_INFINITY 1 - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -void checkFloat(const char* input, float expected) { - CAPTURE(input); - REQUIRE(parseNumber(input) == 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); - checkFloat("100000000000000000000000000000000.0", 1e+32f); - checkFloat( - "100000000000000000000000000000000.00000000000000000000000000000", - 1e+32f); - } - - 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); - } - - SECTION("ExponentTooBig") { - checkFloatInf("1e39", false); - checkFloatInf("-1e39", true); - checkFloatInf("1e255", false); - checkFloat("1e-255", 0.0f); - } - - 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); - - checkFloatInf("1e300", false); - checkFloatInf("-1e300", true); - } -} diff --git a/lib/ArduinoJson-6.x/extras/tests/Numbers/parseInteger.cpp b/lib/ArduinoJson-6.x/extras/tests/Numbers/parseInteger.cpp deleted file mode 100644 index aae66e808a..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Numbers/parseInteger.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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/lib/ArduinoJson-6.x/extras/tests/Numbers/parseNumber.cpp b/lib/ArduinoJson-6.x/extras/tests/Numbers/parseNumber.cpp deleted file mode 100644 index eb52f3a5a2..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/Numbers/parseNumber.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -TEST_CASE("Test unsigned integer overflow") { - VariantData first, second; - first.init(); - second.init(); - - // Avoids MSVC warning C4127 (conditional expression is constant) - size_t integerSize = sizeof(Integer); - - if (integerSize == 8) { - parseNumber("18446744073709551615", first); - parseNumber("18446744073709551616", second); - } else { - parseNumber("4294967295", first); - parseNumber("4294967296", second); - } - - REQUIRE(first.type() == uint8_t(VALUE_IS_UNSIGNED_INTEGER)); - REQUIRE(second.type() == uint8_t(VALUE_IS_FLOAT)); -} - -TEST_CASE("Test signed integer overflow") { - VariantData first, second; - first.init(); - second.init(); - - // Avoids MSVC warning C4127 (conditional expression is constant) - size_t integerSize = sizeof(Integer); - - if (integerSize == 8) { - parseNumber("-9223372036854775808", first); - parseNumber("-9223372036854775809", second); - } else { - parseNumber("-2147483648", first); - parseNumber("-2147483649", second); - } - - REQUIRE(first.type() == uint8_t(VALUE_IS_SIGNED_INTEGER)); - REQUIRE(second.type() == uint8_t(VALUE_IS_FLOAT)); -} - -TEST_CASE("Invalid value") { - VariantData result; - result.init(); - - parseNumber("6a3", result); - - REQUIRE(result.type() == uint8_t(VALUE_IS_NULL)); -} diff --git a/lib/ArduinoJson-6.x/extras/tests/TextFormatter/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/TextFormatter/CMakeLists.txt deleted file mode 100644 index 57a3f85b23..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/TextFormatter/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright © 2014-2022, 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/lib/ArduinoJson-6.x/extras/tests/TextFormatter/writeFloat.cpp b/lib/ArduinoJson-6.x/extras/tests/TextFormatter/writeFloat.cpp deleted file mode 100644 index 87eef3d940..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/TextFormatter/writeFloat.cpp +++ /dev/null @@ -1,119 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -#define ARDUINOJSON_ENABLE_NAN 1 -#define ARDUINOJSON_ENABLE_INFINITY 1 -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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/lib/ArduinoJson-6.x/extras/tests/TextFormatter/writeInteger.cpp b/lib/ArduinoJson-6.x/extras/tests/TextFormatter/writeInteger.cpp deleted file mode 100644 index cc29fc0ffe..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/TextFormatter/writeInteger.cpp +++ /dev/null @@ -1,55 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include -#include -#include - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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/lib/ArduinoJson-6.x/extras/tests/TextFormatter/writeString.cpp b/lib/ArduinoJson-6.x/extras/tests/TextFormatter/writeString.cpp deleted file mode 100644 index 67b12b5029..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/TextFormatter/writeString.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#include - -#include -#include - -using namespace ARDUINOJSON_NAMESPACE; - -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/lib/ArduinoJson-6.x/extras/tests/catch/.clang-format b/lib/ArduinoJson-6.x/extras/tests/catch/.clang-format deleted file mode 100644 index 9d159247d5..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/catch/.clang-format +++ /dev/null @@ -1,2 +0,0 @@ -DisableFormat: true -SortIncludes: false diff --git a/lib/ArduinoJson-6.x/extras/tests/catch/CMakeLists.txt b/lib/ArduinoJson-6.x/extras/tests/catch/CMakeLists.txt deleted file mode 100644 index 776a07a007..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/catch/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# ArduinoJson - https://arduinojson.org -# Copyright Benoit Blanchon 2014-2021 -# MIT License - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED OFF) - -add_library(catch - catch.hpp - catch.cpp -) - -target_include_directories(catch - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} -) - -if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") - # prevent "xxx will change in GCC x.x" with arm-linux-gnueabihf-gcc - target_compile_options(catch PRIVATE -Wno-psabi) -endif() diff --git a/lib/ArduinoJson-6.x/extras/tests/catch/catch.cpp b/lib/ArduinoJson-6.x/extras/tests/catch/catch.cpp deleted file mode 100644 index e6c8548a9c..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/catch/catch.cpp +++ /dev/null @@ -1,6 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright Benoit Blanchon 2014-2021 -// MIT License - -#define CATCH_CONFIG_MAIN -#include "catch.hpp" diff --git a/lib/ArduinoJson-6.x/extras/tests/catch/catch.hpp b/lib/ArduinoJson-6.x/extras/tests/catch/catch.hpp deleted file mode 100644 index fdb046fe44..0000000000 --- a/lib/ArduinoJson-6.x/extras/tests/catch/catch.hpp +++ /dev/null @@ -1,11689 +0,0 @@ -/* - * Catch v1.12.2 - * Generated: 2018-05-14 15:10:01.112442 - * ---------------------------------------------------------- - * This file has been merged from multiple headers. Please don't edit it directly - * Copyright (c) 2012 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 - -#define TWOBLUECUBES_CATCH_HPP_INCLUDED - -#ifdef __clang__ -# pragma clang system_header -#elif defined __GNUC__ -# pragma GCC system_header -#endif - -// #included from: internal/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 ignored "-Wglobal-constructors" -# pragma clang diagnostic ignored "-Wvariadic-macros" -# pragma clang diagnostic ignored "-Wc99-extensions" -# pragma clang diagnostic ignored "-Wunused-variable" -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wpadded" -# pragma clang diagnostic ignored "-Wc++98-compat" -# pragma clang diagnostic ignored "-Wc++98-compat-pedantic" -# pragma clang diagnostic ignored "-Wswitch-enum" -# pragma clang diagnostic ignored "-Wcovered-switch-default" -# endif -#elif defined __GNUC__ -# pragma GCC diagnostic ignored "-Wvariadic-macros" -# pragma GCC diagnostic ignored "-Wunused-variable" -# pragma GCC diagnostic ignored "-Wparentheses" - -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wpadded" -#endif -#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) -# define CATCH_IMPL -#endif - -#ifdef CATCH_IMPL -# ifndef CLARA_CONFIG_MAIN -# define CLARA_CONFIG_MAIN_NOT_DEFINED -# define CLARA_CONFIG_MAIN -# endif -#endif - -// #included from: internal/catch_notimplemented_exception.h -#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED - -// #included from: catch_common.h -#define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED - -// #included from: catch_compiler_capabilities.h -#define TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED - -// Detect a number of compiler features - mostly C++11/14 conformance - by compiler -// The following features are defined: -// -// CATCH_CONFIG_CPP11_NULLPTR : is nullptr supported? -// CATCH_CONFIG_CPP11_NOEXCEPT : is noexcept supported? -// CATCH_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods -// CATCH_CONFIG_CPP11_IS_ENUM : std::is_enum is supported? -// CATCH_CONFIG_CPP11_TUPLE : std::tuple is supported -// CATCH_CONFIG_CPP11_LONG_LONG : is long long supported? -// CATCH_CONFIG_CPP11_OVERRIDE : is override supported? -// CATCH_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr) -// CATCH_CONFIG_CPP11_SHUFFLE : is std::shuffle supported? -// CATCH_CONFIG_CPP11_TYPE_TRAITS : are type_traits and enable_if supported? - -// CATCH_CONFIG_CPP11_OR_GREATER : Is C++11 supported? - -// CATCH_CONFIG_VARIADIC_MACROS : are variadic macros supported? -// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported? -// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported? -// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported? -// **************** -// 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_CPP11_NO_NULLPTR) 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. - -// All the C++11 features can be disabled with CATCH_CONFIG_NO_CPP11 - -#ifdef __cplusplus - -# if __cplusplus >= 201103L -# define CATCH_CPP11_OR_GREATER -# endif - -# if __cplusplus >= 201402L -# define CATCH_CPP14_OR_GREATER -# endif - -#endif - -#ifdef __clang__ - -# if __has_feature(cxx_nullptr) -# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -# endif - -# if __has_feature(cxx_noexcept) -# define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT -# endif - -# if defined(CATCH_CPP11_OR_GREATER) -# define CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - _Pragma( "clang diagnostic push" ) \ - _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) -# define CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ - _Pragma( "clang diagnostic pop" ) - -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "clang diagnostic push" ) \ - _Pragma( "clang diagnostic ignored \"-Wparentheses\"" ) -# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "clang diagnostic pop" ) -# endif - -#endif // __clang__ - -//////////////////////////////////////////////////////////////////////////////// -// We know some environments not to support full POSIX signals -#if defined(__CYGWIN__) || defined(__QNX__) - -# if !defined(CATCH_CONFIG_POSIX_SIGNALS) -# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -# endif - -#endif - -#ifdef __OS400__ -# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -# define CATCH_CONFIG_COLOUR_NONE -#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 - -#endif // __CYGWIN__ - -//////////////////////////////////////////////////////////////////////////////// -// Borland -#ifdef __BORLANDC__ - -#endif // __BORLANDC__ - -//////////////////////////////////////////////////////////////////////////////// -// EDG -#ifdef __EDG_VERSION__ - -#endif // __EDG_VERSION__ - -//////////////////////////////////////////////////////////////////////////////// -// Digital Mars -#ifdef __DMC__ - -#endif // __DMC__ - -//////////////////////////////////////////////////////////////////////////////// -// GCC -#ifdef __GNUC__ - -# if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__) -# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -# endif - -// - otherwise more recent versions define __cplusplus >= 201103L -// and will get picked up below - -#endif // __GNUC__ - -//////////////////////////////////////////////////////////////////////////////// -// Visual C++ -#ifdef _MSC_VER - -#define CATCH_INTERNAL_CONFIG_WINDOWS_SEH - -#if (_MSC_VER >= 1600) -# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -# define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR -#endif - -#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015)) -#define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT -#define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -#define CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE -#define CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS -#endif - -#endif // _MSC_VER - -//////////////////////////////////////////////////////////////////////////////// - -// Use variadic macros if the compiler supports them -#if ( defined _MSC_VER && _MSC_VER > 1400 && !defined __EDGE__) || \ - ( defined __WAVE__ && __WAVE_HAS_VARIADICS ) || \ - ( defined __GNUC__ && __GNUC__ >= 3 ) || \ - ( !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L ) - -#define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS - -#endif - -// Use __COUNTER__ if the compiler supports it -#if ( defined _MSC_VER && _MSC_VER >= 1300 ) || \ - ( defined __GNUC__ && ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3 )) ) || \ - ( defined __clang__ && __clang_major__ >= 3 ) - -// Use of __COUNTER__ is suppressed during code analysis in CLion/AppCode 2017.2.x and former, -// because __COUNTER__ is not properly handled by it. -// This does not affect compilation -#if ( !defined __JETBRAINS_IDE__ || __JETBRAINS_IDE__ >= 20170300L ) - #define CATCH_INTERNAL_CONFIG_COUNTER -#endif - -#endif - -//////////////////////////////////////////////////////////////////////////////// -// C++ language feature support - -// catch all support for C++11 -#if defined(CATCH_CPP11_OR_GREATER) - -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) -# define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR -# endif - -# ifndef CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT -# define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT -# endif - -# ifndef CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -# define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -# endif - -# ifndef CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM -# define CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM -# endif - -# ifndef CATCH_INTERNAL_CONFIG_CPP11_TUPLE -# define CATCH_INTERNAL_CONFIG_CPP11_TUPLE -# endif - -# ifndef CATCH_INTERNAL_CONFIG_VARIADIC_MACROS -# define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS -# endif - -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) -# define CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG -# endif - -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) -# define CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE -# endif -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) -# define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR -# endif -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE) -# define CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE -# endif -# if !defined(CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS) -# define CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS -# endif - -#endif // __cplusplus >= 201103L - -// Now set the actual defines based on the above + anything the user has configured -#if defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NO_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_NULLPTR -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_NOEXCEPT -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_GENERATED_METHODS -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_NO_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_IS_ENUM -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_CPP11_NO_TUPLE) && !defined(CATCH_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_TUPLE -#endif -#if defined(CATCH_INTERNAL_CONFIG_VARIADIC_MACROS) && !defined(CATCH_CONFIG_NO_VARIADIC_MACROS) && !defined(CATCH_CONFIG_VARIADIC_MACROS) -# define CATCH_CONFIG_VARIADIC_MACROS -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_NO_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_LONG_LONG -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_NO_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_OVERRIDE -#endif -#if defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_NO_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_UNIQUE_PTR -#endif -#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_CPP11_SHUFFLE) && !defined(CATCH_CONFIG_CPP11_NO_SHUFFLE) && !defined(CATCH_CONFIG_CPP11_SHUFFLE) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_SHUFFLE -#endif -# if defined(CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS) && !defined(CATCH_CONFIG_CPP11_NO_TYPE_TRAITS) && !defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) && !defined(CATCH_CONFIG_NO_CPP11) -# define CATCH_CONFIG_CPP11_TYPE_TRAITS -# endif -#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_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_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS) -# define CATCH_CONFIG_POSIX_SIGNALS -#endif - -#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS -# define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS -# define CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS -#endif - -// noexcept support: -#if defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_NOEXCEPT) -# define CATCH_NOEXCEPT noexcept -# define CATCH_NOEXCEPT_IS(x) noexcept(x) -#else -# define CATCH_NOEXCEPT throw() -# define CATCH_NOEXCEPT_IS(x) -#endif - -// nullptr support -#ifdef CATCH_CONFIG_CPP11_NULLPTR -# define CATCH_NULL nullptr -#else -# define CATCH_NULL NULL -#endif - -// override support -#ifdef CATCH_CONFIG_CPP11_OVERRIDE -# define CATCH_OVERRIDE override -#else -# define CATCH_OVERRIDE -#endif - -// unique_ptr support -#ifdef CATCH_CONFIG_CPP11_UNIQUE_PTR -# define CATCH_AUTO_PTR( T ) std::unique_ptr -#else -# define CATCH_AUTO_PTR( T ) std::auto_ptr -#endif - -#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 - -#define INTERNAL_CATCH_STRINGIFY2( expr ) #expr -#define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr ) - -#include -#include - -namespace Catch { - - struct IConfig; - - struct CaseSensitive { enum Choice { - Yes, - No - }; }; - - class NonCopyable { -#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - NonCopyable( NonCopyable const& ) = delete; - NonCopyable( NonCopyable && ) = delete; - NonCopyable& operator = ( NonCopyable const& ) = delete; - NonCopyable& operator = ( NonCopyable && ) = delete; -#else - NonCopyable( NonCopyable const& info ); - NonCopyable& operator = ( NonCopyable const& ); -#endif - - protected: - NonCopyable() {} - virtual ~NonCopyable(); - }; - - class SafeBool { - public: - typedef void (SafeBool::*type)() const; - - static type makeSafe( bool value ) { - return value ? &SafeBool::trueValue : 0; - } - private: - void trueValue() const {} - }; - - template - void deleteAll( ContainerT& container ) { - typename ContainerT::const_iterator it = container.begin(); - typename ContainerT::const_iterator itEnd = container.end(); - for(; it != itEnd; ++it ) - delete *it; - } - template - void deleteAllValues( AssociativeContainerT& container ) { - typename AssociativeContainerT::const_iterator it = container.begin(); - typename AssociativeContainerT::const_iterator itEnd = container.end(); - for(; it != itEnd; ++it ) - delete it->second; - } - - bool startsWith( std::string const& s, std::string const& prefix ); - bool startsWith( std::string const& s, char prefix ); - bool endsWith( std::string const& s, std::string const& suffix ); - bool endsWith( std::string const& s, char suffix ); - bool contains( std::string const& s, std::string const& infix ); - void toLowerInPlace( std::string& s ); - std::string toLower( std::string const& s ); - std::string trim( std::string const& str ); - bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ); - - struct pluralise { - pluralise( std::size_t count, std::string const& label ); - - friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ); - - std::size_t m_count; - std::string m_label; - }; - - struct SourceLineInfo { - - SourceLineInfo(); - SourceLineInfo( char const* _file, std::size_t _line ); -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - SourceLineInfo(SourceLineInfo const& other) = default; - SourceLineInfo( SourceLineInfo && ) = default; - SourceLineInfo& operator = ( SourceLineInfo const& ) = default; - SourceLineInfo& operator = ( SourceLineInfo && ) = default; -# endif - bool empty() const; - bool operator == ( SourceLineInfo const& other ) const; - bool operator < ( SourceLineInfo const& other ) const; - - char const* file; - std::size_t line; - }; - - std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); - - // This is just here to avoid compiler warnings with macro constants and boolean literals - inline bool isTrue( bool value ){ return value; } - inline bool alwaysTrue() { return true; } - inline bool alwaysFalse() { return false; } - - void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ); - - void seedRng( IConfig const& config ); - unsigned int rngSeed(); - - // Use this in variadic streaming macros to allow - // >> +StreamEndStop - // as well as - // >> stuff +StreamEndStop - struct StreamEndStop { - std::string operator+() { - return std::string(); - } - }; - template - T const& operator + ( T const& value, StreamEndStop ) { - return value; - } -} - -#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, static_cast( __LINE__ ) ) -#define CATCH_INTERNAL_ERROR( msg ) ::Catch::throwLogicError( msg, CATCH_INTERNAL_LINEINFO ); - -namespace Catch { - - class NotImplementedException : public std::exception - { - public: - NotImplementedException( SourceLineInfo const& lineInfo ); - - virtual ~NotImplementedException() CATCH_NOEXCEPT {} - - virtual const char* what() const CATCH_NOEXCEPT; - - private: - std::string m_what; - SourceLineInfo m_lineInfo; - }; - -} // end namespace Catch - -/////////////////////////////////////////////////////////////////////////////// -#define CATCH_NOT_IMPLEMENTED throw Catch::NotImplementedException( CATCH_INTERNAL_LINEINFO ) - -// #included from: internal/catch_context.h -#define TWOBLUECUBES_CATCH_CONTEXT_H_INCLUDED - -// #included from: catch_interfaces_generators.h -#define TWOBLUECUBES_CATCH_INTERFACES_GENERATORS_H_INCLUDED - -#include - -namespace Catch { - - struct IGeneratorInfo { - virtual ~IGeneratorInfo(); - virtual bool moveNext() = 0; - virtual std::size_t getCurrentIndex() const = 0; - }; - - struct IGeneratorsForTest { - virtual ~IGeneratorsForTest(); - - virtual IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) = 0; - virtual bool moveNext() = 0; - }; - - IGeneratorsForTest* createGeneratorsForTest(); - -} // end namespace Catch - -// #included from: catch_ptr.hpp -#define TWOBLUECUBES_CATCH_PTR_HPP_INCLUDED - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpadded" -#endif - -namespace Catch { - - // An intrusive reference counting smart pointer. - // T must implement addRef() and release() methods - // typically implementing the IShared interface - template - class Ptr { - public: - Ptr() : m_p( CATCH_NULL ){} - Ptr( T* p ) : m_p( p ){ - if( m_p ) - m_p->addRef(); - } - Ptr( Ptr const& other ) : m_p( other.m_p ){ - if( m_p ) - m_p->addRef(); - } - ~Ptr(){ - if( m_p ) - m_p->release(); - } - void reset() { - if( m_p ) - m_p->release(); - m_p = CATCH_NULL; - } - Ptr& operator = ( T* p ){ - Ptr temp( p ); - swap( temp ); - return *this; - } - Ptr& operator = ( Ptr const& other ){ - Ptr temp( other ); - swap( temp ); - return *this; - } - void swap( Ptr& other ) { std::swap( m_p, other.m_p ); } - T* get() const{ return m_p; } - T& operator*() const { return *m_p; } - T* operator->() const { return m_p; } - bool operator !() const { return m_p == CATCH_NULL; } - operator SafeBool::type() const { return SafeBool::makeSafe( m_p != CATCH_NULL ); } - - private: - T* m_p; - }; - - struct IShared : NonCopyable { - virtual ~IShared(); - virtual void addRef() const = 0; - virtual void release() const = 0; - }; - - template - struct SharedImpl : T { - - SharedImpl() : m_rc( 0 ){} - - virtual void addRef() const { - ++m_rc; - } - virtual void release() const { - if( --m_rc == 0 ) - delete this; - } - - mutable unsigned int m_rc; - }; - -} // end namespace Catch - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - -namespace Catch { - - class TestCase; - class Stream; - struct IResultCapture; - struct IRunner; - struct IGeneratorsForTest; - struct IConfig; - - struct IContext - { - virtual ~IContext(); - - virtual IResultCapture* getResultCapture() = 0; - virtual IRunner* getRunner() = 0; - virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) = 0; - virtual bool advanceGeneratorsForCurrentTest() = 0; - virtual Ptr getConfig() const = 0; - }; - - struct IMutableContext : IContext - { - virtual ~IMutableContext(); - virtual void setResultCapture( IResultCapture* resultCapture ) = 0; - virtual void setRunner( IRunner* runner ) = 0; - virtual void setConfig( Ptr const& config ) = 0; - }; - - IContext& getCurrentContext(); - IMutableContext& getCurrentMutableContext(); - void cleanUpContext(); - Stream createStream( std::string const& streamName ); - -} - -// #included from: internal/catch_test_registry.hpp -#define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED - -// #included from: catch_interfaces_testcase.h -#define TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED - -#include - -namespace Catch { - - class TestSpec; - - struct ITestCase : IShared { - virtual void invoke () const = 0; - protected: - virtual ~ITestCase(); - }; - - 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 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 ); - -} - -namespace Catch { - -template -class MethodTestCase : public SharedImpl { - -public: - MethodTestCase( void (C::*method)() ) : m_method( method ) {} - - virtual void invoke() const { - C obj; - (obj.*m_method)(); - } - -private: - virtual ~MethodTestCase() {} - - void (C::*m_method)(); -}; - -typedef void(*TestFunction)(); - -struct NameAndDesc { - NameAndDesc( const char* _name = "", const char* _description= "" ) - : name( _name ), description( _description ) - {} - - const char* name; - const char* description; -}; - -void registerTestCase - ( ITestCase* testCase, - char const* className, - NameAndDesc const& nameAndDesc, - SourceLineInfo const& lineInfo ); - -struct AutoReg { - - AutoReg - ( TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc ); - - template - AutoReg - ( void (C::*method)(), - char const* className, - NameAndDesc const& nameAndDesc, - SourceLineInfo const& lineInfo ) { - - registerTestCase - ( new MethodTestCase( method ), - className, - nameAndDesc, - lineInfo ); - } - - ~AutoReg(); - -private: - AutoReg( AutoReg const& ); - void operator= ( AutoReg const& ); -}; - -void registerTestCaseFunction - ( TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc ); - -} // end namespace Catch - -#ifdef CATCH_CONFIG_VARIADIC_MACROS - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \ - static void TestName(); \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); } /* NOLINT */ \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ - static void TestName() - #define INTERNAL_CATCH_TESTCASE( ... ) \ - INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ ) - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); } /* NOLINT */ \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ \ - struct TestName : ClassName{ \ - void test(); \ - }; \ - Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestName::test, #ClassName, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); /* NOLINT */ \ - } \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ - void TestName::test() - #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \ - INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ ) - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); /* NOLINT */ \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - -#else - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_TESTCASE2( TestName, Name, Desc ) \ - static void TestName(); \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); } /* NOLINT */ \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ - static void TestName() - #define INTERNAL_CATCH_TESTCASE( Name, Desc ) \ - INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), Name, Desc ) - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, Name, Desc ) \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( Name, Desc ), CATCH_INTERNAL_LINEINFO ); } /* NOLINT */ \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestCaseName, ClassName, TestName, Desc )\ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - namespace{ \ - struct TestCaseName : ClassName{ \ - void test(); \ - }; \ - Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestCaseName::test, #ClassName, Catch::NameAndDesc( TestName, Desc ), CATCH_INTERNAL_LINEINFO ); /* NOLINT */ \ - } \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \ - void TestCaseName::test() - #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, TestName, Desc )\ - INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, TestName, Desc ) - - /////////////////////////////////////////////////////////////////////////////// - #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, Name, Desc ) \ - CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \ - Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); /* NOLINT */ \ - CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - -#endif - -// #included from: internal/catch_capture.hpp -#define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED - -// #included from: catch_result_builder.h -#define TWOBLUECUBES_CATCH_RESULT_BUILDER_H_INCLUDED - -// #included from: catch_result_type.h -#define TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED - -namespace Catch { - - // ResultWas::OfType enum - struct ResultWas { enum OfType { - Unknown = -1, - Ok = 0, - Info = 1, - Warning = 2, - - FailureBit = 0x10, - - ExpressionFailed = FailureBit | 1, - ExplicitFailure = FailureBit | 2, - - Exception = 0x100 | FailureBit, - - ThrewException = Exception | 1, - DidntThrowException = Exception | 2, - - FatalErrorCondition = 0x200 | FailureBit - - }; }; - - inline bool isOk( ResultWas::OfType resultType ) { - return ( resultType & ResultWas::FailureBit ) == 0; - } - inline bool isJustInfo( int flags ) { - return flags == ResultWas::Info; - } - - // ResultDisposition::Flags enum - struct ResultDisposition { enum Flags { - Normal = 0x01, - - ContinueOnFailure = 0x02, // Failures fail test, but execution continues - FalseTest = 0x04, // Prefix expression with ! - SuppressFail = 0x08 // Failures are reported but do not fail the test - }; }; - - inline ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) { - return static_cast( static_cast( lhs ) | static_cast( rhs ) ); - } - - inline bool shouldContinueOnFailure( int flags ) { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; } - inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; } - inline bool shouldSuppressFailure( int flags ) { return ( flags & ResultDisposition::SuppressFail ) != 0; } - -} // end namespace Catch - -// #included from: catch_assertionresult.h -#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED - -#include - -namespace Catch { - - struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison; - - struct DecomposedExpression - { - virtual ~DecomposedExpression() {} - virtual bool isBinaryExpression() const { - return false; - } - virtual void reconstructExpression( std::string& dest ) const = 0; - - // Only simple binary comparisons can be decomposed. - // If more complex check is required then wrap sub-expressions in parentheses. - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator + ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator * ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator / ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator % ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( T const& ); - template STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( T const& ); - - private: - DecomposedExpression& operator = (DecomposedExpression const&); - }; - - struct AssertionInfo - { - AssertionInfo(); - AssertionInfo( char const * _macroName, - SourceLineInfo const& _lineInfo, - char const * _capturedExpression, - ResultDisposition::Flags _resultDisposition, - char const * _secondArg = ""); - - char const * macroName; - SourceLineInfo lineInfo; - char const * capturedExpression; - ResultDisposition::Flags resultDisposition; - char const * secondArg; - }; - - struct AssertionResultData - { - AssertionResultData() : decomposedExpression( CATCH_NULL ) - , resultType( ResultWas::Unknown ) - , negated( false ) - , parenthesized( false ) {} - - void negate( bool parenthesize ) { - negated = !negated; - parenthesized = parenthesize; - if( resultType == ResultWas::Ok ) - resultType = ResultWas::ExpressionFailed; - else if( resultType == ResultWas::ExpressionFailed ) - resultType = ResultWas::Ok; - } - - std::string const& reconstructExpression() const { - if( decomposedExpression != CATCH_NULL ) { - decomposedExpression->reconstructExpression( reconstructedExpression ); - if( parenthesized ) { - reconstructedExpression.insert( 0, 1, '(' ); - reconstructedExpression.append( 1, ')' ); - } - if( negated ) { - reconstructedExpression.insert( 0, 1, '!' ); - } - decomposedExpression = CATCH_NULL; - } - return reconstructedExpression; - } - - mutable DecomposedExpression const* decomposedExpression; - mutable std::string reconstructedExpression; - std::string message; - ResultWas::OfType resultType; - bool negated; - bool parenthesized; - }; - - class AssertionResult { - public: - AssertionResult(); - AssertionResult( AssertionInfo const& info, AssertionResultData const& data ); - ~AssertionResult(); -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - AssertionResult( AssertionResult const& ) = default; - AssertionResult( AssertionResult && ) = default; - AssertionResult& operator = ( AssertionResult const& ) = default; - AssertionResult& operator = ( AssertionResult && ) = default; -# endif - - bool isOk() const; - bool succeeded() const; - ResultWas::OfType getResultType() const; - bool hasExpression() const; - bool hasMessage() const; - std::string getExpression() const; - std::string getExpressionInMacro() const; - bool hasExpandedExpression() const; - std::string getExpandedExpression() const; - std::string getMessage() const; - SourceLineInfo getSourceInfo() const; - std::string getTestMacroName() const; - void discardDecomposedExpression() const; - void expandDecomposedExpression() const; - - protected: - AssertionInfo m_info; - AssertionResultData m_resultData; - }; - -} // end namespace Catch - -// #included from: catch_matchers.hpp -#define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED - -namespace Catch { -namespace Matchers { - namespace Impl { - - template struct MatchAllOf; - template struct MatchAnyOf; - template struct MatchNotOf; - - class MatcherUntypedBase { - public: - std::string toString() const { - if( m_cachedToString.empty() ) - m_cachedToString = describe(); - return m_cachedToString; - } - - protected: - virtual ~MatcherUntypedBase(); - virtual std::string describe() const = 0; - mutable std::string m_cachedToString; - private: - MatcherUntypedBase& operator = ( MatcherUntypedBase const& ); - }; - - template - struct MatcherMethod { - virtual bool match( ObjectT const& arg ) const = 0; - }; - template - struct MatcherMethod { - virtual bool match( PtrT* arg ) const = 0; - }; - - template - struct MatcherBase : MatcherUntypedBase, MatcherMethod { - - MatchAllOf operator && ( MatcherBase const& other ) const; - MatchAnyOf operator || ( MatcherBase const& other ) const; - MatchNotOf operator ! () const; - }; - - template - struct MatchAllOf : MatcherBase { - virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE { - for( std::size_t i = 0; i < m_matchers.size(); ++i ) { - if (!m_matchers[i]->match(arg)) - return false; - } - return true; - } - virtual std::string describe() const CATCH_OVERRIDE { - std::string description; - description.reserve( 4 + m_matchers.size()*32 ); - description += "( "; - for( std::size_t i = 0; i < m_matchers.size(); ++i ) { - if( i != 0 ) - description += " and "; - description += m_matchers[i]->toString(); - } - description += " )"; - return description; - } - - MatchAllOf& operator && ( MatcherBase const& other ) { - m_matchers.push_back( &other ); - return *this; - } - - std::vector const*> m_matchers; - }; - template - struct MatchAnyOf : MatcherBase { - - virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE { - for( std::size_t i = 0; i < m_matchers.size(); ++i ) { - if (m_matchers[i]->match(arg)) - return true; - } - return false; - } - virtual std::string describe() const CATCH_OVERRIDE { - std::string description; - description.reserve( 4 + m_matchers.size()*32 ); - description += "( "; - for( std::size_t i = 0; i < m_matchers.size(); ++i ) { - if( i != 0 ) - description += " or "; - description += m_matchers[i]->toString(); - } - description += " )"; - return description; - } - - MatchAnyOf& operator || ( MatcherBase const& other ) { - m_matchers.push_back( &other ); - return *this; - } - - std::vector const*> m_matchers; - }; - - template - struct MatchNotOf : MatcherBase { - - MatchNotOf( MatcherBase const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {} - - virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE { - return !m_underlyingMatcher.match( arg ); - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "not " + m_underlyingMatcher.toString(); - } - MatcherBase const& m_underlyingMatcher; - }; - - template - MatchAllOf MatcherBase::operator && ( MatcherBase const& other ) const { - return MatchAllOf() && *this && other; - } - template - MatchAnyOf MatcherBase::operator || ( MatcherBase const& other ) const { - return MatchAnyOf() || *this || other; - } - template - MatchNotOf MatcherBase::operator ! () const { - return MatchNotOf( *this ); - } - - } // namespace Impl - - // The following functions create the actual matcher objects. - // This allows the types to be inferred - // - deprecated: prefer ||, && and ! - template - Impl::MatchNotOf Not( Impl::MatcherBase const& underlyingMatcher ) { - return Impl::MatchNotOf( underlyingMatcher ); - } - template - Impl::MatchAllOf AllOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2 ) { - return Impl::MatchAllOf() && m1 && m2; - } - template - Impl::MatchAllOf AllOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2, Impl::MatcherBase const& m3 ) { - return Impl::MatchAllOf() && m1 && m2 && m3; - } - template - Impl::MatchAnyOf AnyOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2 ) { - return Impl::MatchAnyOf() || m1 || m2; - } - template - Impl::MatchAnyOf AnyOf( Impl::MatcherBase const& m1, Impl::MatcherBase const& m2, Impl::MatcherBase const& m3 ) { - return Impl::MatchAnyOf() || m1 || m2 || m3; - } - -} // namespace Matchers - -using namespace Matchers; -using Matchers::Impl::MatcherBase; - -} // namespace Catch - -namespace Catch { - - struct TestFailureException{}; - - template class ExpressionLhs; - - struct CopyableStream { - CopyableStream() {} - CopyableStream( CopyableStream const& other ) { - oss << other.oss.str(); - } - CopyableStream& operator=( CopyableStream const& other ) { - oss.str(std::string()); - oss << other.oss.str(); - return *this; - } - std::ostringstream oss; - }; - - class ResultBuilder : public DecomposedExpression { - public: - ResultBuilder( char const* macroName, - SourceLineInfo const& lineInfo, - char const* capturedExpression, - ResultDisposition::Flags resultDisposition, - char const* secondArg = "" ); - ~ResultBuilder(); - - template - ExpressionLhs operator <= ( T const& operand ); - ExpressionLhs operator <= ( bool value ); - - template - ResultBuilder& operator << ( T const& value ) { - stream().oss << value; - return *this; - } - - ResultBuilder& setResultType( ResultWas::OfType result ); - ResultBuilder& setResultType( bool result ); - - void endExpression( DecomposedExpression const& expr ); - - virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE; - - AssertionResult build() const; - AssertionResult build( DecomposedExpression const& expr ) const; - - void useActiveException( ResultDisposition::Flags resultDisposition = ResultDisposition::Normal ); - void captureResult( ResultWas::OfType resultType ); - void captureExpression(); - void captureExpectedException( std::string const& expectedMessage ); - void captureExpectedException( Matchers::Impl::MatcherBase const& matcher ); - void handleResult( AssertionResult const& result ); - void react(); - bool shouldDebugBreak() const; - bool allowThrows() const; - - template - void captureMatch( ArgT const& arg, MatcherT const& matcher, char const* matcherString ); - - void setExceptionGuard(); - void unsetExceptionGuard(); - - private: - AssertionInfo m_assertionInfo; - AssertionResultData m_data; - - CopyableStream &stream() - { - if(!m_usedStream) - { - m_usedStream = true; - m_stream().oss.str(""); - } - return m_stream(); - } - - static CopyableStream &m_stream() - { - static CopyableStream s; - return s; - } - - bool m_shouldDebugBreak; - bool m_shouldThrow; - bool m_guardException; - bool m_usedStream; - }; - -} // namespace Catch - -// Include after due to circular dependency: -// #included from: catch_expression_lhs.hpp -#define TWOBLUECUBES_CATCH_EXPRESSION_LHS_HPP_INCLUDED - -// #included from: catch_evaluate.hpp -#define TWOBLUECUBES_CATCH_EVALUATE_HPP_INCLUDED - -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4389) // '==' : signed/unsigned mismatch -#pragma warning(disable:4018) // more "signed/unsigned mismatch" -#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform) -#endif - -#include - -namespace Catch { -namespace Internal { - - enum Operator { - IsEqualTo, - IsNotEqualTo, - IsLessThan, - IsGreaterThan, - IsLessThanOrEqualTo, - IsGreaterThanOrEqualTo - }; - - template struct OperatorTraits { static const char* getName(){ return "*error*"; } }; - template<> struct OperatorTraits { static const char* getName(){ return "=="; } }; - template<> struct OperatorTraits { static const char* getName(){ return "!="; } }; - template<> struct OperatorTraits { static const char* getName(){ return "<"; } }; - template<> struct OperatorTraits { static const char* getName(){ return ">"; } }; - template<> struct OperatorTraits { static const char* getName(){ return "<="; } }; - template<> struct OperatorTraits{ static const char* getName(){ return ">="; } }; - - template - T& opCast(T const& t) { return const_cast(t); } - -// nullptr_t support based on pull request #154 from Konstantin Baumann -#ifdef CATCH_CONFIG_CPP11_NULLPTR - inline std::nullptr_t opCast(std::nullptr_t) { return nullptr; } -#endif // CATCH_CONFIG_CPP11_NULLPTR - - // So the compare overloads can be operator agnostic we convey the operator as a template - // enum, which is used to specialise an Evaluator for doing the comparison. - template - struct Evaluator{}; - - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs) { - return bool( opCast( lhs ) == opCast( rhs ) ); - } - }; - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs ) { - return bool( opCast( lhs ) != opCast( rhs ) ); - } - }; - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs ) { - return bool( opCast( lhs ) < opCast( rhs ) ); - } - }; - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs ) { - return bool( opCast( lhs ) > opCast( rhs ) ); - } - }; - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs ) { - return bool( opCast( lhs ) >= opCast( rhs ) ); - } - }; - template - struct Evaluator { - static bool evaluate( T1 const& lhs, T2 const& rhs ) { - return bool( opCast( lhs ) <= opCast( rhs ) ); - } - }; - - template - bool applyEvaluator( T1 const& lhs, T2 const& rhs ) { - return Evaluator::evaluate( lhs, rhs ); - } - - // This level of indirection allows us to specialise for integer types - // to avoid signed/ unsigned warnings - - // "base" overload - template - bool compare( T1 const& lhs, T2 const& rhs ) { - return Evaluator::evaluate( lhs, rhs ); - } - - // unsigned X to int - template bool compare( unsigned int lhs, int rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - template bool compare( unsigned long lhs, int rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - template bool compare( unsigned char lhs, int rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - - // unsigned X to long - template bool compare( unsigned int lhs, long rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - template bool compare( unsigned long lhs, long rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - template bool compare( unsigned char lhs, long rhs ) { - return applyEvaluator( lhs, static_cast( rhs ) ); - } - - // int to unsigned X - template bool compare( int lhs, unsigned int rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( int lhs, unsigned long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( int lhs, unsigned char rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - - // long to unsigned X - template bool compare( long lhs, unsigned int rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( long lhs, unsigned long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( long lhs, unsigned char rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - - // pointer to long (when comparing against NULL) - template bool compare( long lhs, T* rhs ) { - return Evaluator::evaluate( reinterpret_cast( lhs ), rhs ); - } - template bool compare( T* lhs, long rhs ) { - return Evaluator::evaluate( lhs, reinterpret_cast( rhs ) ); - } - - // pointer to int (when comparing against NULL) - template bool compare( int lhs, T* rhs ) { - return Evaluator::evaluate( reinterpret_cast( lhs ), rhs ); - } - template bool compare( T* lhs, int rhs ) { - return Evaluator::evaluate( lhs, reinterpret_cast( rhs ) ); - } - -#ifdef CATCH_CONFIG_CPP11_LONG_LONG - // long long to unsigned X - template bool compare( long long lhs, unsigned int rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( long long lhs, unsigned long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( long long lhs, unsigned long long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( long long lhs, unsigned char rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - - // unsigned long long to X - template bool compare( unsigned long long lhs, int rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( unsigned long long lhs, long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( unsigned long long lhs, long long rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - template bool compare( unsigned long long lhs, char rhs ) { - return applyEvaluator( static_cast( lhs ), rhs ); - } - - // pointer to long long (when comparing against NULL) - template bool compare( long long lhs, T* rhs ) { - return Evaluator::evaluate( reinterpret_cast( lhs ), rhs ); - } - template bool compare( T* lhs, long long rhs ) { - return Evaluator::evaluate( lhs, reinterpret_cast( rhs ) ); - } -#endif // CATCH_CONFIG_CPP11_LONG_LONG - -#ifdef CATCH_CONFIG_CPP11_NULLPTR - // pointer to nullptr_t (when comparing against nullptr) - template bool compare( std::nullptr_t, T* rhs ) { - return Evaluator::evaluate( nullptr, rhs ); - } - template bool compare( T* lhs, std::nullptr_t ) { - return Evaluator::evaluate( lhs, nullptr ); - } -#endif // CATCH_CONFIG_CPP11_NULLPTR - -} // end of namespace Internal -} // end of namespace Catch - -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -// #included from: catch_tostring.h -#define TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED - -#include -#include -#include -#include -#include - -#ifdef __OBJC__ -// #included from: catch_objc_arc.hpp -#define TWOBLUECUBES_CATCH_OBJC_ARC_HPP_INCLUDED - -#import - -#ifdef __has_feature -#define CATCH_ARC_ENABLED __has_feature(objc_arc) -#else -#define CATCH_ARC_ENABLED 0 -#endif - -void arcSafeRelease( NSObject* obj ); -id performOptionalSelector( id obj, SEL sel ); - -#if !CATCH_ARC_ENABLED -inline void arcSafeRelease( NSObject* obj ) { - [obj release]; -} -inline id performOptionalSelector( id obj, SEL sel ) { - if( [obj respondsToSelector: sel] ) - return [obj performSelector: sel]; - return nil; -} -#define CATCH_UNSAFE_UNRETAINED -#define CATCH_ARC_STRONG -#else -inline void arcSafeRelease( NSObject* ){} -inline id performOptionalSelector( id obj, SEL sel ) { -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" -#endif - if( [obj respondsToSelector: sel] ) - return [obj performSelector: sel]; -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - return nil; -} -#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained -#define CATCH_ARC_STRONG __strong -#endif - -#endif - -#ifdef CATCH_CONFIG_CPP11_TUPLE -#include -#endif - -#ifdef CATCH_CONFIG_CPP11_IS_ENUM -#include -#endif - -namespace Catch { - -// Why we're here. -template -std::string toString( T const& value ); - -// Built in overloads - -std::string toString( std::string const& value ); -std::string toString( std::wstring const& value ); -std::string toString( const char* const value ); -std::string toString( char* const value ); -std::string toString( const wchar_t* const value ); -std::string toString( wchar_t* const value ); -std::string toString( int value ); -std::string toString( unsigned long value ); -std::string toString( unsigned int value ); -std::string toString( const double value ); -std::string toString( const float value ); -std::string toString( bool value ); -std::string toString( char value ); -std::string toString( signed char value ); -std::string toString( unsigned char value ); - -#ifdef CATCH_CONFIG_CPP11_LONG_LONG -std::string toString( long long value ); -std::string toString( unsigned long long value ); -#endif - -#ifdef CATCH_CONFIG_CPP11_NULLPTR -std::string toString( std::nullptr_t ); -#endif - -#ifdef __OBJC__ - std::string toString( NSString const * const& nsstring ); - std::string toString( NSString * CATCH_ARC_STRONG & nsstring ); - std::string toString( NSObject* const& nsObject ); -#endif - -namespace Detail { - - extern const std::string unprintableString; - - #if !defined(CATCH_CONFIG_CPP11_STREAM_INSERTABLE_CHECK) - struct BorgType { - template BorgType( T const& ); - }; - - struct TrueType { char sizer[1]; }; - struct FalseType { char sizer[2]; }; - - TrueType& testStreamable( std::ostream& ); - FalseType testStreamable( FalseType ); - - FalseType operator<<( std::ostream const&, BorgType const& ); - - template - struct IsStreamInsertable { - static std::ostream &s; - static T const&t; - enum { value = sizeof( testStreamable(s << t) ) == sizeof( TrueType ) }; - }; -#else - template - class IsStreamInsertable { - template - static auto test(int) - -> decltype( std::declval() << std::declval(), std::true_type() ); - - template - static auto test(...) -> std::false_type; - - public: - static const bool value = decltype(test(0))::value; - }; -#endif - -#if defined(CATCH_CONFIG_CPP11_IS_ENUM) - template::value - > - struct EnumStringMaker - { - static std::string convert( T const& ) { return unprintableString; } - }; - - template - struct EnumStringMaker - { - static std::string convert( T const& v ) - { - return ::Catch::toString( - static_cast::type>(v) - ); - } - }; -#endif - template - struct StringMakerBase { -#if defined(CATCH_CONFIG_CPP11_IS_ENUM) - template - static std::string convert( T const& v ) - { - return EnumStringMaker::convert( v ); - } -#else - template - static std::string convert( T const& ) { return unprintableString; } -#endif - }; - - template<> - struct StringMakerBase { - template - static std::string convert( T const& _value ) { - std::ostringstream oss; - oss << _value; - return oss.str(); - } - }; - - std::string rawMemoryToString( const void *object, std::size_t size ); - - template - std::string rawMemoryToString( const T& object ) { - return rawMemoryToString( &object, sizeof(object) ); - } - -} // end namespace Detail - -template -struct StringMaker : - Detail::StringMakerBase::value> {}; - -template -struct StringMaker { - template - static std::string convert( U* p ) { - if( !p ) - return "NULL"; - else - return Detail::rawMemoryToString( p ); - } -}; - -template -struct StringMaker { - static std::string convert( R C::* p ) { - if( !p ) - return "NULL"; - else - return Detail::rawMemoryToString( p ); - } -}; - -namespace Detail { - template - std::string rangeToString( InputIterator first, InputIterator last ); -} - -//template -//struct StringMaker > { -// static std::string convert( std::vector const& v ) { -// return Detail::rangeToString( v.begin(), v.end() ); -// } -//}; - -template -std::string toString( std::vector const& v ) { - return Detail::rangeToString( v.begin(), v.end() ); -} - -#ifdef CATCH_CONFIG_CPP11_TUPLE - -// toString for tuples -namespace TupleDetail { - template< - typename Tuple, - std::size_t N = 0, - bool = (N < std::tuple_size::value) - > - struct ElementPrinter { - static void print( const Tuple& tuple, std::ostream& os ) - { - os << ( N ? ", " : " " ) - << Catch::toString(std::get(tuple)); - ElementPrinter::print(tuple,os); - } - }; - - template< - typename Tuple, - std::size_t N - > - struct ElementPrinter { - static void print( const Tuple&, std::ostream& ) {} - }; - -} - -template -struct StringMaker> { - - static std::string convert( const std::tuple& tuple ) - { - std::ostringstream os; - os << '{'; - TupleDetail::ElementPrinter>::print( tuple, os ); - os << " }"; - return os.str(); - } -}; -#endif // CATCH_CONFIG_CPP11_TUPLE - -namespace Detail { - template - std::string makeString( T const& value ) { - return StringMaker::convert( value ); - } -} // end namespace Detail - -/// \brief converts any type to a string -/// -/// The default template forwards on to ostringstream - except when an -/// ostringstream overload does not exist - in which case it attempts to detect -/// that and writes {?}. -/// Overload (not specialise) this template for custom typs that you don't want -/// to provide an ostream overload for. -template -std::string toString( T const& value ) { - return StringMaker::convert( value ); -} - - namespace Detail { - template - std::string rangeToString( InputIterator first, InputIterator last ) { - std::ostringstream oss; - oss << "{ "; - if( first != last ) { - oss << Catch::toString( *first ); - for( ++first ; first != last ; ++first ) - oss << ", " << Catch::toString( *first ); - } - oss << " }"; - return oss.str(); - } -} - -} // end namespace Catch - -namespace Catch { - -template -class BinaryExpression; - -template -class MatchExpression; - -// Wraps the LHS of an expression and overloads comparison operators -// for also capturing those and RHS (if any) -template -class ExpressionLhs : public DecomposedExpression { -public: - ExpressionLhs( ResultBuilder& rb, T lhs ) : m_rb( rb ), m_lhs( lhs ), m_truthy(false) {} - - ExpressionLhs& operator = ( const ExpressionLhs& ); - - template - BinaryExpression - operator == ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - template - BinaryExpression - operator != ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - template - BinaryExpression - operator < ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - template - BinaryExpression - operator > ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - template - BinaryExpression - operator <= ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - template - BinaryExpression - operator >= ( RhsT const& rhs ) { - return captureExpression( rhs ); - } - - BinaryExpression operator == ( bool rhs ) { - return captureExpression( rhs ); - } - - BinaryExpression operator != ( bool rhs ) { - return captureExpression( rhs ); - } - - void endExpression() { - m_truthy = m_lhs ? true : false; - m_rb - .setResultType( m_truthy ) - .endExpression( *this ); - } - - virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE { - dest = Catch::toString( m_lhs ); - } - -private: - template - BinaryExpression captureExpression( RhsT& rhs ) const { - return BinaryExpression( m_rb, m_lhs, rhs ); - } - - template - BinaryExpression captureExpression( bool rhs ) const { - return BinaryExpression( m_rb, m_lhs, rhs ); - } - -private: - ResultBuilder& m_rb; - T m_lhs; - bool m_truthy; -}; - -template -class BinaryExpression : public DecomposedExpression { -public: - BinaryExpression( ResultBuilder& rb, LhsT lhs, RhsT rhs ) - : m_rb( rb ), m_lhs( lhs ), m_rhs( rhs ) {} - - BinaryExpression& operator = ( BinaryExpression& ); - - void endExpression() const { - m_rb - .setResultType( Internal::compare( m_lhs, m_rhs ) ) - .endExpression( *this ); - } - - virtual bool isBinaryExpression() const CATCH_OVERRIDE { - return true; - } - - virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE { - std::string lhs = Catch::toString( m_lhs ); - std::string rhs = Catch::toString( m_rhs ); - char delim = lhs.size() + rhs.size() < 40 && - lhs.find('\n') == std::string::npos && - rhs.find('\n') == std::string::npos ? ' ' : '\n'; - dest.reserve( 7 + lhs.size() + rhs.size() ); - // 2 for spaces around operator - // 2 for operator - // 2 for parentheses (conditionally added later) - // 1 for negation (conditionally added later) - dest = lhs; - dest += delim; - dest += Internal::OperatorTraits::getName(); - dest += delim; - dest += rhs; - } - -private: - ResultBuilder& m_rb; - LhsT m_lhs; - RhsT m_rhs; -}; - -template -class MatchExpression : public DecomposedExpression { -public: - MatchExpression( ArgT arg, MatcherT matcher, char const* matcherString ) - : m_arg( arg ), m_matcher( matcher ), m_matcherString( matcherString ) {} - - virtual bool isBinaryExpression() const CATCH_OVERRIDE { - return true; - } - - virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE { - std::string matcherAsString = m_matcher.toString(); - dest = Catch::toString( m_arg ); - dest += ' '; - if( matcherAsString == Detail::unprintableString ) - dest += m_matcherString; - else - dest += matcherAsString; - } - -private: - ArgT m_arg; - MatcherT m_matcher; - char const* m_matcherString; -}; - -} // end namespace Catch - - -namespace Catch { - - template - ExpressionLhs ResultBuilder::operator <= ( T const& operand ) { - return ExpressionLhs( *this, operand ); - } - - inline ExpressionLhs ResultBuilder::operator <= ( bool value ) { - return ExpressionLhs( *this, value ); - } - - template - void ResultBuilder::captureMatch( ArgT const& arg, MatcherT const& matcher, - char const* matcherString ) { - MatchExpression expr( arg, matcher, matcherString ); - setResultType( matcher.match( arg ) ); - endExpression( expr ); - } - -} // namespace Catch - -// #included from: catch_message.h -#define TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED - -#include - -namespace Catch { - - struct MessageInfo { - MessageInfo( std::string const& _macroName, - SourceLineInfo const& _lineInfo, - ResultWas::OfType _type ); - - std::string macroName; - SourceLineInfo lineInfo; - ResultWas::OfType type; - std::string message; - unsigned int sequence; - - bool operator == ( MessageInfo const& other ) const { - return sequence == other.sequence; - } - bool operator < ( MessageInfo const& other ) const { - return sequence < other.sequence; - } - private: - static unsigned int globalCount; - }; - - struct MessageBuilder { - MessageBuilder( std::string const& macroName, - SourceLineInfo const& lineInfo, - ResultWas::OfType type ) - : m_info( macroName, lineInfo, type ) - {} - - template - MessageBuilder& operator << ( T const& value ) { - m_stream << value; - return *this; - } - - MessageInfo m_info; - std::ostringstream m_stream; - }; - - class ScopedMessage { - public: - ScopedMessage( MessageBuilder const& builder ); - ScopedMessage( ScopedMessage const& other ); - ~ScopedMessage(); - - MessageInfo m_info; - }; - -} // end namespace Catch - -// #included from: catch_interfaces_capture.h -#define TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED - -#include - -namespace Catch { - - class TestCase; - class AssertionResult; - struct AssertionInfo; - struct SectionInfo; - struct SectionEndInfo; - struct MessageInfo; - class ScopedMessageBuilder; - struct Counts; - - struct IResultCapture { - - virtual ~IResultCapture(); - - virtual void assertionEnded( AssertionResult const& result ) = 0; - virtual bool sectionStarted( SectionInfo const& sectionInfo, - Counts& assertions ) = 0; - virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0; - virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0; - virtual void pushScopedMessage( MessageInfo const& message ) = 0; - virtual void popScopedMessage( MessageInfo const& message ) = 0; - - virtual std::string getCurrentTestName() const = 0; - virtual const AssertionResult* getLastResult() const = 0; - - virtual void exceptionEarlyReported() = 0; - - virtual void handleFatalErrorCondition( std::string const& message ) = 0; - - virtual bool lastAssertionPassed() = 0; - virtual void assertionPassed() = 0; - virtual void assertionRun() = 0; - }; - - IResultCapture& getResultCapture(); -} - -// #included from: catch_debugger.h -#define TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED - -// #included from: catch_platform.h -#define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED - -#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) -# define CATCH_PLATFORM_MAC -#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) -# define CATCH_PLATFORM_IPHONE -#elif defined(linux) || defined(__linux) || defined(__linux__) -# define CATCH_PLATFORM_LINUX -#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) -# define CATCH_PLATFORM_WINDOWS -# if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) -# define CATCH_DEFINES_NOMINMAX -# endif -# if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN) -# define CATCH_DEFINES_WIN32_LEAN_AND_MEAN -# endif -#endif - -#include - -namespace Catch{ - - bool isDebuggerActive(); - void writeToDebugConsole( std::string const& text ); -} - -#ifdef CATCH_PLATFORM_MAC - - // The following code snippet based on: - // http://cocoawithlove.com/2008/03/break-into-debugger.html - #if defined(__ppc64__) || defined(__ppc__) - #define CATCH_TRAP() \ - __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \ - : : : "memory","r0","r3","r4" ) /* NOLINT */ - #else - #define CATCH_TRAP() __asm__("int $3\n" : : /* NOLINT */ ) - #endif - -#elif defined(CATCH_PLATFORM_LINUX) - // If we can use inline assembler, do it because this allows us to break - // directly at the location of the failing check instead of breaking inside - // raise() called from it, i.e. one stack frame below. - #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64)) - #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */ - #else // Fall back to the generic way. - #include - - #define CATCH_TRAP() raise(SIGTRAP) - #endif -#elif defined(_MSC_VER) - #define CATCH_TRAP() __debugbreak() -#elif defined(__MINGW32__) - extern "C" __declspec(dllimport) void __stdcall DebugBreak(); - #define CATCH_TRAP() DebugBreak() -#endif - -#ifdef CATCH_TRAP - #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } -#else - #define CATCH_BREAK_INTO_DEBUGGER() Catch::alwaysTrue(); -#endif - -// #included from: catch_interfaces_runner.h -#define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED - -namespace Catch { - class TestCase; - - struct IRunner { - virtual ~IRunner(); - virtual bool aborting() const = 0; - }; -} - -#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION) -# define CATCH_INTERNAL_STRINGIFY(expr) #expr -#else -# define CATCH_INTERNAL_STRINGIFY(expr) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION" -#endif - -#if defined(CATCH_CONFIG_FAST_COMPILE) -/////////////////////////////////////////////////////////////////////////////// -// We can speedup compilation significantly by breaking into debugger lower in -// the callstack, because then we don't have to expand CATCH_BREAK_INTO_DEBUGGER -// macro in each assertion -#define INTERNAL_CATCH_REACT( resultBuilder ) \ - resultBuilder.react(); - -/////////////////////////////////////////////////////////////////////////////// -// Another way to speed-up compilation is to omit local try-catch for REQUIRE* -// macros. -// This can potentially cause false negative, if the test code catches -// the exception before it propagates back up to the runner. -#define INTERNAL_CATCH_TEST_NO_TRY( macroName, resultDisposition, expr ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr), resultDisposition ); \ - __catchResult.setExceptionGuard(); \ - CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - ( __catchResult <= expr ).endExpression(); \ - CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ - __catchResult.unsetExceptionGuard(); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::isTrue( false && static_cast( !!(expr) ) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look -// The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&. - -#define INTERNAL_CHECK_THAT_NO_TRY( macroName, matcher, resultDisposition, arg ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \ - __catchResult.setExceptionGuard(); \ - __catchResult.captureMatch( arg, matcher, CATCH_INTERNAL_STRINGIFY(matcher) ); \ - __catchResult.unsetExceptionGuard(); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) - -#else -/////////////////////////////////////////////////////////////////////////////// -// In the event of a failure works out if the debugger needs to be invoked -// and/or an exception thrown and takes appropriate action. -// This needs to be done as a macro so the debugger will stop in the user -// source code rather than in Catch library code -#define INTERNAL_CATCH_REACT( resultBuilder ) \ - if( resultBuilder.shouldDebugBreak() ) CATCH_BREAK_INTO_DEBUGGER(); \ - resultBuilder.react(); -#endif - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr), resultDisposition ); \ - try { \ - CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - ( __catchResult <= expr ).endExpression(); \ - CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \ - } \ - catch( ... ) { \ - __catchResult.useActiveException( resultDisposition ); \ - } \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::isTrue( false && static_cast( !!(expr) ) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look - // The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&. - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_IF( macroName, resultDisposition, expr ) \ - INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ); \ - if( Catch::getResultCapture().lastAssertionPassed() ) - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, expr ) \ - INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ); \ - if( !Catch::getResultCapture().lastAssertionPassed() ) - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, expr ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr), resultDisposition ); \ - try { \ - static_cast(expr); \ - __catchResult.captureResult( Catch::ResultWas::Ok ); \ - } \ - catch( ... ) { \ - __catchResult.useActiveException( resultDisposition ); \ - } \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, matcher, expr ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr), resultDisposition, CATCH_INTERNAL_STRINGIFY(matcher) ); \ - if( __catchResult.allowThrows() ) \ - try { \ - static_cast(expr); \ - __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \ - } \ - catch( ... ) { \ - __catchResult.captureExpectedException( matcher ); \ - } \ - else \ - __catchResult.captureResult( Catch::ResultWas::Ok ); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \ - if( __catchResult.allowThrows() ) \ - try { \ - static_cast(expr); \ - __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \ - } \ - catch( exceptionType ) { \ - __catchResult.captureResult( Catch::ResultWas::Ok ); \ - } \ - catch( ... ) { \ - __catchResult.useActiveException( resultDisposition ); \ - } \ - else \ - __catchResult.captureResult( Catch::ResultWas::Ok ); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) - -/////////////////////////////////////////////////////////////////////////////// -#ifdef CATCH_CONFIG_VARIADIC_MACROS - #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \ - __catchResult << __VA_ARGS__ + ::Catch::StreamEndStop(); \ - __catchResult.captureResult( messageType ); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) -#else - #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, log ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \ - __catchResult << log + ::Catch::StreamEndStop(); \ - __catchResult.captureResult( messageType ); \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) -#endif - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_INFO( macroName, log ) \ - Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) = Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log; - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \ - do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \ - try { \ - __catchResult.captureMatch( arg, matcher, CATCH_INTERNAL_STRINGIFY(matcher) ); \ - } catch( ... ) { \ - __catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \ - } \ - INTERNAL_CATCH_REACT( __catchResult ) \ - } while( Catch::alwaysFalse() ) - -// #included from: internal/catch_section.h -#define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED - -// #included from: catch_section_info.h -#define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED - -// #included from: catch_totals.hpp -#define TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED - -#include - -namespace Catch { - - struct Counts { - Counts() : passed( 0 ), failed( 0 ), failedButOk( 0 ) {} - - Counts operator - ( Counts const& other ) const { - Counts diff; - diff.passed = passed - other.passed; - diff.failed = failed - other.failed; - diff.failedButOk = failedButOk - other.failedButOk; - return diff; - } - Counts& operator += ( Counts const& other ) { - passed += other.passed; - failed += other.failed; - failedButOk += other.failedButOk; - return *this; - } - - std::size_t total() const { - return passed + failed + failedButOk; - } - bool allPassed() const { - return failed == 0 && failedButOk == 0; - } - bool allOk() const { - return failed == 0; - } - - std::size_t passed; - std::size_t failed; - std::size_t failedButOk; - }; - - struct Totals { - - Totals operator - ( Totals const& other ) const { - Totals diff; - diff.assertions = assertions - other.assertions; - diff.testCases = testCases - other.testCases; - return diff; - } - - Totals delta( Totals const& prevTotals ) const { - Totals diff = *this - prevTotals; - if( diff.assertions.failed > 0 ) - ++diff.testCases.failed; - else if( diff.assertions.failedButOk > 0 ) - ++diff.testCases.failedButOk; - else - ++diff.testCases.passed; - return diff; - } - - Totals& operator += ( Totals const& other ) { - assertions += other.assertions; - testCases += other.testCases; - return *this; - } - - Counts assertions; - Counts testCases; - }; -} - -#include - -namespace Catch { - - struct SectionInfo { - SectionInfo - ( SourceLineInfo const& _lineInfo, - std::string const& _name, - std::string const& _description = std::string() ); - - std::string name; - std::string description; - SourceLineInfo lineInfo; - }; - - struct SectionEndInfo { - SectionEndInfo( SectionInfo const& _sectionInfo, Counts const& _prevAssertions, double _durationInSeconds ) - : sectionInfo( _sectionInfo ), prevAssertions( _prevAssertions ), durationInSeconds( _durationInSeconds ) - {} - - SectionInfo sectionInfo; - Counts prevAssertions; - double durationInSeconds; - }; - -} // end namespace Catch - -// #included from: catch_timer.h -#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED - -#ifdef _MSC_VER - -namespace Catch { - typedef unsigned long long UInt64; -} -#else -#include -namespace Catch { - typedef uint64_t UInt64; -} -#endif - -namespace Catch { - class Timer { - public: - Timer() : m_ticks( 0 ) {} - void start(); - unsigned int getElapsedMicroseconds() const; - unsigned int getElapsedMilliseconds() const; - double getElapsedSeconds() const; - - private: - UInt64 m_ticks; - }; - -} // namespace Catch - -#include - -namespace Catch { - - class Section : NonCopyable { - public: - Section( SectionInfo const& info ); - ~Section(); - - // This indicates whether the section should be executed or not - operator bool() const; - - private: - SectionInfo m_info; - - std::string m_name; - Counts m_assertions; - bool m_sectionIncluded; - Timer m_timer; - }; - -} // end namespace Catch - -#ifdef CATCH_CONFIG_VARIADIC_MACROS - #define INTERNAL_CATCH_SECTION( ... ) \ - if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) -#else - #define INTERNAL_CATCH_SECTION( name, desc ) \ - if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, name, desc ) ) -#endif - -// #included from: internal/catch_generators.hpp -#define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED - -#include -#include -#include - -namespace Catch { - -template -struct IGenerator { - virtual ~IGenerator() {} - virtual T getValue( std::size_t index ) const = 0; - virtual std::size_t size () const = 0; -}; - -template -class BetweenGenerator : public IGenerator { -public: - BetweenGenerator( T from, T to ) : m_from( from ), m_to( to ){} - - virtual T getValue( std::size_t index ) const { - return m_from+static_cast( index ); - } - - virtual std::size_t size() const { - return static_cast( 1+m_to-m_from ); - } - -private: - - T m_from; - T m_to; -}; - -template -class ValuesGenerator : public IGenerator { -public: - ValuesGenerator(){} - - void add( T value ) { - m_values.push_back( value ); - } - - virtual T getValue( std::size_t index ) const { - return m_values[index]; - } - - virtual std::size_t size() const { - return m_values.size(); - } - -private: - std::vector m_values; -}; - -template -class CompositeGenerator { -public: - CompositeGenerator() : m_totalSize( 0 ) {} - - // *** Move semantics, similar to auto_ptr *** - CompositeGenerator( CompositeGenerator& other ) - : m_fileInfo( other.m_fileInfo ), - m_totalSize( 0 ) - { - move( other ); - } - - CompositeGenerator& setFileInfo( const char* fileInfo ) { - m_fileInfo = fileInfo; - return *this; - } - - ~CompositeGenerator() { - deleteAll( m_composed ); - } - - operator T () const { - size_t overallIndex = getCurrentContext().getGeneratorIndex( m_fileInfo, m_totalSize ); - - typename std::vector*>::const_iterator it = m_composed.begin(); - typename std::vector*>::const_iterator itEnd = m_composed.end(); - for( size_t index = 0; it != itEnd; ++it ) - { - const IGenerator* generator = *it; - if( overallIndex >= index && overallIndex < index + generator->size() ) - { - return generator->getValue( overallIndex-index ); - } - index += generator->size(); - } - CATCH_INTERNAL_ERROR( "Indexed past end of generated range" ); - return T(); // Suppress spurious "not all control paths return a value" warning in Visual Studio - if you know how to fix this please do so - } - - void add( const IGenerator* generator ) { - m_totalSize += generator->size(); - m_composed.push_back( generator ); - } - - CompositeGenerator& then( CompositeGenerator& other ) { - move( other ); - return *this; - } - - CompositeGenerator& then( T value ) { - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add( value ); - add( valuesGen ); - return *this; - } - -private: - - void move( CompositeGenerator& other ) { - m_composed.insert( m_composed.end(), other.m_composed.begin(), other.m_composed.end() ); - m_totalSize += other.m_totalSize; - other.m_composed.clear(); - } - - std::vector*> m_composed; - std::string m_fileInfo; - size_t m_totalSize; -}; - -namespace Generators -{ - template - CompositeGenerator between( T from, T to ) { - CompositeGenerator generators; - generators.add( new BetweenGenerator( from, to ) ); - return generators; - } - - template - CompositeGenerator values( T val1, T val2 ) { - CompositeGenerator generators; - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add( val1 ); - valuesGen->add( val2 ); - generators.add( valuesGen ); - return generators; - } - - template - CompositeGenerator values( T val1, T val2, T val3 ){ - CompositeGenerator generators; - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add( val1 ); - valuesGen->add( val2 ); - valuesGen->add( val3 ); - generators.add( valuesGen ); - return generators; - } - - template - CompositeGenerator values( T val1, T val2, T val3, T val4 ) { - CompositeGenerator generators; - ValuesGenerator* valuesGen = new ValuesGenerator(); - valuesGen->add( val1 ); - valuesGen->add( val2 ); - valuesGen->add( val3 ); - valuesGen->add( val4 ); - generators.add( valuesGen ); - return generators; - } - -} // end namespace Generators - -using namespace Generators; - -} // end namespace Catch - -#define INTERNAL_CATCH_LINESTR2( line ) #line -#define INTERNAL_CATCH_LINESTR( line ) INTERNAL_CATCH_LINESTR2( line ) - -#define INTERNAL_CATCH_GENERATE( expr ) expr.setFileInfo( __FILE__ "(" INTERNAL_CATCH_LINESTR( __LINE__ ) ")" ) - -// #included from: internal/catch_interfaces_exception.h -#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED - -#include -#include - -// #included from: catch_interfaces_registry_hub.h -#define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED - -#include - -namespace Catch { - - class TestCase; - struct ITestCaseRegistry; - struct IExceptionTranslatorRegistry; - struct IExceptionTranslator; - struct IReporterRegistry; - struct IReporterFactory; - struct ITagAliasRegistry; - - struct IRegistryHub { - virtual ~IRegistryHub(); - - virtual IReporterRegistry const& getReporterRegistry() const = 0; - virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0; - virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0; - - virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0; - }; - - struct IMutableRegistryHub { - virtual ~IMutableRegistryHub(); - virtual void registerReporter( std::string const& name, Ptr const& factory ) = 0; - virtual void registerListener( Ptr const& factory ) = 0; - virtual void registerTest( TestCase const& testInfo ) = 0; - virtual void registerTranslator( const IExceptionTranslator* translator ) = 0; - virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0; - }; - - IRegistryHub& getRegistryHub(); - IMutableRegistryHub& getMutableRegistryHub(); - void cleanUp(); - std::string translateActiveException(); - -} - -namespace Catch { - - typedef std::string(*exceptionTranslateFunction)(); - - struct IExceptionTranslator; - typedef std::vector ExceptionTranslators; - - struct IExceptionTranslator { - virtual ~IExceptionTranslator(); - virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0; - }; - - struct IExceptionTranslatorRegistry { - virtual ~IExceptionTranslatorRegistry(); - - virtual std::string translateActiveException() const = 0; - }; - - class ExceptionTranslatorRegistrar { - template - class ExceptionTranslator : public IExceptionTranslator { - public: - - ExceptionTranslator( std::string(*translateFunction)( T& ) ) - : m_translateFunction( translateFunction ) - {} - - virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const CATCH_OVERRIDE { - try { - if( it == itEnd ) - throw; - else - return (*it)->translate( it+1, itEnd ); - } - catch( T& ex ) { - return m_translateFunction( ex ); - } - } - - protected: - std::string(*m_translateFunction)( T& ); - }; - - public: - template - ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) { - getMutableRegistryHub().registerTranslator - ( new ExceptionTranslator( translateFunction ) ); - } - }; -} - -/////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \ - static std::string translatorName( signature ); \ - namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); }\ - static std::string translatorName( signature ) - -#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature ) - -// #included from: internal/catch_approx.hpp -#define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED - -#include -#include - -#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) -#include -#endif - -namespace Catch { -namespace Detail { - - class Approx { - public: - explicit Approx ( double value ) - : m_epsilon( std::numeric_limits::epsilon()*100 ), - m_margin( 0.0 ), - m_scale( 1.0 ), - m_value( value ) - {} - - static Approx custom() { - return Approx( 0 ); - } - -#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) - - template ::value>::type> - Approx operator()( T value ) { - Approx approx( static_cast(value) ); - approx.epsilon( m_epsilon ); - approx.margin( m_margin ); - approx.scale( m_scale ); - return approx; - } - - template ::value>::type> - explicit Approx( T value ): Approx(static_cast(value)) - {} - - template ::value>::type> - friend bool operator == ( const T& lhs, Approx const& rhs ) { - // Thanks to Richard Harris for his help refining this formula - auto lhs_v = double(lhs); - bool relativeOK = std::fabs(lhs_v - rhs.m_value) < rhs.m_epsilon * (rhs.m_scale + (std::max)(std::fabs(lhs_v), std::fabs(rhs.m_value))); - if (relativeOK) { - return true; - } - - return std::fabs(lhs_v - rhs.m_value) <= rhs.m_margin; - } - - template ::value>::type> - friend bool operator == ( Approx const& lhs, const T& rhs ) { - return operator==( rhs, lhs ); - } - - template ::value>::type> - friend bool operator != ( T lhs, Approx const& rhs ) { - return !operator==( lhs, rhs ); - } - - template ::value>::type> - friend bool operator != ( Approx const& lhs, T rhs ) { - return !operator==( rhs, lhs ); - } - - template ::value>::type> - friend bool operator <= ( T lhs, Approx const& rhs ) { - return double(lhs) < rhs.m_value || lhs == rhs; - } - - template ::value>::type> - friend bool operator <= ( Approx const& lhs, T rhs ) { - return lhs.m_value < double(rhs) || lhs == rhs; - } - - template ::value>::type> - friend bool operator >= ( T lhs, Approx const& rhs ) { - return double(lhs) > rhs.m_value || lhs == rhs; - } - - template ::value>::type> - friend bool operator >= ( Approx const& lhs, T rhs ) { - return lhs.m_value > double(rhs) || lhs == rhs; - } - - template ::value>::type> - Approx& epsilon( T newEpsilon ) { - m_epsilon = double(newEpsilon); - return *this; - } - - template ::value>::type> - Approx& margin( T newMargin ) { - m_margin = double(newMargin); - return *this; - } - - template ::value>::type> - Approx& scale( T newScale ) { - m_scale = double(newScale); - return *this; - } - -#else - - Approx operator()( double value ) { - Approx approx( value ); - approx.epsilon( m_epsilon ); - approx.margin( m_margin ); - approx.scale( m_scale ); - return approx; - } - - friend bool operator == ( double lhs, Approx const& rhs ) { - // Thanks to Richard Harris for his help refining this formula - bool relativeOK = std::fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( std::fabs(lhs), std::fabs(rhs.m_value) ) ); - if (relativeOK) { - return true; - } - return std::fabs(lhs - rhs.m_value) <= rhs.m_margin; - } - - friend bool operator == ( Approx const& lhs, double rhs ) { - return operator==( rhs, lhs ); - } - - friend bool operator != ( double lhs, Approx const& rhs ) { - return !operator==( lhs, rhs ); - } - - friend bool operator != ( Approx const& lhs, double rhs ) { - return !operator==( rhs, lhs ); - } - - friend bool operator <= ( double lhs, Approx const& rhs ) { - return lhs < rhs.m_value || lhs == rhs; - } - - friend bool operator <= ( Approx const& lhs, double rhs ) { - return lhs.m_value < rhs || lhs == rhs; - } - - friend bool operator >= ( double lhs, Approx const& rhs ) { - return lhs > rhs.m_value || lhs == rhs; - } - - friend bool operator >= ( Approx const& lhs, double rhs ) { - return lhs.m_value > rhs || lhs == rhs; - } - - Approx& epsilon( double newEpsilon ) { - m_epsilon = newEpsilon; - return *this; - } - - Approx& margin( double newMargin ) { - m_margin = newMargin; - return *this; - } - - Approx& scale( double newScale ) { - m_scale = newScale; - return *this; - } -#endif - - std::string toString() const { - std::ostringstream oss; - oss << "Approx( " << Catch::toString( m_value ) << " )"; - return oss.str(); - } - - private: - double m_epsilon; - double m_margin; - double m_scale; - double m_value; - }; -} - -template<> -inline std::string toString( Detail::Approx const& value ) { - return value.toString(); -} - -} // end namespace Catch - -// #included from: internal/catch_matchers_string.h -#define TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED - -namespace Catch { -namespace Matchers { - - namespace StdString { - - struct CasedString - { - CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity ); - std::string adjustString( std::string const& str ) const; - std::string caseSensitivitySuffix() const; - - CaseSensitive::Choice m_caseSensitivity; - std::string m_str; - }; - - struct StringMatcherBase : MatcherBase { - StringMatcherBase( std::string const& operation, CasedString const& comparator ); - virtual std::string describe() const CATCH_OVERRIDE; - - CasedString m_comparator; - std::string m_operation; - }; - - struct EqualsMatcher : StringMatcherBase { - EqualsMatcher( CasedString const& comparator ); - virtual bool match( std::string const& source ) const CATCH_OVERRIDE; - }; - struct ContainsMatcher : StringMatcherBase { - ContainsMatcher( CasedString const& comparator ); - virtual bool match( std::string const& source ) const CATCH_OVERRIDE; - }; - struct StartsWithMatcher : StringMatcherBase { - StartsWithMatcher( CasedString const& comparator ); - virtual bool match( std::string const& source ) const CATCH_OVERRIDE; - }; - struct EndsWithMatcher : StringMatcherBase { - EndsWithMatcher( CasedString const& comparator ); - virtual bool match( std::string const& source ) const CATCH_OVERRIDE; - }; - - } // namespace StdString - - // The following functions create the actual matcher objects. - // This allows the types to be inferred - - StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); - StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); - StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); - StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes ); - -} // namespace Matchers -} // namespace Catch - -// #included from: internal/catch_matchers_vector.h -#define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED - -namespace Catch { -namespace Matchers { - - namespace Vector { - - template - struct ContainsElementMatcher : MatcherBase, T> { - - ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {} - - bool match(std::vector const &v) const CATCH_OVERRIDE { - return std::find(v.begin(), v.end(), m_comparator) != v.end(); - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "Contains: " + Catch::toString( m_comparator ); - } - - T const& m_comparator; - }; - - template - struct ContainsMatcher : MatcherBase, std::vector > { - - ContainsMatcher(std::vector const &comparator) : m_comparator( comparator ) {} - - bool match(std::vector const &v) const CATCH_OVERRIDE { - // !TBD: see note in EqualsMatcher - if (m_comparator.size() > v.size()) - return false; - for (size_t i = 0; i < m_comparator.size(); ++i) - if (std::find(v.begin(), v.end(), m_comparator[i]) == v.end()) - return false; - return true; - } - virtual std::string describe() const CATCH_OVERRIDE { - return "Contains: " + Catch::toString( m_comparator ); - } - - std::vector const& m_comparator; - }; - - template - struct EqualsMatcher : MatcherBase, std::vector > { - - EqualsMatcher(std::vector const &comparator) : m_comparator( comparator ) {} - - bool match(std::vector const &v) const CATCH_OVERRIDE { - // !TBD: This currently works if all elements can be compared using != - // - a more general approach would be via a compare template that defaults - // to using !=. but could be specialised for, e.g. std::vector etc - // - then just call that directly - if (m_comparator.size() != v.size()) - return false; - for (size_t i = 0; i < v.size(); ++i) - if (m_comparator[i] != v[i]) - return false; - return true; - } - virtual std::string describe() const CATCH_OVERRIDE { - return "Equals: " + Catch::toString( m_comparator ); - } - std::vector const& m_comparator; - }; - - } // namespace Vector - - // The following functions create the actual matcher objects. - // This allows the types to be inferred - - template - Vector::ContainsMatcher Contains( std::vector const& comparator ) { - return Vector::ContainsMatcher( comparator ); - } - - template - Vector::ContainsElementMatcher VectorContains( T const& comparator ) { - return Vector::ContainsElementMatcher( comparator ); - } - - template - Vector::EqualsMatcher Equals( std::vector const& comparator ) { - return Vector::EqualsMatcher( comparator ); - } - -} // namespace Matchers -} // namespace Catch - -// #included from: internal/catch_interfaces_tag_alias_registry.h -#define TWOBLUECUBES_CATCH_INTERFACES_TAG_ALIAS_REGISTRY_H_INCLUDED - -// #included from: catch_tag_alias.h -#define TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED - -#include - -namespace Catch { - - struct TagAlias { - TagAlias( std::string const& _tag, SourceLineInfo _lineInfo ) : tag( _tag ), lineInfo( _lineInfo ) {} - - std::string tag; - SourceLineInfo lineInfo; - }; - - struct RegistrarForTagAliases { - RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ); - }; - -} // end namespace Catch - -#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } -// #included from: catch_option.hpp -#define TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED - -namespace Catch { - - // An optional type - template - class Option { - public: - Option() : nullableValue( CATCH_NULL ) {} - Option( T const& _value ) - : nullableValue( new( storage ) T( _value ) ) - {} - Option( Option const& _other ) - : nullableValue( _other ? new( storage ) T( *_other ) : CATCH_NULL ) - {} - - ~Option() { - reset(); - } - - Option& operator= ( Option const& _other ) { - if( &_other != this ) { - reset(); - if( _other ) - nullableValue = new( storage ) T( *_other ); - } - return *this; - } - Option& operator = ( T const& _value ) { - reset(); - nullableValue = new( storage ) T( _value ); - return *this; - } - - void reset() { - if( nullableValue ) - nullableValue->~T(); - nullableValue = CATCH_NULL; - } - - T& operator*() { return *nullableValue; } - T const& operator*() const { return *nullableValue; } - T* operator->() { return nullableValue; } - const T* operator->() const { return nullableValue; } - - T valueOr( T const& defaultValue ) const { - return nullableValue ? *nullableValue : defaultValue; - } - - bool some() const { return nullableValue != CATCH_NULL; } - bool none() const { return nullableValue == CATCH_NULL; } - - bool operator !() const { return nullableValue == CATCH_NULL; } - operator SafeBool::type() const { - return SafeBool::makeSafe( some() ); - } - - private: - T *nullableValue; - union { - char storage[sizeof(T)]; - - // These are here to force alignment for the storage - long double dummy1; - void (*dummy2)(); - long double dummy3; -#ifdef CATCH_CONFIG_CPP11_LONG_LONG - long long dummy4; -#endif - }; - }; - -} // end namespace Catch - -namespace Catch { - - struct ITagAliasRegistry { - virtual ~ITagAliasRegistry(); - virtual Option find( std::string const& alias ) const = 0; - virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0; - - static ITagAliasRegistry const& get(); - }; - -} // end namespace Catch - -// These files are included here so the single_include script doesn't put them -// in the conditionally compiled sections -// #included from: internal/catch_test_case_info.h -#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED - -#include -#include - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpadded" -#endif - -namespace Catch { - - struct ITestCase; - - struct TestCaseInfo { - enum SpecialProperties{ - None = 0, - IsHidden = 1 << 1, - ShouldFail = 1 << 2, - MayFail = 1 << 3, - Throws = 1 << 4, - NonPortable = 1 << 5 - }; - - TestCaseInfo( std::string const& _name, - std::string const& _className, - std::string const& _description, - std::set const& _tags, - SourceLineInfo const& _lineInfo ); - - TestCaseInfo( TestCaseInfo const& other ); - - friend void setTags( TestCaseInfo& testCaseInfo, std::set const& tags ); - - bool isHidden() const; - bool throws() const; - bool okToFail() const; - bool expectedToFail() const; - - std::string name; - std::string className; - std::string description; - std::set tags; - std::set lcaseTags; - std::string tagsAsString; - SourceLineInfo lineInfo; - SpecialProperties properties; - }; - - class TestCase : public TestCaseInfo { - public: - - TestCase( ITestCase* testCase, TestCaseInfo const& info ); - TestCase( TestCase const& other ); - - TestCase withName( std::string const& _newName ) const; - - void invoke() const; - - TestCaseInfo const& getTestCaseInfo() const; - - void swap( TestCase& other ); - bool operator == ( TestCase const& other ) const; - bool operator < ( TestCase const& other ) const; - TestCase& operator = ( TestCase const& other ); - - private: - Ptr test; - }; - - TestCase makeTestCase( ITestCase* testCase, - std::string const& className, - std::string const& name, - std::string const& description, - SourceLineInfo const& lineInfo ); -} - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - - -#ifdef __OBJC__ -// #included from: internal/catch_objc.hpp -#define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED - -#import - -#include - -// NB. Any general catch headers included here must be included -// in catch.hpp first to make sure they are included by the single -// header for non obj-usage - -/////////////////////////////////////////////////////////////////////////////// -// This protocol is really only here for (self) documenting purposes, since -// all its methods are optional. -@protocol OcFixture - -@optional - --(void) setUp; --(void) tearDown; - -@end - -namespace Catch { - - class OcMethod : public SharedImpl { - - public: - OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {} - - virtual void invoke() const { - id obj = [[m_cls alloc] init]; - - performOptionalSelector( obj, @selector(setUp) ); - performOptionalSelector( obj, m_sel ); - performOptionalSelector( obj, @selector(tearDown) ); - - arcSafeRelease( obj ); - } - private: - virtual ~OcMethod() {} - - Class m_cls; - SEL m_sel; - }; - - namespace Detail{ - - inline std::string getAnnotation( Class cls, - std::string const& annotationName, - std::string const& testCaseName ) { - NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()]; - SEL sel = NSSelectorFromString( selStr ); - arcSafeRelease( selStr ); - id value = performOptionalSelector( cls, sel ); - if( value ) - return [(NSString*)value UTF8String]; - return ""; - } - } - - inline size_t registerTestMethods() { - size_t noTestMethods = 0; - int noClasses = objc_getClassList( CATCH_NULL, 0 ); - - Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses); - objc_getClassList( classes, noClasses ); - - for( int c = 0; c < noClasses; c++ ) { - Class cls = classes[c]; - { - u_int count; - Method* methods = class_copyMethodList( cls, &count ); - for( u_int m = 0; m < count ; m++ ) { - SEL selector = method_getName(methods[m]); - std::string methodName = sel_getName(selector); - if( startsWith( methodName, "Catch_TestCase_" ) ) { - std::string testCaseName = methodName.substr( 15 ); - std::string name = Detail::getAnnotation( cls, "Name", testCaseName ); - std::string desc = Detail::getAnnotation( cls, "Description", testCaseName ); - const char* className = class_getName( cls ); - - getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, name.c_str(), desc.c_str(), SourceLineInfo() ) ); - noTestMethods++; - } - } - free(methods); - } - } - return noTestMethods; - } - - namespace Matchers { - namespace Impl { - namespace NSStringMatchers { - - struct StringHolder : MatcherBase{ - StringHolder( NSString* substr ) : m_substr( [substr copy] ){} - StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){} - StringHolder() { - arcSafeRelease( m_substr ); - } - - virtual bool match( NSString* arg ) const CATCH_OVERRIDE { - return false; - } - - NSString* m_substr; - }; - - struct Equals : StringHolder { - Equals( NSString* substr ) : StringHolder( substr ){} - - virtual bool match( NSString* str ) const CATCH_OVERRIDE { - return (str != nil || m_substr == nil ) && - [str isEqualToString:m_substr]; - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "equals string: " + Catch::toString( m_substr ); - } - }; - - struct Contains : StringHolder { - Contains( NSString* substr ) : StringHolder( substr ){} - - virtual bool match( NSString* str ) const { - return (str != nil || m_substr == nil ) && - [str rangeOfString:m_substr].location != NSNotFound; - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "contains string: " + Catch::toString( m_substr ); - } - }; - - struct StartsWith : StringHolder { - StartsWith( NSString* substr ) : StringHolder( substr ){} - - virtual bool match( NSString* str ) const { - return (str != nil || m_substr == nil ) && - [str rangeOfString:m_substr].location == 0; - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "starts with: " + Catch::toString( m_substr ); - } - }; - struct EndsWith : StringHolder { - EndsWith( NSString* substr ) : StringHolder( substr ){} - - virtual bool match( NSString* str ) const { - return (str != nil || m_substr == nil ) && - [str rangeOfString:m_substr].location == [str length] - [m_substr length]; - } - - virtual std::string describe() const CATCH_OVERRIDE { - return "ends with: " + Catch::toString( m_substr ); - } - }; - - } // namespace NSStringMatchers - } // namespace Impl - - inline Impl::NSStringMatchers::Equals - Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); } - - inline Impl::NSStringMatchers::Contains - Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); } - - inline Impl::NSStringMatchers::StartsWith - StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); } - - inline Impl::NSStringMatchers::EndsWith - EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); } - - } // namespace Matchers - - using namespace Matchers; - -} // namespace Catch - -/////////////////////////////////////////////////////////////////////////////// -#define OC_TEST_CASE( name, desc )\ -+(NSString*) INTERNAL_CATCH_UNIQUE_NAME( Catch_Name_test ) \ -{\ -return @ name; \ -}\ -+(NSString*) INTERNAL_CATCH_UNIQUE_NAME( Catch_Description_test ) \ -{ \ -return @ desc; \ -} \ --(void) INTERNAL_CATCH_UNIQUE_NAME( Catch_TestCase_test ) - -#endif - -#ifdef CATCH_IMPL - -// !TBD: Move the leak detector code into a separate header -#ifdef CATCH_CONFIG_WINDOWS_CRTDBG -#include -class LeakDetector { -public: - LeakDetector() { - int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); - flag |= _CRTDBG_LEAK_CHECK_DF; - flag |= _CRTDBG_ALLOC_MEM_DF; - _CrtSetDbgFlag(flag); - _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG); - _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); - // Change this to leaking allocation's number to break there - _CrtSetBreakAlloc(-1); - } -}; -#else -class LeakDetector {}; -#endif - -LeakDetector leakDetector; - -// #included from: internal/catch_impl.hpp -#define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED - -// Collect all the implementation files together here -// These are the equivalent of what would usually be cpp files - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wweak-vtables" -#endif - -// #included from: ../catch_session.hpp -#define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED - -// #included from: internal/catch_commandline.hpp -#define TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED - -// #included from: catch_config.hpp -#define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED - -// #included from: catch_test_spec_parser.hpp -#define TWOBLUECUBES_CATCH_TEST_SPEC_PARSER_HPP_INCLUDED - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpadded" -#endif - -// #included from: catch_test_spec.hpp -#define TWOBLUECUBES_CATCH_TEST_SPEC_HPP_INCLUDED - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wpadded" -#endif - -// #included from: catch_wildcard_pattern.hpp -#define TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED - -#include - -namespace Catch -{ - class WildcardPattern { - enum WildcardPosition { - NoWildcard = 0, - WildcardAtStart = 1, - WildcardAtEnd = 2, - WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd - }; - - public: - - WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity ) - : m_caseSensitivity( caseSensitivity ), - m_wildcard( NoWildcard ), - m_pattern( adjustCase( pattern ) ) - { - if( startsWith( m_pattern, '*' ) ) { - m_pattern = m_pattern.substr( 1 ); - m_wildcard = WildcardAtStart; - } - if( endsWith( m_pattern, '*' ) ) { - m_pattern = m_pattern.substr( 0, m_pattern.size()-1 ); - m_wildcard = static_cast( m_wildcard | WildcardAtEnd ); - } - } - virtual ~WildcardPattern(); - virtual bool matches( std::string const& str ) const { - switch( m_wildcard ) { - case NoWildcard: - return m_pattern == adjustCase( str ); - case WildcardAtStart: - return endsWith( adjustCase( str ), m_pattern ); - case WildcardAtEnd: - return startsWith( adjustCase( str ), m_pattern ); - case WildcardAtBothEnds: - return contains( adjustCase( str ), m_pattern ); - } - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunreachable-code" -#endif - throw std::logic_error( "Unknown enum" ); -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - } - private: - std::string adjustCase( std::string const& str ) const { - return m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str; - } - CaseSensitive::Choice m_caseSensitivity; - WildcardPosition m_wildcard; - std::string m_pattern; - }; -} - -#include -#include - -namespace Catch { - - class TestSpec { - struct Pattern : SharedImpl<> { - virtual ~Pattern(); - virtual bool matches( TestCaseInfo const& testCase ) const = 0; - }; - class NamePattern : public Pattern { - public: - NamePattern( std::string const& name ) - : m_wildcardPattern( toLower( name ), CaseSensitive::No ) - {} - virtual ~NamePattern(); - virtual bool matches( TestCaseInfo const& testCase ) const { - return m_wildcardPattern.matches( toLower( testCase.name ) ); - } - private: - WildcardPattern m_wildcardPattern; - }; - - class TagPattern : public Pattern { - public: - TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {} - virtual ~TagPattern(); - virtual bool matches( TestCaseInfo const& testCase ) const { - return testCase.lcaseTags.find( m_tag ) != testCase.lcaseTags.end(); - } - private: - std::string m_tag; - }; - - class ExcludedPattern : public Pattern { - public: - ExcludedPattern( Ptr const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {} - virtual ~ExcludedPattern(); - virtual bool matches( TestCaseInfo const& testCase ) const { return !m_underlyingPattern->matches( testCase ); } - private: - Ptr m_underlyingPattern; - }; - - struct Filter { - std::vector > m_patterns; - - bool matches( TestCaseInfo const& testCase ) const { - // All patterns in a filter must match for the filter to be a match - for( std::vector >::const_iterator it = m_patterns.begin(), itEnd = m_patterns.end(); it != itEnd; ++it ) { - if( !(*it)->matches( testCase ) ) - return false; - } - return true; - } - }; - - public: - bool hasFilters() const { - return !m_filters.empty(); - } - bool matches( TestCaseInfo const& testCase ) const { - // A TestSpec matches if any filter matches - for( std::vector::const_iterator it = m_filters.begin(), itEnd = m_filters.end(); it != itEnd; ++it ) - if( it->matches( testCase ) ) - return true; - return false; - } - - private: - std::vector m_filters; - - friend class TestSpecParser; - }; -} - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - -namespace Catch { - - class TestSpecParser { - enum Mode{ None, Name, QuotedName, Tag, EscapedName }; - Mode m_mode; - bool m_exclusion; - std::size_t m_start, m_pos; - std::string m_arg; - std::vector m_escapeChars; - TestSpec::Filter m_currentFilter; - TestSpec m_testSpec; - ITagAliasRegistry const* m_tagAliases; - - public: - TestSpecParser( ITagAliasRegistry const& tagAliases ) :m_mode(None), m_exclusion(false), m_start(0), m_pos(0), m_tagAliases( &tagAliases ) {} - - TestSpecParser& parse( std::string const& arg ) { - m_mode = None; - m_exclusion = false; - m_start = std::string::npos; - m_arg = m_tagAliases->expandAliases( arg ); - m_escapeChars.clear(); - for( m_pos = 0; m_pos < m_arg.size(); ++m_pos ) - visitChar( m_arg[m_pos] ); - if( m_mode == Name ) - addPattern(); - return *this; - } - TestSpec testSpec() { - addFilter(); - return m_testSpec; - } - private: - void visitChar( char c ) { - if( m_mode == None ) { - switch( c ) { - case ' ': return; - case '~': m_exclusion = true; return; - case '[': return startNewMode( Tag, ++m_pos ); - case '"': return startNewMode( QuotedName, ++m_pos ); - case '\\': return escape(); - default: startNewMode( Name, m_pos ); break; - } - } - if( m_mode == Name ) { - if( c == ',' ) { - addPattern(); - addFilter(); - } - else if( c == '[' ) { - if( subString() == "exclude:" ) - m_exclusion = true; - else - addPattern(); - startNewMode( Tag, ++m_pos ); - } - else if( c == '\\' ) - escape(); - } - else if( m_mode == EscapedName ) - m_mode = Name; - else if( m_mode == QuotedName && c == '"' ) - addPattern(); - else if( m_mode == Tag && c == ']' ) - addPattern(); - } - void startNewMode( Mode mode, std::size_t start ) { - m_mode = mode; - m_start = start; - } - void escape() { - if( m_mode == None ) - m_start = m_pos; - m_mode = EscapedName; - m_escapeChars.push_back( m_pos ); - } - std::string subString() const { return m_arg.substr( m_start, m_pos - m_start ); } - template - void addPattern() { - std::string token = subString(); - for( size_t i = 0; i < m_escapeChars.size(); ++i ) - token = token.substr( 0, m_escapeChars[i]-m_start-i ) + token.substr( m_escapeChars[i]-m_start-i+1 ); - m_escapeChars.clear(); - if( startsWith( token, "exclude:" ) ) { - m_exclusion = true; - token = token.substr( 8 ); - } - if( !token.empty() ) { - Ptr pattern = new T( token ); - if( m_exclusion ) - pattern = new TestSpec::ExcludedPattern( pattern ); - m_currentFilter.m_patterns.push_back( pattern ); - } - m_exclusion = false; - m_mode = None; - } - void addFilter() { - if( !m_currentFilter.m_patterns.empty() ) { - m_testSpec.m_filters.push_back( m_currentFilter ); - m_currentFilter = TestSpec::Filter(); - } - } - }; - inline TestSpec parseTestSpec( std::string const& arg ) { - return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec(); - } - -} // namespace Catch - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - -// #included from: catch_interfaces_config.h -#define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED - -#include -#include -#include - -namespace Catch { - - struct Verbosity { enum Level { - NoOutput = 0, - Quiet, - Normal - }; }; - - struct WarnAbout { enum What { - Nothing = 0x00, - NoAssertions = 0x01 - }; }; - - struct ShowDurations { enum OrNot { - DefaultForReporter, - Always, - Never - }; }; - struct RunTests { enum InWhatOrder { - InDeclarationOrder, - InLexicographicalOrder, - InRandomOrder - }; }; - struct UseColour { enum YesOrNo { - Auto, - Yes, - No - }; }; - struct WaitForKeypress { enum When { - Never, - BeforeStart = 1, - BeforeExit = 2, - BeforeStartAndExit = BeforeStart | BeforeExit - }; }; - - class TestSpec; - - struct IConfig : IShared { - - virtual ~IConfig(); - - virtual bool allowThrows() const = 0; - virtual std::ostream& stream() const = 0; - virtual std::string name() const = 0; - virtual bool includeSuccessfulResults() const = 0; - virtual bool shouldDebugBreak() const = 0; - virtual bool warnAboutMissingAssertions() const = 0; - virtual int abortAfter() const = 0; - virtual bool showInvisibles() const = 0; - virtual ShowDurations::OrNot showDurations() const = 0; - virtual TestSpec const& testSpec() const = 0; - virtual RunTests::InWhatOrder runOrder() const = 0; - virtual unsigned int rngSeed() const = 0; - virtual UseColour::YesOrNo useColour() const = 0; - virtual std::vector const& getSectionsToRun() const = 0; - - }; -} - -// #included from: catch_stream.h -#define TWOBLUECUBES_CATCH_STREAM_H_INCLUDED - -// #included from: catch_streambuf.h -#define TWOBLUECUBES_CATCH_STREAMBUF_H_INCLUDED - -#include - -namespace Catch { - - class StreamBufBase : public std::streambuf { - public: - virtual ~StreamBufBase() CATCH_NOEXCEPT; - }; -} - -#include -#include -#include -#include - -namespace Catch { - - std::ostream& cout(); - std::ostream& cerr(); - std::ostream& clog(); - - struct IStream { - virtual ~IStream() CATCH_NOEXCEPT; - virtual std::ostream& stream() const = 0; - }; - - class FileStream : public IStream { - mutable std::ofstream m_ofs; - public: - FileStream( std::string const& filename ); - virtual ~FileStream() CATCH_NOEXCEPT; - public: // IStream - virtual std::ostream& stream() const CATCH_OVERRIDE; - }; - - class CoutStream : public IStream { - mutable std::ostream m_os; - public: - CoutStream(); - virtual ~CoutStream() CATCH_NOEXCEPT; - - public: // IStream - virtual std::ostream& stream() const CATCH_OVERRIDE; - }; - - class DebugOutStream : public IStream { - CATCH_AUTO_PTR( StreamBufBase ) m_streamBuf; - mutable std::ostream m_os; - public: - DebugOutStream(); - virtual ~DebugOutStream() CATCH_NOEXCEPT; - - public: // IStream - virtual std::ostream& stream() const CATCH_OVERRIDE; - }; -} - -#include -#include -#include -#include - -#ifndef CATCH_CONFIG_CONSOLE_WIDTH -#define CATCH_CONFIG_CONSOLE_WIDTH 80 -#endif - -namespace Catch { - - struct ConfigData { - - ConfigData() - : listTests( false ), - listTags( false ), - listReporters( false ), - listTestNamesOnly( false ), - listExtraInfo( false ), - showSuccessfulTests( false ), - shouldDebugBreak( false ), - noThrow( false ), - showHelp( false ), - showInvisibles( false ), - filenamesAsTags( false ), - libIdentify( false ), - abortAfter( -1 ), - rngSeed( 0 ), - verbosity( Verbosity::Normal ), - warnings( WarnAbout::Nothing ), - showDurations( ShowDurations::DefaultForReporter ), - runOrder( RunTests::InDeclarationOrder ), - useColour( UseColour::Auto ), - waitForKeypress( WaitForKeypress::Never ) - {} - - bool listTests; - bool listTags; - bool listReporters; - bool listTestNamesOnly; - bool listExtraInfo; - - bool showSuccessfulTests; - bool shouldDebugBreak; - bool noThrow; - bool showHelp; - bool showInvisibles; - bool filenamesAsTags; - bool libIdentify; - - int abortAfter; - unsigned int rngSeed; - - Verbosity::Level verbosity; - WarnAbout::What warnings; - ShowDurations::OrNot showDurations; - RunTests::InWhatOrder runOrder; - UseColour::YesOrNo useColour; - WaitForKeypress::When waitForKeypress; - - std::string outputFilename; - std::string name; - std::string processName; - - std::vector reporterNames; - std::vector testsOrTags; - std::vector sectionsToRun; - }; - - class Config : public SharedImpl { - private: - Config( Config const& other ); - Config& operator = ( Config const& other ); - virtual void dummy(); - public: - - Config() - {} - - Config( ConfigData const& data ) - : m_data( data ), - m_stream( openStream() ) - { - if( !data.testsOrTags.empty() ) { - TestSpecParser parser( ITagAliasRegistry::get() ); - for( std::size_t i = 0; i < data.testsOrTags.size(); ++i ) - parser.parse( data.testsOrTags[i] ); - m_testSpec = parser.testSpec(); - } - } - - virtual ~Config() {} - - std::string const& getFilename() const { - return m_data.outputFilename ; - } - - bool listTests() const { return m_data.listTests; } - bool listTestNamesOnly() const { return m_data.listTestNamesOnly; } - bool listTags() const { return m_data.listTags; } - bool listReporters() const { return m_data.listReporters; } - bool listExtraInfo() const { return m_data.listExtraInfo; } - - std::string getProcessName() const { return m_data.processName; } - - std::vector const& getReporterNames() const { return m_data.reporterNames; } - std::vector const& getSectionsToRun() const CATCH_OVERRIDE { return m_data.sectionsToRun; } - - virtual TestSpec const& testSpec() const CATCH_OVERRIDE { return m_testSpec; } - - bool showHelp() const { return m_data.showHelp; } - - // IConfig interface - virtual bool allowThrows() const CATCH_OVERRIDE { return !m_data.noThrow; } - virtual std::ostream& stream() const CATCH_OVERRIDE { return m_stream->stream(); } - virtual std::string name() const CATCH_OVERRIDE { return m_data.name.empty() ? m_data.processName : m_data.name; } - virtual bool includeSuccessfulResults() const CATCH_OVERRIDE { return m_data.showSuccessfulTests; } - virtual bool warnAboutMissingAssertions() const CATCH_OVERRIDE { return m_data.warnings & WarnAbout::NoAssertions; } - virtual ShowDurations::OrNot showDurations() const CATCH_OVERRIDE { return m_data.showDurations; } - virtual RunTests::InWhatOrder runOrder() const CATCH_OVERRIDE { return m_data.runOrder; } - virtual unsigned int rngSeed() const CATCH_OVERRIDE { return m_data.rngSeed; } - virtual UseColour::YesOrNo useColour() const CATCH_OVERRIDE { return m_data.useColour; } - virtual bool shouldDebugBreak() const CATCH_OVERRIDE { return m_data.shouldDebugBreak; } - virtual int abortAfter() const CATCH_OVERRIDE { return m_data.abortAfter; } - virtual bool showInvisibles() const CATCH_OVERRIDE { return m_data.showInvisibles; } - - private: - - IStream const* openStream() { - if( m_data.outputFilename.empty() ) - return new CoutStream(); - else if( m_data.outputFilename[0] == '%' ) { - if( m_data.outputFilename == "%debug" ) - return new DebugOutStream(); - else - throw std::domain_error( "Unrecognised stream: " + m_data.outputFilename ); - } - else - return new FileStream( m_data.outputFilename ); - } - ConfigData m_data; - - CATCH_AUTO_PTR( IStream const ) m_stream; - TestSpec m_testSpec; - }; - -} // end namespace Catch - -// #included from: catch_clara.h -#define TWOBLUECUBES_CATCH_CLARA_H_INCLUDED - -// Use Catch's value for console width (store Clara's off to the side, if present) -#ifdef CLARA_CONFIG_CONSOLE_WIDTH -#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CLARA_CONFIG_CONSOLE_WIDTH -#undef CLARA_CONFIG_CONSOLE_WIDTH -#endif -#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH - -// Declare Clara inside the Catch namespace -#define STITCH_CLARA_OPEN_NAMESPACE namespace Catch { -// #included from: ../external/clara.h - -// Version 0.0.2.4 - -// Only use header guard if we are not using an outer namespace -#if !defined(TWOBLUECUBES_CLARA_H_INCLUDED) || defined(STITCH_CLARA_OPEN_NAMESPACE) - -#ifndef STITCH_CLARA_OPEN_NAMESPACE -#define TWOBLUECUBES_CLARA_H_INCLUDED -#define STITCH_CLARA_OPEN_NAMESPACE -#define STITCH_CLARA_CLOSE_NAMESPACE -#else -#define STITCH_CLARA_CLOSE_NAMESPACE } -#endif - -#define STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE STITCH_CLARA_OPEN_NAMESPACE - -// ----------- #included from tbc_text_format.h ----------- - -// Only use header guard if we are not using an outer namespace -#if !defined(TBC_TEXT_FORMAT_H_INCLUDED) || defined(STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE) -#ifndef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE -#define TBC_TEXT_FORMAT_H_INCLUDED -#endif - -#include -#include -#include -#include -#include - -// Use optional outer namespace -#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE -namespace STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE { -#endif - -namespace Tbc { - -#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH - const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH; -#else - const unsigned int consoleWidth = 80; -#endif - - struct TextAttributes { - TextAttributes() - : initialIndent( std::string::npos ), - indent( 0 ), - width( consoleWidth-1 ), - tabChar( '\t' ) - {} - - TextAttributes& setInitialIndent( std::size_t _value ) { initialIndent = _value; return *this; } - TextAttributes& setIndent( std::size_t _value ) { indent = _value; return *this; } - TextAttributes& setWidth( std::size_t _value ) { width = _value; return *this; } - TextAttributes& setTabChar( char _value ) { tabChar = _value; return *this; } - - std::size_t initialIndent; // indent of first line, or npos - std::size_t indent; // indent of subsequent lines, or all if initialIndent is npos - std::size_t width; // maximum width of text, including indent. Longer text will wrap - char tabChar; // If this char is seen the indent is changed to current pos - }; - - class Text { - public: - Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() ) - : attr( _attr ) - { - std::string wrappableChars = " [({.,/|\\-"; - std::size_t indent = _attr.initialIndent != std::string::npos - ? _attr.initialIndent - : _attr.indent; - std::string remainder = _str; - - while( !remainder.empty() ) { - if( lines.size() >= 1000 ) { - lines.push_back( "... message truncated due to excessive size" ); - return; - } - std::size_t tabPos = std::string::npos; - std::size_t width = (std::min)( remainder.size(), _attr.width - indent ); - std::size_t pos = remainder.find_first_of( '\n' ); - if( pos <= width ) { - width = pos; - } - pos = remainder.find_last_of( _attr.tabChar, width ); - if( pos != std::string::npos ) { - tabPos = pos; - if( remainder[width] == '\n' ) - width--; - remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 ); - } - - if( width == remainder.size() ) { - spliceLine( indent, remainder, width ); - } - else if( remainder[width] == '\n' ) { - spliceLine( indent, remainder, width ); - if( width <= 1 || remainder.size() != 1 ) - remainder = remainder.substr( 1 ); - indent = _attr.indent; - } - else { - pos = remainder.find_last_of( wrappableChars, width ); - if( pos != std::string::npos && pos > 0 ) { - spliceLine( indent, remainder, pos ); - if( remainder[0] == ' ' ) - remainder = remainder.substr( 1 ); - } - else { - spliceLine( indent, remainder, width-1 ); - lines.back() += "-"; - } - if( lines.size() == 1 ) - indent = _attr.indent; - if( tabPos != std::string::npos ) - indent += tabPos; - } - } - } - - void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) { - lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) ); - _remainder = _remainder.substr( _pos ); - } - - typedef std::vector::const_iterator const_iterator; - - const_iterator begin() const { return lines.begin(); } - const_iterator end() const { return lines.end(); } - std::string const& last() const { return lines.back(); } - std::size_t size() const { return lines.size(); } - std::string const& operator[]( std::size_t _index ) const { return lines[_index]; } - std::string toString() const { - std::ostringstream oss; - oss << *this; - return oss.str(); - } - - friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) { - for( Text::const_iterator it = _text.begin(), itEnd = _text.end(); - it != itEnd; ++it ) { - if( it != _text.begin() ) - _stream << "\n"; - _stream << *it; - } - return _stream; - } - - private: - std::string str; - TextAttributes attr; - std::vector lines; - }; - -} // end namespace Tbc - -#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE -} // end outer namespace -#endif - -#endif // TBC_TEXT_FORMAT_H_INCLUDED - -// ----------- end of #include from tbc_text_format.h ----------- -// ........... back in clara.h - -#undef STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE - -// ----------- #included from clara_compilers.h ----------- - -#ifndef TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED -#define TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED - -// Detect a number of compiler features - mostly C++11/14 conformance - by compiler -// The following features are defined: -// -// CLARA_CONFIG_CPP11_NULLPTR : is nullptr supported? -// CLARA_CONFIG_CPP11_NOEXCEPT : is noexcept supported? -// CLARA_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods -// CLARA_CONFIG_CPP11_OVERRIDE : is override supported? -// CLARA_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr) - -// CLARA_CONFIG_CPP11_OR_GREATER : Is C++11 supported? - -// CLARA_CONFIG_VARIADIC_MACROS : are variadic macros supported? - -// In general each macro has a _NO_ form -// (e.g. CLARA_CONFIG_CPP11_NO_NULLPTR) 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. - -// All the C++11 features can be disabled with CLARA_CONFIG_NO_CPP11 - -#ifdef __clang__ - -#if __has_feature(cxx_nullptr) -#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR -#endif - -#if __has_feature(cxx_noexcept) -#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT -#endif - -#endif // __clang__ - -//////////////////////////////////////////////////////////////////////////////// -// GCC -#ifdef __GNUC__ - -#if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__) -#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR -#endif - -// - otherwise more recent versions define __cplusplus >= 201103L -// and will get picked up below - -#endif // __GNUC__ - -//////////////////////////////////////////////////////////////////////////////// -// Visual C++ -#ifdef _MSC_VER - -#if (_MSC_VER >= 1600) -#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR -#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR -#endif - -#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015)) -#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT -#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -#endif - -#endif // _MSC_VER - -//////////////////////////////////////////////////////////////////////////////// -// C++ language feature support - -// catch all support for C++11 -#if defined(__cplusplus) && __cplusplus >= 201103L - -#define CLARA_CPP11_OR_GREATER - -#if !defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR) -#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR -#endif - -#ifndef CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT -#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT -#endif - -#ifndef CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS -#endif - -#if !defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE) -#define CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE -#endif -#if !defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) -#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR -#endif - -#endif // __cplusplus >= 201103L - -// Now set the actual defines based on the above + anything the user has configured -#if defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NO_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_NO_CPP11) -#define CLARA_CONFIG_CPP11_NULLPTR -#endif -#if defined(CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_NO_CPP11) -#define CLARA_CONFIG_CPP11_NOEXCEPT -#endif -#if defined(CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_NO_CPP11) -#define CLARA_CONFIG_CPP11_GENERATED_METHODS -#endif -#if defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_OVERRIDE) && !defined(CLARA_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_CPP11) -#define CLARA_CONFIG_CPP11_OVERRIDE -#endif -#if defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_UNIQUE_PTR) && !defined(CLARA_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_CPP11) -#define CLARA_CONFIG_CPP11_UNIQUE_PTR -#endif - -// noexcept support: -#if defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_NOEXCEPT) -#define CLARA_NOEXCEPT noexcept -# define CLARA_NOEXCEPT_IS(x) noexcept(x) -#else -#define CLARA_NOEXCEPT throw() -# define CLARA_NOEXCEPT_IS(x) -#endif - -// nullptr support -#ifdef CLARA_CONFIG_CPP11_NULLPTR -#define CLARA_NULL nullptr -#else -#define CLARA_NULL NULL -#endif - -// override support -#ifdef CLARA_CONFIG_CPP11_OVERRIDE -#define CLARA_OVERRIDE override -#else -#define CLARA_OVERRIDE -#endif - -// unique_ptr support -#ifdef CLARA_CONFIG_CPP11_UNIQUE_PTR -# define CLARA_AUTO_PTR( T ) std::unique_ptr -#else -# define CLARA_AUTO_PTR( T ) std::auto_ptr -#endif - -#endif // TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED - -// ----------- end of #include from clara_compilers.h ----------- -// ........... back in clara.h - -#include -#include -#include - -#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) -#define CLARA_PLATFORM_WINDOWS -#endif - -// Use optional outer namespace -#ifdef STITCH_CLARA_OPEN_NAMESPACE -STITCH_CLARA_OPEN_NAMESPACE -#endif - -namespace Clara { - - struct UnpositionalTag {}; - - extern UnpositionalTag _; - -#ifdef CLARA_CONFIG_MAIN - UnpositionalTag _; -#endif - - namespace Detail { - -#ifdef CLARA_CONSOLE_WIDTH - const unsigned int consoleWidth = CLARA_CONFIG_CONSOLE_WIDTH; -#else - const unsigned int consoleWidth = 80; -#endif - - using namespace Tbc; - - inline bool startsWith( std::string const& str, std::string const& prefix ) { - return str.size() >= prefix.size() && str.substr( 0, prefix.size() ) == prefix; - } - - template struct RemoveConstRef{ typedef T type; }; - template struct RemoveConstRef{ typedef T type; }; - template struct RemoveConstRef{ typedef T type; }; - template struct RemoveConstRef{ typedef T type; }; - - template struct IsBool { static const bool value = false; }; - template<> struct IsBool { static const bool value = true; }; - - template - void convertInto( std::string const& _source, T& _dest ) { - std::stringstream ss; - ss << _source; - ss >> _dest; - if( ss.fail() ) - throw std::runtime_error( "Unable to convert " + _source + " to destination type" ); - } - inline void convertInto( std::string const& _source, std::string& _dest ) { - _dest = _source; - } - char toLowerCh(char c) { - return static_cast( std::tolower( c ) ); - } - inline void convertInto( std::string const& _source, bool& _dest ) { - std::string sourceLC = _source; - std::transform( sourceLC.begin(), sourceLC.end(), sourceLC.begin(), toLowerCh ); - if( sourceLC == "y" || sourceLC == "1" || sourceLC == "true" || sourceLC == "yes" || sourceLC == "on" ) - _dest = true; - else if( sourceLC == "n" || sourceLC == "0" || sourceLC == "false" || sourceLC == "no" || sourceLC == "off" ) - _dest = false; - else - throw std::runtime_error( "Expected a boolean value but did not recognise:\n '" + _source + "'" ); - } - - template - struct IArgFunction { - virtual ~IArgFunction() {} -#ifdef CLARA_CONFIG_CPP11_GENERATED_METHODS - IArgFunction() = default; - IArgFunction( IArgFunction const& ) = default; -#endif - virtual void set( ConfigT& config, std::string const& value ) const = 0; - virtual bool takesArg() const = 0; - virtual IArgFunction* clone() const = 0; - }; - - template - class BoundArgFunction { - public: - BoundArgFunction() : functionObj( CLARA_NULL ) {} - BoundArgFunction( IArgFunction* _functionObj ) : functionObj( _functionObj ) {} - BoundArgFunction( BoundArgFunction const& other ) : functionObj( other.functionObj ? other.functionObj->clone() : CLARA_NULL ) {} - BoundArgFunction& operator = ( BoundArgFunction const& other ) { - IArgFunction* newFunctionObj = other.functionObj ? other.functionObj->clone() : CLARA_NULL; - delete functionObj; - functionObj = newFunctionObj; - return *this; - } - ~BoundArgFunction() { delete functionObj; } - - void set( ConfigT& config, std::string const& value ) const { - functionObj->set( config, value ); - } - bool takesArg() const { return functionObj->takesArg(); } - - bool isSet() const { - return functionObj != CLARA_NULL; - } - private: - IArgFunction* functionObj; - }; - - template - struct NullBinder : IArgFunction{ - virtual void set( C&, std::string const& ) const {} - virtual bool takesArg() const { return true; } - virtual IArgFunction* clone() const { return new NullBinder( *this ); } - }; - - template - struct BoundDataMember : IArgFunction{ - BoundDataMember( M C::* _member ) : member( _member ) {} - virtual void set( C& p, std::string const& stringValue ) const { - convertInto( stringValue, p.*member ); - } - virtual bool takesArg() const { return !IsBool::value; } - virtual IArgFunction* clone() const { return new BoundDataMember( *this ); } - M C::* member; - }; - template - struct BoundUnaryMethod : IArgFunction{ - BoundUnaryMethod( void (C::*_member)( M ) ) : member( _member ) {} - virtual void set( C& p, std::string const& stringValue ) const { - typename RemoveConstRef::type value; - convertInto( stringValue, value ); - (p.*member)( value ); - } - virtual bool takesArg() const { return !IsBool::value; } - virtual IArgFunction* clone() const { return new BoundUnaryMethod( *this ); } - void (C::*member)( M ); - }; - template - struct BoundNullaryMethod : IArgFunction{ - BoundNullaryMethod( void (C::*_member)() ) : member( _member ) {} - virtual void set( C& p, std::string const& stringValue ) const { - bool value; - convertInto( stringValue, value ); - if( value ) - (p.*member)(); - } - virtual bool takesArg() const { return false; } - virtual IArgFunction* clone() const { return new BoundNullaryMethod( *this ); } - void (C::*member)(); - }; - - template - struct BoundUnaryFunction : IArgFunction{ - BoundUnaryFunction( void (*_function)( C& ) ) : function( _function ) {} - virtual void set( C& obj, std::string const& stringValue ) const { - bool value; - convertInto( stringValue, value ); - if( value ) - function( obj ); - } - virtual bool takesArg() const { return false; } - virtual IArgFunction* clone() const { return new BoundUnaryFunction( *this ); } - void (*function)( C& ); - }; - - template - struct BoundBinaryFunction : IArgFunction{ - BoundBinaryFunction( void (*_function)( C&, T ) ) : function( _function ) {} - virtual void set( C& obj, std::string const& stringValue ) const { - typename RemoveConstRef::type value; - convertInto( stringValue, value ); - function( obj, value ); - } - virtual bool takesArg() const { return !IsBool::value; } - virtual IArgFunction* clone() const { return new BoundBinaryFunction( *this ); } - void (*function)( C&, T ); - }; - - } // namespace Detail - - inline std::vector argsToVector( int argc, char const* const* const argv ) { - std::vector args( static_cast( argc ) ); - for( std::size_t i = 0; i < static_cast( argc ); ++i ) - args[i] = argv[i]; - - return args; - } - - class Parser { - enum Mode { None, MaybeShortOpt, SlashOpt, ShortOpt, LongOpt, Positional }; - Mode mode; - std::size_t from; - bool inQuotes; - public: - - struct Token { - enum Type { Positional, ShortOpt, LongOpt }; - Token( Type _type, std::string const& _data ) : type( _type ), data( _data ) {} - Type type; - std::string data; - }; - - Parser() : mode( None ), from( 0 ), inQuotes( false ){} - - void parseIntoTokens( std::vector const& args, std::vector& tokens ) { - const std::string doubleDash = "--"; - for( std::size_t i = 1; i < args.size() && args[i] != doubleDash; ++i ) - parseIntoTokens( args[i], tokens); - } - - void parseIntoTokens( std::string const& arg, std::vector& tokens ) { - for( std::size_t i = 0; i < arg.size(); ++i ) { - char c = arg[i]; - if( c == '"' ) - inQuotes = !inQuotes; - mode = handleMode( i, c, arg, tokens ); - } - mode = handleMode( arg.size(), '\0', arg, tokens ); - } - Mode handleMode( std::size_t i, char c, std::string const& arg, std::vector& tokens ) { - switch( mode ) { - case None: return handleNone( i, c ); - case MaybeShortOpt: return handleMaybeShortOpt( i, c ); - case ShortOpt: - case LongOpt: - case SlashOpt: return handleOpt( i, c, arg, tokens ); - case Positional: return handlePositional( i, c, arg, tokens ); - default: throw std::logic_error( "Unknown mode" ); - } - } - - Mode handleNone( std::size_t i, char c ) { - if( inQuotes ) { - from = i; - return Positional; - } - switch( c ) { - case '-': return MaybeShortOpt; -#ifdef CLARA_PLATFORM_WINDOWS - case '/': from = i+1; return SlashOpt; -#endif - default: from = i; return Positional; - } - } - Mode handleMaybeShortOpt( std::size_t i, char c ) { - switch( c ) { - case '-': from = i+1; return LongOpt; - default: from = i; return ShortOpt; - } - } - - Mode handleOpt( std::size_t i, char c, std::string const& arg, std::vector& tokens ) { - if( std::string( ":=\0", 3 ).find( c ) == std::string::npos ) - return mode; - - std::string optName = arg.substr( from, i-from ); - if( mode == ShortOpt ) - for( std::size_t j = 0; j < optName.size(); ++j ) - tokens.push_back( Token( Token::ShortOpt, optName.substr( j, 1 ) ) ); - else if( mode == SlashOpt && optName.size() == 1 ) - tokens.push_back( Token( Token::ShortOpt, optName ) ); - else - tokens.push_back( Token( Token::LongOpt, optName ) ); - return None; - } - Mode handlePositional( std::size_t i, char c, std::string const& arg, std::vector& tokens ) { - if( inQuotes || std::string( "\0", 1 ).find( c ) == std::string::npos ) - return mode; - - std::string data = arg.substr( from, i-from ); - tokens.push_back( Token( Token::Positional, data ) ); - return None; - } - }; - - template - struct CommonArgProperties { - CommonArgProperties() {} - CommonArgProperties( Detail::BoundArgFunction const& _boundField ) : boundField( _boundField ) {} - - Detail::BoundArgFunction boundField; - std::string description; - std::string detail; - std::string placeholder; // Only value if boundField takes an arg - - bool takesArg() const { - return !placeholder.empty(); - } - void validate() const { - if( !boundField.isSet() ) - throw std::logic_error( "option not bound" ); - } - }; - struct OptionArgProperties { - std::vector shortNames; - std::string longName; - - bool hasShortName( std::string const& shortName ) const { - return std::find( shortNames.begin(), shortNames.end(), shortName ) != shortNames.end(); - } - bool hasLongName( std::string const& _longName ) const { - return _longName == longName; - } - }; - struct PositionalArgProperties { - PositionalArgProperties() : position( -1 ) {} - int position; // -1 means non-positional (floating) - - bool isFixedPositional() const { - return position != -1; - } - }; - - template - class CommandLine { - - struct Arg : CommonArgProperties, OptionArgProperties, PositionalArgProperties { - Arg() {} - Arg( Detail::BoundArgFunction const& _boundField ) : CommonArgProperties( _boundField ) {} - - using CommonArgProperties::placeholder; // !TBD - - std::string dbgName() const { - if( !longName.empty() ) - return "--" + longName; - if( !shortNames.empty() ) - return "-" + shortNames[0]; - return "positional args"; - } - std::string commands() const { - std::ostringstream oss; - bool first = true; - std::vector::const_iterator it = shortNames.begin(), itEnd = shortNames.end(); - for(; it != itEnd; ++it ) { - if( first ) - first = false; - else - oss << ", "; - oss << "-" << *it; - } - if( !longName.empty() ) { - if( !first ) - oss << ", "; - oss << "--" << longName; - } - if( !placeholder.empty() ) - oss << " <" << placeholder << ">"; - return oss.str(); - } - }; - - typedef CLARA_AUTO_PTR( Arg ) ArgAutoPtr; - - friend void addOptName( Arg& arg, std::string const& optName ) - { - if( optName.empty() ) - return; - if( Detail::startsWith( optName, "--" ) ) { - if( !arg.longName.empty() ) - throw std::logic_error( "Only one long opt may be specified. '" - + arg.longName - + "' already specified, now attempting to add '" - + optName + "'" ); - arg.longName = optName.substr( 2 ); - } - else if( Detail::startsWith( optName, "-" ) ) - arg.shortNames.push_back( optName.substr( 1 ) ); - else - throw std::logic_error( "option must begin with - or --. Option was: '" + optName + "'" ); - } - friend void setPositionalArg( Arg& arg, int position ) - { - arg.position = position; - } - - class ArgBuilder { - public: - ArgBuilder( Arg* arg ) : m_arg( arg ) {} - - // Bind a non-boolean data member (requires placeholder string) - template - void bind( M C::* field, std::string const& placeholder ) { - m_arg->boundField = new Detail::BoundDataMember( field ); - m_arg->placeholder = placeholder; - } - // Bind a boolean data member (no placeholder required) - template - void bind( bool C::* field ) { - m_arg->boundField = new Detail::BoundDataMember( field ); - } - - // Bind a method taking a single, non-boolean argument (requires a placeholder string) - template - void bind( void (C::* unaryMethod)( M ), std::string const& placeholder ) { - m_arg->boundField = new Detail::BoundUnaryMethod( unaryMethod ); - m_arg->placeholder = placeholder; - } - - // Bind a method taking a single, boolean argument (no placeholder string required) - template - void bind( void (C::* unaryMethod)( bool ) ) { - m_arg->boundField = new Detail::BoundUnaryMethod( unaryMethod ); - } - - // Bind a method that takes no arguments (will be called if opt is present) - template - void bind( void (C::* nullaryMethod)() ) { - m_arg->boundField = new Detail::BoundNullaryMethod( nullaryMethod ); - } - - // Bind a free function taking a single argument - the object to operate on (no placeholder string required) - template - void bind( void (* unaryFunction)( C& ) ) { - m_arg->boundField = new Detail::BoundUnaryFunction( unaryFunction ); - } - - // Bind a free function taking a single argument - the object to operate on (requires a placeholder string) - template - void bind( void (* binaryFunction)( C&, T ), std::string const& placeholder ) { - m_arg->boundField = new Detail::BoundBinaryFunction( binaryFunction ); - m_arg->placeholder = placeholder; - } - - ArgBuilder& describe( std::string const& description ) { - m_arg->description = description; - return *this; - } - ArgBuilder& detail( std::string const& detail ) { - m_arg->detail = detail; - return *this; - } - - protected: - Arg* m_arg; - }; - - class OptBuilder : public ArgBuilder { - public: - OptBuilder( Arg* arg ) : ArgBuilder( arg ) {} - OptBuilder( OptBuilder& other ) : ArgBuilder( other ) {} - - OptBuilder& operator[]( std::string const& optName ) { - addOptName( *ArgBuilder::m_arg, optName ); - return *this; - } - }; - - public: - - CommandLine() - : m_boundProcessName( new Detail::NullBinder() ), - m_highestSpecifiedArgPosition( 0 ), - m_throwOnUnrecognisedTokens( false ) - {} - CommandLine( CommandLine const& other ) - : m_boundProcessName( other.m_boundProcessName ), - m_options ( other.m_options ), - m_positionalArgs( other.m_positionalArgs ), - m_highestSpecifiedArgPosition( other.m_highestSpecifiedArgPosition ), - m_throwOnUnrecognisedTokens( other.m_throwOnUnrecognisedTokens ) - { - if( other.m_floatingArg.get() ) - m_floatingArg.reset( new Arg( *other.m_floatingArg ) ); - } - - CommandLine& setThrowOnUnrecognisedTokens( bool shouldThrow = true ) { - m_throwOnUnrecognisedTokens = shouldThrow; - return *this; - } - - OptBuilder operator[]( std::string const& optName ) { - m_options.push_back( Arg() ); - addOptName( m_options.back(), optName ); - OptBuilder builder( &m_options.back() ); - return builder; - } - - ArgBuilder operator[]( int position ) { - m_positionalArgs.insert( std::make_pair( position, Arg() ) ); - if( position > m_highestSpecifiedArgPosition ) - m_highestSpecifiedArgPosition = position; - setPositionalArg( m_positionalArgs[position], position ); - ArgBuilder builder( &m_positionalArgs[position] ); - return builder; - } - - // Invoke this with the _ instance - ArgBuilder operator[]( UnpositionalTag ) { - if( m_floatingArg.get() ) - throw std::logic_error( "Only one unpositional argument can be added" ); - m_floatingArg.reset( new Arg() ); - ArgBuilder builder( m_floatingArg.get() ); - return builder; - } - - template - void bindProcessName( M C::* field ) { - m_boundProcessName = new Detail::BoundDataMember( field ); - } - template - void bindProcessName( void (C::*_unaryMethod)( M ) ) { - m_boundProcessName = new Detail::BoundUnaryMethod( _unaryMethod ); - } - - void optUsage( std::ostream& os, std::size_t indent = 0, std::size_t width = Detail::consoleWidth ) const { - typename std::vector::const_iterator itBegin = m_options.begin(), itEnd = m_options.end(), it; - std::size_t maxWidth = 0; - for( it = itBegin; it != itEnd; ++it ) - maxWidth = (std::max)( maxWidth, it->commands().size() ); - - for( it = itBegin; it != itEnd; ++it ) { - Detail::Text usage( it->commands(), Detail::TextAttributes() - .setWidth( maxWidth+indent ) - .setIndent( indent ) ); - Detail::Text desc( it->description, Detail::TextAttributes() - .setWidth( width - maxWidth - 3 ) ); - - for( std::size_t i = 0; i < (std::max)( usage.size(), desc.size() ); ++i ) { - std::string usageCol = i < usage.size() ? usage[i] : ""; - os << usageCol; - - if( i < desc.size() && !desc[i].empty() ) - os << std::string( indent + 2 + maxWidth - usageCol.size(), ' ' ) - << desc[i]; - os << "\n"; - } - } - } - std::string optUsage() const { - std::ostringstream oss; - optUsage( oss ); - return oss.str(); - } - - void argSynopsis( std::ostream& os ) const { - for( int i = 1; i <= m_highestSpecifiedArgPosition; ++i ) { - if( i > 1 ) - os << " "; - typename std::map::const_iterator it = m_positionalArgs.find( i ); - if( it != m_positionalArgs.end() ) - os << "<" << it->second.placeholder << ">"; - else if( m_floatingArg.get() ) - os << "<" << m_floatingArg->placeholder << ">"; - else - throw std::logic_error( "non consecutive positional arguments with no floating args" ); - } - // !TBD No indication of mandatory args - if( m_floatingArg.get() ) { - if( m_highestSpecifiedArgPosition > 1 ) - os << " "; - os << "[<" << m_floatingArg->placeholder << "> ...]"; - } - } - std::string argSynopsis() const { - std::ostringstream oss; - argSynopsis( oss ); - return oss.str(); - } - - void usage( std::ostream& os, std::string const& procName ) const { - validate(); - os << "usage:\n " << procName << " "; - argSynopsis( os ); - if( !m_options.empty() ) { - os << " [options]\n\nwhere options are: \n"; - optUsage( os, 2 ); - } - os << "\n"; - } - std::string usage( std::string const& procName ) const { - std::ostringstream oss; - usage( oss, procName ); - return oss.str(); - } - - ConfigT parse( std::vector const& args ) const { - ConfigT config; - parseInto( args, config ); - return config; - } - - std::vector parseInto( std::vector const& args, ConfigT& config ) const { - std::string processName = args.empty() ? std::string() : args[0]; - std::size_t lastSlash = processName.find_last_of( "/\\" ); - if( lastSlash != std::string::npos ) - processName = processName.substr( lastSlash+1 ); - m_boundProcessName.set( config, processName ); - std::vector tokens; - Parser parser; - parser.parseIntoTokens( args, tokens ); - return populate( tokens, config ); - } - - std::vector populate( std::vector const& tokens, ConfigT& config ) const { - validate(); - std::vector unusedTokens = populateOptions( tokens, config ); - unusedTokens = populateFixedArgs( unusedTokens, config ); - unusedTokens = populateFloatingArgs( unusedTokens, config ); - return unusedTokens; - } - - std::vector populateOptions( std::vector const& tokens, ConfigT& config ) const { - std::vector unusedTokens; - std::vector errors; - for( std::size_t i = 0; i < tokens.size(); ++i ) { - Parser::Token const& token = tokens[i]; - typename std::vector::const_iterator it = m_options.begin(), itEnd = m_options.end(); - for(; it != itEnd; ++it ) { - Arg const& arg = *it; - - try { - if( ( token.type == Parser::Token::ShortOpt && arg.hasShortName( token.data ) ) || - ( token.type == Parser::Token::LongOpt && arg.hasLongName( token.data ) ) ) { - if( arg.takesArg() ) { - if( i == tokens.size()-1 || tokens[i+1].type != Parser::Token::Positional ) - errors.push_back( "Expected argument to option: " + token.data ); - else - arg.boundField.set( config, tokens[++i].data ); - } - else { - arg.boundField.set( config, "true" ); - } - break; - } - } - catch( std::exception& ex ) { - errors.push_back( std::string( ex.what() ) + "\n- while parsing: (" + arg.commands() + ")" ); - } - } - if( it == itEnd ) { - if( token.type == Parser::Token::Positional || !m_throwOnUnrecognisedTokens ) - unusedTokens.push_back( token ); - else if( errors.empty() && m_throwOnUnrecognisedTokens ) - errors.push_back( "unrecognised option: " + token.data ); - } - } - if( !errors.empty() ) { - std::ostringstream oss; - for( std::vector::const_iterator it = errors.begin(), itEnd = errors.end(); - it != itEnd; - ++it ) { - if( it != errors.begin() ) - oss << "\n"; - oss << *it; - } - throw std::runtime_error( oss.str() ); - } - return unusedTokens; - } - std::vector populateFixedArgs( std::vector const& tokens, ConfigT& config ) const { - std::vector unusedTokens; - int position = 1; - for( std::size_t i = 0; i < tokens.size(); ++i ) { - Parser::Token const& token = tokens[i]; - typename std::map::const_iterator it = m_positionalArgs.find( position ); - if( it != m_positionalArgs.end() ) - it->second.boundField.set( config, token.data ); - else - unusedTokens.push_back( token ); - if( token.type == Parser::Token::Positional ) - position++; - } - return unusedTokens; - } - std::vector populateFloatingArgs( std::vector const& tokens, ConfigT& config ) const { - if( !m_floatingArg.get() ) - return tokens; - std::vector unusedTokens; - for( std::size_t i = 0; i < tokens.size(); ++i ) { - Parser::Token const& token = tokens[i]; - if( token.type == Parser::Token::Positional ) - m_floatingArg->boundField.set( config, token.data ); - else - unusedTokens.push_back( token ); - } - return unusedTokens; - } - - void validate() const - { - if( m_options.empty() && m_positionalArgs.empty() && !m_floatingArg.get() ) - throw std::logic_error( "No options or arguments specified" ); - - for( typename std::vector::const_iterator it = m_options.begin(), - itEnd = m_options.end(); - it != itEnd; ++it ) - it->validate(); - } - - private: - Detail::BoundArgFunction m_boundProcessName; - std::vector m_options; - std::map m_positionalArgs; - ArgAutoPtr m_floatingArg; - int m_highestSpecifiedArgPosition; - bool m_throwOnUnrecognisedTokens; - }; - -} // end namespace Clara - -STITCH_CLARA_CLOSE_NAMESPACE -#undef STITCH_CLARA_OPEN_NAMESPACE -#undef STITCH_CLARA_CLOSE_NAMESPACE - -#endif // TWOBLUECUBES_CLARA_H_INCLUDED -#undef STITCH_CLARA_OPEN_NAMESPACE - -// Restore Clara's value for console width, if present -#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH -#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH -#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH -#endif - -#include -#include - -namespace Catch { - - inline void abortAfterFirst( ConfigData& config ) { config.abortAfter = 1; } - inline void abortAfterX( ConfigData& config, int x ) { - if( x < 1 ) - throw std::runtime_error( "Value after -x or --abortAfter must be greater than zero" ); - config.abortAfter = x; - } - inline void addTestOrTags( ConfigData& config, std::string const& _testSpec ) { config.testsOrTags.push_back( _testSpec ); } - inline void addSectionToRun( ConfigData& config, std::string const& sectionName ) { config.sectionsToRun.push_back( sectionName ); } - inline void addReporterName( ConfigData& config, std::string const& _reporterName ) { config.reporterNames.push_back( _reporterName ); } - - inline void addWarning( ConfigData& config, std::string const& _warning ) { - if( _warning == "NoAssertions" ) - config.warnings = static_cast( config.warnings | WarnAbout::NoAssertions ); - else - throw std::runtime_error( "Unrecognised warning: '" + _warning + '\'' ); - } - inline void setOrder( ConfigData& config, std::string const& order ) { - if( startsWith( "declared", order ) ) - config.runOrder = RunTests::InDeclarationOrder; - else if( startsWith( "lexical", order ) ) - config.runOrder = RunTests::InLexicographicalOrder; - else if( startsWith( "random", order ) ) - config.runOrder = RunTests::InRandomOrder; - else - throw std::runtime_error( "Unrecognised ordering: '" + order + '\'' ); - } - inline void setRngSeed( ConfigData& config, std::string const& seed ) { - if( seed == "time" ) { - config.rngSeed = static_cast( std::time(0) ); - } - else { - std::stringstream ss; - ss << seed; - ss >> config.rngSeed; - if( ss.fail() ) - throw std::runtime_error( "Argument to --rng-seed should be the word 'time' or a number" ); - } - } - inline void setVerbosity( ConfigData& config, int level ) { - // !TBD: accept strings? - config.verbosity = static_cast( level ); - } - inline void setShowDurations( ConfigData& config, bool _showDurations ) { - config.showDurations = _showDurations - ? ShowDurations::Always - : ShowDurations::Never; - } - inline void setUseColour( ConfigData& config, std::string const& value ) { - std::string mode = toLower( value ); - - if( mode == "yes" ) - config.useColour = UseColour::Yes; - else if( mode == "no" ) - config.useColour = UseColour::No; - else if( mode == "auto" ) - config.useColour = UseColour::Auto; - else - throw std::runtime_error( "colour mode must be one of: auto, yes or no" ); - } - inline void setWaitForKeypress( ConfigData& config, std::string const& keypress ) { - std::string keypressLc = toLower( keypress ); - if( keypressLc == "start" ) - config.waitForKeypress = WaitForKeypress::BeforeStart; - else if( keypressLc == "exit" ) - config.waitForKeypress = WaitForKeypress::BeforeExit; - else if( keypressLc == "both" ) - config.waitForKeypress = WaitForKeypress::BeforeStartAndExit; - else - throw std::runtime_error( "keypress argument must be one of: start, exit or both. '" + keypress + "' not recognised" ); - }; - - inline void forceColour( ConfigData& config ) { - config.useColour = UseColour::Yes; - } - inline void loadTestNamesFromFile( ConfigData& config, std::string const& _filename ) { - std::ifstream f( _filename.c_str() ); - if( !f.is_open() ) - throw std::domain_error( "Unable to load input file: " + _filename ); - - std::string line; - while( std::getline( f, line ) ) { - line = trim(line); - if( !line.empty() && !startsWith( line, '#' ) ) { - if( !startsWith( line, '"' ) ) - line = '"' + line + '"'; - addTestOrTags( config, line + ',' ); - } - } - } - - inline Clara::CommandLine makeCommandLineParser() { - - using namespace Clara; - CommandLine cli; - - cli.bindProcessName( &ConfigData::processName ); - - cli["-?"]["-h"]["--help"] - .describe( "display usage information" ) - .bind( &ConfigData::showHelp ); - - cli["-l"]["--list-tests"] - .describe( "list all/matching test cases" ) - .bind( &ConfigData::listTests ); - - cli["-t"]["--list-tags"] - .describe( "list all/matching tags" ) - .bind( &ConfigData::listTags ); - - cli["-s"]["--success"] - .describe( "include successful tests in output" ) - .bind( &ConfigData::showSuccessfulTests ); - - cli["-b"]["--break"] - .describe( "break into debugger on failure" ) - .bind( &ConfigData::shouldDebugBreak ); - - cli["-e"]["--nothrow"] - .describe( "skip exception tests" ) - .bind( &ConfigData::noThrow ); - - cli["-i"]["--invisibles"] - .describe( "show invisibles (tabs, newlines)" ) - .bind( &ConfigData::showInvisibles ); - - cli["-o"]["--out"] - .describe( "output filename" ) - .bind( &ConfigData::outputFilename, "filename" ); - - cli["-r"]["--reporter"] -// .placeholder( "name[:filename]" ) - .describe( "reporter to use (defaults to console)" ) - .bind( &addReporterName, "name" ); - - cli["-n"]["--name"] - .describe( "suite name" ) - .bind( &ConfigData::name, "name" ); - - cli["-a"]["--abort"] - .describe( "abort at first failure" ) - .bind( &abortAfterFirst ); - - cli["-x"]["--abortx"] - .describe( "abort after x failures" ) - .bind( &abortAfterX, "no. failures" ); - - cli["-w"]["--warn"] - .describe( "enable warnings" ) - .bind( &addWarning, "warning name" ); - -// - needs updating if reinstated -// cli.into( &setVerbosity ) -// .describe( "level of verbosity (0=no output)" ) -// .shortOpt( "v") -// .longOpt( "verbosity" ) -// .placeholder( "level" ); - - cli[_] - .describe( "which test or tests to use" ) - .bind( &addTestOrTags, "test name, pattern or tags" ); - - cli["-d"]["--durations"] - .describe( "show test durations" ) - .bind( &setShowDurations, "yes|no" ); - - cli["-f"]["--input-file"] - .describe( "load test names to run from a file" ) - .bind( &loadTestNamesFromFile, "filename" ); - - cli["-#"]["--filenames-as-tags"] - .describe( "adds a tag for the filename" ) - .bind( &ConfigData::filenamesAsTags ); - - cli["-c"]["--section"] - .describe( "specify section to run" ) - .bind( &addSectionToRun, "section name" ); - - // Less common commands which don't have a short form - cli["--list-test-names-only"] - .describe( "list all/matching test cases names only" ) - .bind( &ConfigData::listTestNamesOnly ); - - cli["--list-extra-info"] - .describe( "list all/matching test cases with more info" ) - .bind( &ConfigData::listExtraInfo ); - - cli["--list-reporters"] - .describe( "list all reporters" ) - .bind( &ConfigData::listReporters ); - - cli["--order"] - .describe( "test case order (defaults to decl)" ) - .bind( &setOrder, "decl|lex|rand" ); - - cli["--rng-seed"] - .describe( "set a specific seed for random numbers" ) - .bind( &setRngSeed, "'time'|number" ); - - cli["--force-colour"] - .describe( "force colourised output (deprecated)" ) - .bind( &forceColour ); - - cli["--use-colour"] - .describe( "should output be colourised" ) - .bind( &setUseColour, "yes|no" ); - - cli["--libidentify"] - .describe( "report name and version according to libidentify standard" ) - .bind( &ConfigData::libIdentify ); - - cli["--wait-for-keypress"] - .describe( "waits for a keypress before exiting" ) - .bind( &setWaitForKeypress, "start|exit|both" ); - - return cli; - } - -} // end namespace Catch - -// #included from: internal/catch_list.hpp -#define TWOBLUECUBES_CATCH_LIST_HPP_INCLUDED - -// #included from: catch_text.h -#define TWOBLUECUBES_CATCH_TEXT_H_INCLUDED - -#define TBC_TEXT_FORMAT_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH - -#define CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE Catch -// #included from: ../external/tbc_text_format.h -// Only use header guard if we are not using an outer namespace -#ifndef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE -# ifdef TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED -# ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -# define TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -# endif -# else -# define TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED -# endif -#endif -#ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -#include -#include -#include - -// Use optional outer namespace -#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE -namespace CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE { -#endif - -namespace Tbc { - -#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH - const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH; -#else - const unsigned int consoleWidth = 80; -#endif - - struct TextAttributes { - TextAttributes() - : initialIndent( std::string::npos ), - indent( 0 ), - width( consoleWidth-1 ) - {} - - TextAttributes& setInitialIndent( std::size_t _value ) { initialIndent = _value; return *this; } - TextAttributes& setIndent( std::size_t _value ) { indent = _value; return *this; } - TextAttributes& setWidth( std::size_t _value ) { width = _value; return *this; } - - std::size_t initialIndent; // indent of first line, or npos - std::size_t indent; // indent of subsequent lines, or all if initialIndent is npos - std::size_t width; // maximum width of text, including indent. Longer text will wrap - }; - - class Text { - public: - Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() ) - : attr( _attr ) - { - const std::string wrappableBeforeChars = "[({<\t"; - const std::string wrappableAfterChars = "])}>-,./|\\"; - const std::string wrappableInsteadOfChars = " \n\r"; - std::string indent = _attr.initialIndent != std::string::npos - ? std::string( _attr.initialIndent, ' ' ) - : std::string( _attr.indent, ' ' ); - - typedef std::string::const_iterator iterator; - iterator it = _str.begin(); - const iterator strEnd = _str.end(); - - while( it != strEnd ) { - - if( lines.size() >= 1000 ) { - lines.push_back( "... message truncated due to excessive size" ); - return; - } - - std::string suffix; - std::size_t width = (std::min)( static_cast( strEnd-it ), _attr.width-static_cast( indent.size() ) ); - iterator itEnd = it+width; - iterator itNext = _str.end(); - - iterator itNewLine = std::find( it, itEnd, '\n' ); - if( itNewLine != itEnd ) - itEnd = itNewLine; - - if( itEnd != strEnd ) { - bool foundWrapPoint = false; - iterator findIt = itEnd; - do { - if( wrappableAfterChars.find( *findIt ) != std::string::npos && findIt != itEnd ) { - itEnd = findIt+1; - itNext = findIt+1; - foundWrapPoint = true; - } - else if( findIt > it && wrappableBeforeChars.find( *findIt ) != std::string::npos ) { - itEnd = findIt; - itNext = findIt; - foundWrapPoint = true; - } - else if( wrappableInsteadOfChars.find( *findIt ) != std::string::npos ) { - itNext = findIt+1; - itEnd = findIt; - foundWrapPoint = true; - } - if( findIt == it ) - break; - else - --findIt; - } - while( !foundWrapPoint ); - - if( !foundWrapPoint ) { - // No good wrap char, so we'll break mid word and add a hyphen - --itEnd; - itNext = itEnd; - suffix = "-"; - } - else { - while( itEnd > it && wrappableInsteadOfChars.find( *(itEnd-1) ) != std::string::npos ) - --itEnd; - } - } - lines.push_back( indent + std::string( it, itEnd ) + suffix ); - - if( indent.size() != _attr.indent ) - indent = std::string( _attr.indent, ' ' ); - it = itNext; - } - } - - typedef std::vector::const_iterator const_iterator; - - const_iterator begin() const { return lines.begin(); } - const_iterator end() const { return lines.end(); } - std::string const& last() const { return lines.back(); } - std::size_t size() const { return lines.size(); } - std::string const& operator[]( std::size_t _index ) const { return lines[_index]; } - std::string toString() const { - std::ostringstream oss; - oss << *this; - return oss.str(); - } - - inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) { - for( Text::const_iterator it = _text.begin(), itEnd = _text.end(); - it != itEnd; ++it ) { - if( it != _text.begin() ) - _stream << "\n"; - _stream << *it; - } - return _stream; - } - - private: - std::string str; - TextAttributes attr; - std::vector lines; - }; - -} // end namespace Tbc - -#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE -} // end outer namespace -#endif - -#endif // TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED -#undef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE - -namespace Catch { - using Tbc::Text; - using Tbc::TextAttributes; -} - -// #included from: catch_console_colour.hpp -#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED - -namespace Catch { - - struct Colour { - enum Code { - None = 0, - - White, - Red, - Green, - Blue, - Cyan, - Yellow, - Grey, - - Bright = 0x10, - - BrightRed = Bright | Red, - BrightGreen = Bright | Green, - LightGrey = Bright | Grey, - BrightWhite = Bright | White, - - // By intention - FileName = LightGrey, - Warning = Yellow, - ResultError = BrightRed, - ResultSuccess = BrightGreen, - ResultExpectedFailure = Warning, - - Error = BrightRed, - Success = Green, - - OriginalExpression = Cyan, - ReconstructedExpression = Yellow, - - SecondaryText = LightGrey, - Headers = White - }; - - // Use constructed object for RAII guard - Colour( Code _colourCode ); - Colour( Colour const& other ); - ~Colour(); - - // Use static method for one-shot changes - static void use( Code _colourCode ); - - private: - bool m_moved; - }; - - inline std::ostream& operator << ( std::ostream& os, Colour const& ) { return os; } - -} // end namespace Catch - -// #included from: catch_interfaces_reporter.h -#define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED - -#include -#include -#include - -namespace Catch -{ - struct ReporterConfig { - explicit ReporterConfig( Ptr const& _fullConfig ) - : m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {} - - ReporterConfig( Ptr const& _fullConfig, std::ostream& _stream ) - : m_stream( &_stream ), m_fullConfig( _fullConfig ) {} - - std::ostream& stream() const { return *m_stream; } - Ptr fullConfig() const { return m_fullConfig; } - - private: - std::ostream* m_stream; - Ptr m_fullConfig; - }; - - struct ReporterPreferences { - ReporterPreferences() - : shouldRedirectStdOut( false ) - {} - - bool shouldRedirectStdOut; - }; - - template - struct LazyStat : Option { - LazyStat() : used( false ) {} - LazyStat& operator=( T const& _value ) { - Option::operator=( _value ); - used = false; - return *this; - } - void reset() { - Option::reset(); - used = false; - } - bool used; - }; - - struct TestRunInfo { - TestRunInfo( std::string const& _name ) : name( _name ) {} - std::string name; - }; - struct GroupInfo { - GroupInfo( std::string const& _name, - std::size_t _groupIndex, - std::size_t _groupsCount ) - : name( _name ), - groupIndex( _groupIndex ), - groupsCounts( _groupsCount ) - {} - - std::string name; - std::size_t groupIndex; - std::size_t groupsCounts; - }; - - struct AssertionStats { - AssertionStats( AssertionResult const& _assertionResult, - std::vector const& _infoMessages, - Totals const& _totals ) - : assertionResult( _assertionResult ), - infoMessages( _infoMessages ), - totals( _totals ) - { - if( assertionResult.hasMessage() ) { - // Copy message into messages list. - // !TBD This should have been done earlier, somewhere - MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() ); - builder << assertionResult.getMessage(); - builder.m_info.message = builder.m_stream.str(); - - infoMessages.push_back( builder.m_info ); - } - } - virtual ~AssertionStats(); - -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - AssertionStats( AssertionStats const& ) = default; - AssertionStats( AssertionStats && ) = default; - AssertionStats& operator = ( AssertionStats const& ) = default; - AssertionStats& operator = ( AssertionStats && ) = default; -# endif - - AssertionResult assertionResult; - std::vector infoMessages; - Totals totals; - }; - - struct SectionStats { - SectionStats( SectionInfo const& _sectionInfo, - Counts const& _assertions, - double _durationInSeconds, - bool _missingAssertions ) - : sectionInfo( _sectionInfo ), - assertions( _assertions ), - durationInSeconds( _durationInSeconds ), - missingAssertions( _missingAssertions ) - {} - virtual ~SectionStats(); -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - SectionStats( SectionStats const& ) = default; - SectionStats( SectionStats && ) = default; - SectionStats& operator = ( SectionStats const& ) = default; - SectionStats& operator = ( SectionStats && ) = default; -# endif - - SectionInfo sectionInfo; - Counts assertions; - double durationInSeconds; - bool missingAssertions; - }; - - struct TestCaseStats { - TestCaseStats( TestCaseInfo const& _testInfo, - Totals const& _totals, - std::string const& _stdOut, - std::string const& _stdErr, - bool _aborting ) - : testInfo( _testInfo ), - totals( _totals ), - stdOut( _stdOut ), - stdErr( _stdErr ), - aborting( _aborting ) - {} - virtual ~TestCaseStats(); - -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - TestCaseStats( TestCaseStats const& ) = default; - TestCaseStats( TestCaseStats && ) = default; - TestCaseStats& operator = ( TestCaseStats const& ) = default; - TestCaseStats& operator = ( TestCaseStats && ) = default; -# endif - - TestCaseInfo testInfo; - Totals totals; - std::string stdOut; - std::string stdErr; - bool aborting; - }; - - struct TestGroupStats { - TestGroupStats( GroupInfo const& _groupInfo, - Totals const& _totals, - bool _aborting ) - : groupInfo( _groupInfo ), - totals( _totals ), - aborting( _aborting ) - {} - TestGroupStats( GroupInfo const& _groupInfo ) - : groupInfo( _groupInfo ), - aborting( false ) - {} - virtual ~TestGroupStats(); - -# ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS - TestGroupStats( TestGroupStats const& ) = default; - TestGroupStats( TestGroupStats && ) = default; - TestGroupStats& operator = ( TestGroupStats const& ) = default; - TestGroupStats& operator = ( TestGroupStats && ) = default; -# endif - - GroupInfo groupInfo; - Totals totals; - bool aborting; - }; - - struct TestRunStats { - TestRunStats( TestRunInfo const& _runInfo, - Totals const& _totals, - bool _aborting ) - : runInfo( _runInfo ), - totals( _totals ), - aborting( _aborting ) - {} - virtual ~TestRunStats(); - -# ifndef CATCH_CONFIG_CPP11_GENERATED_METHODS - TestRunStats( TestRunStats const& _other ) - : runInfo( _other.runInfo ), - totals( _other.totals ), - aborting( _other.aborting ) - {} -# else - TestRunStats( TestRunStats const& ) = default; - TestRunStats( TestRunStats && ) = default; - TestRunStats& operator = ( TestRunStats const& ) = default; - TestRunStats& operator = ( TestRunStats && ) = default; -# endif - - TestRunInfo runInfo; - Totals totals; - bool aborting; - }; - - class MultipleReporters; - - struct IStreamingReporter : IShared { - virtual ~IStreamingReporter(); - - // Implementing class must also provide the following static method: - // static std::string getDescription(); - - virtual ReporterPreferences getPreferences() const = 0; - - virtual void noMatchingTestCases( std::string const& spec ) = 0; - - virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0; - virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0; - - virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0; - virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0; - - virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0; - - // The return value indicates if the messages buffer should be cleared: - virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0; - - virtual void sectionEnded( SectionStats const& sectionStats ) = 0; - virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0; - virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0; - virtual void testRunEnded( TestRunStats const& testRunStats ) = 0; - - virtual void skipTest( TestCaseInfo const& testInfo ) = 0; - - virtual MultipleReporters* tryAsMulti() { return CATCH_NULL; } - }; - - struct IReporterFactory : IShared { - virtual ~IReporterFactory(); - virtual IStreamingReporter* create( ReporterConfig const& config ) const = 0; - virtual std::string getDescription() const = 0; - }; - - struct IReporterRegistry { - typedef std::map > FactoryMap; - typedef std::vector > Listeners; - - virtual ~IReporterRegistry(); - virtual IStreamingReporter* create( std::string const& name, Ptr const& config ) const = 0; - virtual FactoryMap const& getFactories() const = 0; - virtual Listeners const& getListeners() const = 0; - }; - - Ptr addReporter( Ptr const& existingReporter, Ptr const& additionalReporter ); - -} - -#include -#include - -namespace Catch { - - inline std::size_t listTests( Config const& config ) { - - TestSpec testSpec = config.testSpec(); - if( config.testSpec().hasFilters() ) - Catch::cout() << "Matching test cases:\n"; - else { - Catch::cout() << "All available test cases:\n"; - testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec(); - } - - std::size_t matchedTests = 0; - TextAttributes nameAttr, descAttr, tagsAttr; - nameAttr.setInitialIndent( 2 ).setIndent( 4 ); - descAttr.setIndent( 4 ); - tagsAttr.setIndent( 6 ); - - std::vector matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config ); - for( std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); - it != itEnd; - ++it ) { - matchedTests++; - TestCaseInfo const& testCaseInfo = it->getTestCaseInfo(); - Colour::Code colour = testCaseInfo.isHidden() - ? Colour::SecondaryText - : Colour::None; - Colour colourGuard( colour ); - - Catch::cout() << Text( testCaseInfo.name, nameAttr ) << std::endl; - if( config.listExtraInfo() ) { - Catch::cout() << " " << testCaseInfo.lineInfo << std::endl; - std::string description = testCaseInfo.description; - if( description.empty() ) - description = "(NO DESCRIPTION)"; - Catch::cout() << Text( description, descAttr ) << std::endl; - } - if( !testCaseInfo.tags.empty() ) - Catch::cout() << Text( testCaseInfo.tagsAsString, tagsAttr ) << std::endl; - } - - if( !config.testSpec().hasFilters() ) - Catch::cout() << pluralise( matchedTests, "test case" ) << '\n' << std::endl; - else - Catch::cout() << pluralise( matchedTests, "matching test case" ) << '\n' << std::endl; - return matchedTests; - } - - inline std::size_t listTestsNamesOnly( Config const& config ) { - TestSpec testSpec = config.testSpec(); - if( !config.testSpec().hasFilters() ) - testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec(); - std::size_t matchedTests = 0; - std::vector matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config ); - for( std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); - it != itEnd; - ++it ) { - matchedTests++; - TestCaseInfo const& testCaseInfo = it->getTestCaseInfo(); - if( startsWith( testCaseInfo.name, '#' ) ) - Catch::cout() << '"' << testCaseInfo.name << '"'; - else - Catch::cout() << testCaseInfo.name; - if ( config.listExtraInfo() ) - Catch::cout() << "\t@" << testCaseInfo.lineInfo; - Catch::cout() << std::endl; - } - return matchedTests; - } - - struct TagInfo { - TagInfo() : count ( 0 ) {} - void add( std::string const& spelling ) { - ++count; - spellings.insert( spelling ); - } - std::string all() const { - std::string out; - for( std::set::const_iterator it = spellings.begin(), itEnd = spellings.end(); - it != itEnd; - ++it ) - out += "[" + *it + "]"; - return out; - } - std::set spellings; - std::size_t count; - }; - - inline std::size_t listTags( Config const& config ) { - TestSpec testSpec = config.testSpec(); - if( config.testSpec().hasFilters() ) - Catch::cout() << "Tags for matching test cases:\n"; - else { - Catch::cout() << "All available tags:\n"; - testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec(); - } - - std::map tagCounts; - - std::vector matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config ); - for( std::vector::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end(); - it != itEnd; - ++it ) { - for( std::set::const_iterator tagIt = it->getTestCaseInfo().tags.begin(), - tagItEnd = it->getTestCaseInfo().tags.end(); - tagIt != tagItEnd; - ++tagIt ) { - std::string tagName = *tagIt; - std::string lcaseTagName = toLower( tagName ); - std::map::iterator countIt = tagCounts.find( lcaseTagName ); - if( countIt == tagCounts.end() ) - countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first; - countIt->second.add( tagName ); - } - } - - for( std::map::const_iterator countIt = tagCounts.begin(), - countItEnd = tagCounts.end(); - countIt != countItEnd; - ++countIt ) { - std::ostringstream oss; - oss << " " << std::setw(2) << countIt->second.count << " "; - Text wrapper( countIt->second.all(), TextAttributes() - .setInitialIndent( 0 ) - .setIndent( oss.str().size() ) - .setWidth( CATCH_CONFIG_CONSOLE_WIDTH-10 ) ); - Catch::cout() << oss.str() << wrapper << '\n'; - } - Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl; - return tagCounts.size(); - } - - inline std::size_t listReporters( Config const& /*config*/ ) { - Catch::cout() << "Available reporters:\n"; - IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories(); - IReporterRegistry::FactoryMap::const_iterator itBegin = factories.begin(), itEnd = factories.end(), it; - std::size_t maxNameLen = 0; - for(it = itBegin; it != itEnd; ++it ) - maxNameLen = (std::max)( maxNameLen, it->first.size() ); - - for(it = itBegin; it != itEnd; ++it ) { - Text wrapper( it->second->getDescription(), TextAttributes() - .setInitialIndent( 0 ) - .setIndent( 7+maxNameLen ) - .setWidth( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 ) ); - Catch::cout() << " " - << it->first - << ':' - << std::string( maxNameLen - it->first.size() + 2, ' ' ) - << wrapper << '\n'; - } - Catch::cout() << std::endl; - return factories.size(); - } - - inline Option list( Config const& config ) { - Option listedCount; - if( config.listTests() || ( config.listExtraInfo() && !config.listTestNamesOnly() ) ) - listedCount = listedCount.valueOr(0) + listTests( config ); - if( config.listTestNamesOnly() ) - listedCount = listedCount.valueOr(0) + listTestsNamesOnly( config ); - if( config.listTags() ) - listedCount = listedCount.valueOr(0) + listTags( config ); - if( config.listReporters() ) - listedCount = listedCount.valueOr(0) + listReporters( config ); - return listedCount; - } - -} // end namespace Catch - -// #included from: internal/catch_run_context.hpp -#define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED - -// #included from: catch_test_case_tracker.hpp -#define TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED - -#include -#include -#include -#include -#include - -CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS - -namespace Catch { -namespace TestCaseTracking { - - struct NameAndLocation { - std::string name; - SourceLineInfo location; - - NameAndLocation( std::string const& _name, SourceLineInfo const& _location ) - : name( _name ), - location( _location ) - {} - }; - - struct ITracker : SharedImpl<> { - virtual ~ITracker(); - - // static queries - virtual NameAndLocation const& nameAndLocation() const = 0; - - // dynamic queries - virtual bool isComplete() const = 0; // Successfully completed or failed - virtual bool isSuccessfullyCompleted() const = 0; - virtual bool isOpen() const = 0; // Started but not complete - virtual bool hasChildren() const = 0; - - virtual ITracker& parent() = 0; - - // actions - virtual void close() = 0; // Successfully complete - virtual void fail() = 0; - virtual void markAsNeedingAnotherRun() = 0; - - virtual void addChild( Ptr const& child ) = 0; - virtual ITracker* findChild( NameAndLocation const& nameAndLocation ) = 0; - virtual void openChild() = 0; - - // Debug/ checking - virtual bool isSectionTracker() const = 0; - virtual bool isIndexTracker() const = 0; - }; - - class TrackerContext { - - enum RunState { - NotStarted, - Executing, - CompletedCycle - }; - - Ptr m_rootTracker; - ITracker* m_currentTracker; - RunState m_runState; - - public: - - static TrackerContext& instance() { - static TrackerContext s_instance; - return s_instance; - } - - TrackerContext() - : m_currentTracker( CATCH_NULL ), - m_runState( NotStarted ) - {} - - ITracker& startRun(); - - void endRun() { - m_rootTracker.reset(); - m_currentTracker = CATCH_NULL; - m_runState = NotStarted; - } - - void startCycle() { - m_currentTracker = m_rootTracker.get(); - m_runState = Executing; - } - void completeCycle() { - m_runState = CompletedCycle; - } - - bool completedCycle() const { - return m_runState == CompletedCycle; - } - ITracker& currentTracker() { - return *m_currentTracker; - } - void setCurrentTracker( ITracker* tracker ) { - m_currentTracker = tracker; - } - }; - - class TrackerBase : public ITracker { - protected: - enum CycleState { - NotStarted, - Executing, - ExecutingChildren, - NeedsAnotherRun, - CompletedSuccessfully, - Failed - }; - class TrackerHasName { - NameAndLocation m_nameAndLocation; - public: - TrackerHasName( NameAndLocation const& nameAndLocation ) : m_nameAndLocation( nameAndLocation ) {} - bool operator ()( Ptr const& tracker ) { - return - tracker->nameAndLocation().name == m_nameAndLocation.name && - tracker->nameAndLocation().location == m_nameAndLocation.location; - } - }; - typedef std::vector > Children; - NameAndLocation m_nameAndLocation; - TrackerContext& m_ctx; - ITracker* m_parent; - Children m_children; - CycleState m_runState; - public: - TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ) - : m_nameAndLocation( nameAndLocation ), - m_ctx( ctx ), - m_parent( parent ), - m_runState( NotStarted ) - {} - virtual ~TrackerBase(); - - virtual NameAndLocation const& nameAndLocation() const CATCH_OVERRIDE { - return m_nameAndLocation; - } - virtual bool isComplete() const CATCH_OVERRIDE { - return m_runState == CompletedSuccessfully || m_runState == Failed; - } - virtual bool isSuccessfullyCompleted() const CATCH_OVERRIDE { - return m_runState == CompletedSuccessfully; - } - virtual bool isOpen() const CATCH_OVERRIDE { - return m_runState != NotStarted && !isComplete(); - } - virtual bool hasChildren() const CATCH_OVERRIDE { - return !m_children.empty(); - } - - virtual void addChild( Ptr const& child ) CATCH_OVERRIDE { - m_children.push_back( child ); - } - - virtual ITracker* findChild( NameAndLocation const& nameAndLocation ) CATCH_OVERRIDE { - Children::const_iterator it = std::find_if( m_children.begin(), m_children.end(), TrackerHasName( nameAndLocation ) ); - return( it != m_children.end() ) - ? it->get() - : CATCH_NULL; - } - virtual ITracker& parent() CATCH_OVERRIDE { - assert( m_parent ); // Should always be non-null except for root - return *m_parent; - } - - virtual void openChild() CATCH_OVERRIDE { - if( m_runState != ExecutingChildren ) { - m_runState = ExecutingChildren; - if( m_parent ) - m_parent->openChild(); - } - } - - virtual bool isSectionTracker() const CATCH_OVERRIDE { return false; } - virtual bool isIndexTracker() const CATCH_OVERRIDE { return false; } - - void open() { - m_runState = Executing; - moveToThis(); - if( m_parent ) - m_parent->openChild(); - } - - virtual void close() CATCH_OVERRIDE { - - // Close any still open children (e.g. generators) - while( &m_ctx.currentTracker() != this ) - m_ctx.currentTracker().close(); - - switch( m_runState ) { - case NotStarted: - case CompletedSuccessfully: - case Failed: - throw std::logic_error( "Illogical state" ); - - case NeedsAnotherRun: - break;; - - case Executing: - m_runState = CompletedSuccessfully; - break; - case ExecutingChildren: - if( m_children.empty() || m_children.back()->isComplete() ) - m_runState = CompletedSuccessfully; - break; - - default: - throw std::logic_error( "Unexpected state" ); - } - moveToParent(); - m_ctx.completeCycle(); - } - virtual void fail() CATCH_OVERRIDE { - m_runState = Failed; - if( m_parent ) - m_parent->markAsNeedingAnotherRun(); - moveToParent(); - m_ctx.completeCycle(); - } - virtual void markAsNeedingAnotherRun() CATCH_OVERRIDE { - m_runState = NeedsAnotherRun; - } - private: - void moveToParent() { - assert( m_parent ); - m_ctx.setCurrentTracker( m_parent ); - } - void moveToThis() { - m_ctx.setCurrentTracker( this ); - } - }; - - class SectionTracker : public TrackerBase { - std::vector m_filters; - public: - SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ) - : TrackerBase( nameAndLocation, ctx, parent ) - { - if( parent ) { - while( !parent->isSectionTracker() ) - parent = &parent->parent(); - - SectionTracker& parentSection = static_cast( *parent ); - addNextFilters( parentSection.m_filters ); - } - } - virtual ~SectionTracker(); - - virtual bool isSectionTracker() const CATCH_OVERRIDE { return true; } - - static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) { - SectionTracker* section = CATCH_NULL; - - ITracker& currentTracker = ctx.currentTracker(); - if( ITracker* childTracker = currentTracker.findChild( nameAndLocation ) ) { - assert( childTracker ); - assert( childTracker->isSectionTracker() ); - section = static_cast( childTracker ); - } - else { - section = new SectionTracker( nameAndLocation, ctx, ¤tTracker ); - currentTracker.addChild( section ); - } - if( !ctx.completedCycle() ) - section->tryOpen(); - return *section; - } - - void tryOpen() { - if( !isComplete() && (m_filters.empty() || m_filters[0].empty() || m_filters[0] == m_nameAndLocation.name ) ) - open(); - } - - void addInitialFilters( std::vector const& filters ) { - if( !filters.empty() ) { - m_filters.push_back(""); // Root - should never be consulted - m_filters.push_back(""); // Test Case - not a section filter - m_filters.insert( m_filters.end(), filters.begin(), filters.end() ); - } - } - void addNextFilters( std::vector const& filters ) { - if( filters.size() > 1 ) - m_filters.insert( m_filters.end(), ++filters.begin(), filters.end() ); - } - }; - - class IndexTracker : public TrackerBase { - int m_size; - int m_index; - public: - IndexTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent, int size ) - : TrackerBase( nameAndLocation, ctx, parent ), - m_size( size ), - m_index( -1 ) - {} - virtual ~IndexTracker(); - - virtual bool isIndexTracker() const CATCH_OVERRIDE { return true; } - - static IndexTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation, int size ) { - IndexTracker* tracker = CATCH_NULL; - - ITracker& currentTracker = ctx.currentTracker(); - if( ITracker* childTracker = currentTracker.findChild( nameAndLocation ) ) { - assert( childTracker ); - assert( childTracker->isIndexTracker() ); - tracker = static_cast( childTracker ); - } - else { - tracker = new IndexTracker( nameAndLocation, ctx, ¤tTracker, size ); - currentTracker.addChild( tracker ); - } - - if( !ctx.completedCycle() && !tracker->isComplete() ) { - if( tracker->m_runState != ExecutingChildren && tracker->m_runState != NeedsAnotherRun ) - tracker->moveNext(); - tracker->open(); - } - - return *tracker; - } - - int index() const { return m_index; } - - void moveNext() { - m_index++; - m_children.clear(); - } - - virtual void close() CATCH_OVERRIDE { - TrackerBase::close(); - if( m_runState == CompletedSuccessfully && m_index < m_size-1 ) - m_runState = Executing; - } - }; - - inline ITracker& TrackerContext::startRun() { - m_rootTracker = new SectionTracker( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, CATCH_NULL ); - m_currentTracker = CATCH_NULL; - m_runState = Executing; - return *m_rootTracker; - } - -} // namespace TestCaseTracking - -using TestCaseTracking::ITracker; -using TestCaseTracking::TrackerContext; -using TestCaseTracking::SectionTracker; -using TestCaseTracking::IndexTracker; - -} // namespace Catch - -CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS - -// #included from: catch_fatal_condition.hpp -#define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED - -namespace Catch { - - // Report the error condition - inline void reportFatal( std::string const& message ) { - IContext& context = Catch::getCurrentContext(); - IResultCapture* resultCapture = context.getResultCapture(); - resultCapture->handleFatalErrorCondition( message ); - } - -} // namespace Catch - -#if defined ( CATCH_PLATFORM_WINDOWS ) ///////////////////////////////////////// -// #included from: catch_windows_h_proxy.h - -#define TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED - -#ifdef CATCH_DEFINES_NOMINMAX -# define NOMINMAX -#endif -#ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -#endif - -#ifdef __AFXDLL -#include -#else -#include -#endif - -#ifdef CATCH_DEFINES_NOMINMAX -# undef NOMINMAX -#endif -#ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN -# undef WIN32_LEAN_AND_MEAN -#endif - - -# if !defined ( CATCH_CONFIG_WINDOWS_SEH ) - -namespace Catch { - struct FatalConditionHandler { - void reset() {} - }; -} - -# else // CATCH_CONFIG_WINDOWS_SEH is defined - -namespace Catch { - - struct SignalDefs { DWORD id; const char* name; }; - extern SignalDefs signalDefs[]; - // There is no 1-1 mapping between signals and windows exceptions. - // Windows can easily distinguish between SO and SigSegV, - // but SigInt, SigTerm, etc are handled differently. - SignalDefs signalDefs[] = { - { EXCEPTION_ILLEGAL_INSTRUCTION, "SIGILL - Illegal instruction signal" }, - { EXCEPTION_STACK_OVERFLOW, "SIGSEGV - Stack overflow" }, - { EXCEPTION_ACCESS_VIOLATION, "SIGSEGV - Segmentation violation signal" }, - { EXCEPTION_INT_DIVIDE_BY_ZERO, "Divide by zero error" }, - }; - - struct FatalConditionHandler { - - static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) { - for (int i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { - if (ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) { - reportFatal(signalDefs[i].name); - } - } - // If its not an exception we care about, pass it along. - // This stops us from eating debugger breaks etc. - return EXCEPTION_CONTINUE_SEARCH; - } - - FatalConditionHandler() { - isSet = true; - // 32k seems enough for Catch to handle stack overflow, - // but the value was found experimentally, so there is no strong guarantee - guaranteeSize = 32 * 1024; - exceptionHandlerHandle = CATCH_NULL; - // Register as first handler in current chain - exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException); - // Pass in guarantee size to be filled - SetThreadStackGuarantee(&guaranteeSize); - } - - static void reset() { - if (isSet) { - // Unregister handler and restore the old guarantee - RemoveVectoredExceptionHandler(exceptionHandlerHandle); - SetThreadStackGuarantee(&guaranteeSize); - exceptionHandlerHandle = CATCH_NULL; - isSet = false; - } - } - - ~FatalConditionHandler() { - reset(); - } - private: - static bool isSet; - static ULONG guaranteeSize; - static PVOID exceptionHandlerHandle; - }; - - bool FatalConditionHandler::isSet = false; - ULONG FatalConditionHandler::guaranteeSize = 0; - PVOID FatalConditionHandler::exceptionHandlerHandle = CATCH_NULL; - -} // namespace Catch - -# endif // CATCH_CONFIG_WINDOWS_SEH - -#else // Not Windows - assumed to be POSIX compatible ////////////////////////// - -# if !defined(CATCH_CONFIG_POSIX_SIGNALS) - -namespace Catch { - struct FatalConditionHandler { - void reset() {} - }; -} - -# else // CATCH_CONFIG_POSIX_SIGNALS is defined - -#include - -namespace Catch { - - struct SignalDefs { - int id; - const char* name; - }; - extern SignalDefs signalDefs[]; - SignalDefs signalDefs[] = { - { SIGINT, "SIGINT - Terminal interrupt signal" }, - { SIGILL, "SIGILL - Illegal instruction signal" }, - { SIGFPE, "SIGFPE - Floating point error signal" }, - { SIGSEGV, "SIGSEGV - Segmentation violation signal" }, - { SIGTERM, "SIGTERM - Termination request signal" }, - { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" } - }; - - struct FatalConditionHandler { - - static bool isSet; - static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)]; - static stack_t oldSigStack; - static char altStackMem[SIGSTKSZ]; - - static void handleSignal( int sig ) { - std::string name = ""; - for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { - SignalDefs &def = signalDefs[i]; - if (sig == def.id) { - name = def.name; - break; - } - } - reset(); - reportFatal(name); - raise( sig ); - } - - FatalConditionHandler() { - isSet = true; - stack_t sigStack; - sigStack.ss_sp = altStackMem; - sigStack.ss_size = SIGSTKSZ; - sigStack.ss_flags = 0; - sigaltstack(&sigStack, &oldSigStack); - struct sigaction sa = { 0 }; - - sa.sa_handler = handleSignal; - sa.sa_flags = SA_ONSTACK; - for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) { - sigaction(signalDefs[i].id, &sa, &oldSigActions[i]); - } - } - - ~FatalConditionHandler() { - reset(); - } - static void reset() { - if( isSet ) { - // Set signals back to previous values -- hopefully nobody overwrote them in the meantime - for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) { - sigaction(signalDefs[i].id, &oldSigActions[i], CATCH_NULL); - } - // Return the old stack - sigaltstack(&oldSigStack, CATCH_NULL); - isSet = false; - } - } - }; - - bool FatalConditionHandler::isSet = false; - struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; - stack_t FatalConditionHandler::oldSigStack = {}; - char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; - -} // namespace Catch - -# endif // CATCH_CONFIG_POSIX_SIGNALS - -#endif // not Windows - -#include -#include -#include - -namespace Catch { - - class StreamRedirect { - - public: - StreamRedirect( std::ostream& stream, std::string& targetString ) - : m_stream( stream ), - m_prevBuf( stream.rdbuf() ), - m_targetString( targetString ) - { - stream.rdbuf( m_oss.rdbuf() ); - } - - ~StreamRedirect() { - m_targetString += m_oss.str(); - m_stream.rdbuf( m_prevBuf ); - } - - private: - std::ostream& m_stream; - std::streambuf* m_prevBuf; - std::ostringstream m_oss; - std::string& m_targetString; - }; - - // StdErr has two constituent streams in C++, std::cerr and std::clog - // This means that we need to redirect 2 streams into 1 to keep proper - // order of writes and cannot use StreamRedirect on its own - class StdErrRedirect { - public: - StdErrRedirect(std::string& targetString) - :m_cerrBuf( cerr().rdbuf() ), m_clogBuf(clog().rdbuf()), - m_targetString(targetString){ - cerr().rdbuf(m_oss.rdbuf()); - clog().rdbuf(m_oss.rdbuf()); - } - ~StdErrRedirect() { - m_targetString += m_oss.str(); - cerr().rdbuf(m_cerrBuf); - clog().rdbuf(m_clogBuf); - } - private: - std::streambuf* m_cerrBuf; - std::streambuf* m_clogBuf; - std::ostringstream m_oss; - std::string& m_targetString; - }; - - /////////////////////////////////////////////////////////////////////////// - - class RunContext : public IResultCapture, public IRunner { - - RunContext( RunContext const& ); - void operator =( RunContext const& ); - - public: - - explicit RunContext( Ptr const& _config, Ptr const& reporter ) - : m_runInfo( _config->name() ), - m_context( getCurrentMutableContext() ), - m_activeTestCase( CATCH_NULL ), - m_config( _config ), - m_reporter( reporter ), - m_shouldReportUnexpected ( true ) - { - m_context.setRunner( this ); - m_context.setConfig( m_config ); - m_context.setResultCapture( this ); - m_reporter->testRunStarting( m_runInfo ); - } - - virtual ~RunContext() { - m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, aborting() ) ); - } - - void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount ) { - m_reporter->testGroupStarting( GroupInfo( testSpec, groupIndex, groupsCount ) ); - } - void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount ) { - m_reporter->testGroupEnded( TestGroupStats( GroupInfo( testSpec, groupIndex, groupsCount ), totals, aborting() ) ); - } - - Totals runTest( TestCase const& testCase ) { - Totals prevTotals = m_totals; - - std::string redirectedCout; - std::string redirectedCerr; - - TestCaseInfo testInfo = testCase.getTestCaseInfo(); - - m_reporter->testCaseStarting( testInfo ); - - m_activeTestCase = &testCase; - - do { - ITracker& rootTracker = m_trackerContext.startRun(); - assert( rootTracker.isSectionTracker() ); - static_cast( rootTracker ).addInitialFilters( m_config->getSectionsToRun() ); - do { - m_trackerContext.startCycle(); - m_testCaseTracker = &SectionTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( testInfo.name, testInfo.lineInfo ) ); - runCurrentTest( redirectedCout, redirectedCerr ); - } - while( !m_testCaseTracker->isSuccessfullyCompleted() && !aborting() ); - } - // !TBD: deprecated - this will be replaced by indexed trackers - while( getCurrentContext().advanceGeneratorsForCurrentTest() && !aborting() ); - - Totals deltaTotals = m_totals.delta( prevTotals ); - if( testInfo.expectedToFail() && deltaTotals.testCases.passed > 0 ) { - deltaTotals.assertions.failed++; - deltaTotals.testCases.passed--; - deltaTotals.testCases.failed++; - } - m_totals.testCases += deltaTotals.testCases; - m_reporter->testCaseEnded( TestCaseStats( testInfo, - deltaTotals, - redirectedCout, - redirectedCerr, - aborting() ) ); - - m_activeTestCase = CATCH_NULL; - m_testCaseTracker = CATCH_NULL; - - return deltaTotals; - } - - Ptr config() const { - return m_config; - } - - private: // IResultCapture - - virtual void assertionEnded( AssertionResult const& result ) { - if( result.getResultType() == ResultWas::Ok ) { - m_totals.assertions.passed++; - } - else if( !result.isOk() ) { - if( m_activeTestCase->getTestCaseInfo().okToFail() ) - m_totals.assertions.failedButOk++; - else - m_totals.assertions.failed++; - } - - // We have no use for the return value (whether messages should be cleared), because messages were made scoped - // and should be let to clear themselves out. - static_cast(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals))); - - // Reset working state - m_lastAssertionInfo = AssertionInfo( "", m_lastAssertionInfo.lineInfo, "{Unknown expression after the reported line}" , m_lastAssertionInfo.resultDisposition ); - m_lastResult = result; - } - - virtual bool lastAssertionPassed() - { - return m_totals.assertions.passed == (m_prevPassed + 1); - } - - virtual void assertionPassed() - { - m_totals.assertions.passed++; - m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"; - m_lastAssertionInfo.macroName = ""; - } - - virtual void assertionRun() - { - m_prevPassed = m_totals.assertions.passed; - } - - virtual bool sectionStarted ( - SectionInfo const& sectionInfo, - Counts& assertions - ) - { - ITracker& sectionTracker = SectionTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( sectionInfo.name, sectionInfo.lineInfo ) ); - if( !sectionTracker.isOpen() ) - return false; - m_activeSections.push_back( §ionTracker ); - - m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo; - - m_reporter->sectionStarting( sectionInfo ); - - assertions = m_totals.assertions; - - return true; - } - bool testForMissingAssertions( Counts& assertions ) { - if( assertions.total() != 0 ) - return false; - if( !m_config->warnAboutMissingAssertions() ) - return false; - if( m_trackerContext.currentTracker().hasChildren() ) - return false; - m_totals.assertions.failed++; - assertions.failed++; - return true; - } - - virtual void sectionEnded( SectionEndInfo const& endInfo ) { - Counts assertions = m_totals.assertions - endInfo.prevAssertions; - bool missingAssertions = testForMissingAssertions( assertions ); - - if( !m_activeSections.empty() ) { - m_activeSections.back()->close(); - m_activeSections.pop_back(); - } - - m_reporter->sectionEnded( SectionStats( endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions ) ); - m_messages.clear(); - } - - virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) { - if( m_unfinishedSections.empty() ) - m_activeSections.back()->fail(); - else - m_activeSections.back()->close(); - m_activeSections.pop_back(); - - m_unfinishedSections.push_back( endInfo ); - } - - virtual void pushScopedMessage( MessageInfo const& message ) { - m_messages.push_back( message ); - } - - virtual void popScopedMessage( MessageInfo const& message ) { - m_messages.erase( std::remove( m_messages.begin(), m_messages.end(), message ), m_messages.end() ); - } - - virtual std::string getCurrentTestName() const { - return m_activeTestCase - ? m_activeTestCase->getTestCaseInfo().name - : std::string(); - } - - virtual const AssertionResult* getLastResult() const { - return &m_lastResult; - } - - virtual void exceptionEarlyReported() { - m_shouldReportUnexpected = false; - } - - virtual void handleFatalErrorCondition( std::string const& message ) { - // Don't rebuild the result -- the stringification itself can cause more fatal errors - // Instead, fake a result data. - AssertionResultData tempResult; - tempResult.resultType = ResultWas::FatalErrorCondition; - tempResult.message = message; - AssertionResult result(m_lastAssertionInfo, tempResult); - - getResultCapture().assertionEnded(result); - - handleUnfinishedSections(); - - // Recreate section for test case (as we will lose the one that was in scope) - TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo(); - SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description ); - - Counts assertions; - assertions.failed = 1; - SectionStats testCaseSectionStats( testCaseSection, assertions, 0, false ); - m_reporter->sectionEnded( testCaseSectionStats ); - - TestCaseInfo testInfo = m_activeTestCase->getTestCaseInfo(); - - Totals deltaTotals; - deltaTotals.testCases.failed = 1; - deltaTotals.assertions.failed = 1; - m_reporter->testCaseEnded( TestCaseStats( testInfo, - deltaTotals, - std::string(), - std::string(), - false ) ); - m_totals.testCases.failed++; - testGroupEnded( std::string(), m_totals, 1, 1 ); - m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, false ) ); - } - - public: - // !TBD We need to do this another way! - bool aborting() const { - return m_totals.assertions.failed == static_cast( m_config->abortAfter() ); - } - - private: - - void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr ) { - TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo(); - SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description ); - m_reporter->sectionStarting( testCaseSection ); - Counts prevAssertions = m_totals.assertions; - double duration = 0; - m_shouldReportUnexpected = true; - try { - m_lastAssertionInfo = AssertionInfo( "TEST_CASE", testCaseInfo.lineInfo, "", ResultDisposition::Normal ); - - seedRng( *m_config ); - - Timer timer; - timer.start(); - if( m_reporter->getPreferences().shouldRedirectStdOut ) { - StreamRedirect coutRedir( Catch::cout(), redirectedCout ); - StdErrRedirect errRedir( redirectedCerr ); - invokeActiveTestCase(); - } - else { - invokeActiveTestCase(); - } - duration = timer.getElapsedSeconds(); - } - catch( TestFailureException& ) { - // This just means the test was aborted due to failure - } - catch(...) { - // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions - // are reported without translation at the point of origin. - if (m_shouldReportUnexpected) { - makeUnexpectedResultBuilder().useActiveException(); - } - } - m_testCaseTracker->close(); - handleUnfinishedSections(); - m_messages.clear(); - - Counts assertions = m_totals.assertions - prevAssertions; - bool missingAssertions = testForMissingAssertions( assertions ); - - SectionStats testCaseSectionStats( testCaseSection, assertions, duration, missingAssertions ); - m_reporter->sectionEnded( testCaseSectionStats ); - } - - void invokeActiveTestCase() { - FatalConditionHandler fatalConditionHandler; // Handle signals - m_activeTestCase->invoke(); - fatalConditionHandler.reset(); - } - - private: - - ResultBuilder makeUnexpectedResultBuilder() const { - return ResultBuilder( m_lastAssertionInfo.macroName, - m_lastAssertionInfo.lineInfo, - m_lastAssertionInfo.capturedExpression, - m_lastAssertionInfo.resultDisposition ); - } - - void handleUnfinishedSections() { - // If sections ended prematurely due to an exception we stored their - // infos here so we can tear them down outside the unwind process. - for( std::vector::const_reverse_iterator it = m_unfinishedSections.rbegin(), - itEnd = m_unfinishedSections.rend(); - it != itEnd; - ++it ) - sectionEnded( *it ); - m_unfinishedSections.clear(); - } - - TestRunInfo m_runInfo; - IMutableContext& m_context; - TestCase const* m_activeTestCase; - ITracker* m_testCaseTracker; - ITracker* m_currentSectionTracker; - AssertionResult m_lastResult; - - Ptr m_config; - Totals m_totals; - Ptr m_reporter; - std::vector m_messages; - AssertionInfo m_lastAssertionInfo; - std::vector m_unfinishedSections; - std::vector m_activeSections; - TrackerContext m_trackerContext; - size_t m_prevPassed; - bool m_shouldReportUnexpected; - }; - - IResultCapture& getResultCapture() { - if( IResultCapture* capture = getCurrentContext().getResultCapture() ) - return *capture; - else - throw std::logic_error( "No result capture instance" ); - } - -} // end namespace Catch - -// #included from: internal/catch_version.h -#define TWOBLUECUBES_CATCH_VERSION_H_INCLUDED - -namespace Catch { - - // Versioning information - struct Version { - Version( unsigned int _majorVersion, - unsigned int _minorVersion, - unsigned int _patchNumber, - char const * const _branchName, - unsigned int _buildNumber ); - - unsigned int const majorVersion; - unsigned int const minorVersion; - unsigned int const patchNumber; - - // buildNumber is only used if branchName is not null - char const * const branchName; - unsigned int const buildNumber; - - friend std::ostream& operator << ( std::ostream& os, Version const& version ); - - private: - void operator=( Version const& ); - }; - - inline Version libraryVersion(); -} - -#include -#include -#include - -namespace Catch { - - Ptr createReporter( std::string const& reporterName, Ptr const& config ) { - Ptr reporter = getRegistryHub().getReporterRegistry().create( reporterName, config.get() ); - if( !reporter ) { - std::ostringstream oss; - oss << "No reporter registered with name: '" << reporterName << "'"; - throw std::domain_error( oss.str() ); - } - return reporter; - } - -#if !defined(CATCH_CONFIG_DEFAULT_REPORTER) -#define CATCH_CONFIG_DEFAULT_REPORTER "console" -#endif - - Ptr makeReporter( Ptr const& config ) { - std::vector reporters = config->getReporterNames(); - if( reporters.empty() ) - reporters.push_back( CATCH_CONFIG_DEFAULT_REPORTER ); - - Ptr reporter; - for( std::vector::const_iterator it = reporters.begin(), itEnd = reporters.end(); - it != itEnd; - ++it ) - reporter = addReporter( reporter, createReporter( *it, config ) ); - return reporter; - } - Ptr addListeners( Ptr const& config, Ptr reporters ) { - IReporterRegistry::Listeners listeners = getRegistryHub().getReporterRegistry().getListeners(); - for( IReporterRegistry::Listeners::const_iterator it = listeners.begin(), itEnd = listeners.end(); - it != itEnd; - ++it ) - reporters = addReporter(reporters, (*it)->create( ReporterConfig( config ) ) ); - return reporters; - } - - Totals runTests( Ptr const& config ) { - - Ptr iconfig = config.get(); - - Ptr reporter = makeReporter( config ); - reporter = addListeners( iconfig, reporter ); - - RunContext context( iconfig, reporter ); - - Totals totals; - - context.testGroupStarting( config->name(), 1, 1 ); - - TestSpec testSpec = config->testSpec(); - if( !testSpec.hasFilters() ) - testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "~[.]" ).testSpec(); // All not hidden tests - - std::vector const& allTestCases = getAllTestCasesSorted( *iconfig ); - for( std::vector::const_iterator it = allTestCases.begin(), itEnd = allTestCases.end(); - it != itEnd; - ++it ) { - if( !context.aborting() && matchTest( *it, testSpec, *iconfig ) ) - totals += context.runTest( *it ); - else - reporter->skipTest( *it ); - } - - context.testGroupEnded( iconfig->name(), totals, 1, 1 ); - return totals; - } - - void applyFilenamesAsTags( IConfig const& config ) { - std::vector const& tests = getAllTestCasesSorted( config ); - for(std::size_t i = 0; i < tests.size(); ++i ) { - TestCase& test = const_cast( tests[i] ); - std::set tags = test.tags; - - std::string filename = test.lineInfo.file; - std::string::size_type lastSlash = filename.find_last_of( "\\/" ); - if( lastSlash != std::string::npos ) - filename = filename.substr( lastSlash+1 ); - - std::string::size_type lastDot = filename.find_last_of( '.' ); - if( lastDot != std::string::npos ) - filename = filename.substr( 0, lastDot ); - - tags.insert( '#' + filename ); - setTags( test, tags ); - } - } - - class Session : NonCopyable { - static bool alreadyInstantiated; - - public: - - struct OnUnusedOptions { enum DoWhat { Ignore, Fail }; }; - - Session() - : m_cli( makeCommandLineParser() ) { - if( alreadyInstantiated ) { - std::string msg = "Only one instance of Catch::Session can ever be used"; - Catch::cerr() << msg << std::endl; - throw std::logic_error( msg ); - } - alreadyInstantiated = true; - } - ~Session() { - Catch::cleanUp(); - } - - void showHelp( std::string const& processName ) { - Catch::cout() << "\nCatch v" << libraryVersion() << "\n"; - - m_cli.usage( Catch::cout(), processName ); - Catch::cout() << "For more detail usage please see the project docs\n" << std::endl; - } - void libIdentify() { - Catch::cout() - << std::left << std::setw(16) << "description: " << "A Catch test executable\n" - << std::left << std::setw(16) << "category: " << "testframework\n" - << std::left << std::setw(16) << "framework: " << "Catch Test\n" - << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl; - } - - int applyCommandLine( int argc, char const* const* const argv, OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) { - try { - m_cli.setThrowOnUnrecognisedTokens( unusedOptionBehaviour == OnUnusedOptions::Fail ); - m_unusedTokens = m_cli.parseInto( Clara::argsToVector( argc, argv ), m_configData ); - if( m_configData.showHelp ) - showHelp( m_configData.processName ); - if( m_configData.libIdentify ) - libIdentify(); - m_config.reset(); - } - catch( std::exception& ex ) { - { - Colour colourGuard( Colour::Red ); - Catch::cerr() - << "\nError(s) in input:\n" - << Text( ex.what(), TextAttributes().setIndent(2) ) - << "\n\n"; - } - m_cli.usage( Catch::cout(), m_configData.processName ); - return (std::numeric_limits::max)(); - } - return 0; - } - - void useConfigData( ConfigData const& _configData ) { - m_configData = _configData; - m_config.reset(); - } - - int run( int argc, char const* const* const argv ) { - - int returnCode = applyCommandLine( argc, argv ); - if( returnCode == 0 ) - returnCode = run(); - return returnCode; - } - - #if defined(WIN32) && defined(UNICODE) - int run( int argc, wchar_t const* const* const argv ) { - - char **utf8Argv = new char *[ argc ]; - - for ( int i = 0; i < argc; ++i ) { - int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL ); - - utf8Argv[ i ] = new char[ bufSize ]; - - WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL ); - } - - int returnCode = applyCommandLine( argc, utf8Argv ); - if( returnCode == 0 ) - returnCode = run(); - - for ( int i = 0; i < argc; ++i ) - delete [] utf8Argv[ i ]; - - delete [] utf8Argv; - - return returnCode; - } - #endif - - int run() { - if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) { - Catch::cout() << "...waiting for enter/ return before starting" << std::endl; - static_cast(std::getchar()); - } - int exitCode = runInternal(); - if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) { - Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl; - static_cast(std::getchar()); - } - return exitCode; - } - - Clara::CommandLine const& cli() const { - return m_cli; - } - std::vector const& unusedTokens() const { - return m_unusedTokens; - } - ConfigData& configData() { - return m_configData; - } - Config& config() { - if( !m_config ) - m_config = new Config( m_configData ); - return *m_config; - } - private: - - int runInternal() { - if( m_configData.showHelp || m_configData.libIdentify ) - return 0; - - try - { - config(); // Force config to be constructed - - seedRng( *m_config ); - - if( m_configData.filenamesAsTags ) - applyFilenamesAsTags( *m_config ); - - // Handle list request - if( Option listed = list( config() ) ) - return static_cast( *listed ); - - return static_cast( runTests( m_config ).assertions.failed ); - } - catch( std::exception& ex ) { - Catch::cerr() << ex.what() << std::endl; - return (std::numeric_limits::max)(); - } - } - - Clara::CommandLine m_cli; - std::vector m_unusedTokens; - ConfigData m_configData; - Ptr m_config; - }; - - bool Session::alreadyInstantiated = false; - -} // end namespace Catch - -// #included from: catch_registry_hub.hpp -#define TWOBLUECUBES_CATCH_REGISTRY_HUB_HPP_INCLUDED - -// #included from: catch_test_case_registry_impl.hpp -#define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED - -#include -#include -#include -#include - -namespace Catch { - - struct RandomNumberGenerator { - typedef unsigned int result_type; - - result_type operator()( result_type n ) const { return std::rand() % n; } - -#ifdef CATCH_CONFIG_CPP11_SHUFFLE - static constexpr result_type (min)() { return 0; } - static constexpr result_type (max)() { return 1000000; } - result_type operator()() const { return std::rand() % (max)(); } -#endif - template - static void shuffle( V& vector ) { - RandomNumberGenerator rng; -#ifdef CATCH_CONFIG_CPP11_SHUFFLE - std::shuffle( vector.begin(), vector.end(), rng ); -#else - std::random_shuffle( vector.begin(), vector.end(), rng ); -#endif - } - }; - - inline std::vector sortTests( IConfig const& config, std::vector const& unsortedTestCases ) { - - std::vector sorted = unsortedTestCases; - - switch( config.runOrder() ) { - case RunTests::InLexicographicalOrder: - std::sort( sorted.begin(), sorted.end() ); - break; - case RunTests::InRandomOrder: - { - seedRng( config ); - RandomNumberGenerator::shuffle( sorted ); - } - break; - case RunTests::InDeclarationOrder: - // already in declaration order - break; - } - return sorted; - } - bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) { - return testSpec.matches( testCase ) && ( config.allowThrows() || !testCase.throws() ); - } - - void enforceNoDuplicateTestCases( std::vector const& functions ) { - std::set seenFunctions; - for( std::vector::const_iterator it = functions.begin(), itEnd = functions.end(); - it != itEnd; - ++it ) { - std::pair::const_iterator, bool> prev = seenFunctions.insert( *it ); - if( !prev.second ) { - std::ostringstream ss; - - ss << Colour( Colour::Red ) - << "error: TEST_CASE( \"" << it->name << "\" ) already defined.\n" - << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << '\n' - << "\tRedefined at " << it->getTestCaseInfo().lineInfo << std::endl; - - throw std::runtime_error(ss.str()); - } - } - } - - std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ) { - std::vector filtered; - filtered.reserve( testCases.size() ); - for( std::vector::const_iterator it = testCases.begin(), itEnd = testCases.end(); - it != itEnd; - ++it ) - if( matchTest( *it, testSpec, config ) ) - filtered.push_back( *it ); - return filtered; - } - std::vector const& getAllTestCasesSorted( IConfig const& config ) { - return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config ); - } - - class TestRegistry : public ITestCaseRegistry { - public: - TestRegistry() - : m_currentSortOrder( RunTests::InDeclarationOrder ), - m_unnamedCount( 0 ) - {} - virtual ~TestRegistry(); - - virtual void registerTest( TestCase const& testCase ) { - std::string name = testCase.getTestCaseInfo().name; - if( name.empty() ) { - std::ostringstream oss; - oss << "Anonymous test case " << ++m_unnamedCount; - return registerTest( testCase.withName( oss.str() ) ); - } - m_functions.push_back( testCase ); - } - - virtual std::vector const& getAllTests() const { - return m_functions; - } - virtual std::vector const& getAllTestsSorted( IConfig const& config ) const { - if( m_sortedFunctions.empty() ) - enforceNoDuplicateTestCases( m_functions ); - - if( m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) { - m_sortedFunctions = sortTests( config, m_functions ); - m_currentSortOrder = config.runOrder(); - } - return m_sortedFunctions; - } - - private: - std::vector m_functions; - mutable RunTests::InWhatOrder m_currentSortOrder; - mutable std::vector m_sortedFunctions; - size_t m_unnamedCount; - std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised - }; - - /////////////////////////////////////////////////////////////////////////// - - class FreeFunctionTestCase : public SharedImpl { - public: - - FreeFunctionTestCase( TestFunction fun ) : m_fun( fun ) {} - - virtual void invoke() const { - m_fun(); - } - - private: - virtual ~FreeFunctionTestCase(); - - TestFunction m_fun; - }; - - inline std::string extractClassName( std::string const& classOrQualifiedMethodName ) { - std::string className = classOrQualifiedMethodName; - if( startsWith( className, '&' ) ) - { - std::size_t lastColons = className.rfind( "::" ); - std::size_t penultimateColons = className.rfind( "::", lastColons-1 ); - if( penultimateColons == std::string::npos ) - penultimateColons = 1; - className = className.substr( penultimateColons, lastColons-penultimateColons ); - } - return className; - } - - void registerTestCase - ( ITestCase* testCase, - char const* classOrQualifiedMethodName, - NameAndDesc const& nameAndDesc, - SourceLineInfo const& lineInfo ) { - - getMutableRegistryHub().registerTest - ( makeTestCase - ( testCase, - extractClassName( classOrQualifiedMethodName ), - nameAndDesc.name, - nameAndDesc.description, - lineInfo ) ); - } - void registerTestCaseFunction - ( TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc ) { - registerTestCase( new FreeFunctionTestCase( function ), "", nameAndDesc, lineInfo ); - } - - /////////////////////////////////////////////////////////////////////////// - - AutoReg::AutoReg - ( TestFunction function, - SourceLineInfo const& lineInfo, - NameAndDesc const& nameAndDesc ) { - registerTestCaseFunction( function, lineInfo, nameAndDesc ); - } - - AutoReg::~AutoReg() {} - -} // end namespace Catch - -// #included from: catch_reporter_registry.hpp -#define TWOBLUECUBES_CATCH_REPORTER_REGISTRY_HPP_INCLUDED - -#include - -namespace Catch { - - class ReporterRegistry : public IReporterRegistry { - - public: - - virtual ~ReporterRegistry() CATCH_OVERRIDE {} - - virtual IStreamingReporter* create( std::string const& name, Ptr const& config ) const CATCH_OVERRIDE { - FactoryMap::const_iterator it = m_factories.find( name ); - if( it == m_factories.end() ) - return CATCH_NULL; - return it->second->create( ReporterConfig( config ) ); - } - - void registerReporter( std::string const& name, Ptr const& factory ) { - m_factories.insert( std::make_pair( name, factory ) ); - } - void registerListener( Ptr const& factory ) { - m_listeners.push_back( factory ); - } - - virtual FactoryMap const& getFactories() const CATCH_OVERRIDE { - return m_factories; - } - virtual Listeners const& getListeners() const CATCH_OVERRIDE { - return m_listeners; - } - - private: - FactoryMap m_factories; - Listeners m_listeners; - }; -} - -// #included from: catch_exception_translator_registry.hpp -#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED - -#ifdef __OBJC__ -#import "Foundation/Foundation.h" -#endif - -namespace Catch { - - class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry { - public: - ~ExceptionTranslatorRegistry() { - deleteAll( m_translators ); - } - - virtual void registerTranslator( const IExceptionTranslator* translator ) { - m_translators.push_back( translator ); - } - - virtual std::string translateActiveException() const { - try { -#ifdef __OBJC__ - // In Objective-C try objective-c exceptions first - @try { - return tryTranslators(); - } - @catch (NSException *exception) { - return Catch::toString( [exception description] ); - } -#else - return tryTranslators(); -#endif - } - catch( TestFailureException& ) { - throw; - } - catch( std::exception& ex ) { - return ex.what(); - } - catch( std::string& msg ) { - return msg; - } - catch( const char* msg ) { - return msg; - } - catch(...) { - return "Unknown exception"; - } - } - - std::string tryTranslators() const { - if( m_translators.empty() ) - throw; - else - return m_translators[0]->translate( m_translators.begin()+1, m_translators.end() ); - } - - private: - std::vector m_translators; - }; -} - -// #included from: catch_tag_alias_registry.h -#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED - -#include - -namespace Catch { - - class TagAliasRegistry : public ITagAliasRegistry { - public: - virtual ~TagAliasRegistry(); - virtual Option find( std::string const& alias ) const; - virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const; - void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ); - - private: - std::map m_registry; - }; - -} // end namespace Catch - -namespace Catch { - - namespace { - - class RegistryHub : public IRegistryHub, public IMutableRegistryHub { - - RegistryHub( RegistryHub const& ); - void operator=( RegistryHub const& ); - - public: // IRegistryHub - RegistryHub() { - } - virtual IReporterRegistry const& getReporterRegistry() const CATCH_OVERRIDE { - return m_reporterRegistry; - } - virtual ITestCaseRegistry const& getTestCaseRegistry() const CATCH_OVERRIDE { - return m_testCaseRegistry; - } - virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() CATCH_OVERRIDE { - return m_exceptionTranslatorRegistry; - } - virtual ITagAliasRegistry const& getTagAliasRegistry() const CATCH_OVERRIDE { - return m_tagAliasRegistry; - } - - public: // IMutableRegistryHub - virtual void registerReporter( std::string const& name, Ptr const& factory ) CATCH_OVERRIDE { - m_reporterRegistry.registerReporter( name, factory ); - } - virtual void registerListener( Ptr const& factory ) CATCH_OVERRIDE { - m_reporterRegistry.registerListener( factory ); - } - virtual void registerTest( TestCase const& testInfo ) CATCH_OVERRIDE { - m_testCaseRegistry.registerTest( testInfo ); - } - virtual void registerTranslator( const IExceptionTranslator* translator ) CATCH_OVERRIDE { - m_exceptionTranslatorRegistry.registerTranslator( translator ); - } - virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) CATCH_OVERRIDE { - m_tagAliasRegistry.add( alias, tag, lineInfo ); - } - - private: - TestRegistry m_testCaseRegistry; - ReporterRegistry m_reporterRegistry; - ExceptionTranslatorRegistry m_exceptionTranslatorRegistry; - TagAliasRegistry m_tagAliasRegistry; - }; - - // Single, global, instance - inline RegistryHub*& getTheRegistryHub() { - static RegistryHub* theRegistryHub = CATCH_NULL; - if( !theRegistryHub ) - theRegistryHub = new RegistryHub(); - return theRegistryHub; - } - } - - IRegistryHub& getRegistryHub() { - return *getTheRegistryHub(); - } - IMutableRegistryHub& getMutableRegistryHub() { - return *getTheRegistryHub(); - } - void cleanUp() { - delete getTheRegistryHub(); - getTheRegistryHub() = CATCH_NULL; - cleanUpContext(); - } - std::string translateActiveException() { - return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException(); - } - -} // end namespace Catch - -// #included from: catch_notimplemented_exception.hpp -#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED - -#include - -namespace Catch { - - NotImplementedException::NotImplementedException( SourceLineInfo const& lineInfo ) - : m_lineInfo( lineInfo ) { - std::ostringstream oss; - oss << lineInfo << ": function "; - oss << "not implemented"; - m_what = oss.str(); - } - - const char* NotImplementedException::what() const CATCH_NOEXCEPT { - return m_what.c_str(); - } - -} // end namespace Catch - -// #included from: catch_context_impl.hpp -#define TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED - -// #included from: catch_stream.hpp -#define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED - -#include -#include -#include - -namespace Catch { - - template - class StreamBufImpl : public StreamBufBase { - char data[bufferSize]; - WriterF m_writer; - - public: - StreamBufImpl() { - setp( data, data + sizeof(data) ); - } - - ~StreamBufImpl() CATCH_NOEXCEPT { - sync(); - } - - private: - int overflow( int c ) { - sync(); - - if( c != EOF ) { - if( pbase() == epptr() ) - m_writer( std::string( 1, static_cast( c ) ) ); - else - sputc( static_cast( c ) ); - } - return 0; - } - - int sync() { - if( pbase() != pptr() ) { - m_writer( std::string( pbase(), static_cast( pptr() - pbase() ) ) ); - setp( pbase(), epptr() ); - } - return 0; - } - }; - - /////////////////////////////////////////////////////////////////////////// - - FileStream::FileStream( std::string const& filename ) { - m_ofs.open( filename.c_str() ); - if( m_ofs.fail() ) { - std::ostringstream oss; - oss << "Unable to open file: '" << filename << '\''; - throw std::domain_error( oss.str() ); - } - } - - std::ostream& FileStream::stream() const { - return m_ofs; - } - - struct OutputDebugWriter { - - void operator()( std::string const&str ) { - writeToDebugConsole( str ); - } - }; - - DebugOutStream::DebugOutStream() - : m_streamBuf( new StreamBufImpl() ), - m_os( m_streamBuf.get() ) - {} - - std::ostream& DebugOutStream::stream() const { - return m_os; - } - - // Store the streambuf from cout up-front because - // cout may get redirected when running tests - CoutStream::CoutStream() - : m_os( Catch::cout().rdbuf() ) - {} - - std::ostream& CoutStream::stream() const { - return m_os; - } - -#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions - std::ostream& cout() { - return std::cout; - } - std::ostream& cerr() { - return std::cerr; - } - std::ostream& clog() { - return std::clog; - } -#endif -} - -namespace Catch { - - class Context : public IMutableContext { - - Context() : m_config( CATCH_NULL ), m_runner( CATCH_NULL ), m_resultCapture( CATCH_NULL ) {} - Context( Context const& ); - void operator=( Context const& ); - - public: - virtual ~Context() { - deleteAllValues( m_generatorsByTestName ); - } - - public: // IContext - virtual IResultCapture* getResultCapture() { - return m_resultCapture; - } - virtual IRunner* getRunner() { - return m_runner; - } - virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) { - return getGeneratorsForCurrentTest() - .getGeneratorInfo( fileInfo, totalSize ) - .getCurrentIndex(); - } - virtual bool advanceGeneratorsForCurrentTest() { - IGeneratorsForTest* generators = findGeneratorsForCurrentTest(); - return generators && generators->moveNext(); - } - - virtual Ptr getConfig() const { - return m_config; - } - - public: // IMutableContext - virtual void setResultCapture( IResultCapture* resultCapture ) { - m_resultCapture = resultCapture; - } - virtual void setRunner( IRunner* runner ) { - m_runner = runner; - } - virtual void setConfig( Ptr const& config ) { - m_config = config; - } - - friend IMutableContext& getCurrentMutableContext(); - - private: - IGeneratorsForTest* findGeneratorsForCurrentTest() { - std::string testName = getResultCapture()->getCurrentTestName(); - - std::map::const_iterator it = - m_generatorsByTestName.find( testName ); - return it != m_generatorsByTestName.end() - ? it->second - : CATCH_NULL; - } - - IGeneratorsForTest& getGeneratorsForCurrentTest() { - IGeneratorsForTest* generators = findGeneratorsForCurrentTest(); - if( !generators ) { - std::string testName = getResultCapture()->getCurrentTestName(); - generators = createGeneratorsForTest(); - m_generatorsByTestName.insert( std::make_pair( testName, generators ) ); - } - return *generators; - } - - private: - Ptr m_config; - IRunner* m_runner; - IResultCapture* m_resultCapture; - std::map m_generatorsByTestName; - }; - - namespace { - Context* currentContext = CATCH_NULL; - } - IMutableContext& getCurrentMutableContext() { - if( !currentContext ) - currentContext = new Context(); - return *currentContext; - } - IContext& getCurrentContext() { - return getCurrentMutableContext(); - } - - void cleanUpContext() { - delete currentContext; - currentContext = CATCH_NULL; - } -} - -// #included from: catch_console_colour_impl.hpp -#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED - -// #included from: catch_errno_guard.hpp -#define TWOBLUECUBES_CATCH_ERRNO_GUARD_HPP_INCLUDED - -#include - -namespace Catch { - - class ErrnoGuard { - public: - ErrnoGuard():m_oldErrno(errno){} - ~ErrnoGuard() { errno = m_oldErrno; } - private: - int m_oldErrno; - }; - -} - -namespace Catch { - namespace { - - struct IColourImpl { - virtual ~IColourImpl() {} - virtual void use( Colour::Code _colourCode ) = 0; - }; - - struct NoColourImpl : IColourImpl { - void use( Colour::Code ) {} - - static IColourImpl* instance() { - static NoColourImpl s_instance; - return &s_instance; - } - }; - - } // anon namespace -} // namespace Catch - -#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI ) -# ifdef CATCH_PLATFORM_WINDOWS -# define CATCH_CONFIG_COLOUR_WINDOWS -# else -# define CATCH_CONFIG_COLOUR_ANSI -# endif -#endif - -#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) ///////////////////////////////////////// - -namespace Catch { -namespace { - - class Win32ColourImpl : public IColourImpl { - public: - Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) ) - { - CONSOLE_SCREEN_BUFFER_INFO csbiInfo; - GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo ); - originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY ); - originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY ); - } - - virtual void use( Colour::Code _colourCode ) { - switch( _colourCode ) { - case Colour::None: return setTextAttribute( originalForegroundAttributes ); - case Colour::White: return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE ); - case Colour::Red: return setTextAttribute( FOREGROUND_RED ); - case Colour::Green: return setTextAttribute( FOREGROUND_GREEN ); - case Colour::Blue: return setTextAttribute( FOREGROUND_BLUE ); - case Colour::Cyan: return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN ); - case Colour::Yellow: return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN ); - case Colour::Grey: return setTextAttribute( 0 ); - - case Colour::LightGrey: return setTextAttribute( FOREGROUND_INTENSITY ); - case Colour::BrightRed: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED ); - case Colour::BrightGreen: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN ); - case Colour::BrightWhite: return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE ); - - case Colour::Bright: throw std::logic_error( "not a colour" ); - } - } - - private: - void setTextAttribute( WORD _textAttribute ) { - SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes ); - } - HANDLE stdoutHandle; - WORD originalForegroundAttributes; - WORD originalBackgroundAttributes; - }; - - IColourImpl* platformColourInstance() { - static Win32ColourImpl s_instance; - - Ptr config = getCurrentContext().getConfig(); - UseColour::YesOrNo colourMode = config - ? config->useColour() - : UseColour::Auto; - if( colourMode == UseColour::Auto ) - colourMode = !isDebuggerActive() - ? UseColour::Yes - : UseColour::No; - return colourMode == UseColour::Yes - ? &s_instance - : NoColourImpl::instance(); - } - -} // end anon namespace -} // end namespace Catch - -#elif defined( CATCH_CONFIG_COLOUR_ANSI ) ////////////////////////////////////// - -#include - -namespace Catch { -namespace { - - // use POSIX/ ANSI console terminal codes - // Thanks to Adam Strzelecki for original contribution - // (http://github.com/nanoant) - // https://github.com/philsquared/Catch/pull/131 - class PosixColourImpl : public IColourImpl { - public: - virtual void use( Colour::Code _colourCode ) { - switch( _colourCode ) { - case Colour::None: - case Colour::White: return setColour( "[0m" ); - case Colour::Red: return setColour( "[0;31m" ); - case Colour::Green: return setColour( "[0;32m" ); - case Colour::Blue: return setColour( "[0;34m" ); - case Colour::Cyan: return setColour( "[0;36m" ); - case Colour::Yellow: return setColour( "[0;33m" ); - case Colour::Grey: return setColour( "[1;30m" ); - - case Colour::LightGrey: return setColour( "[0;37m" ); - case Colour::BrightRed: return setColour( "[1;31m" ); - case Colour::BrightGreen: return setColour( "[1;32m" ); - case Colour::BrightWhite: return setColour( "[1;37m" ); - - case Colour::Bright: throw std::logic_error( "not a colour" ); - } - } - static IColourImpl* instance() { - static PosixColourImpl s_instance; - return &s_instance; - } - - private: - void setColour( const char* _escapeCode ) { - Catch::cout() << '\033' << _escapeCode; - } - }; - - IColourImpl* platformColourInstance() { - ErrnoGuard guard; - Ptr config = getCurrentContext().getConfig(); - UseColour::YesOrNo colourMode = config - ? config->useColour() - : UseColour::Auto; - if( colourMode == UseColour::Auto ) - colourMode = (!isDebuggerActive() && isatty(STDOUT_FILENO) ) - ? UseColour::Yes - : UseColour::No; - return colourMode == UseColour::Yes - ? PosixColourImpl::instance() - : NoColourImpl::instance(); - } - -} // end anon namespace -} // end namespace Catch - -#else // not Windows or ANSI /////////////////////////////////////////////// - -namespace Catch { - - static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); } - -} // end namespace Catch - -#endif // Windows/ ANSI/ None - -namespace Catch { - - Colour::Colour( Code _colourCode ) : m_moved( false ) { use( _colourCode ); } - Colour::Colour( Colour const& _other ) : m_moved( false ) { const_cast( _other ).m_moved = true; } - Colour::~Colour(){ if( !m_moved ) use( None ); } - - void Colour::use( Code _colourCode ) { - static IColourImpl* impl = platformColourInstance(); - impl->use( _colourCode ); - } - -} // end namespace Catch - -// #included from: catch_generators_impl.hpp -#define TWOBLUECUBES_CATCH_GENERATORS_IMPL_HPP_INCLUDED - -#include -#include -#include - -namespace Catch { - - struct GeneratorInfo : IGeneratorInfo { - - GeneratorInfo( std::size_t size ) - : m_size( size ), - m_currentIndex( 0 ) - {} - - bool moveNext() { - if( ++m_currentIndex == m_size ) { - m_currentIndex = 0; - return false; - } - return true; - } - - std::size_t getCurrentIndex() const { - return m_currentIndex; - } - - std::size_t m_size; - std::size_t m_currentIndex; - }; - - /////////////////////////////////////////////////////////////////////////// - - class GeneratorsForTest : public IGeneratorsForTest { - - public: - ~GeneratorsForTest() { - deleteAll( m_generatorsInOrder ); - } - - IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) { - std::map::const_iterator it = m_generatorsByName.find( fileInfo ); - if( it == m_generatorsByName.end() ) { - IGeneratorInfo* info = new GeneratorInfo( size ); - m_generatorsByName.insert( std::make_pair( fileInfo, info ) ); - m_generatorsInOrder.push_back( info ); - return *info; - } - return *it->second; - } - - bool moveNext() { - std::vector::const_iterator it = m_generatorsInOrder.begin(); - std::vector::const_iterator itEnd = m_generatorsInOrder.end(); - for(; it != itEnd; ++it ) { - if( (*it)->moveNext() ) - return true; - } - return false; - } - - private: - std::map m_generatorsByName; - std::vector m_generatorsInOrder; - }; - - IGeneratorsForTest* createGeneratorsForTest() - { - return new GeneratorsForTest(); - } - -} // end namespace Catch - -// #included from: catch_assertionresult.hpp -#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_HPP_INCLUDED - -namespace Catch { - - AssertionInfo::AssertionInfo():macroName(""), capturedExpression(""), resultDisposition(ResultDisposition::Normal), secondArg(""){} - - AssertionInfo::AssertionInfo( char const * _macroName, - SourceLineInfo const& _lineInfo, - char const * _capturedExpression, - ResultDisposition::Flags _resultDisposition, - char const * _secondArg) - : macroName( _macroName ), - lineInfo( _lineInfo ), - capturedExpression( _capturedExpression ), - resultDisposition( _resultDisposition ), - secondArg( _secondArg ) - {} - - AssertionResult::AssertionResult() {} - - AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data ) - : m_info( info ), - m_resultData( data ) - {} - - AssertionResult::~AssertionResult() {} - - // Result was a success - bool AssertionResult::succeeded() const { - return Catch::isOk( m_resultData.resultType ); - } - - // Result was a success, or failure is suppressed - bool AssertionResult::isOk() const { - return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition ); - } - - ResultWas::OfType AssertionResult::getResultType() const { - return m_resultData.resultType; - } - - bool AssertionResult::hasExpression() const { - return m_info.capturedExpression[0] != 0; - } - - bool AssertionResult::hasMessage() const { - return !m_resultData.message.empty(); - } - - std::string capturedExpressionWithSecondArgument( char const * capturedExpression, char const * secondArg ) { - return (secondArg[0] == 0 || secondArg[0] == '"' && secondArg[1] == '"') - ? capturedExpression - : std::string(capturedExpression) + ", " + secondArg; - } - - std::string AssertionResult::getExpression() const { - if( isFalseTest( m_info.resultDisposition ) ) - return "!(" + capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg) + ")"; - else - return capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg); - } - std::string AssertionResult::getExpressionInMacro() const { - if( m_info.macroName[0] == 0 ) - return capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg); - else - return std::string(m_info.macroName) + "( " + capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg) + " )"; - } - - bool AssertionResult::hasExpandedExpression() const { - return hasExpression() && getExpandedExpression() != getExpression(); - } - - std::string AssertionResult::getExpandedExpression() const { - return m_resultData.reconstructExpression(); - } - - std::string AssertionResult::getMessage() const { - return m_resultData.message; - } - SourceLineInfo AssertionResult::getSourceInfo() const { - return m_info.lineInfo; - } - - std::string AssertionResult::getTestMacroName() const { - return m_info.macroName; - } - - void AssertionResult::discardDecomposedExpression() const { - m_resultData.decomposedExpression = CATCH_NULL; - } - - void AssertionResult::expandDecomposedExpression() const { - m_resultData.reconstructExpression(); - } - -} // end namespace Catch - -// #included from: catch_test_case_info.hpp -#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED - -#include - -namespace Catch { - - inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) { - if( startsWith( tag, '.' ) || - tag == "hide" || - tag == "!hide" ) - return TestCaseInfo::IsHidden; - else if( tag == "!throws" ) - return TestCaseInfo::Throws; - else if( tag == "!shouldfail" ) - return TestCaseInfo::ShouldFail; - else if( tag == "!mayfail" ) - return TestCaseInfo::MayFail; - else if( tag == "!nonportable" ) - return TestCaseInfo::NonPortable; - else - return TestCaseInfo::None; - } - inline bool isReservedTag( std::string const& tag ) { - return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( tag[0] ); - } - inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) { - if( isReservedTag( tag ) ) { - std::ostringstream ss; - ss << Colour(Colour::Red) - << "Tag name [" << tag << "] not allowed.\n" - << "Tag names starting with non alpha-numeric characters are reserved\n" - << Colour(Colour::FileName) - << _lineInfo << '\n'; - throw std::runtime_error(ss.str()); - } - } - - TestCase makeTestCase( ITestCase* _testCase, - std::string const& _className, - std::string const& _name, - std::string const& _descOrTags, - SourceLineInfo const& _lineInfo ) - { - bool isHidden( startsWith( _name, "./" ) ); // Legacy support - - // Parse out tags - std::set tags; - std::string desc, tag; - bool inTag = false; - for( std::size_t i = 0; i < _descOrTags.size(); ++i ) { - char c = _descOrTags[i]; - if( !inTag ) { - if( c == '[' ) - inTag = true; - else - desc += c; - } - else { - if( c == ']' ) { - TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag ); - if( prop == TestCaseInfo::IsHidden ) - isHidden = true; - else if( prop == TestCaseInfo::None ) - enforceNotReservedTag( tag, _lineInfo ); - - tags.insert( tag ); - tag.clear(); - inTag = false; - } - else - tag += c; - } - } - if( isHidden ) { - tags.insert( "hide" ); - tags.insert( "." ); - } - - TestCaseInfo info( _name, _className, desc, tags, _lineInfo ); - return TestCase( _testCase, info ); - } - - void setTags( TestCaseInfo& testCaseInfo, std::set const& tags ) - { - testCaseInfo.tags = tags; - testCaseInfo.lcaseTags.clear(); - - std::ostringstream oss; - for( std::set::const_iterator it = tags.begin(), itEnd = tags.end(); it != itEnd; ++it ) { - oss << '[' << *it << ']'; - std::string lcaseTag = toLower( *it ); - testCaseInfo.properties = static_cast( testCaseInfo.properties | parseSpecialTag( lcaseTag ) ); - testCaseInfo.lcaseTags.insert( lcaseTag ); - } - testCaseInfo.tagsAsString = oss.str(); - } - - TestCaseInfo::TestCaseInfo( std::string const& _name, - std::string const& _className, - std::string const& _description, - std::set const& _tags, - SourceLineInfo const& _lineInfo ) - : name( _name ), - className( _className ), - description( _description ), - lineInfo( _lineInfo ), - properties( None ) - { - setTags( *this, _tags ); - } - - TestCaseInfo::TestCaseInfo( TestCaseInfo const& other ) - : name( other.name ), - className( other.className ), - description( other.description ), - tags( other.tags ), - lcaseTags( other.lcaseTags ), - tagsAsString( other.tagsAsString ), - lineInfo( other.lineInfo ), - properties( other.properties ) - {} - - bool TestCaseInfo::isHidden() const { - return ( properties & IsHidden ) != 0; - } - bool TestCaseInfo::throws() const { - return ( properties & Throws ) != 0; - } - bool TestCaseInfo::okToFail() const { - return ( properties & (ShouldFail | MayFail ) ) != 0; - } - bool TestCaseInfo::expectedToFail() const { - return ( properties & (ShouldFail ) ) != 0; - } - - TestCase::TestCase( ITestCase* testCase, TestCaseInfo const& info ) : TestCaseInfo( info ), test( testCase ) {} - - TestCase::TestCase( TestCase const& other ) - : TestCaseInfo( other ), - test( other.test ) - {} - - TestCase TestCase::withName( std::string const& _newName ) const { - TestCase other( *this ); - other.name = _newName; - return other; - } - - void TestCase::swap( TestCase& other ) { - test.swap( other.test ); - name.swap( other.name ); - className.swap( other.className ); - description.swap( other.description ); - tags.swap( other.tags ); - lcaseTags.swap( other.lcaseTags ); - tagsAsString.swap( other.tagsAsString ); - std::swap( TestCaseInfo::properties, static_cast( other ).properties ); - std::swap( lineInfo, other.lineInfo ); - } - - void TestCase::invoke() const { - test->invoke(); - } - - bool TestCase::operator == ( TestCase const& other ) const { - return test.get() == other.test.get() && - name == other.name && - className == other.className; - } - - bool TestCase::operator < ( TestCase const& other ) const { - return name < other.name; - } - TestCase& TestCase::operator = ( TestCase const& other ) { - TestCase temp( other ); - swap( temp ); - return *this; - } - - TestCaseInfo const& TestCase::getTestCaseInfo() const - { - return *this; - } - -} // end namespace Catch - -// #included from: catch_version.hpp -#define TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED - -namespace Catch { - - Version::Version - ( unsigned int _majorVersion, - unsigned int _minorVersion, - unsigned int _patchNumber, - char const * const _branchName, - unsigned int _buildNumber ) - : majorVersion( _majorVersion ), - minorVersion( _minorVersion ), - patchNumber( _patchNumber ), - branchName( _branchName ), - buildNumber( _buildNumber ) - {} - - std::ostream& operator << ( std::ostream& os, Version const& version ) { - os << version.majorVersion << '.' - << version.minorVersion << '.' - << version.patchNumber; - // branchName is never null -> 0th char is \0 if it is empty - if (version.branchName[0]) { - os << '-' << version.branchName - << '.' << version.buildNumber; - } - return os; - } - - inline Version libraryVersion() { - static Version version( 1, 12, 2, "", 0 ); - return version; - } - -} - -// #included from: catch_message.hpp -#define TWOBLUECUBES_CATCH_MESSAGE_HPP_INCLUDED - -namespace Catch { - - MessageInfo::MessageInfo( std::string const& _macroName, - SourceLineInfo const& _lineInfo, - ResultWas::OfType _type ) - : macroName( _macroName ), - lineInfo( _lineInfo ), - type( _type ), - sequence( ++globalCount ) - {} - - // This may need protecting if threading support is added - unsigned int MessageInfo::globalCount = 0; - - //////////////////////////////////////////////////////////////////////////// - - ScopedMessage::ScopedMessage( MessageBuilder const& builder ) - : m_info( builder.m_info ) - { - m_info.message = builder.m_stream.str(); - getResultCapture().pushScopedMessage( m_info ); - } - ScopedMessage::ScopedMessage( ScopedMessage const& other ) - : m_info( other.m_info ) - {} - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4996) // std::uncaught_exception is deprecated in C++17 -#endif - ScopedMessage::~ScopedMessage() { - if ( !std::uncaught_exception() ){ - getResultCapture().popScopedMessage(m_info); - } - } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif - -} // end namespace Catch - -// #included from: catch_legacy_reporter_adapter.hpp -#define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_HPP_INCLUDED - -// #included from: catch_legacy_reporter_adapter.h -#define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_H_INCLUDED - -namespace Catch -{ - // Deprecated - struct IReporter : IShared { - virtual ~IReporter(); - - virtual bool shouldRedirectStdout() const = 0; - - virtual void StartTesting() = 0; - virtual void EndTesting( Totals const& totals ) = 0; - virtual void StartGroup( std::string const& groupName ) = 0; - virtual void EndGroup( std::string const& groupName, Totals const& totals ) = 0; - virtual void StartTestCase( TestCaseInfo const& testInfo ) = 0; - virtual void EndTestCase( TestCaseInfo const& testInfo, Totals const& totals, std::string const& stdOut, std::string const& stdErr ) = 0; - virtual void StartSection( std::string const& sectionName, std::string const& description ) = 0; - virtual void EndSection( std::string const& sectionName, Counts const& assertions ) = 0; - virtual void NoAssertionsInSection( std::string const& sectionName ) = 0; - virtual void NoAssertionsInTestCase( std::string const& testName ) = 0; - virtual void Aborted() = 0; - virtual void Result( AssertionResult const& result ) = 0; - }; - - class LegacyReporterAdapter : public SharedImpl - { - public: - LegacyReporterAdapter( Ptr const& legacyReporter ); - virtual ~LegacyReporterAdapter(); - - virtual ReporterPreferences getPreferences() const; - virtual void noMatchingTestCases( std::string const& ); - virtual void testRunStarting( TestRunInfo const& ); - virtual void testGroupStarting( GroupInfo const& groupInfo ); - virtual void testCaseStarting( TestCaseInfo const& testInfo ); - virtual void sectionStarting( SectionInfo const& sectionInfo ); - virtual void assertionStarting( AssertionInfo const& ); - virtual bool assertionEnded( AssertionStats const& assertionStats ); - virtual void sectionEnded( SectionStats const& sectionStats ); - virtual void testCaseEnded( TestCaseStats const& testCaseStats ); - virtual void testGroupEnded( TestGroupStats const& testGroupStats ); - virtual void testRunEnded( TestRunStats const& testRunStats ); - virtual void skipTest( TestCaseInfo const& ); - - private: - Ptr m_legacyReporter; - }; -} - -namespace Catch -{ - LegacyReporterAdapter::LegacyReporterAdapter( Ptr const& legacyReporter ) - : m_legacyReporter( legacyReporter ) - {} - LegacyReporterAdapter::~LegacyReporterAdapter() {} - - ReporterPreferences LegacyReporterAdapter::getPreferences() const { - ReporterPreferences prefs; - prefs.shouldRedirectStdOut = m_legacyReporter->shouldRedirectStdout(); - return prefs; - } - - void LegacyReporterAdapter::noMatchingTestCases( std::string const& ) {} - void LegacyReporterAdapter::testRunStarting( TestRunInfo const& ) { - m_legacyReporter->StartTesting(); - } - void LegacyReporterAdapter::testGroupStarting( GroupInfo const& groupInfo ) { - m_legacyReporter->StartGroup( groupInfo.name ); - } - void LegacyReporterAdapter::testCaseStarting( TestCaseInfo const& testInfo ) { - m_legacyReporter->StartTestCase( testInfo ); - } - void LegacyReporterAdapter::sectionStarting( SectionInfo const& sectionInfo ) { - m_legacyReporter->StartSection( sectionInfo.name, sectionInfo.description ); - } - void LegacyReporterAdapter::assertionStarting( AssertionInfo const& ) { - // Not on legacy interface - } - - bool LegacyReporterAdapter::assertionEnded( AssertionStats const& assertionStats ) { - if( assertionStats.assertionResult.getResultType() != ResultWas::Ok ) { - for( std::vector::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end(); - it != itEnd; - ++it ) { - if( it->type == ResultWas::Info ) { - ResultBuilder rb( it->macroName.c_str(), it->lineInfo, "", ResultDisposition::Normal ); - rb << it->message; - rb.setResultType( ResultWas::Info ); - AssertionResult result = rb.build(); - m_legacyReporter->Result( result ); - } - } - } - m_legacyReporter->Result( assertionStats.assertionResult ); - return true; - } - void LegacyReporterAdapter::sectionEnded( SectionStats const& sectionStats ) { - if( sectionStats.missingAssertions ) - m_legacyReporter->NoAssertionsInSection( sectionStats.sectionInfo.name ); - m_legacyReporter->EndSection( sectionStats.sectionInfo.name, sectionStats.assertions ); - } - void LegacyReporterAdapter::testCaseEnded( TestCaseStats const& testCaseStats ) { - m_legacyReporter->EndTestCase - ( testCaseStats.testInfo, - testCaseStats.totals, - testCaseStats.stdOut, - testCaseStats.stdErr ); - } - void LegacyReporterAdapter::testGroupEnded( TestGroupStats const& testGroupStats ) { - if( testGroupStats.aborting ) - m_legacyReporter->Aborted(); - m_legacyReporter->EndGroup( testGroupStats.groupInfo.name, testGroupStats.totals ); - } - void LegacyReporterAdapter::testRunEnded( TestRunStats const& testRunStats ) { - m_legacyReporter->EndTesting( testRunStats.totals ); - } - void LegacyReporterAdapter::skipTest( TestCaseInfo const& ) { - } -} - -// #included from: catch_timer.hpp - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wc++11-long-long" -#endif - -#ifdef CATCH_PLATFORM_WINDOWS - -#else - -#include - -#endif - -namespace Catch { - - namespace { -#ifdef CATCH_PLATFORM_WINDOWS - UInt64 getCurrentTicks() { - static UInt64 hz=0, hzo=0; - if (!hz) { - QueryPerformanceFrequency( reinterpret_cast( &hz ) ); - QueryPerformanceCounter( reinterpret_cast( &hzo ) ); - } - UInt64 t; - QueryPerformanceCounter( reinterpret_cast( &t ) ); - return ((t-hzo)*1000000)/hz; - } -#else - UInt64 getCurrentTicks() { - timeval t; - gettimeofday(&t,CATCH_NULL); - return static_cast( t.tv_sec ) * 1000000ull + static_cast( t.tv_usec ); - } -#endif - } - - void Timer::start() { - m_ticks = getCurrentTicks(); - } - unsigned int Timer::getElapsedMicroseconds() const { - return static_cast(getCurrentTicks() - m_ticks); - } - unsigned int Timer::getElapsedMilliseconds() const { - return static_cast(getElapsedMicroseconds()/1000); - } - double Timer::getElapsedSeconds() const { - return getElapsedMicroseconds()/1000000.0; - } - -} // namespace Catch - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif -// #included from: catch_common.hpp -#define TWOBLUECUBES_CATCH_COMMON_HPP_INCLUDED - -#include -#include - -namespace Catch { - - bool startsWith( std::string const& s, std::string const& prefix ) { - return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin()); - } - bool startsWith( std::string const& s, char prefix ) { - return !s.empty() && s[0] == prefix; - } - bool endsWith( std::string const& s, std::string const& suffix ) { - return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin()); - } - bool endsWith( std::string const& s, char suffix ) { - return !s.empty() && s[s.size()-1] == suffix; - } - bool contains( std::string const& s, std::string const& infix ) { - return s.find( infix ) != std::string::npos; - } - char toLowerCh(char c) { - return static_cast( std::tolower( c ) ); - } - void toLowerInPlace( std::string& s ) { - std::transform( s.begin(), s.end(), s.begin(), toLowerCh ); - } - std::string toLower( std::string const& s ) { - std::string lc = s; - toLowerInPlace( lc ); - return lc; - } - std::string trim( std::string const& str ) { - static char const* whitespaceChars = "\n\r\t "; - std::string::size_type start = str.find_first_not_of( whitespaceChars ); - std::string::size_type end = str.find_last_not_of( whitespaceChars ); - - return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string(); - } - - bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) { - bool replaced = false; - std::size_t i = str.find( replaceThis ); - while( i != std::string::npos ) { - replaced = true; - str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() ); - if( i < str.size()-withThis.size() ) - i = str.find( replaceThis, i+withThis.size() ); - else - i = std::string::npos; - } - return replaced; - } - - pluralise::pluralise( std::size_t count, std::string const& label ) - : m_count( count ), - m_label( label ) - {} - - std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) { - os << pluraliser.m_count << ' ' << pluraliser.m_label; - if( pluraliser.m_count != 1 ) - os << 's'; - return os; - } - - SourceLineInfo::SourceLineInfo() : file(""), line( 0 ){} - SourceLineInfo::SourceLineInfo( char const* _file, std::size_t _line ) - : file( _file ), - line( _line ) - {} - bool SourceLineInfo::empty() const { - return file[0] == '\0'; - } - bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const { - return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0); - } - bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const { - return line < other.line || ( line == other.line && (std::strcmp(file, other.file) < 0)); - } - - void seedRng( IConfig const& config ) { - if( config.rngSeed() != 0 ) - std::srand( config.rngSeed() ); - } - unsigned int rngSeed() { - return getCurrentContext().getConfig()->rngSeed(); - } - - std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) { -#ifndef __GNUG__ - os << info.file << '(' << info.line << ')'; -#else - os << info.file << ':' << info.line; -#endif - return os; - } - - void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ) { - std::ostringstream oss; - oss << locationInfo << ": Internal Catch error: '" << message << '\''; - if( alwaysTrue() ) - throw std::logic_error( oss.str() ); - } -} - -// #included from: catch_section.hpp -#define TWOBLUECUBES_CATCH_SECTION_HPP_INCLUDED - -namespace Catch { - - SectionInfo::SectionInfo - ( SourceLineInfo const& _lineInfo, - std::string const& _name, - std::string const& _description ) - : name( _name ), - description( _description ), - lineInfo( _lineInfo ) - {} - - Section::Section( SectionInfo const& info ) - : m_info( info ), - m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) ) - { - m_timer.start(); - } - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4996) // std::uncaught_exception is deprecated in C++17 -#endif - Section::~Section() { - if( m_sectionIncluded ) { - SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() ); - if( std::uncaught_exception() ) - getResultCapture().sectionEndedEarly( endInfo ); - else - getResultCapture().sectionEnded( endInfo ); - } - } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif - - // This indicates whether the section should be executed or not - Section::operator bool() const { - return m_sectionIncluded; - } - -} // end namespace Catch - -// #included from: catch_debugger.hpp -#define TWOBLUECUBES_CATCH_DEBUGGER_HPP_INCLUDED - -#ifdef CATCH_PLATFORM_MAC - - #include - #include - #include - #include - #include - - namespace Catch{ - - // The following function is taken directly from the following technical note: - // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html - - // Returns true if the current process is being debugged (either - // running under the debugger or has a debugger attached post facto). - bool isDebuggerActive(){ - - int mib[4]; - struct kinfo_proc info; - size_t size; - - // Initialize the flags so that, if sysctl fails for some bizarre - // reason, we get a predictable result. - - info.kp_proc.p_flag = 0; - - // Initialize mib, which tells sysctl the info we want, in this case - // we're looking for information about a specific process ID. - - mib[0] = CTL_KERN; - mib[1] = KERN_PROC; - mib[2] = KERN_PROC_PID; - mib[3] = getpid(); - - // Call sysctl. - - size = sizeof(info); - if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, CATCH_NULL, 0) != 0 ) { - Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl; - return false; - } - - // We're being debugged if the P_TRACED flag is set. - - return ( (info.kp_proc.p_flag & P_TRACED) != 0 ); - } - } // namespace Catch - -#elif defined(CATCH_PLATFORM_LINUX) - #include - #include - - namespace Catch{ - // The standard POSIX way of detecting a debugger is to attempt to - // ptrace() the process, but this needs to be done from a child and not - // this process itself to still allow attaching to this process later - // if wanted, so is rather heavy. Under Linux we have the PID of the - // "debugger" (which doesn't need to be gdb, of course, it could also - // be strace, for example) in /proc/$PID/status, so just get it from - // there instead. - bool isDebuggerActive(){ - // Libstdc++ has a bug, where std::ifstream sets errno to 0 - // This way our users can properly assert over errno values - ErrnoGuard guard; - std::ifstream in("/proc/self/status"); - for( std::string line; std::getline(in, line); ) { - static const int PREFIX_LEN = 11; - if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) { - // We're traced if the PID is not 0 and no other PID starts - // with 0 digit, so it's enough to check for just a single - // character. - return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0'; - } - } - - return false; - } - } // namespace Catch -#elif defined(_MSC_VER) - extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); - namespace Catch { - bool isDebuggerActive() { - return IsDebuggerPresent() != 0; - } - } -#elif defined(__MINGW32__) - extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent(); - namespace Catch { - bool isDebuggerActive() { - return IsDebuggerPresent() != 0; - } - } -#else - namespace Catch { - inline bool isDebuggerActive() { return false; } - } -#endif // Platform - -#ifdef CATCH_PLATFORM_WINDOWS - - namespace Catch { - void writeToDebugConsole( std::string const& text ) { - ::OutputDebugStringA( text.c_str() ); - } - } -#else - namespace Catch { - void writeToDebugConsole( std::string const& text ) { - // !TBD: Need a version for Mac/ XCode and other IDEs - Catch::cout() << text; - } - } -#endif // Platform - -// #included from: catch_tostring.hpp -#define TWOBLUECUBES_CATCH_TOSTRING_HPP_INCLUDED - -namespace Catch { - -namespace Detail { - - const std::string unprintableString = "{?}"; - - namespace { - const int hexThreshold = 255; - - struct Endianness { - enum Arch { Big, Little }; - - static Arch which() { - union _{ - int asInt; - char asChar[sizeof (int)]; - } u; - - u.asInt = 1; - return ( u.asChar[sizeof(int)-1] == 1 ) ? Big : Little; - } - }; - } - - std::string rawMemoryToString( const void *object, std::size_t size ) - { - // Reverse order for little endian architectures - int i = 0, end = static_cast( size ), inc = 1; - if( Endianness::which() == Endianness::Little ) { - i = end-1; - end = inc = -1; - } - - unsigned char const *bytes = static_cast(object); - std::ostringstream os; - os << "0x" << std::setfill('0') << std::hex; - for( ; i != end; i += inc ) - os << std::setw(2) << static_cast(bytes[i]); - return os.str(); - } -} - -std::string toString( std::string const& value ) { - std::string s = value; - if( getCurrentContext().getConfig()->showInvisibles() ) { - for(size_t i = 0; i < s.size(); ++i ) { - std::string subs; - switch( s[i] ) { - case '\n': subs = "\\n"; break; - case '\t': subs = "\\t"; break; - default: break; - } - if( !subs.empty() ) { - s = s.substr( 0, i ) + subs + s.substr( i+1 ); - ++i; - } - } - } - return '"' + s + '"'; -} -std::string toString( std::wstring const& value ) { - - std::string s; - s.reserve( value.size() ); - for(size_t i = 0; i < value.size(); ++i ) - s += value[i] <= 0xff ? static_cast( value[i] ) : '?'; - return Catch::toString( s ); -} - -std::string toString( const char* const value ) { - return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" ); -} - -std::string toString( char* const value ) { - return Catch::toString( static_cast( value ) ); -} - -std::string toString( const wchar_t* const value ) -{ - return value ? Catch::toString( std::wstring(value) ) : std::string( "{null string}" ); -} - -std::string toString( wchar_t* const value ) -{ - return Catch::toString( static_cast( value ) ); -} - -std::string toString( int value ) { - std::ostringstream oss; - oss << value; - if( value > Detail::hexThreshold ) - oss << " (0x" << std::hex << value << ')'; - return oss.str(); -} - -std::string toString( unsigned long value ) { - std::ostringstream oss; - oss << value; - if( value > Detail::hexThreshold ) - oss << " (0x" << std::hex << value << ')'; - return oss.str(); -} - -std::string toString( unsigned int value ) { - return Catch::toString( static_cast( value ) ); -} - -template -std::string fpToString( T value, int precision ) { - std::ostringstream oss; - oss << std::setprecision( precision ) - << std::fixed - << value; - std::string d = oss.str(); - std::size_t i = d.find_last_not_of( '0' ); - if( i != std::string::npos && i != d.size()-1 ) { - if( d[i] == '.' ) - i++; - d = d.substr( 0, i+1 ); - } - return d; -} - -std::string toString( const double value ) { - return fpToString( value, 10 ); -} -std::string toString( const float value ) { - return fpToString( value, 5 ) + 'f'; -} - -std::string toString( bool value ) { - return value ? "true" : "false"; -} - -std::string toString( char value ) { - if ( value == '\r' ) - return "'\\r'"; - if ( value == '\f' ) - return "'\\f'"; - if ( value == '\n' ) - return "'\\n'"; - if ( value == '\t' ) - return "'\\t'"; - if ( '\0' <= value && value < ' ' ) - return toString( static_cast( value ) ); - char chstr[] = "' '"; - chstr[1] = value; - return chstr; -} - -std::string toString( signed char value ) { - return toString( static_cast( value ) ); -} - -std::string toString( unsigned char value ) { - return toString( static_cast( value ) ); -} - -#ifdef CATCH_CONFIG_CPP11_LONG_LONG -std::string toString( long long value ) { - std::ostringstream oss; - oss << value; - if( value > Detail::hexThreshold ) - oss << " (0x" << std::hex << value << ')'; - return oss.str(); -} -std::string toString( unsigned long long value ) { - std::ostringstream oss; - oss << value; - if( value > Detail::hexThreshold ) - oss << " (0x" << std::hex << value << ')'; - return oss.str(); -} -#endif - -#ifdef CATCH_CONFIG_CPP11_NULLPTR -std::string toString( std::nullptr_t ) { - return "nullptr"; -} -#endif - -#ifdef __OBJC__ - std::string toString( NSString const * const& nsstring ) { - if( !nsstring ) - return "nil"; - return "@" + toString([nsstring UTF8String]); - } - std::string toString( NSString * CATCH_ARC_STRONG & nsstring ) { - if( !nsstring ) - return "nil"; - return "@" + toString([nsstring UTF8String]); - } - std::string toString( NSObject* const& nsObject ) { - return toString( [nsObject description] ); - } -#endif - -} // end namespace Catch - -// #included from: catch_result_builder.hpp -#define TWOBLUECUBES_CATCH_RESULT_BUILDER_HPP_INCLUDED - -#include - -namespace Catch { - - ResultBuilder::ResultBuilder( char const* macroName, - SourceLineInfo const& lineInfo, - char const* capturedExpression, - ResultDisposition::Flags resultDisposition, - char const* secondArg ) - : m_assertionInfo( macroName, lineInfo, capturedExpression, resultDisposition, secondArg ), - m_shouldDebugBreak( false ), - m_shouldThrow( false ), - m_guardException( false ), - m_usedStream( false ) - {} - - ResultBuilder::~ResultBuilder() { -#if defined(CATCH_CONFIG_FAST_COMPILE) - if ( m_guardException ) { - stream().oss << "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE"; - captureResult( ResultWas::ThrewException ); - getCurrentContext().getResultCapture()->exceptionEarlyReported(); - } -#endif - } - - ResultBuilder& ResultBuilder::setResultType( ResultWas::OfType result ) { - m_data.resultType = result; - return *this; - } - ResultBuilder& ResultBuilder::setResultType( bool result ) { - m_data.resultType = result ? ResultWas::Ok : ResultWas::ExpressionFailed; - return *this; - } - - void ResultBuilder::endExpression( DecomposedExpression const& expr ) { - // Flip bool results if FalseTest flag is set - if( isFalseTest( m_assertionInfo.resultDisposition ) ) { - m_data.negate( expr.isBinaryExpression() ); - } - - getResultCapture().assertionRun(); - - if(getCurrentContext().getConfig()->includeSuccessfulResults() || m_data.resultType != ResultWas::Ok) - { - AssertionResult result = build( expr ); - handleResult( result ); - } - else - getResultCapture().assertionPassed(); - } - - void ResultBuilder::useActiveException( ResultDisposition::Flags resultDisposition ) { - m_assertionInfo.resultDisposition = resultDisposition; - stream().oss << Catch::translateActiveException(); - captureResult( ResultWas::ThrewException ); - } - - void ResultBuilder::captureResult( ResultWas::OfType resultType ) { - setResultType( resultType ); - captureExpression(); - } - - void ResultBuilder::captureExpectedException( std::string const& expectedMessage ) { - if( expectedMessage.empty() ) - captureExpectedException( Matchers::Impl::MatchAllOf() ); - else - captureExpectedException( Matchers::Equals( expectedMessage ) ); - } - - void ResultBuilder::captureExpectedException( Matchers::Impl::MatcherBase const& matcher ) { - - assert( !isFalseTest( m_assertionInfo.resultDisposition ) ); - AssertionResultData data = m_data; - data.resultType = ResultWas::Ok; - data.reconstructedExpression = capturedExpressionWithSecondArgument(m_assertionInfo.capturedExpression, m_assertionInfo.secondArg); - - std::string actualMessage = Catch::translateActiveException(); - if( !matcher.match( actualMessage ) ) { - data.resultType = ResultWas::ExpressionFailed; - data.reconstructedExpression = actualMessage; - } - AssertionResult result( m_assertionInfo, data ); - handleResult( result ); - } - - void ResultBuilder::captureExpression() { - AssertionResult result = build(); - handleResult( result ); - } - - void ResultBuilder::handleResult( AssertionResult const& result ) - { - getResultCapture().assertionEnded( result ); - - if( !result.isOk() ) { - if( getCurrentContext().getConfig()->shouldDebugBreak() ) - m_shouldDebugBreak = true; - if( getCurrentContext().getRunner()->aborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal) ) - m_shouldThrow = true; - } - } - - void ResultBuilder::react() { -#if defined(CATCH_CONFIG_FAST_COMPILE) - if (m_shouldDebugBreak) { - /////////////////////////////////////////////////////////////////// - // To inspect the state during test, you need to go one level up the callstack - // To go back to the test and change execution, jump over the throw statement - /////////////////////////////////////////////////////////////////// - CATCH_BREAK_INTO_DEBUGGER(); - } -#endif - if( m_shouldThrow ) - throw Catch::TestFailureException(); - } - - bool ResultBuilder::shouldDebugBreak() const { return m_shouldDebugBreak; } - bool ResultBuilder::allowThrows() const { return getCurrentContext().getConfig()->allowThrows(); } - - AssertionResult ResultBuilder::build() const - { - return build( *this ); - } - - // CAVEAT: The returned AssertionResult stores a pointer to the argument expr, - // a temporary DecomposedExpression, which in turn holds references to - // operands, possibly temporary as well. - // It should immediately be passed to handleResult; if the expression - // needs to be reported, its string expansion must be composed before - // the temporaries are destroyed. - AssertionResult ResultBuilder::build( DecomposedExpression const& expr ) const - { - assert( m_data.resultType != ResultWas::Unknown ); - AssertionResultData data = m_data; - - if(m_usedStream) - data.message = m_stream().oss.str(); - data.decomposedExpression = &expr; // for lazy reconstruction - return AssertionResult( m_assertionInfo, data ); - } - - void ResultBuilder::reconstructExpression( std::string& dest ) const { - dest = capturedExpressionWithSecondArgument(m_assertionInfo.capturedExpression, m_assertionInfo.secondArg); - } - - void ResultBuilder::setExceptionGuard() { - m_guardException = true; - } - void ResultBuilder::unsetExceptionGuard() { - m_guardException = false; - } - -} // end namespace Catch - -// #included from: catch_tag_alias_registry.hpp -#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED - -namespace Catch { - - TagAliasRegistry::~TagAliasRegistry() {} - - Option TagAliasRegistry::find( std::string const& alias ) const { - std::map::const_iterator it = m_registry.find( alias ); - if( it != m_registry.end() ) - return it->second; - else - return Option(); - } - - std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const { - std::string expandedTestSpec = unexpandedTestSpec; - for( std::map::const_iterator it = m_registry.begin(), itEnd = m_registry.end(); - it != itEnd; - ++it ) { - std::size_t pos = expandedTestSpec.find( it->first ); - if( pos != std::string::npos ) { - expandedTestSpec = expandedTestSpec.substr( 0, pos ) + - it->second.tag + - expandedTestSpec.substr( pos + it->first.size() ); - } - } - return expandedTestSpec; - } - - void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) { - - if( !startsWith( alias, "[@" ) || !endsWith( alias, ']' ) ) { - std::ostringstream oss; - oss << Colour( Colour::Red ) - << "error: tag alias, \"" << alias << "\" is not of the form [@alias name].\n" - << Colour( Colour::FileName ) - << lineInfo << '\n'; - throw std::domain_error( oss.str().c_str() ); - } - if( !m_registry.insert( std::make_pair( alias, TagAlias( tag, lineInfo ) ) ).second ) { - std::ostringstream oss; - oss << Colour( Colour::Red ) - << "error: tag alias, \"" << alias << "\" already registered.\n" - << "\tFirst seen at " - << Colour( Colour::Red ) << find(alias)->lineInfo << '\n' - << Colour( Colour::Red ) << "\tRedefined at " - << Colour( Colour::FileName) << lineInfo << '\n'; - throw std::domain_error( oss.str().c_str() ); - } - } - - ITagAliasRegistry::~ITagAliasRegistry() {} - - ITagAliasRegistry const& ITagAliasRegistry::get() { - return getRegistryHub().getTagAliasRegistry(); - } - - RegistrarForTagAliases::RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ) { - getMutableRegistryHub().registerTagAlias( alias, tag, lineInfo ); - } - -} // end namespace Catch - -// #included from: catch_matchers_string.hpp - -namespace Catch { -namespace Matchers { - - namespace StdString { - - CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity ) - : m_caseSensitivity( caseSensitivity ), - m_str( adjustString( str ) ) - {} - std::string CasedString::adjustString( std::string const& str ) const { - return m_caseSensitivity == CaseSensitive::No - ? toLower( str ) - : str; - } - std::string CasedString::caseSensitivitySuffix() const { - return m_caseSensitivity == CaseSensitive::No - ? " (case insensitive)" - : std::string(); - } - - StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator ) - : m_comparator( comparator ), - m_operation( operation ) { - } - - std::string StringMatcherBase::describe() const { - std::string description; - description.reserve(5 + m_operation.size() + m_comparator.m_str.size() + - m_comparator.caseSensitivitySuffix().size()); - description += m_operation; - description += ": \""; - description += m_comparator.m_str; - description += "\""; - description += m_comparator.caseSensitivitySuffix(); - return description; - } - - EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {} - - bool EqualsMatcher::match( std::string const& source ) const { - return m_comparator.adjustString( source ) == m_comparator.m_str; - } - - ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {} - - bool ContainsMatcher::match( std::string const& source ) const { - return contains( m_comparator.adjustString( source ), m_comparator.m_str ); - } - - StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {} - - bool StartsWithMatcher::match( std::string const& source ) const { - return startsWith( m_comparator.adjustString( source ), m_comparator.m_str ); - } - - EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {} - - bool EndsWithMatcher::match( std::string const& source ) const { - return endsWith( m_comparator.adjustString( source ), m_comparator.m_str ); - } - - } // namespace StdString - - StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) { - return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) ); - } - StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) { - return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) ); - } - StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) { - return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) ); - } - StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) { - return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) ); - } - -} // namespace Matchers -} // namespace Catch -// #included from: ../reporters/catch_reporter_multi.hpp -#define TWOBLUECUBES_CATCH_REPORTER_MULTI_HPP_INCLUDED - -namespace Catch { - -class MultipleReporters : public SharedImpl { - typedef std::vector > Reporters; - Reporters m_reporters; - -public: - void add( Ptr const& reporter ) { - m_reporters.push_back( reporter ); - } - -public: // IStreamingReporter - - virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE { - return m_reporters[0]->getPreferences(); - } - - virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->noMatchingTestCases( spec ); - } - - virtual void testRunStarting( TestRunInfo const& testRunInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testRunStarting( testRunInfo ); - } - - virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testGroupStarting( groupInfo ); - } - - virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testCaseStarting( testInfo ); - } - - virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->sectionStarting( sectionInfo ); - } - - virtual void assertionStarting( AssertionInfo const& assertionInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->assertionStarting( assertionInfo ); - } - - // The return value indicates if the messages buffer should be cleared: - virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { - bool clearBuffer = false; - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - clearBuffer |= (*it)->assertionEnded( assertionStats ); - return clearBuffer; - } - - virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->sectionEnded( sectionStats ); - } - - virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testCaseEnded( testCaseStats ); - } - - virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testGroupEnded( testGroupStats ); - } - - virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->testRunEnded( testRunStats ); - } - - virtual void skipTest( TestCaseInfo const& testInfo ) CATCH_OVERRIDE { - for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end(); - it != itEnd; - ++it ) - (*it)->skipTest( testInfo ); - } - - virtual MultipleReporters* tryAsMulti() CATCH_OVERRIDE { - return this; - } - -}; - -Ptr addReporter( Ptr const& existingReporter, Ptr const& additionalReporter ) { - Ptr resultingReporter; - - if( existingReporter ) { - MultipleReporters* multi = existingReporter->tryAsMulti(); - if( !multi ) { - multi = new MultipleReporters; - resultingReporter = Ptr( multi ); - if( existingReporter ) - multi->add( existingReporter ); - } - else - resultingReporter = existingReporter; - multi->add( additionalReporter ); - } - else - resultingReporter = additionalReporter; - - return resultingReporter; -} - -} // end namespace Catch - -// #included from: ../reporters/catch_reporter_xml.hpp -#define TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED - -// #included from: catch_reporter_bases.hpp -#define TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED - -#include -#include -#include -#include - -namespace Catch { - - namespace { - // Because formatting using c++ streams is stateful, drop down to C is required - // Alternatively we could use stringstream, but its performance is... not good. - std::string getFormattedDuration( double duration ) { - // Max exponent + 1 is required to represent the whole part - // + 1 for decimal point - // + 3 for the 3 decimal places - // + 1 for null terminator - const size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1; - char buffer[maxDoubleSize]; - - // Save previous errno, to prevent sprintf from overwriting it - ErrnoGuard guard; -#ifdef _MSC_VER - sprintf_s(buffer, "%.3f", duration); -#else - sprintf(buffer, "%.3f", duration); -#endif - return std::string(buffer); - } - } - - struct StreamingReporterBase : SharedImpl { - - StreamingReporterBase( ReporterConfig const& _config ) - : m_config( _config.fullConfig() ), - stream( _config.stream() ) - { - m_reporterPrefs.shouldRedirectStdOut = false; - } - - virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE { - return m_reporterPrefs; - } - - virtual ~StreamingReporterBase() CATCH_OVERRIDE; - - virtual void noMatchingTestCases( std::string const& ) CATCH_OVERRIDE {} - - virtual void testRunStarting( TestRunInfo const& _testRunInfo ) CATCH_OVERRIDE { - currentTestRunInfo = _testRunInfo; - } - virtual void testGroupStarting( GroupInfo const& _groupInfo ) CATCH_OVERRIDE { - currentGroupInfo = _groupInfo; - } - - virtual void testCaseStarting( TestCaseInfo const& _testInfo ) CATCH_OVERRIDE { - currentTestCaseInfo = _testInfo; - } - virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE { - m_sectionStack.push_back( _sectionInfo ); - } - - virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) CATCH_OVERRIDE { - m_sectionStack.pop_back(); - } - virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) CATCH_OVERRIDE { - currentTestCaseInfo.reset(); - } - virtual void testGroupEnded( TestGroupStats const& /* _testGroupStats */ ) CATCH_OVERRIDE { - currentGroupInfo.reset(); - } - virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) CATCH_OVERRIDE { - currentTestCaseInfo.reset(); - currentGroupInfo.reset(); - currentTestRunInfo.reset(); - } - - virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE { - // Don't do anything with this by default. - // It can optionally be overridden in the derived class. - } - - Ptr m_config; - std::ostream& stream; - - LazyStat currentTestRunInfo; - LazyStat currentGroupInfo; - LazyStat currentTestCaseInfo; - - std::vector m_sectionStack; - ReporterPreferences m_reporterPrefs; - }; - - struct CumulativeReporterBase : SharedImpl { - template - struct Node : SharedImpl<> { - explicit Node( T const& _value ) : value( _value ) {} - virtual ~Node() {} - - typedef std::vector > ChildNodes; - T value; - ChildNodes children; - }; - struct SectionNode : SharedImpl<> { - explicit SectionNode( SectionStats const& _stats ) : stats( _stats ) {} - virtual ~SectionNode(); - - bool operator == ( SectionNode const& other ) const { - return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo; - } - bool operator == ( Ptr const& other ) const { - return operator==( *other ); - } - - SectionStats stats; - typedef std::vector > ChildSections; - typedef std::vector Assertions; - ChildSections childSections; - Assertions assertions; - std::string stdOut; - std::string stdErr; - }; - - struct BySectionInfo { - BySectionInfo( SectionInfo const& other ) : m_other( other ) {} - BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {} - bool operator() ( Ptr const& node ) const { - return ((node->stats.sectionInfo.name == m_other.name) && - (node->stats.sectionInfo.lineInfo == m_other.lineInfo)); - } - private: - void operator=( BySectionInfo const& ); - SectionInfo const& m_other; - }; - - typedef Node TestCaseNode; - typedef Node TestGroupNode; - typedef Node TestRunNode; - - CumulativeReporterBase( ReporterConfig const& _config ) - : m_config( _config.fullConfig() ), - stream( _config.stream() ) - { - m_reporterPrefs.shouldRedirectStdOut = false; - } - ~CumulativeReporterBase(); - - virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE { - return m_reporterPrefs; - } - - virtual void testRunStarting( TestRunInfo const& ) CATCH_OVERRIDE {} - virtual void testGroupStarting( GroupInfo const& ) CATCH_OVERRIDE {} - - virtual void testCaseStarting( TestCaseInfo const& ) CATCH_OVERRIDE {} - - virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE { - SectionStats incompleteStats( sectionInfo, Counts(), 0, false ); - Ptr node; - if( m_sectionStack.empty() ) { - if( !m_rootSection ) - m_rootSection = new SectionNode( incompleteStats ); - node = m_rootSection; - } - else { - SectionNode& parentNode = *m_sectionStack.back(); - SectionNode::ChildSections::const_iterator it = - std::find_if( parentNode.childSections.begin(), - parentNode.childSections.end(), - BySectionInfo( sectionInfo ) ); - if( it == parentNode.childSections.end() ) { - node = new SectionNode( incompleteStats ); - parentNode.childSections.push_back( node ); - } - else - node = *it; - } - m_sectionStack.push_back( node ); - m_deepestSection = node; - } - - virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {} - - virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { - assert( !m_sectionStack.empty() ); - SectionNode& sectionNode = *m_sectionStack.back(); - sectionNode.assertions.push_back( assertionStats ); - // AssertionResult holds a pointer to a temporary DecomposedExpression, - // which getExpandedExpression() calls to build the expression string. - // Our section stack copy of the assertionResult will likely outlive the - // temporary, so it must be expanded or discarded now to avoid calling - // a destroyed object later. - prepareExpandedExpression( sectionNode.assertions.back().assertionResult ); - return true; - } - virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE { - assert( !m_sectionStack.empty() ); - SectionNode& node = *m_sectionStack.back(); - node.stats = sectionStats; - m_sectionStack.pop_back(); - } - virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { - Ptr node = new TestCaseNode( testCaseStats ); - assert( m_sectionStack.size() == 0 ); - node->children.push_back( m_rootSection ); - m_testCases.push_back( node ); - m_rootSection.reset(); - - assert( m_deepestSection ); - m_deepestSection->stdOut = testCaseStats.stdOut; - m_deepestSection->stdErr = testCaseStats.stdErr; - } - virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { - Ptr node = new TestGroupNode( testGroupStats ); - node->children.swap( m_testCases ); - m_testGroups.push_back( node ); - } - virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE { - Ptr node = new TestRunNode( testRunStats ); - node->children.swap( m_testGroups ); - m_testRuns.push_back( node ); - testRunEndedCumulative(); - } - virtual void testRunEndedCumulative() = 0; - - virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE {} - - virtual void prepareExpandedExpression( AssertionResult& result ) const { - if( result.isOk() ) - result.discardDecomposedExpression(); - else - result.expandDecomposedExpression(); - } - - Ptr m_config; - std::ostream& stream; - std::vector m_assertions; - std::vector > > m_sections; - std::vector > m_testCases; - std::vector > m_testGroups; - - std::vector > m_testRuns; - - Ptr m_rootSection; - Ptr m_deepestSection; - std::vector > m_sectionStack; - ReporterPreferences m_reporterPrefs; - - }; - - template - char const* getLineOfChars() { - static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0}; - if( !*line ) { - std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 ); - line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0; - } - return line; - } - - struct TestEventListenerBase : StreamingReporterBase { - TestEventListenerBase( ReporterConfig const& _config ) - : StreamingReporterBase( _config ) - {} - - virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {} - virtual bool assertionEnded( AssertionStats const& ) CATCH_OVERRIDE { - return false; - } - }; - -} // end namespace Catch - -// #included from: ../internal/catch_reporter_registrars.hpp -#define TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED - -namespace Catch { - - template - class LegacyReporterRegistrar { - - class ReporterFactory : public IReporterFactory { - virtual IStreamingReporter* create( ReporterConfig const& config ) const { - return new LegacyReporterAdapter( new T( config ) ); - } - - virtual std::string getDescription() const { - return T::getDescription(); - } - }; - - public: - - LegacyReporterRegistrar( std::string const& name ) { - getMutableRegistryHub().registerReporter( name, new ReporterFactory() ); - } - }; - - template - class ReporterRegistrar { - - class ReporterFactory : public SharedImpl { - - // *** Please Note ***: - // - If you end up here looking at a compiler error because it's trying to register - // your custom reporter class be aware that the native reporter interface has changed - // to IStreamingReporter. The "legacy" interface, IReporter, is still supported via - // an adapter. Just use REGISTER_LEGACY_REPORTER to take advantage of the adapter. - // However please consider updating to the new interface as the old one is now - // deprecated and will probably be removed quite soon! - // Please contact me via github if you have any questions at all about this. - // In fact, ideally, please contact me anyway to let me know you've hit this - as I have - // no idea who is actually using custom reporters at all (possibly no-one!). - // The new interface is designed to minimise exposure to interface changes in the future. - virtual IStreamingReporter* create( ReporterConfig const& config ) const { - return new T( config ); - } - - virtual std::string getDescription() const { - return T::getDescription(); - } - }; - - public: - - ReporterRegistrar( std::string const& name ) { - getMutableRegistryHub().registerReporter( name, new ReporterFactory() ); - } - }; - - template - class ListenerRegistrar { - - class ListenerFactory : public SharedImpl { - - virtual IStreamingReporter* create( ReporterConfig const& config ) const { - return new T( config ); - } - virtual std::string getDescription() const { - return std::string(); - } - }; - - public: - - ListenerRegistrar() { - getMutableRegistryHub().registerListener( new ListenerFactory() ); - } - }; -} - -#define INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) \ - namespace{ Catch::LegacyReporterRegistrar catch_internal_RegistrarFor##reporterType( name ); } - -#define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \ - namespace{ Catch::ReporterRegistrar catch_internal_RegistrarFor##reporterType( name ); } - -// Deprecated - use the form without INTERNAL_ -#define INTERNAL_CATCH_REGISTER_LISTENER( listenerType ) \ - namespace{ Catch::ListenerRegistrar catch_internal_RegistrarFor##listenerType; } - -#define CATCH_REGISTER_LISTENER( listenerType ) \ - namespace{ Catch::ListenerRegistrar catch_internal_RegistrarFor##listenerType; } - -// #included from: ../internal/catch_xmlwriter.hpp -#define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED - -#include -#include -#include -#include - -namespace Catch { - - class XmlEncode { - public: - enum ForWhat { ForTextNodes, ForAttributes }; - - XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes ) - : m_str( str ), - m_forWhat( forWhat ) - {} - - void encodeTo( std::ostream& os ) const { - - // Apostrophe escaping not necessary if we always use " to write attributes - // (see: http://www.w3.org/TR/xml/#syntax) - - for( std::size_t i = 0; i < m_str.size(); ++ i ) { - char c = m_str[i]; - switch( c ) { - case '<': os << "<"; break; - case '&': os << "&"; break; - - case '>': - // See: http://www.w3.org/TR/xml/#syntax - if( i > 2 && m_str[i-1] == ']' && m_str[i-2] == ']' ) - os << ">"; - else - os << c; - break; - - case '\"': - if( m_forWhat == ForAttributes ) - os << """; - else - os << c; - break; - - default: - // Escape control chars - based on contribution by @espenalb in PR #465 and - // by @mrpi PR #588 - if ( ( c >= 0 && c < '\x09' ) || ( c > '\x0D' && c < '\x20') || c=='\x7F' ) { - // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0 - os << "\\x" << std::uppercase << std::hex << std::setfill('0') << std::setw(2) - << static_cast( c ); - } - else - os << c; - } - } - } - - friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) { - xmlEncode.encodeTo( os ); - return os; - } - - private: - std::string m_str; - ForWhat m_forWhat; - }; - - class XmlWriter { - public: - - class ScopedElement { - public: - ScopedElement( XmlWriter* writer ) - : m_writer( writer ) - {} - - ScopedElement( ScopedElement const& other ) - : m_writer( other.m_writer ){ - other.m_writer = CATCH_NULL; - } - - ~ScopedElement() { - if( m_writer ) - m_writer->endElement(); - } - - ScopedElement& writeText( std::string const& text, bool indent = true ) { - m_writer->writeText( text, indent ); - return *this; - } - - template - ScopedElement& writeAttribute( std::string const& name, T const& attribute ) { - m_writer->writeAttribute( name, attribute ); - return *this; - } - - private: - mutable XmlWriter* m_writer; - }; - - XmlWriter() - : m_tagIsOpen( false ), - m_needsNewline( false ), - m_os( Catch::cout() ) - { - writeDeclaration(); - } - - XmlWriter( std::ostream& os ) - : m_tagIsOpen( false ), - m_needsNewline( false ), - m_os( os ) - { - writeDeclaration(); - } - - ~XmlWriter() { - while( !m_tags.empty() ) - endElement(); - } - - XmlWriter& startElement( std::string const& name ) { - ensureTagClosed(); - newlineIfNecessary(); - m_os << m_indent << '<' << name; - m_tags.push_back( name ); - m_indent += " "; - m_tagIsOpen = true; - return *this; - } - - ScopedElement scopedElement( std::string const& name ) { - ScopedElement scoped( this ); - startElement( name ); - return scoped; - } - - XmlWriter& endElement() { - newlineIfNecessary(); - m_indent = m_indent.substr( 0, m_indent.size()-2 ); - if( m_tagIsOpen ) { - m_os << "/>"; - m_tagIsOpen = false; - } - else { - m_os << m_indent << ""; - } - m_os << std::endl; - m_tags.pop_back(); - return *this; - } - - XmlWriter& writeAttribute( std::string const& name, std::string const& attribute ) { - if( !name.empty() && !attribute.empty() ) - m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"'; - return *this; - } - - XmlWriter& writeAttribute( std::string const& name, bool attribute ) { - m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"'; - return *this; - } - - template - XmlWriter& writeAttribute( std::string const& name, T const& attribute ) { - std::ostringstream oss; - oss << attribute; - return writeAttribute( name, oss.str() ); - } - - XmlWriter& writeText( std::string const& text, bool indent = true ) { - if( !text.empty() ){ - bool tagWasOpen = m_tagIsOpen; - ensureTagClosed(); - if( tagWasOpen && indent ) - m_os << m_indent; - m_os << XmlEncode( text ); - m_needsNewline = true; - } - return *this; - } - - XmlWriter& writeComment( std::string const& text ) { - ensureTagClosed(); - m_os << m_indent << ""; - m_needsNewline = true; - return *this; - } - - void writeStylesheetRef( std::string const& url ) { - m_os << "\n"; - } - - XmlWriter& writeBlankLine() { - ensureTagClosed(); - m_os << '\n'; - return *this; - } - - void ensureTagClosed() { - if( m_tagIsOpen ) { - m_os << ">" << std::endl; - m_tagIsOpen = false; - } - } - - private: - XmlWriter( XmlWriter const& ); - void operator=( XmlWriter const& ); - - void writeDeclaration() { - m_os << "\n"; - } - - void newlineIfNecessary() { - if( m_needsNewline ) { - m_os << std::endl; - m_needsNewline = false; - } - } - - bool m_tagIsOpen; - bool m_needsNewline; - std::vector m_tags; - std::string m_indent; - std::ostream& m_os; - }; - -} - -namespace Catch { - class XmlReporter : public StreamingReporterBase { - public: - XmlReporter( ReporterConfig const& _config ) - : StreamingReporterBase( _config ), - m_xml(_config.stream()), - m_sectionDepth( 0 ) - { - m_reporterPrefs.shouldRedirectStdOut = true; - } - - virtual ~XmlReporter() CATCH_OVERRIDE; - - static std::string getDescription() { - return "Reports test results as an XML document"; - } - - virtual std::string getStylesheetRef() const { - return std::string(); - } - - void writeSourceInfo( SourceLineInfo const& sourceInfo ) { - m_xml - .writeAttribute( "filename", sourceInfo.file ) - .writeAttribute( "line", sourceInfo.line ); - } - - public: // StreamingReporterBase - - virtual void noMatchingTestCases( std::string const& s ) CATCH_OVERRIDE { - StreamingReporterBase::noMatchingTestCases( s ); - } - - virtual void testRunStarting( TestRunInfo const& testInfo ) CATCH_OVERRIDE { - StreamingReporterBase::testRunStarting( testInfo ); - std::string stylesheetRef = getStylesheetRef(); - if( !stylesheetRef.empty() ) - m_xml.writeStylesheetRef( stylesheetRef ); - m_xml.startElement( "Catch" ); - if( !m_config->name().empty() ) - m_xml.writeAttribute( "name", m_config->name() ); - } - - virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE { - StreamingReporterBase::testGroupStarting( groupInfo ); - m_xml.startElement( "Group" ) - .writeAttribute( "name", groupInfo.name ); - } - - virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE { - StreamingReporterBase::testCaseStarting(testInfo); - m_xml.startElement( "TestCase" ) - .writeAttribute( "name", trim( testInfo.name ) ) - .writeAttribute( "description", testInfo.description ) - .writeAttribute( "tags", testInfo.tagsAsString ); - - writeSourceInfo( testInfo.lineInfo ); - - if ( m_config->showDurations() == ShowDurations::Always ) - m_testCaseTimer.start(); - m_xml.ensureTagClosed(); - } - - virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE { - StreamingReporterBase::sectionStarting( sectionInfo ); - if( m_sectionDepth++ > 0 ) { - m_xml.startElement( "Section" ) - .writeAttribute( "name", trim( sectionInfo.name ) ) - .writeAttribute( "description", sectionInfo.description ); - writeSourceInfo( sectionInfo.lineInfo ); - m_xml.ensureTagClosed(); - } - } - - virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE { } - - virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { - - AssertionResult const& result = assertionStats.assertionResult; - - bool includeResults = m_config->includeSuccessfulResults() || !result.isOk(); - - if( includeResults || result.getResultType() == ResultWas::Warning ) { - // Print any info messages in tags. - for( std::vector::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end(); - it != itEnd; - ++it ) { - if( it->type == ResultWas::Info && includeResults ) { - m_xml.scopedElement( "Info" ) - .writeText( it->message ); - } else if ( it->type == ResultWas::Warning ) { - m_xml.scopedElement( "Warning" ) - .writeText( it->message ); - } - } - } - - // Drop out if result was successful but we're not printing them. - if( !includeResults && result.getResultType() != ResultWas::Warning ) - return true; - - // Print the expression if there is one. - if( result.hasExpression() ) { - m_xml.startElement( "Expression" ) - .writeAttribute( "success", result.succeeded() ) - .writeAttribute( "type", result.getTestMacroName() ); - - writeSourceInfo( result.getSourceInfo() ); - - m_xml.scopedElement( "Original" ) - .writeText( result.getExpression() ); - m_xml.scopedElement( "Expanded" ) - .writeText( result.getExpandedExpression() ); - } - - // And... Print a result applicable to each result type. - switch( result.getResultType() ) { - case ResultWas::ThrewException: - m_xml.startElement( "Exception" ); - writeSourceInfo( result.getSourceInfo() ); - m_xml.writeText( result.getMessage() ); - m_xml.endElement(); - break; - case ResultWas::FatalErrorCondition: - m_xml.startElement( "FatalErrorCondition" ); - writeSourceInfo( result.getSourceInfo() ); - m_xml.writeText( result.getMessage() ); - m_xml.endElement(); - break; - case ResultWas::Info: - m_xml.scopedElement( "Info" ) - .writeText( result.getMessage() ); - break; - case ResultWas::Warning: - // Warning will already have been written - break; - case ResultWas::ExplicitFailure: - m_xml.startElement( "Failure" ); - writeSourceInfo( result.getSourceInfo() ); - m_xml.writeText( result.getMessage() ); - m_xml.endElement(); - break; - default: - break; - } - - if( result.hasExpression() ) - m_xml.endElement(); - - return true; - } - - virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE { - StreamingReporterBase::sectionEnded( sectionStats ); - if( --m_sectionDepth > 0 ) { - XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" ); - e.writeAttribute( "successes", sectionStats.assertions.passed ); - e.writeAttribute( "failures", sectionStats.assertions.failed ); - e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk ); - - if ( m_config->showDurations() == ShowDurations::Always ) - e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds ); - - m_xml.endElement(); - } - } - - virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { - StreamingReporterBase::testCaseEnded( testCaseStats ); - XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" ); - e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() ); - - if ( m_config->showDurations() == ShowDurations::Always ) - e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() ); - - if( !testCaseStats.stdOut.empty() ) - m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), false ); - if( !testCaseStats.stdErr.empty() ) - m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), false ); - - m_xml.endElement(); - } - - virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { - StreamingReporterBase::testGroupEnded( testGroupStats ); - // TODO: Check testGroupStats.aborting and act accordingly. - m_xml.scopedElement( "OverallResults" ) - .writeAttribute( "successes", testGroupStats.totals.assertions.passed ) - .writeAttribute( "failures", testGroupStats.totals.assertions.failed ) - .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk ); - m_xml.endElement(); - } - - virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE { - StreamingReporterBase::testRunEnded( testRunStats ); - m_xml.scopedElement( "OverallResults" ) - .writeAttribute( "successes", testRunStats.totals.assertions.passed ) - .writeAttribute( "failures", testRunStats.totals.assertions.failed ) - .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk ); - m_xml.endElement(); - } - - private: - Timer m_testCaseTimer; - XmlWriter m_xml; - int m_sectionDepth; - }; - - INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter ) - -} // end namespace Catch - -// #included from: ../reporters/catch_reporter_junit.hpp -#define TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED - -#include - -namespace Catch { - - namespace { - std::string getCurrentTimestamp() { - // Beware, this is not reentrant because of backward compatibility issues - // Also, UTC only, again because of backward compatibility (%z is C++11) - time_t rawtime; - std::time(&rawtime); - const size_t timeStampSize = sizeof("2017-01-16T17:06:45Z"); - -#ifdef _MSC_VER - std::tm timeInfo = {}; - gmtime_s(&timeInfo, &rawtime); -#else - std::tm* timeInfo; - timeInfo = std::gmtime(&rawtime); -#endif - - char timeStamp[timeStampSize]; - const char * const fmt = "%Y-%m-%dT%H:%M:%SZ"; - -#ifdef _MSC_VER - std::strftime(timeStamp, timeStampSize, fmt, &timeInfo); -#else - std::strftime(timeStamp, timeStampSize, fmt, timeInfo); -#endif - return std::string(timeStamp); - } - - } - - class JunitReporter : public CumulativeReporterBase { - public: - JunitReporter( ReporterConfig const& _config ) - : CumulativeReporterBase( _config ), - xml( _config.stream() ), - unexpectedExceptions( 0 ), - m_okToFail( false ) - { - m_reporterPrefs.shouldRedirectStdOut = true; - } - - virtual ~JunitReporter() CATCH_OVERRIDE; - - static std::string getDescription() { - return "Reports test results in an XML format that looks like Ant's junitreport target"; - } - - virtual void noMatchingTestCases( std::string const& /*spec*/ ) CATCH_OVERRIDE {} - - virtual void testRunStarting( TestRunInfo const& runInfo ) CATCH_OVERRIDE { - CumulativeReporterBase::testRunStarting( runInfo ); - xml.startElement( "testsuites" ); - } - - virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE { - suiteTimer.start(); - stdOutForSuite.str(""); - stdErrForSuite.str(""); - unexpectedExceptions = 0; - CumulativeReporterBase::testGroupStarting( groupInfo ); - } - - virtual void testCaseStarting( TestCaseInfo const& testCaseInfo ) CATCH_OVERRIDE { - m_okToFail = testCaseInfo.okToFail(); - } - virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE { - if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail ) - unexpectedExceptions++; - return CumulativeReporterBase::assertionEnded( assertionStats ); - } - - virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE { - stdOutForSuite << testCaseStats.stdOut; - stdErrForSuite << testCaseStats.stdErr; - CumulativeReporterBase::testCaseEnded( testCaseStats ); - } - - virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE { - double suiteTime = suiteTimer.getElapsedSeconds(); - CumulativeReporterBase::testGroupEnded( testGroupStats ); - writeGroup( *m_testGroups.back(), suiteTime ); - } - - virtual void testRunEndedCumulative() CATCH_OVERRIDE { - xml.endElement(); - } - - void writeGroup( TestGroupNode const& groupNode, double suiteTime ) { - XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" ); - TestGroupStats const& stats = groupNode.value; - xml.writeAttribute( "name", stats.groupInfo.name ); - xml.writeAttribute( "errors", unexpectedExceptions ); - xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions ); - xml.writeAttribute( "tests", stats.totals.assertions.total() ); - xml.writeAttribute( "hostname", "tbd" ); // !TBD - if( m_config->showDurations() == ShowDurations::Never ) - xml.writeAttribute( "time", "" ); - else - xml.writeAttribute( "time", suiteTime ); - xml.writeAttribute( "timestamp", getCurrentTimestamp() ); - - // Write test cases - for( TestGroupNode::ChildNodes::const_iterator - it = groupNode.children.begin(), itEnd = groupNode.children.end(); - it != itEnd; - ++it ) - writeTestCase( **it ); - - xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite.str() ), false ); - xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite.str() ), false ); - } - - void writeTestCase( TestCaseNode const& testCaseNode ) { - TestCaseStats const& stats = testCaseNode.value; - - // All test cases have exactly one section - which represents the - // test case itself. That section may have 0-n nested sections - assert( testCaseNode.children.size() == 1 ); - SectionNode const& rootSection = *testCaseNode.children.front(); - - std::string className = stats.testInfo.className; - - if( className.empty() ) { - if( rootSection.childSections.empty() ) - className = "global"; - } - writeSection( className, "", rootSection ); - } - - void writeSection( std::string const& className, - std::string const& rootName, - SectionNode const& sectionNode ) { - std::string name = trim( sectionNode.stats.sectionInfo.name ); - if( !rootName.empty() ) - name = rootName + '/' + name; - - if( !sectionNode.assertions.empty() || - !sectionNode.stdOut.empty() || - !sectionNode.stdErr.empty() ) { - XmlWriter::ScopedElement e = xml.scopedElement( "testcase" ); - if( className.empty() ) { - xml.writeAttribute( "classname", name ); - xml.writeAttribute( "name", "root" ); - } - else { - xml.writeAttribute( "classname", className ); - xml.writeAttribute( "name", name ); - } - xml.writeAttribute( "time", Catch::toString( sectionNode.stats.durationInSeconds ) ); - - writeAssertions( sectionNode ); - - if( !sectionNode.stdOut.empty() ) - xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), false ); - if( !sectionNode.stdErr.empty() ) - xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), false ); - } - for( SectionNode::ChildSections::const_iterator - it = sectionNode.childSections.begin(), - itEnd = sectionNode.childSections.end(); - it != itEnd; - ++it ) - if( className.empty() ) - writeSection( name, "", **it ); - else - writeSection( className, name, **it ); - } - - void writeAssertions( SectionNode const& sectionNode ) { - for( SectionNode::Assertions::const_iterator - it = sectionNode.assertions.begin(), itEnd = sectionNode.assertions.end(); - it != itEnd; - ++it ) - writeAssertion( *it ); - } - void writeAssertion( AssertionStats const& stats ) { - AssertionResult const& result = stats.assertionResult; - if( !result.isOk() ) { - std::string elementName; - switch( result.getResultType() ) { - case ResultWas::ThrewException: - case ResultWas::FatalErrorCondition: - elementName = "error"; - break; - case ResultWas::ExplicitFailure: - elementName = "failure"; - break; - case ResultWas::ExpressionFailed: - elementName = "failure"; - break; - case ResultWas::DidntThrowException: - elementName = "failure"; - break; - - // We should never see these here: - case ResultWas::Info: - case ResultWas::Warning: - case ResultWas::Ok: - case ResultWas::Unknown: - case ResultWas::FailureBit: - case ResultWas::Exception: - elementName = "internalError"; - break; - } - - XmlWriter::ScopedElement e = xml.scopedElement( elementName ); - - xml.writeAttribute( "message", result.getExpandedExpression() ); - xml.writeAttribute( "type", result.getTestMacroName() ); - - std::ostringstream oss; - if( !result.getMessage().empty() ) - oss << result.getMessage() << '\n'; - for( std::vector::const_iterator - it = stats.infoMessages.begin(), - itEnd = stats.infoMessages.end(); - it != itEnd; - ++it ) - if( it->type == ResultWas::Info ) - oss << it->message << '\n'; - - oss << "at " << result.getSourceInfo(); - xml.writeText( oss.str(), false ); - } - } - - XmlWriter xml; - Timer suiteTimer; - std::ostringstream stdOutForSuite; - std::ostringstream stdErrForSuite; - unsigned int unexpectedExceptions; - bool m_okToFail; - }; - - INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter ) - -} // end namespace Catch - -// #included from: ../reporters/catch_reporter_console.hpp -#define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_HPP_INCLUDED - -#include -#include -#include - -namespace Catch { - - struct ConsoleReporter : StreamingReporterBase { - ConsoleReporter( ReporterConfig const& _config ) - : StreamingReporterBase( _config ), - m_headerPrinted( false ) - {} - - virtual ~ConsoleReporter() CATCH_OVERRIDE; - static std::string getDescription() { - return "Reports test results as plain lines of text"; - } - - virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE { - stream << "No test cases matched '" << spec << '\'' << std::endl; - } - - virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE { - } - - virtual bool assertionEnded( AssertionStats const& _assertionStats ) CATCH_OVERRIDE { - AssertionResult const& result = _assertionStats.assertionResult; - - bool includeResults = m_config->includeSuccessfulResults() || !result.isOk(); - - // Drop out if result was successful but we're not printing them. - if( !includeResults && result.getResultType() != ResultWas::Warning ) - return false; - - lazyPrint(); - - AssertionPrinter printer( stream, _assertionStats, includeResults ); - printer.print(); - stream << std::endl; - return true; - } - - virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE { - m_headerPrinted = false; - StreamingReporterBase::sectionStarting( _sectionInfo ); - } - virtual void sectionEnded( SectionStats const& _sectionStats ) CATCH_OVERRIDE { - if( _sectionStats.missingAssertions ) { - lazyPrint(); - Colour colour( Colour::ResultError ); - if( m_sectionStack.size() > 1 ) - stream << "\nNo assertions in section"; - else - stream << "\nNo assertions in test case"; - stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl; - } - if( m_config->showDurations() == ShowDurations::Always ) { - stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl; - } - if( m_headerPrinted ) { - m_headerPrinted = false; - } - StreamingReporterBase::sectionEnded( _sectionStats ); - } - - virtual void testCaseEnded( TestCaseStats const& _testCaseStats ) CATCH_OVERRIDE { - StreamingReporterBase::testCaseEnded( _testCaseStats ); - m_headerPrinted = false; - } - virtual void testGroupEnded( TestGroupStats const& _testGroupStats ) CATCH_OVERRIDE { - if( currentGroupInfo.used ) { - printSummaryDivider(); - stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n"; - printTotals( _testGroupStats.totals ); - stream << '\n' << std::endl; - } - StreamingReporterBase::testGroupEnded( _testGroupStats ); - } - virtual void testRunEnded( TestRunStats const& _testRunStats ) CATCH_OVERRIDE { - printTotalsDivider( _testRunStats.totals ); - printTotals( _testRunStats.totals ); - stream << std::endl; - StreamingReporterBase::testRunEnded( _testRunStats ); - } - - private: - - class AssertionPrinter { - void operator= ( AssertionPrinter const& ); - public: - AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages ) - : stream( _stream ), - stats( _stats ), - result( _stats.assertionResult ), - colour( Colour::None ), - message( result.getMessage() ), - messages( _stats.infoMessages ), - printInfoMessages( _printInfoMessages ) - { - switch( result.getResultType() ) { - case ResultWas::Ok: - colour = Colour::Success; - passOrFail = "PASSED"; - //if( result.hasMessage() ) - if( _stats.infoMessages.size() == 1 ) - messageLabel = "with message"; - if( _stats.infoMessages.size() > 1 ) - messageLabel = "with messages"; - break; - case ResultWas::ExpressionFailed: - if( result.isOk() ) { - colour = Colour::Success; - passOrFail = "FAILED - but was ok"; - } - else { - colour = Colour::Error; - passOrFail = "FAILED"; - } - if( _stats.infoMessages.size() == 1 ) - messageLabel = "with message"; - if( _stats.infoMessages.size() > 1 ) - messageLabel = "with messages"; - break; - case ResultWas::ThrewException: - colour = Colour::Error; - passOrFail = "FAILED"; - messageLabel = "due to unexpected exception with "; - if (_stats.infoMessages.size() == 1) - messageLabel += "message"; - if (_stats.infoMessages.size() > 1) - messageLabel += "messages"; - break; - case ResultWas::FatalErrorCondition: - colour = Colour::Error; - passOrFail = "FAILED"; - messageLabel = "due to a fatal error condition"; - break; - case ResultWas::DidntThrowException: - colour = Colour::Error; - passOrFail = "FAILED"; - messageLabel = "because no exception was thrown where one was expected"; - break; - case ResultWas::Info: - messageLabel = "info"; - break; - case ResultWas::Warning: - messageLabel = "warning"; - break; - case ResultWas::ExplicitFailure: - passOrFail = "FAILED"; - colour = Colour::Error; - if( _stats.infoMessages.size() == 1 ) - messageLabel = "explicitly with message"; - if( _stats.infoMessages.size() > 1 ) - messageLabel = "explicitly with messages"; - break; - // These cases are here to prevent compiler warnings - case ResultWas::Unknown: - case ResultWas::FailureBit: - case ResultWas::Exception: - passOrFail = "** internal error **"; - colour = Colour::Error; - break; - } - } - - void print() const { - printSourceInfo(); - if( stats.totals.assertions.total() > 0 ) { - if( result.isOk() ) - stream << '\n'; - printResultType(); - printOriginalExpression(); - printReconstructedExpression(); - } - else { - stream << '\n'; - } - printMessage(); - } - - private: - void printResultType() const { - if( !passOrFail.empty() ) { - Colour colourGuard( colour ); - stream << passOrFail << ":\n"; - } - } - void printOriginalExpression() const { - if( result.hasExpression() ) { - Colour colourGuard( Colour::OriginalExpression ); - stream << " "; - stream << result.getExpressionInMacro(); - stream << '\n'; - } - } - void printReconstructedExpression() const { - if( result.hasExpandedExpression() ) { - stream << "with expansion:\n"; - Colour colourGuard( Colour::ReconstructedExpression ); - stream << Text( result.getExpandedExpression(), TextAttributes().setIndent(2) ) << '\n'; - } - } - void printMessage() const { - if( !messageLabel.empty() ) - stream << messageLabel << ':' << '\n'; - for( std::vector::const_iterator it = messages.begin(), itEnd = messages.end(); - it != itEnd; - ++it ) { - // If this assertion is a warning ignore any INFO messages - if( printInfoMessages || it->type != ResultWas::Info ) - stream << Text( it->message, TextAttributes().setIndent(2) ) << '\n'; - } - } - void printSourceInfo() const { - Colour colourGuard( Colour::FileName ); - stream << result.getSourceInfo() << ": "; - } - - std::ostream& stream; - AssertionStats const& stats; - AssertionResult const& result; - Colour::Code colour; - std::string passOrFail; - std::string messageLabel; - std::string message; - std::vector messages; - bool printInfoMessages; - }; - - void lazyPrint() { - - if( !currentTestRunInfo.used ) - lazyPrintRunInfo(); - if( !currentGroupInfo.used ) - lazyPrintGroupInfo(); - - if( !m_headerPrinted ) { - printTestCaseAndSectionHeader(); - m_headerPrinted = true; - } - } - void lazyPrintRunInfo() { - stream << '\n' << getLineOfChars<'~'>() << '\n'; - Colour colour( Colour::SecondaryText ); - stream << currentTestRunInfo->name - << " is a Catch v" << libraryVersion() << " host application.\n" - << "Run with -? for options\n\n"; - - if( m_config->rngSeed() != 0 ) - stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n"; - - currentTestRunInfo.used = true; - } - void lazyPrintGroupInfo() { - if( !currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1 ) { - printClosedHeader( "Group: " + currentGroupInfo->name ); - currentGroupInfo.used = true; - } - } - void printTestCaseAndSectionHeader() { - assert( !m_sectionStack.empty() ); - printOpenHeader( currentTestCaseInfo->name ); - - if( m_sectionStack.size() > 1 ) { - Colour colourGuard( Colour::Headers ); - - std::vector::const_iterator - it = m_sectionStack.begin()+1, // Skip first section (test case) - itEnd = m_sectionStack.end(); - for( ; it != itEnd; ++it ) - printHeaderString( it->name, 2 ); - } - - SourceLineInfo lineInfo = m_sectionStack.back().lineInfo; - - if( !lineInfo.empty() ){ - stream << getLineOfChars<'-'>() << '\n'; - Colour colourGuard( Colour::FileName ); - stream << lineInfo << '\n'; - } - stream << getLineOfChars<'.'>() << '\n' << std::endl; - } - - void printClosedHeader( std::string const& _name ) { - printOpenHeader( _name ); - stream << getLineOfChars<'.'>() << '\n'; - } - void printOpenHeader( std::string const& _name ) { - stream << getLineOfChars<'-'>() << '\n'; - { - Colour colourGuard( Colour::Headers ); - printHeaderString( _name ); - } - } - - // if string has a : in first line will set indent to follow it on - // subsequent lines - void printHeaderString( std::string const& _string, std::size_t indent = 0 ) { - std::size_t i = _string.find( ": " ); - if( i != std::string::npos ) - i+=2; - else - i = 0; - stream << Text( _string, TextAttributes() - .setIndent( indent+i) - .setInitialIndent( indent ) ) << '\n'; - } - - struct SummaryColumn { - - SummaryColumn( std::string const& _label, Colour::Code _colour ) - : label( _label ), - colour( _colour ) - {} - SummaryColumn addRow( std::size_t count ) { - std::ostringstream oss; - oss << count; - std::string row = oss.str(); - for( std::vector::iterator it = rows.begin(); it != rows.end(); ++it ) { - while( it->size() < row.size() ) - *it = ' ' + *it; - while( it->size() > row.size() ) - row = ' ' + row; - } - rows.push_back( row ); - return *this; - } - - std::string label; - Colour::Code colour; - std::vector rows; - - }; - - void printTotals( Totals const& totals ) { - if( totals.testCases.total() == 0 ) { - stream << Colour( Colour::Warning ) << "No tests ran\n"; - } - else if( totals.assertions.total() > 0 && totals.testCases.allPassed() ) { - stream << Colour( Colour::ResultSuccess ) << "All tests passed"; - stream << " (" - << pluralise( totals.assertions.passed, "assertion" ) << " in " - << pluralise( totals.testCases.passed, "test case" ) << ')' - << '\n'; - } - else { - - std::vector columns; - columns.push_back( SummaryColumn( "", Colour::None ) - .addRow( totals.testCases.total() ) - .addRow( totals.assertions.total() ) ); - columns.push_back( SummaryColumn( "passed", Colour::Success ) - .addRow( totals.testCases.passed ) - .addRow( totals.assertions.passed ) ); - columns.push_back( SummaryColumn( "failed", Colour::ResultError ) - .addRow( totals.testCases.failed ) - .addRow( totals.assertions.failed ) ); - columns.push_back( SummaryColumn( "failed as expected", Colour::ResultExpectedFailure ) - .addRow( totals.testCases.failedButOk ) - .addRow( totals.assertions.failedButOk ) ); - - printSummaryRow( "test cases", columns, 0 ); - printSummaryRow( "assertions", columns, 1 ); - } - } - void printSummaryRow( std::string const& label, std::vector const& cols, std::size_t row ) { - for( std::vector::const_iterator it = cols.begin(); it != cols.end(); ++it ) { - std::string value = it->rows[row]; - if( it->label.empty() ) { - stream << label << ": "; - if( value != "0" ) - stream << value; - else - stream << Colour( Colour::Warning ) << "- none -"; - } - else if( value != "0" ) { - stream << Colour( Colour::LightGrey ) << " | "; - stream << Colour( it->colour ) - << value << ' ' << it->label; - } - } - stream << '\n'; - } - - static std::size_t makeRatio( std::size_t number, std::size_t total ) { - std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number/ total : 0; - return ( ratio == 0 && number > 0 ) ? 1 : ratio; - } - static std::size_t& findMax( std::size_t& i, std::size_t& j, std::size_t& k ) { - if( i > j && i > k ) - return i; - else if( j > k ) - return j; - else - return k; - } - - void printTotalsDivider( Totals const& totals ) { - if( totals.testCases.total() > 0 ) { - std::size_t failedRatio = makeRatio( totals.testCases.failed, totals.testCases.total() ); - std::size_t failedButOkRatio = makeRatio( totals.testCases.failedButOk, totals.testCases.total() ); - std::size_t passedRatio = makeRatio( totals.testCases.passed, totals.testCases.total() ); - while( failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH-1 ) - findMax( failedRatio, failedButOkRatio, passedRatio )++; - while( failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH-1 ) - findMax( failedRatio, failedButOkRatio, passedRatio )--; - - stream << Colour( Colour::Error ) << std::string( failedRatio, '=' ); - stream << Colour( Colour::ResultExpectedFailure ) << std::string( failedButOkRatio, '=' ); - if( totals.testCases.allPassed() ) - stream << Colour( Colour::ResultSuccess ) << std::string( passedRatio, '=' ); - else - stream << Colour( Colour::Success ) << std::string( passedRatio, '=' ); - } - else { - stream << Colour( Colour::Warning ) << std::string( CATCH_CONFIG_CONSOLE_WIDTH-1, '=' ); - } - stream << '\n'; - } - void printSummaryDivider() { - stream << getLineOfChars<'-'>() << '\n'; - } - - private: - bool m_headerPrinted; - }; - - INTERNAL_CATCH_REGISTER_REPORTER( "console", ConsoleReporter ) - -} // end namespace Catch - -// #included from: ../reporters/catch_reporter_compact.hpp -#define TWOBLUECUBES_CATCH_REPORTER_COMPACT_HPP_INCLUDED - -namespace Catch { - - struct CompactReporter : StreamingReporterBase { - - CompactReporter( ReporterConfig const& _config ) - : StreamingReporterBase( _config ) - {} - - virtual ~CompactReporter(); - - static std::string getDescription() { - return "Reports test results on a single line, suitable for IDEs"; - } - - virtual ReporterPreferences getPreferences() const { - ReporterPreferences prefs; - prefs.shouldRedirectStdOut = false; - return prefs; - } - - virtual void noMatchingTestCases( std::string const& spec ) { - stream << "No test cases matched '" << spec << '\'' << std::endl; - } - - virtual void assertionStarting( AssertionInfo const& ) {} - - virtual bool assertionEnded( AssertionStats const& _assertionStats ) { - AssertionResult const& result = _assertionStats.assertionResult; - - bool printInfoMessages = true; - - // Drop out if result was successful and we're not printing those - if( !m_config->includeSuccessfulResults() && result.isOk() ) { - if( result.getResultType() != ResultWas::Warning ) - return false; - printInfoMessages = false; - } - - AssertionPrinter printer( stream, _assertionStats, printInfoMessages ); - printer.print(); - - stream << std::endl; - return true; - } - - virtual void sectionEnded(SectionStats const& _sectionStats) CATCH_OVERRIDE { - if (m_config->showDurations() == ShowDurations::Always) { - stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl; - } - } - - virtual void testRunEnded( TestRunStats const& _testRunStats ) { - printTotals( _testRunStats.totals ); - stream << '\n' << std::endl; - StreamingReporterBase::testRunEnded( _testRunStats ); - } - - private: - class AssertionPrinter { - void operator= ( AssertionPrinter const& ); - public: - AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages ) - : stream( _stream ) - , stats( _stats ) - , result( _stats.assertionResult ) - , messages( _stats.infoMessages ) - , itMessage( _stats.infoMessages.begin() ) - , printInfoMessages( _printInfoMessages ) - {} - - void print() { - printSourceInfo(); - - itMessage = messages.begin(); - - switch( result.getResultType() ) { - case ResultWas::Ok: - printResultType( Colour::ResultSuccess, passedString() ); - printOriginalExpression(); - printReconstructedExpression(); - if ( ! result.hasExpression() ) - printRemainingMessages( Colour::None ); - else - printRemainingMessages(); - break; - case ResultWas::ExpressionFailed: - if( result.isOk() ) - printResultType( Colour::ResultSuccess, failedString() + std::string( " - but was ok" ) ); - else - printResultType( Colour::Error, failedString() ); - printOriginalExpression(); - printReconstructedExpression(); - printRemainingMessages(); - break; - case ResultWas::ThrewException: - printResultType( Colour::Error, failedString() ); - printIssue( "unexpected exception with message:" ); - printMessage(); - printExpressionWas(); - printRemainingMessages(); - break; - case ResultWas::FatalErrorCondition: - printResultType( Colour::Error, failedString() ); - printIssue( "fatal error condition with message:" ); - printMessage(); - printExpressionWas(); - printRemainingMessages(); - break; - case ResultWas::DidntThrowException: - printResultType( Colour::Error, failedString() ); - printIssue( "expected exception, got none" ); - printExpressionWas(); - printRemainingMessages(); - break; - case ResultWas::Info: - printResultType( Colour::None, "info" ); - printMessage(); - printRemainingMessages(); - break; - case ResultWas::Warning: - printResultType( Colour::None, "warning" ); - printMessage(); - printRemainingMessages(); - break; - case ResultWas::ExplicitFailure: - printResultType( Colour::Error, failedString() ); - printIssue( "explicitly" ); - printRemainingMessages( Colour::None ); - break; - // These cases are here to prevent compiler warnings - case ResultWas::Unknown: - case ResultWas::FailureBit: - case ResultWas::Exception: - printResultType( Colour::Error, "** internal error **" ); - break; - } - } - - private: - // Colour::LightGrey - - static Colour::Code dimColour() { return Colour::FileName; } - -#ifdef CATCH_PLATFORM_MAC - static const char* failedString() { return "FAILED"; } - static const char* passedString() { return "PASSED"; } -#else - static const char* failedString() { return "failed"; } - static const char* passedString() { return "passed"; } -#endif - - void printSourceInfo() const { - Colour colourGuard( Colour::FileName ); - stream << result.getSourceInfo() << ':'; - } - - void printResultType( Colour::Code colour, std::string const& passOrFail ) const { - if( !passOrFail.empty() ) { - { - Colour colourGuard( colour ); - stream << ' ' << passOrFail; - } - stream << ':'; - } - } - - void printIssue( std::string const& issue ) const { - stream << ' ' << issue; - } - - void printExpressionWas() { - if( result.hasExpression() ) { - stream << ';'; - { - Colour colour( dimColour() ); - stream << " expression was:"; - } - printOriginalExpression(); - } - } - - void printOriginalExpression() const { - if( result.hasExpression() ) { - stream << ' ' << result.getExpression(); - } - } - - void printReconstructedExpression() const { - if( result.hasExpandedExpression() ) { - { - Colour colour( dimColour() ); - stream << " for: "; - } - stream << result.getExpandedExpression(); - } - } - - void printMessage() { - if ( itMessage != messages.end() ) { - stream << " '" << itMessage->message << '\''; - ++itMessage; - } - } - - void printRemainingMessages( Colour::Code colour = dimColour() ) { - if ( itMessage == messages.end() ) - return; - - // using messages.end() directly yields compilation error: - std::vector::const_iterator itEnd = messages.end(); - const std::size_t N = static_cast( std::distance( itMessage, itEnd ) ); - - { - Colour colourGuard( colour ); - stream << " with " << pluralise( N, "message" ) << ':'; - } - - for(; itMessage != itEnd; ) { - // If this assertion is a warning ignore any INFO messages - if( printInfoMessages || itMessage->type != ResultWas::Info ) { - stream << " '" << itMessage->message << '\''; - if ( ++itMessage != itEnd ) { - Colour colourGuard( dimColour() ); - stream << " and"; - } - } - } - } - - private: - std::ostream& stream; - AssertionStats const& stats; - AssertionResult const& result; - std::vector messages; - std::vector::const_iterator itMessage; - bool printInfoMessages; - }; - - // Colour, message variants: - // - white: No tests ran. - // - red: Failed [both/all] N test cases, failed [both/all] M assertions. - // - white: Passed [both/all] N test cases (no assertions). - // - red: Failed N tests cases, failed M assertions. - // - green: Passed [both/all] N tests cases with M assertions. - - std::string bothOrAll( std::size_t count ) const { - return count == 1 ? std::string() : count == 2 ? "both " : "all " ; - } - - void printTotals( const Totals& totals ) const { - if( totals.testCases.total() == 0 ) { - stream << "No tests ran."; - } - else if( totals.testCases.failed == totals.testCases.total() ) { - Colour colour( Colour::ResultError ); - const std::string qualify_assertions_failed = - totals.assertions.failed == totals.assertions.total() ? - bothOrAll( totals.assertions.failed ) : std::string(); - stream << - "Failed " << bothOrAll( totals.testCases.failed ) - << pluralise( totals.testCases.failed, "test case" ) << ", " - "failed " << qualify_assertions_failed << - pluralise( totals.assertions.failed, "assertion" ) << '.'; - } - else if( totals.assertions.total() == 0 ) { - stream << - "Passed " << bothOrAll( totals.testCases.total() ) - << pluralise( totals.testCases.total(), "test case" ) - << " (no assertions)."; - } - else if( totals.assertions.failed ) { - Colour colour( Colour::ResultError ); - stream << - "Failed " << pluralise( totals.testCases.failed, "test case" ) << ", " - "failed " << pluralise( totals.assertions.failed, "assertion" ) << '.'; - } - else { - Colour colour( Colour::ResultSuccess ); - stream << - "Passed " << bothOrAll( totals.testCases.passed ) - << pluralise( totals.testCases.passed, "test case" ) << - " with " << pluralise( totals.assertions.passed, "assertion" ) << '.'; - } - } - }; - - INTERNAL_CATCH_REGISTER_REPORTER( "compact", CompactReporter ) - -} // end namespace Catch - -namespace Catch { - // These are all here to avoid warnings about not having any out of line - // virtual methods - NonCopyable::~NonCopyable() {} - IShared::~IShared() {} - IStream::~IStream() CATCH_NOEXCEPT {} - FileStream::~FileStream() CATCH_NOEXCEPT {} - CoutStream::~CoutStream() CATCH_NOEXCEPT {} - DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {} - StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {} - IContext::~IContext() {} - IResultCapture::~IResultCapture() {} - ITestCase::~ITestCase() {} - ITestCaseRegistry::~ITestCaseRegistry() {} - IRegistryHub::~IRegistryHub() {} - IMutableRegistryHub::~IMutableRegistryHub() {} - IExceptionTranslator::~IExceptionTranslator() {} - IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() {} - IReporter::~IReporter() {} - IReporterFactory::~IReporterFactory() {} - IReporterRegistry::~IReporterRegistry() {} - IStreamingReporter::~IStreamingReporter() {} - AssertionStats::~AssertionStats() {} - SectionStats::~SectionStats() {} - TestCaseStats::~TestCaseStats() {} - TestGroupStats::~TestGroupStats() {} - TestRunStats::~TestRunStats() {} - CumulativeReporterBase::SectionNode::~SectionNode() {} - CumulativeReporterBase::~CumulativeReporterBase() {} - - StreamingReporterBase::~StreamingReporterBase() {} - ConsoleReporter::~ConsoleReporter() {} - CompactReporter::~CompactReporter() {} - IRunner::~IRunner() {} - IMutableContext::~IMutableContext() {} - IConfig::~IConfig() {} - XmlReporter::~XmlReporter() {} - JunitReporter::~JunitReporter() {} - TestRegistry::~TestRegistry() {} - FreeFunctionTestCase::~FreeFunctionTestCase() {} - IGeneratorInfo::~IGeneratorInfo() {} - IGeneratorsForTest::~IGeneratorsForTest() {} - WildcardPattern::~WildcardPattern() {} - TestSpec::Pattern::~Pattern() {} - TestSpec::NamePattern::~NamePattern() {} - TestSpec::TagPattern::~TagPattern() {} - TestSpec::ExcludedPattern::~ExcludedPattern() {} - Matchers::Impl::MatcherUntypedBase::~MatcherUntypedBase() {} - - void Config::dummy() {} - - namespace TestCaseTracking { - ITracker::~ITracker() {} - TrackerBase::~TrackerBase() {} - SectionTracker::~SectionTracker() {} - IndexTracker::~IndexTracker() {} - } -} - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - -#endif - -#ifdef CATCH_CONFIG_MAIN -// #included from: internal/catch_default_main.hpp -#define TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED - -#ifndef __OBJC__ - -#if defined(WIN32) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN) -// Standard C/C++ Win32 Unicode wmain entry point -extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) { -#else -// Standard C/C++ main entry point -int main (int argc, char * argv[]) { -#endif - - int result = Catch::Session().run( argc, argv ); - return ( result < 0xff ? result : 0xff ); -} - -#else // __OBJC__ - -// Objective-C entry point -int main (int argc, char * const argv[]) { -#if !CATCH_ARC_ENABLED - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; -#endif - - Catch::registerTestMethods(); - int result = Catch::Session().run( argc, (char* const*)argv ); - -#if !CATCH_ARC_ENABLED - [pool drain]; -#endif - - return ( result < 0xff ? result : 0xff ); -} - -#endif // __OBJC__ - -#endif - -#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED -# undef CLARA_CONFIG_MAIN -#endif - -////// - -// If this config identifier is defined then all CATCH macros are prefixed with CATCH_ -#ifdef CATCH_CONFIG_PREFIX_ALL - -#if defined(CATCH_CONFIG_FAST_COMPILE) -#define CATCH_REQUIRE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, expr ) -#define CATCH_REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) -#else -#define CATCH_REQUIRE( expr ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, expr ) -#define CATCH_REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) -#endif - -#define CATCH_REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", expr ) -#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr ) -#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr ) -#define CATCH_REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, expr ) - -#define CATCH_CHECK( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CATCH_CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, expr ) -#define CATCH_CHECKED_IF( expr ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CATCH_CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CATCH_CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr ) - -#define CATCH_CHECK_THROWS( expr ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", expr ) -#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr ) -#define CATCH_CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, expr ) - -#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg ) - -#if defined(CATCH_CONFIG_FAST_COMPILE) -#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT_NO_TRY( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) -#else -#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) -#endif - -#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg ) -#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg ) -#define CATCH_SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg ) -#define CATCH_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CATCH_CAPTURE", #msg " := " << Catch::toString(msg) ) -#define CATCH_SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CATCH_CAPTURE", #msg " := " << Catch::toString(msg) ) - -#ifdef CATCH_CONFIG_VARIADIC_MACROS - #define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ ) - #define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ ) - #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ ) - #define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ ) - #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ ) - #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ ) - #define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) - #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) -#else - #define CATCH_TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description ) - #define CATCH_TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description ) - #define CATCH_METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description ) - #define CATCH_REGISTER_TEST_CASE( function, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( function, name, description ) - #define CATCH_SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description ) - #define CATCH_FAIL( msg ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, msg ) - #define CATCH_FAIL_CHECK( msg ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, msg ) - #define CATCH_SUCCEED( msg ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, msg ) -#endif -#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" ) - -#define CATCH_REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) -#define CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) - -#define CATCH_GENERATE( expr) INTERNAL_CATCH_GENERATE( expr ) - -// "BDD-style" convenience wrappers -#ifdef CATCH_CONFIG_VARIADIC_MACROS -#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ ) -#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ ) -#else -#define CATCH_SCENARIO( name, tags ) CATCH_TEST_CASE( "Scenario: " name, tags ) -#define CATCH_SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags ) -#endif -#define CATCH_GIVEN( desc ) CATCH_SECTION( std::string( "Given: ") + desc, "" ) -#define CATCH_WHEN( desc ) CATCH_SECTION( std::string( " When: ") + desc, "" ) -#define CATCH_AND_WHEN( desc ) CATCH_SECTION( std::string( " And: ") + desc, "" ) -#define CATCH_THEN( desc ) CATCH_SECTION( std::string( " Then: ") + desc, "" ) -#define CATCH_AND_THEN( desc ) CATCH_SECTION( std::string( " And: ") + desc, "" ) - -// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required -#else - -#if defined(CATCH_CONFIG_FAST_COMPILE) -#define REQUIRE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "REQUIRE", Catch::ResultDisposition::Normal, expr ) -#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) - -#else -#define REQUIRE( expr ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, expr ) -#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr ) -#endif - -#define REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", expr ) -#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr ) -#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr ) -#define REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, expr ) - -#define CHECK( expr ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, expr ) -#define CHECKED_IF( expr ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr ) - -#define CHECK_THROWS( expr ) INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", expr ) -#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr ) -#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr ) -#define CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, expr ) - -#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg ) - -#if defined(CATCH_CONFIG_FAST_COMPILE) -#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT_NO_TRY( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) -#else -#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg ) -#endif - -#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg ) -#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg ) -#define SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg ) -#define CAPTURE( msg ) INTERNAL_CATCH_INFO( "CAPTURE", #msg " := " << Catch::toString(msg) ) -#define SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CAPTURE", #msg " := " << Catch::toString(msg) ) - -#ifdef CATCH_CONFIG_VARIADIC_MACROS -#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ ) -#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ ) -#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ ) -#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ ) -#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ ) -#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ ) -#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) -#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ ) -#else -#define TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description ) - #define TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description ) - #define METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description ) - #define REGISTER_TEST_CASE( method, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( method, name, description ) - #define SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description ) - #define FAIL( msg ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, msg ) - #define FAIL_CHECK( msg ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, msg ) - #define SUCCEED( msg ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, msg ) -#endif -#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" ) - -#define REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) -#define REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) - -#define GENERATE( expr) INTERNAL_CATCH_GENERATE( expr ) - -#endif - -#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) - -// "BDD-style" convenience wrappers -#ifdef CATCH_CONFIG_VARIADIC_MACROS -#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ ) -#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ ) -#else -#define SCENARIO( name, tags ) TEST_CASE( "Scenario: " name, tags ) -#define SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags ) -#endif -#define GIVEN( desc ) SECTION( std::string(" Given: ") + desc, "" ) -#define WHEN( desc ) SECTION( std::string(" When: ") + desc, "" ) -#define AND_WHEN( desc ) SECTION( std::string("And when: ") + desc, "" ) -#define THEN( desc ) SECTION( std::string(" Then: ") + desc, "" ) -#define AND_THEN( desc ) SECTION( std::string(" And: ") + desc, "" ) - -using Catch::Detail::Approx; - -// #included from: internal/catch_reenable_warnings.h - -#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED - -#ifdef __clang__ -# ifdef __ICC // icpc defines the __clang__ macro -# pragma warning(pop) -# else -# pragma clang diagnostic pop -# endif -#elif defined __GNUC__ -# pragma GCC diagnostic pop -#endif - -#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED - diff --git a/lib/ArduinoJson-6.x/library.json b/lib/ArduinoJson-6.x/library.json deleted file mode 100644 index 24a9794b2a..0000000000 --- a/lib/ArduinoJson-6.x/library.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "ArduinoJson", - "keywords": "json, rest, http, web", - "description": "A simple and efficient JSON library for embedded C++. ArduinoJson supports ✔ serialization, ✔ deserialization, ✔ MessagePack, ✔ fixed allocation, ✔ zero-copy, ✔ streams, ✔ filtering, and more. It is the most popular Arduino library on GitHub ❤❤❤❤❤. Check out arduinojson.org for a comprehensive documentation.", - "homepage": "https://arduinojson.org/?utm_source=meta&utm_medium=library.json", - "repository": { - "type": "git", - "url": "https://github.com/bblanchon/ArduinoJson.git" - }, - "version": "6.19.4", - "authors": { - "name": "Benoit Blanchon", - "url": "https://blog.benoitblanchon.fr" - }, - "exclude": [ - ".github", - "extras" - ], - "frameworks": "*", - "platforms": "*", - "build": { - "libArchive": false - } -} diff --git a/lib/ArduinoJson-6.x/library.properties b/lib/ArduinoJson-6.x/library.properties index aa20cfc9aa..414daa4692 100644 --- a/lib/ArduinoJson-6.x/library.properties +++ b/lib/ArduinoJson-6.x/library.properties @@ -1,5 +1,5 @@ name=ArduinoJson -version=6.19.4 +version=6.21.2 author=Benoit Blanchon maintainer=Benoit Blanchon sentence=A simple and efficient JSON library for embedded C++. diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson.h b/lib/ArduinoJson-6.x/src/ArduinoJson.h index f79212dbc2..c9ac0ca642 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson.h +++ b/lib/ArduinoJson-6.x/src/ArduinoJson.h @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson.hpp index abb8dd1fa3..2d1b0be133 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson.hpp @@ -1,15 +1,20 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once +#if __cplusplus < 201103L && (!defined(_MSC_VER) || _MSC_VER < 1910) +# error ArduinoJson requires C++11 or newer. Configure your compiler for C++11 or downgrade ArduinoJson to 6.20. +#endif + #include "ArduinoJson/Configuration.hpp" // Include Arduino.h before stdlib.h to avoid conflict with atexit() // https://github.com/bblanchon/ArduinoJson/pull/1693#issuecomment-1001060240 #if ARDUINOJSON_ENABLE_ARDUINO_STRING || ARDUINOJSON_ENABLE_ARDUINO_STREAM || \ - ARDUINOJSON_ENABLE_ARDUINO_PRINT || ARDUINOJSON_ENABLE_PROGMEM + ARDUINOJSON_ENABLE_ARDUINO_PRINT || \ + (ARDUINOJSON_ENABLE_PROGMEM && defined(ARDUINO)) # include #endif @@ -21,19 +26,19 @@ # endif #endif -#include "ArduinoJson/Array/ArrayRef.hpp" -#include "ArduinoJson/Object/ObjectRef.hpp" -#include "ArduinoJson/Variant/VariantRef.hpp" +#include "ArduinoJson/Array/JsonArray.hpp" +#include "ArduinoJson/Object/JsonObject.hpp" +#include "ArduinoJson/Variant/JsonVariantConst.hpp" #include "ArduinoJson/Document/DynamicJsonDocument.hpp" #include "ArduinoJson/Document/StaticJsonDocument.hpp" -#include "ArduinoJson/Array/ArrayImpl.hpp" #include "ArduinoJson/Array/ElementProxy.hpp" +#include "ArduinoJson/Array/JsonArrayImpl.hpp" #include "ArduinoJson/Array/Utilities.hpp" #include "ArduinoJson/Collection/CollectionImpl.hpp" +#include "ArduinoJson/Object/JsonObjectImpl.hpp" #include "ArduinoJson/Object/MemberProxy.hpp" -#include "ArduinoJson/Object/ObjectImpl.hpp" #include "ArduinoJson/Variant/ConverterImpl.hpp" #include "ArduinoJson/Variant/VariantCompare.hpp" #include "ArduinoJson/Variant/VariantImpl.hpp" @@ -45,36 +50,3 @@ #include "ArduinoJson/MsgPack/MsgPackSerializer.hpp" #include "ArduinoJson/compatibility.hpp" - -namespace ArduinoJson { -typedef ARDUINOJSON_NAMESPACE::ArrayConstRef JsonArrayConst; -typedef ARDUINOJSON_NAMESPACE::ArrayRef JsonArray; -typedef ARDUINOJSON_NAMESPACE::Float JsonFloat; -typedef ARDUINOJSON_NAMESPACE::Integer JsonInteger; -typedef ARDUINOJSON_NAMESPACE::ObjectConstRef JsonObjectConst; -typedef ARDUINOJSON_NAMESPACE::ObjectRef JsonObject; -typedef ARDUINOJSON_NAMESPACE::Pair JsonPair; -typedef ARDUINOJSON_NAMESPACE::PairConst JsonPairConst; -typedef ARDUINOJSON_NAMESPACE::String JsonString; -typedef ARDUINOJSON_NAMESPACE::UInt JsonUInt; -typedef ARDUINOJSON_NAMESPACE::VariantConstRef JsonVariantConst; -typedef ARDUINOJSON_NAMESPACE::VariantRef JsonVariant; -using ARDUINOJSON_NAMESPACE::BasicJsonDocument; -using ARDUINOJSON_NAMESPACE::copyArray; -using ARDUINOJSON_NAMESPACE::DeserializationError; -using ARDUINOJSON_NAMESPACE::deserializeJson; -using ARDUINOJSON_NAMESPACE::deserializeMsgPack; -using ARDUINOJSON_NAMESPACE::DynamicJsonDocument; -using ARDUINOJSON_NAMESPACE::JsonDocument; -using ARDUINOJSON_NAMESPACE::measureJson; -using ARDUINOJSON_NAMESPACE::serialized; -using ARDUINOJSON_NAMESPACE::serializeJson; -using ARDUINOJSON_NAMESPACE::serializeJsonPretty; -using ARDUINOJSON_NAMESPACE::serializeMsgPack; -using ARDUINOJSON_NAMESPACE::StaticJsonDocument; - -namespace DeserializationOption { -using ARDUINOJSON_NAMESPACE::Filter; -using ARDUINOJSON_NAMESPACE::NestingLimit; -} // namespace DeserializationOption -} // namespace ArduinoJson diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayFunctions.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayFunctions.hpp deleted file mode 100644 index 0b4d342f29..0000000000 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayFunctions.hpp +++ /dev/null @@ -1,31 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#pragma once - -#include - -namespace ARDUINOJSON_NAMESPACE { - -inline VariantData *arrayAdd(CollectionData *arr, MemoryPool *pool) { - return arr ? arr->addElement(pool) : 0; -} - -template -inline typename TVisitor::result_type arrayAccept(const CollectionData *arr, - TVisitor &visitor) { - if (arr) - return visitor.visitArray(*arr); - else - return visitor.visitNull(); -} - -inline bool arrayEquals(const CollectionData *lhs, const CollectionData *rhs) { - if (lhs == rhs) - return true; - if (!lhs || !rhs) - return false; - return lhs->equalsArray(*rhs); -} -} // namespace ARDUINOJSON_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayImpl.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayImpl.hpp deleted file mode 100644 index dcb4ff0b32..0000000000 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayImpl.hpp +++ /dev/null @@ -1,28 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#pragma once - -#include -#include - -namespace ARDUINOJSON_NAMESPACE { - -template -inline ArrayRef ArrayShortcuts::createNestedArray() const { - return impl()->addElement().template to(); -} - -template -inline ObjectRef ArrayShortcuts::createNestedObject() const { - return impl()->addElement().template to(); -} - -template -inline ElementProxy ArrayShortcuts::operator[]( - size_t index) const { - return ElementProxy(*impl(), index); -} - -} // namespace ARDUINOJSON_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayIterator.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayIterator.hpp deleted file mode 100644 index cde9a246dc..0000000000 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayIterator.hpp +++ /dev/null @@ -1,121 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#pragma once - -#include -#include - -namespace ARDUINOJSON_NAMESPACE { - -class VariantPtr { - public: - VariantPtr(MemoryPool *pool, VariantData *data) : _variant(pool, data) {} - - VariantRef *operator->() { - return &_variant; - } - - VariantRef &operator*() { - return _variant; - } - - private: - VariantRef _variant; -}; - -class ArrayIterator { - public: - ArrayIterator() : _slot(0) {} - explicit ArrayIterator(MemoryPool *pool, VariantSlot *slot) - : _pool(pool), _slot(slot) {} - - VariantRef operator*() const { - return VariantRef(_pool, _slot->data()); - } - VariantPtr operator->() { - return VariantPtr(_pool, _slot->data()); - } - - bool operator==(const ArrayIterator &other) const { - return _slot == other._slot; - } - - bool operator!=(const ArrayIterator &other) const { - return _slot != other._slot; - } - - ArrayIterator &operator++() { - _slot = _slot->next(); - return *this; - } - - ArrayIterator &operator+=(size_t distance) { - _slot = _slot->next(distance); - return *this; - } - - VariantSlot *internal() { - return _slot; - } - - private: - MemoryPool *_pool; - VariantSlot *_slot; -}; - -class VariantConstPtr { - public: - VariantConstPtr(const VariantData *data) : _variant(data) {} - - VariantConstRef *operator->() { - return &_variant; - } - - VariantConstRef &operator*() { - return _variant; - } - - private: - VariantConstRef _variant; -}; - -class ArrayConstRefIterator { - public: - ArrayConstRefIterator() : _slot(0) {} - explicit ArrayConstRefIterator(const VariantSlot *slot) : _slot(slot) {} - - VariantConstRef operator*() const { - return VariantConstRef(_slot->data()); - } - VariantConstPtr operator->() { - return VariantConstPtr(_slot->data()); - } - - bool operator==(const ArrayConstRefIterator &other) const { - return _slot == other._slot; - } - - bool operator!=(const ArrayConstRefIterator &other) const { - return _slot != other._slot; - } - - ArrayConstRefIterator &operator++() { - _slot = _slot->next(); - return *this; - } - - ArrayConstRefIterator &operator+=(size_t distance) { - _slot = _slot->next(distance); - return *this; - } - - const VariantSlot *internal() { - return _slot; - } - - private: - const VariantSlot *_slot; -}; -} // namespace ARDUINOJSON_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayRef.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayRef.hpp deleted file mode 100644 index a5df7abcd8..0000000000 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayRef.hpp +++ /dev/null @@ -1,213 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#pragma once - -#include -#include -#include - -// Returns the size (in bytes) of an array with n elements. -// Can be very handy to determine the size of a StaticMemoryPool. -#define JSON_ARRAY_SIZE(NUMBER_OF_ELEMENTS) \ - ((NUMBER_OF_ELEMENTS) * sizeof(ARDUINOJSON_NAMESPACE::VariantSlot)) - -namespace ARDUINOJSON_NAMESPACE { - -class ObjectRef; -template -class ElementProxy; - -template -class ArrayRefBase { - public: - operator VariantConstRef() const { - const void* data = _data; // prevent warning cast-align - return VariantConstRef(reinterpret_cast(data)); - } - - template - FORCE_INLINE typename TVisitor::result_type accept(TVisitor& visitor) const { - return arrayAccept(_data, visitor); - } - - FORCE_INLINE bool isNull() const { - return _data == 0; - } - - FORCE_INLINE operator bool() const { - return _data != 0; - } - - FORCE_INLINE size_t memoryUsage() const { - return _data ? _data->memoryUsage() : 0; - } - - FORCE_INLINE size_t nesting() const { - return _data ? _data->nesting() : 0; - } - - FORCE_INLINE size_t size() const { - return _data ? _data->size() : 0; - } - - protected: - ArrayRefBase(TData* data) : _data(data) {} - TData* _data; -}; - -class ArrayConstRef : public ArrayRefBase, - public Visitable { - friend class ArrayRef; - typedef ArrayRefBase base_type; - - public: - typedef ArrayConstRefIterator iterator; - - FORCE_INLINE iterator begin() const { - if (!_data) - return iterator(); - return iterator(_data->head()); - } - - FORCE_INLINE iterator end() const { - return iterator(); - } - - FORCE_INLINE ArrayConstRef() : base_type(0) {} - FORCE_INLINE ArrayConstRef(const CollectionData* data) : base_type(data) {} - - FORCE_INLINE bool operator==(ArrayConstRef rhs) const { - return arrayEquals(_data, rhs._data); - } - - FORCE_INLINE VariantConstRef operator[](size_t index) const { - return getElement(index); - } - - FORCE_INLINE VariantConstRef getElement(size_t index) const { - return VariantConstRef(_data ? _data->getElement(index) : 0); - } -}; - -class ArrayRef : public ArrayRefBase, - public ArrayShortcuts, - public Visitable { - typedef ArrayRefBase base_type; - - public: - typedef ArrayIterator iterator; - - FORCE_INLINE ArrayRef() : base_type(0), _pool(0) {} - FORCE_INLINE ArrayRef(MemoryPool* pool, CollectionData* data) - : base_type(data), _pool(pool) {} - - operator VariantRef() { - void* data = _data; // prevent warning cast-align - return VariantRef(_pool, reinterpret_cast(data)); - } - - operator ArrayConstRef() const { - return ArrayConstRef(_data); - } - - VariantRef addElement() const { - return VariantRef(_pool, arrayAdd(_data, _pool)); - } - - FORCE_INLINE iterator begin() const { - if (!_data) - return iterator(); - return iterator(_pool, _data->head()); - } - - FORCE_INLINE iterator end() const { - return iterator(); - } - - // Copy a ArrayRef - FORCE_INLINE bool set(ArrayConstRef src) const { - if (!_data || !src._data) - return false; - return _data->copyFrom(*src._data, _pool); - } - - FORCE_INLINE bool operator==(ArrayRef rhs) const { - return arrayEquals(_data, rhs._data); - } - - // Internal use - FORCE_INLINE VariantRef getOrAddElement(size_t index) const { - return VariantRef(_pool, _data ? _data->getOrAddElement(index, _pool) : 0); - } - - // Gets the value at the specified index. - FORCE_INLINE VariantRef getElement(size_t index) const { - return VariantRef(_pool, _data ? _data->getElement(index) : 0); - } - - // Removes element at specified position. - FORCE_INLINE void remove(iterator it) const { - if (!_data) - return; - _data->removeSlot(it.internal()); - } - - // Removes element at specified index. - FORCE_INLINE void remove(size_t index) const { - if (!_data) - return; - _data->removeElement(index); - } - - void clear() const { - if (!_data) - return; - _data->clear(); - } - - private: - MemoryPool* _pool; -}; - -template <> -struct Converter { - static void toJson(VariantConstRef src, VariantRef dst) { - variantCopyFrom(getData(dst), getData(src), getPool(dst)); - } - - static ArrayConstRef fromJson(VariantConstRef src) { - return ArrayConstRef(variantAsArray(getData(src))); - } - - static bool checkJson(VariantConstRef src) { - const VariantData* data = getData(src); - return data && data->isArray(); - } -}; - -template <> -struct Converter { - static void toJson(VariantConstRef src, VariantRef dst) { - variantCopyFrom(getData(dst), getData(src), getPool(dst)); - } - - static ArrayRef fromJson(VariantRef src) { - VariantData* data = getData(src); - MemoryPool* pool = getPool(src); - return ArrayRef(pool, data != 0 ? data->asArray() : 0); - } - - static InvalidConversion fromJson(VariantConstRef); - - static bool checkJson(VariantConstRef) { - return false; - } - - static bool checkJson(VariantRef src) { - VariantData* data = getData(src); - return data && data->isArray(); - } -}; -} // namespace ARDUINOJSON_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayShortcuts.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayShortcuts.hpp deleted file mode 100644 index 1854a8c388..0000000000 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ArrayShortcuts.hpp +++ /dev/null @@ -1,49 +0,0 @@ -// ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON -// MIT License - -#pragma once - -#include -#include - -namespace ARDUINOJSON_NAMESPACE { -// Forward declarations. -class ArrayRef; -class ObjectRef; -template -class ElementProxy; - -template -class ArrayShortcuts { - public: - // Returns the element at specified index if the variant is an array. - FORCE_INLINE ElementProxy operator[](size_t index) const; - - FORCE_INLINE ObjectRef createNestedObject() const; - - FORCE_INLINE ArrayRef createNestedArray() const; - - // Adds the specified value at the end of the array. - // - // bool add(TValue); - // TValue = bool, long, int, short, float, double, serialized, VariantRef, - // std::string, String, ObjectRef - template - FORCE_INLINE bool add(const T &value) const { - return impl()->addElement().set(value); - } - // - // bool add(TValue); - // TValue = char*, const char*, const __FlashStringHelper* - template - FORCE_INLINE bool add(T *value) const { - return impl()->addElement().set(value); - } - - private: - const TArray *impl() const { - return static_cast(this); - } -}; -} // namespace ARDUINOJSON_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ElementProxy.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ElementProxy.hpp index 821cfba3c8..d6e9aa5d10 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ElementProxy.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/ElementProxy.hpp @@ -1,197 +1,60 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once -#include -#include -#include -#include +#include -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable : 4522) -#endif +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE -namespace ARDUINOJSON_NAMESPACE { - -template -class ElementProxy : public VariantOperators >, - public VariantShortcuts >, - public Visitable, - public VariantTag { - typedef ElementProxy this_type; +// A proxy class to get or set an element of an array. +// https://arduinojson.org/v6/api/jsonarray/subscript/ +template +class ElementProxy : public VariantRefBase>, + public VariantOperators> { + friend class VariantAttorney; public: - typedef VariantRef variant_type; - - FORCE_INLINE ElementProxy(TArray array, size_t index) - : _array(array), _index(index) {} + ElementProxy(TUpstream upstream, size_t index) + : upstream_(upstream), index_(index) {} - FORCE_INLINE ElementProxy(const ElementProxy& src) - : _array(src._array), _index(src._index) {} + ElementProxy(const ElementProxy& src) + : upstream_(src.upstream_), index_(src.index_) {} - FORCE_INLINE this_type& operator=(const this_type& src) { - getOrAddUpstreamElement().set(src.as()); + FORCE_INLINE ElementProxy& operator=(const ElementProxy& src) { + this->set(src); return *this; } - // Replaces the value - // - // operator=(const TValue&) - // TValue = bool, long, int, short, float, double, serialized, VariantRef, - // std::string, String, ArrayRef, ObjectRef template - FORCE_INLINE this_type& operator=(const T& src) { - getOrAddUpstreamElement().set(src); + FORCE_INLINE ElementProxy& operator=(const T& src) { + this->set(src); return *this; } - // - // operator=(TValue) - // TValue = char*, const char*, const __FlashStringHelper* - template - FORCE_INLINE this_type& operator=(T* src) { - getOrAddUpstreamElement().set(src); - return *this; - } - - FORCE_INLINE void clear() const { - getUpstreamElement().clear(); - } - - FORCE_INLINE bool isNull() const { - return getUpstreamElement().isNull(); - } - - template - FORCE_INLINE typename enable_if::value, T>::type as() - const { - return getUpstreamElement().template as(); - } template - FORCE_INLINE typename enable_if::value, const char*>::type - ARDUINOJSON_DEPRECATED("Replace as() with as()") - as() const { - return as(); - } - - template - FORCE_INLINE operator T() const { - return getUpstreamElement(); - } - - template - FORCE_INLINE bool is() const { - return getUpstreamElement().template is(); - } - - template - FORCE_INLINE typename VariantTo::type to() const { - return getOrAddUpstreamElement().template to(); - } - - // Replaces the value - // - // bool set(const TValue&) - // TValue = bool, long, int, short, float, double, serialized, VariantRef, - // std::string, String, ArrayRef, ObjectRef - template - FORCE_INLINE bool set(const TValue& value) const { - return getOrAddUpstreamElement().set(value); - } - // - // bool set(TValue) - // TValue = char*, const char*, const __FlashStringHelper* - template - FORCE_INLINE bool set(TValue* value) const { - return getOrAddUpstreamElement().set(value); - } - - template - typename TVisitor::result_type accept(TVisitor& visitor) const { - return getUpstreamElement().accept(visitor); - } - - FORCE_INLINE size_t size() const { - return getUpstreamElement().size(); - } - - FORCE_INLINE size_t memoryUsage() const { - return getUpstreamElement().memoryUsage(); - } - - template - VariantRef getMember(TNestedKey* key) const { - return getUpstreamElement().getMember(key); - } - - template - VariantRef getMember(const TNestedKey& key) const { - return getUpstreamElement().getMember(key); - } - - template - VariantRef getOrAddMember(TNestedKey* key) const { - return getOrAddUpstreamElement().getOrAddMember(key); - } - - template - VariantRef getOrAddMember(const TNestedKey& key) const { - return getOrAddUpstreamElement().getOrAddMember(key); - } - - VariantRef addElement() const { - return getOrAddUpstreamElement().addElement(); - } - - VariantRef getElement(size_t index) const { - return getOrAddUpstreamElement().getElement(index); - } - - VariantRef getOrAddElement(size_t index) const { - return getOrAddUpstreamElement().getOrAddElement(index); - } - - FORCE_INLINE void remove(size_t index) const { - getUpstreamElement().remove(index); - } - // remove(char*) const - // remove(const char*) const - // remove(const __FlashStringHelper*) const - template - FORCE_INLINE typename enable_if::value>::type remove( - TChar* key) const { - getUpstreamElement().remove(key); - } - // remove(const std::string&) const - // remove(const String&) const - template - FORCE_INLINE typename enable_if::value>::type remove( - const TString& key) const { - getUpstreamElement().remove(key); + FORCE_INLINE ElementProxy& operator=(T* src) { + this->set(src); + return *this; } private: - FORCE_INLINE VariantRef getUpstreamElement() const { - return _array.getElement(_index); + FORCE_INLINE MemoryPool* getPool() const { + return VariantAttorney::getPool(upstream_); } - FORCE_INLINE VariantRef getOrAddUpstreamElement() const { - return _array.getOrAddElement(_index); + FORCE_INLINE VariantData* getData() const { + return variantGetElement(VariantAttorney::getData(upstream_), index_); } - friend void convertToJson(const this_type& src, VariantRef dst) { - dst.set(src.getUpstreamElement()); + FORCE_INLINE VariantData* getOrCreateData() const { + return variantGetOrAddElement(VariantAttorney::getOrCreateData(upstream_), + index_, VariantAttorney::getPool(upstream_)); } - TArray _array; - const size_t _index; + TUpstream upstream_; + size_t index_; }; -} // namespace ARDUINOJSON_NAMESPACE - -#ifdef _MSC_VER -# pragma warning(pop) -#endif +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArray.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArray.hpp new file mode 100644 index 0000000000..d208e41754 --- /dev/null +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArray.hpp @@ -0,0 +1,211 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2023, Benoit BLANCHON +// MIT License + +#pragma once + +#include +#include + +ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE + +class JsonObject; + +// A reference to an array in a JsonDocument +// https://arduinojson.org/v6/api/jsonarray/ +class JsonArray : public detail::VariantOperators { + friend class detail::VariantAttorney; + + public: + typedef JsonArrayIterator iterator; + + // Constructs an unbound reference. + FORCE_INLINE JsonArray() : data_(0), pool_(0) {} + + // INTERNAL USE ONLY + FORCE_INLINE JsonArray(detail::MemoryPool* pool, detail::CollectionData* data) + : data_(data), pool_(pool) {} + + // Returns a JsonVariant pointing to the array. + // https://arduinojson.org/v6/api/jsonvariant/ + operator JsonVariant() { + void* data = data_; // prevent warning cast-align + return JsonVariant(pool_, reinterpret_cast(data)); + } + + // Returns a read-only reference to the array. + // https://arduinojson.org/v6/api/jsonarrayconst/ + operator JsonArrayConst() const { + return JsonArrayConst(data_); + } + + // Appends a new (null) element to the array. + // Returns a reference to the new element. + // https://arduinojson.org/v6/api/jsonarray/add/ + JsonVariant add() const { + if (!data_) + return JsonVariant(); + return JsonVariant(pool_, data_->addElement(pool_)); + } + + // Appends a value to the array. + // https://arduinojson.org/v6/api/jsonarray/add/ + template + FORCE_INLINE bool add(const T& value) const { + return add().set(value); + } + + // Appends a value to the array. + // https://arduinojson.org/v6/api/jsonarray/add/ + template + FORCE_INLINE bool add(T* value) const { + return add().set(value); + } + + // Returns an iterator to the first element of the array. + // https://arduinojson.org/v6/api/jsonarray/begin/ + FORCE_INLINE iterator begin() const { + if (!data_) + return iterator(); + return iterator(pool_, data_->head()); + } + + // Returns an iterator following the last element of the array. + // https://arduinojson.org/v6/api/jsonarray/end/ + FORCE_INLINE iterator end() const { + return iterator(); + } + + // Copies an array. + // https://arduinojson.org/v6/api/jsonarray/set/ + FORCE_INLINE bool set(JsonArrayConst src) const { + if (!data_ || !src.data_) + return false; + return data_->copyFrom(*src.data_, pool_); + } + + // Compares the content of two arrays. + FORCE_INLINE bool operator==(JsonArray rhs) const { + return JsonArrayConst(data_) == JsonArrayConst(rhs.data_); + } + + // Removes the element at the specified iterator. + // ⚠️ Doesn't release the memory associated with the removed element. + // https://arduinojson.org/v6/api/jsonarray/remove/ + FORCE_INLINE void remove(iterator it) const { + if (!data_) + return; + data_->removeSlot(it.slot_); + } + + // Removes the element at the specified index. + // ⚠️ Doesn't release the memory associated with the removed element. + // https://arduinojson.org/v6/api/jsonarray/remove/ + FORCE_INLINE void remove(size_t index) const { + if (!data_) + return; + data_->removeElement(index); + } + + // Removes all the elements of the array. + // ⚠️ Doesn't release the memory associated with the removed elements. + // https://arduinojson.org/v6/api/jsonarray/clear/ + void clear() const { + if (!data_) + return; + data_->clear(); + } + + // Gets or sets the element at the specified index. + // https://arduinojson.org/v6/api/jsonarray/subscript/ + FORCE_INLINE detail::ElementProxy operator[](size_t index) const { + return {*this, index}; + } + + // Creates an object and appends it to the array. + // https://arduinojson.org/v6/api/jsonarray/createnestedobject/ + FORCE_INLINE JsonObject createNestedObject() const; + + // Creates an array and appends it to the array. + // https://arduinojson.org/v6/api/jsonarray/createnestedarray/ + FORCE_INLINE JsonArray createNestedArray() const { + return add().to(); + } + + operator JsonVariantConst() const { + return JsonVariantConst(collectionToVariant(data_)); + } + + // Returns true if the reference is unbound. + // https://arduinojson.org/v6/api/jsonarray/isnull/ + FORCE_INLINE bool isNull() const { + return data_ == 0; + } + + // Returns true if the reference is bound. + // https://arduinojson.org/v6/api/jsonarray/isnull/ + FORCE_INLINE operator bool() const { + return data_ != 0; + } + + // Returns the number of bytes occupied by the array. + // https://arduinojson.org/v6/api/jsonarray/memoryusage/ + FORCE_INLINE size_t memoryUsage() const { + return data_ ? data_->memoryUsage() : 0; + } + + // Returns the depth (nesting level) of the array. + // https://arduinojson.org/v6/api/jsonarray/nesting/ + FORCE_INLINE size_t nesting() const { + return variantNesting(collectionToVariant(data_)); + } + + // Returns the number of elements in the array. + // https://arduinojson.org/v6/api/jsonarray/size/ + FORCE_INLINE size_t size() const { + return data_ ? data_->size() : 0; + } + + private: + detail::MemoryPool* getPool() const { + return pool_; + } + + detail::VariantData* getData() const { + return collectionToVariant(data_); + } + + detail::VariantData* getOrCreateData() const { + return collectionToVariant(data_); + } + + detail::CollectionData* data_; + detail::MemoryPool* pool_; +}; + +template <> +struct Converter : private detail::VariantAttorney { + static void toJson(JsonVariantConst src, JsonVariant dst) { + variantCopyFrom(getData(dst), getData(src), getPool(dst)); + } + + static JsonArray fromJson(JsonVariant src) { + auto data = getData(src); + auto pool = getPool(src); + return JsonArray(pool, data != 0 ? data->asArray() : 0); + } + + static detail::InvalidConversion fromJson( + JsonVariantConst); + + static bool checkJson(JsonVariantConst) { + return false; + } + + static bool checkJson(JsonVariant src) { + auto data = getData(src); + return data && data->isArray(); + } +}; + +ARDUINOJSON_END_PUBLIC_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArrayConst.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArrayConst.hpp new file mode 100644 index 0000000000..6a6463c8cd --- /dev/null +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArrayConst.hpp @@ -0,0 +1,135 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2023, Benoit BLANCHON +// MIT License + +#pragma once + +#include +#include +#include + +ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE + +class JsonObject; + +// A read-only reference to an array in a JsonDocument +// https://arduinojson.org/v6/api/jsonarrayconst/ +class JsonArrayConst : public detail::VariantOperators { + friend class JsonArray; + friend class detail::VariantAttorney; + + public: + typedef JsonArrayConstIterator iterator; + + // Returns an iterator to the first element of the array. + // https://arduinojson.org/v6/api/jsonarrayconst/begin/ + FORCE_INLINE iterator begin() const { + if (!data_) + return iterator(); + return iterator(data_->head()); + } + + // Returns an iterator to the element following the last element of the array. + // https://arduinojson.org/v6/api/jsonarrayconst/end/ + FORCE_INLINE iterator end() const { + return iterator(); + } + + // Creates an unbound reference. + FORCE_INLINE JsonArrayConst() : data_(0) {} + + // INTERNAL USE ONLY + FORCE_INLINE JsonArrayConst(const detail::CollectionData* data) + : data_(data) {} + + // Compares the content of two arrays. + // Returns true if the two arrays are equal. + FORCE_INLINE bool operator==(JsonArrayConst rhs) const { + if (data_ == rhs.data_) + return true; + if (!data_ || !rhs.data_) + return false; + + iterator it1 = begin(); + iterator it2 = rhs.begin(); + + for (;;) { + bool end1 = it1 == end(); + bool end2 = it2 == rhs.end(); + if (end1 && end2) + return true; + if (end1 || end2) + return false; + if (*it1 != *it2) + return false; + ++it1; + ++it2; + } + } + + // Returns the element at the specified index. + // https://arduinojson.org/v6/api/jsonarrayconst/subscript/ + FORCE_INLINE JsonVariantConst operator[](size_t index) const { + return JsonVariantConst(data_ ? data_->getElement(index) : 0); + } + + operator JsonVariantConst() const { + return JsonVariantConst(collectionToVariant(data_)); + } + + // Returns true if the reference is unbound. + // https://arduinojson.org/v6/api/jsonarrayconst/isnull/ + FORCE_INLINE bool isNull() const { + return data_ == 0; + } + + // Returns true if the reference is bound. + // https://arduinojson.org/v6/api/jsonarrayconst/isnull/ + FORCE_INLINE operator bool() const { + return data_ != 0; + } + + // Returns the number of bytes occupied by the array. + // https://arduinojson.org/v6/api/jsonarrayconst/memoryusage/ + FORCE_INLINE size_t memoryUsage() const { + return data_ ? data_->memoryUsage() : 0; + } + + // Returns the depth (nesting level) of the array. + // https://arduinojson.org/v6/api/jsonarrayconst/nesting/ + FORCE_INLINE size_t nesting() const { + return variantNesting(collectionToVariant(data_)); + } + + // Returns the number of elements in the array. + // https://arduinojson.org/v6/api/jsonarrayconst/size/ + FORCE_INLINE size_t size() const { + return data_ ? data_->size() : 0; + } + + private: + const detail::VariantData* getData() const { + return collectionToVariant(data_); + } + + const detail::CollectionData* data_; +}; + +template <> +struct Converter : private detail::VariantAttorney { + static void toJson(JsonVariantConst src, JsonVariant dst) { + variantCopyFrom(getData(dst), getData(src), getPool(dst)); + } + + static JsonArrayConst fromJson(JsonVariantConst src) { + auto data = getData(src); + return data ? data->asArray() : 0; + } + + static bool checkJson(JsonVariantConst src) { + auto data = getData(src); + return data && data->isArray(); + } +}; + +ARDUINOJSON_END_PUBLIC_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArrayImpl.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArrayImpl.hpp new file mode 100644 index 0000000000..dc0487af8c --- /dev/null +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArrayImpl.hpp @@ -0,0 +1,36 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2023, Benoit BLANCHON +// MIT License + +#pragma once + +#include +#include + +ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE + +inline JsonObject JsonArray::createNestedObject() const { + return add().to(); +} + +ARDUINOJSON_END_PUBLIC_NAMESPACE + +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE + +template +inline JsonArray VariantRefBase::createNestedArray() const { + return add().template to(); +} + +template +inline JsonObject VariantRefBase::createNestedObject() const { + return add().template to(); +} + +template +inline ElementProxy VariantRefBase::operator[]( + size_t index) const { + return ElementProxy(derived(), index); +} + +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArrayIterator.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArrayIterator.hpp new file mode 100644 index 0000000000..d9048b28c7 --- /dev/null +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/JsonArrayIterator.hpp @@ -0,0 +1,121 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2023, Benoit BLANCHON +// MIT License + +#pragma once + +#include +#include + +ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE + +class VariantPtr { + public: + VariantPtr(detail::MemoryPool* pool, detail::VariantData* data) + : variant_(pool, data) {} + + JsonVariant* operator->() { + return &variant_; + } + + JsonVariant& operator*() { + return variant_; + } + + private: + JsonVariant variant_; +}; + +class JsonArrayIterator { + friend class JsonArray; + + public: + JsonArrayIterator() : slot_(0) {} + explicit JsonArrayIterator(detail::MemoryPool* pool, + detail::VariantSlot* slot) + : pool_(pool), slot_(slot) {} + + JsonVariant operator*() const { + return JsonVariant(pool_, slot_->data()); + } + VariantPtr operator->() { + return VariantPtr(pool_, slot_->data()); + } + + bool operator==(const JsonArrayIterator& other) const { + return slot_ == other.slot_; + } + + bool operator!=(const JsonArrayIterator& other) const { + return slot_ != other.slot_; + } + + JsonArrayIterator& operator++() { + slot_ = slot_->next(); + return *this; + } + + JsonArrayIterator& operator+=(size_t distance) { + slot_ = slot_->next(distance); + return *this; + } + + private: + detail::MemoryPool* pool_; + detail::VariantSlot* slot_; +}; + +class VariantConstPtr { + public: + VariantConstPtr(const detail::VariantData* data) : variant_(data) {} + + JsonVariantConst* operator->() { + return &variant_; + } + + JsonVariantConst& operator*() { + return variant_; + } + + private: + JsonVariantConst variant_; +}; + +class JsonArrayConstIterator { + friend class JsonArray; + + public: + JsonArrayConstIterator() : slot_(0) {} + explicit JsonArrayConstIterator(const detail::VariantSlot* slot) + : slot_(slot) {} + + JsonVariantConst operator*() const { + return JsonVariantConst(slot_->data()); + } + VariantConstPtr operator->() { + return VariantConstPtr(slot_->data()); + } + + bool operator==(const JsonArrayConstIterator& other) const { + return slot_ == other.slot_; + } + + bool operator!=(const JsonArrayConstIterator& other) const { + return slot_ != other.slot_; + } + + JsonArrayConstIterator& operator++() { + slot_ = slot_->next(); + return *this; + } + + JsonArrayConstIterator& operator+=(size_t distance) { + slot_ = slot_->next(distance); + return *this; + } + + private: + const detail::VariantSlot* slot_; +}; + +ARDUINOJSON_END_PUBLIC_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/Utilities.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/Utilities.hpp index b8e87f2182..398e11d456 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Array/Utilities.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Array/Utilities.hpp @@ -1,87 +1,97 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once -#include +#include #include -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE -// Trivial form to stop the recursion +// Copies a value to a JsonVariant. +// This is a degenerated form of copyArray() to stop the recursion. template -inline typename enable_if::value, bool>::type copyArray( - const T& src, VariantRef dst) { +inline typename detail::enable_if::value, bool>::type +copyArray(const T& src, JsonVariant dst) { return dst.set(src); } -// Copy array to a JsonArray/JsonVariant/MemberProxy/ElementProxy +// Copies values from an array to a JsonArray or a JsonVariant. +// https://arduinojson.org/v6/api/misc/copyarray/ template -inline typename enable_if::value, - bool>::type +inline typename detail::enable_if< + !detail::is_base_of::value, bool>::type copyArray(T (&src)[N], const TDestination& dst) { return copyArray(src, N, dst); } -// Copy ptr+size to a JsonArray/JsonVariant/MemberProxy/ElementProxy +// Copies values from an array to a JsonArray or a JsonVariant. +// https://arduinojson.org/v6/api/misc/copyarray/ template -inline typename enable_if::value, - bool>::type +inline typename detail::enable_if< + !detail::is_base_of::value, bool>::type copyArray(const T* src, size_t len, const TDestination& dst) { bool ok = true; for (size_t i = 0; i < len; i++) { - ok &= copyArray(src[i], dst.addElement()); + ok &= copyArray(src[i], dst.add()); } return ok; } -// Special case for char[] which much be treated as const char* +// Copies a string to a JsonVariant. +// This is a degenerated form of copyArray() to handle strings. template inline bool copyArray(const char* src, size_t, const TDestination& dst) { return dst.set(src); } -// Copy array to a JsonDocument +// Copies values from an array to a JsonDocument. +// https://arduinojson.org/v6/api/misc/copyarray/ template inline bool copyArray(const T& src, JsonDocument& dst) { - return copyArray(src, dst.to()); + return copyArray(src, dst.to()); } -// Copy a ptr+size array to a JsonDocument +// Copies an array to a JsonDocument. +// https://arduinojson.org/v6/api/misc/copyarray/ template inline bool copyArray(const T* src, size_t len, JsonDocument& dst) { - return copyArray(src, len, dst.to()); + return copyArray(src, len, dst.to()); } -// Trivial case form to stop the recursion +// Copies a value from a JsonVariant. +// This is a degenerated form of copyArray() to stop the recursion. template -inline typename enable_if::value, size_t>::type copyArray( - VariantConstRef src, T& dst) { +inline typename detail::enable_if::value, size_t>::type +copyArray(JsonVariantConst src, T& dst) { dst = src.as(); return 1; } -// Copy a JsonArray to array +// Copies values from a JsonArray or JsonVariant to an array. +// https://arduinojson.org/v6/api/misc/copyarray/ template -inline size_t copyArray(ArrayConstRef src, T (&dst)[N]) { +inline size_t copyArray(JsonArrayConst src, T (&dst)[N]) { return copyArray(src, dst, N); } -// Copy a JsonArray to ptr+size +// Copies values from a JsonArray or JsonVariant to an array. +// https://arduinojson.org/v6/api/misc/copyarray/ template -inline size_t copyArray(ArrayConstRef src, T* dst, size_t len) { +inline size_t copyArray(JsonArrayConst src, T* dst, size_t len) { size_t i = 0; - for (ArrayConstRef::iterator it = src.begin(); it != src.end() && i < len; + for (JsonArrayConst::iterator it = src.begin(); it != src.end() && i < len; ++it) copyArray(*it, dst[i++]); return i; } -// Special case for char[] which must be treated as a string +// Copies a string from a JsonVariant. +// This is a degenerated form of copyArray() to handle strings. template -inline size_t copyArray(VariantConstRef src, char (&dst)[N]) { - String s = src; +inline size_t copyArray(JsonVariantConst src, char (&dst)[N]) { + JsonString s = src; size_t len = N - 1; if (len > s.size()) len = s.size(); @@ -90,14 +100,15 @@ inline size_t copyArray(VariantConstRef src, char (&dst)[N]) { return 1; } -// Copy a JsonDocument to an array -// (JsonDocument doesn't implicitly convert to JsonArrayConst) +// Copies values from a JsonDocument to an array. +// https://arduinojson.org/v6/api/misc/copyarray/ template -inline typename enable_if::value && - is_base_of::value, - size_t>::type +inline typename detail::enable_if< + detail::is_array::value && + detail::is_base_of::value, + size_t>::type copyArray(const TSource& src, T& dst) { - return copyArray(src.template as(), dst); + return copyArray(src.template as(), dst); } -} // namespace ARDUINOJSON_NAMESPACE +ARDUINOJSON_END_PUBLIC_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Collection/CollectionData.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Collection/CollectionData.hpp index 74b6054665..090c98b9e2 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Collection/CollectionData.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Collection/CollectionData.hpp @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once @@ -9,15 +9,15 @@ #include // size_t -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE class MemoryPool; class VariantData; class VariantSlot; class CollectionData { - VariantSlot *_head; - VariantSlot *_tail; + VariantSlot* head_; + VariantSlot* tail_; public: // Must be a POD! @@ -28,27 +28,24 @@ class CollectionData { // Array only - VariantData *addElement(MemoryPool *pool); + VariantData* addElement(MemoryPool* pool); - VariantData *getElement(size_t index) const; + VariantData* getElement(size_t index) const; - VariantData *getOrAddElement(size_t index, MemoryPool *pool); + VariantData* getOrAddElement(size_t index, MemoryPool* pool); void removeElement(size_t index); - bool equalsArray(const CollectionData &other) const; - // Object only - template - VariantData *addMember(TAdaptedString key, MemoryPool *pool, TStoragePolicy); + template + VariantData* addMember(TAdaptedString key, MemoryPool* pool); template - VariantData *getMember(TAdaptedString key) const; + VariantData* getMember(TAdaptedString key) const; - template - VariantData *getOrAddMember(TAdaptedString key, MemoryPool *pool, - TStoragePolicy); + template + VariantData* getOrAddMember(TAdaptedString key, MemoryPool* pool); template void removeMember(TAdaptedString key) { @@ -56,34 +53,43 @@ class CollectionData { } template - bool containsKey(const TAdaptedString &key) const; - - bool equalsObject(const CollectionData &other) const; + bool containsKey(const TAdaptedString& key) const; // Generic void clear(); size_t memoryUsage() const; - size_t nesting() const; size_t size() const; - VariantSlot *addSlot(MemoryPool *); - void removeSlot(VariantSlot *slot); + VariantSlot* addSlot(MemoryPool*); + void removeSlot(VariantSlot* slot); - bool copyFrom(const CollectionData &src, MemoryPool *pool); + bool copyFrom(const CollectionData& src, MemoryPool* pool); - VariantSlot *head() const { - return _head; + VariantSlot* head() const { + return head_; } void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance); private: - VariantSlot *getSlot(size_t index) const; + VariantSlot* getSlot(size_t index) const; template - VariantSlot *getSlot(TAdaptedString key) const; + VariantSlot* getSlot(TAdaptedString key) const; - VariantSlot *getPreviousSlot(VariantSlot *) const; + VariantSlot* getPreviousSlot(VariantSlot*) const; }; -} // namespace ARDUINOJSON_NAMESPACE + +inline const VariantData* collectionToVariant( + const CollectionData* collection) { + const void* data = collection; // prevent warning cast-align + return reinterpret_cast(data); +} + +inline VariantData* collectionToVariant(CollectionData* collection) { + void* data = collection; // prevent warning cast-align + return reinterpret_cast(data); +} + +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Collection/CollectionImpl.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Collection/CollectionImpl.hpp index 35678eebf7..134d5bd646 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Collection/CollectionImpl.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Collection/CollectionImpl.hpp @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once @@ -9,23 +9,20 @@ #include #include -namespace ARDUINOJSON_NAMESPACE { - -inline bool variantEquals(const VariantData* a, const VariantData* b) { - return variantCompare(a, b) == COMPARE_RESULT_EQUAL; -} +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE inline VariantSlot* CollectionData::addSlot(MemoryPool* pool) { VariantSlot* slot = pool->allocVariant(); if (!slot) return 0; - if (_tail) { - _tail->setNextNotNull(slot); - _tail = slot; + if (tail_) { + ARDUINOJSON_ASSERT(pool->owns(tail_)); // Can't alter a linked array/object + tail_->setNextNotNull(slot); + tail_ = slot; } else { - _head = slot; - _tail = slot; + head_ = slot; + tail_ = slot; } slot->clear(); @@ -36,12 +33,11 @@ inline VariantData* CollectionData::addElement(MemoryPool* pool) { return slotData(addSlot(pool)); } -template +template inline VariantData* CollectionData::addMember(TAdaptedString key, - MemoryPool* pool, - TStoragePolicy storage) { + MemoryPool* pool) { VariantSlot* slot = addSlot(pool); - if (!slotSetKey(slot, key, pool, storage)) { + if (!slotSetKey(slot, key, pool)) { removeSlot(slot); return 0; } @@ -49,8 +45,8 @@ inline VariantData* CollectionData::addMember(TAdaptedString key, } inline void CollectionData::clear() { - _head = 0; - _tail = 0; + head_ = 0; + tail_ = 0; } template @@ -61,11 +57,12 @@ inline bool CollectionData::containsKey(const TAdaptedString& key) const { inline bool CollectionData::copyFrom(const CollectionData& src, MemoryPool* pool) { clear(); - for (VariantSlot* s = src._head; s; s = s->next()) { + for (VariantSlot* s = src.head_; s; s = s->next()) { VariantData* var; if (s->key() != 0) { - String key(s->key(), s->ownsKey() ? String::Copied : String::Linked); - var = addMember(adaptString(key), pool, getStringStoragePolicy(key)); + JsonString key(s->key(), + s->ownsKey() ? JsonString::Copied : JsonString::Linked); + var = addMember(adaptString(key), pool); } else { var = addElement(pool); } @@ -77,38 +74,11 @@ inline bool CollectionData::copyFrom(const CollectionData& src, return true; } -inline bool CollectionData::equalsObject(const CollectionData& other) const { - size_t count = 0; - for (VariantSlot* slot = _head; slot; slot = slot->next()) { - VariantData* v1 = slot->data(); - VariantData* v2 = other.getMember(adaptString(slot->key())); - if (!variantEquals(v1, v2)) - return false; - count++; - } - return count == other.size(); -} - -inline bool CollectionData::equalsArray(const CollectionData& other) const { - VariantSlot* s1 = _head; - VariantSlot* s2 = other._head; - for (;;) { - if (s1 == s2) - return true; - if (!s1 || !s2) - return false; - if (!variantEquals(s1->data(), s2->data())) - return false; - s1 = s1->next(); - s2 = s2->next(); - } -} - template inline VariantSlot* CollectionData::getSlot(TAdaptedString key) const { if (key.isNull()) return 0; - VariantSlot* slot = _head; + VariantSlot* slot = head_; while (slot) { if (stringEquals(key, adaptString(slot->key()))) break; @@ -118,13 +88,13 @@ inline VariantSlot* CollectionData::getSlot(TAdaptedString key) const { } inline VariantSlot* CollectionData::getSlot(size_t index) const { - if (!_head) + if (!head_) return 0; - return _head->next(index); + return head_->next(index); } inline VariantSlot* CollectionData::getPreviousSlot(VariantSlot* target) const { - VariantSlot* current = _head; + VariantSlot* current = head_; while (current) { VariantSlot* next = current->next(); if (next == target) @@ -140,9 +110,9 @@ inline VariantData* CollectionData::getMember(TAdaptedString key) const { return slot ? slot->data() : 0; } -template -inline VariantData* CollectionData::getOrAddMember( - TAdaptedString key, MemoryPool* pool, TStoragePolicy storage_policy) { +template +inline VariantData* CollectionData::getOrAddMember(TAdaptedString key, + MemoryPool* pool) { // ignore null key if (key.isNull()) return 0; @@ -152,7 +122,7 @@ inline VariantData* CollectionData::getOrAddMember( if (slot) return slot->data(); - return addMember(key, pool, storage_policy); + return addMember(key, pool); } inline VariantData* CollectionData::getElement(size_t index) const { @@ -162,7 +132,7 @@ inline VariantData* CollectionData::getElement(size_t index) const { inline VariantData* CollectionData::getOrAddElement(size_t index, MemoryPool* pool) { - VariantSlot* slot = _head; + VariantSlot* slot = head_; while (slot && index > 0) { slot = slot->next(); index--; @@ -184,9 +154,9 @@ inline void CollectionData::removeSlot(VariantSlot* slot) { if (prev) prev->setNext(next); else - _head = next; + head_ = next; if (!next) - _tail = prev; + tail_ = prev; } inline void CollectionData::removeElement(size_t index) { @@ -195,7 +165,7 @@ inline void CollectionData::removeElement(size_t index) { inline size_t CollectionData::memoryUsage() const { size_t total = 0; - for (VariantSlot* s = _head; s; s = s->next()) { + for (VariantSlot* s = head_; s; s = s->next()) { total += sizeof(VariantSlot) + s->data()->memoryUsage(); if (s->ownsKey()) total += strlen(s->key()) + 1; @@ -203,18 +173,8 @@ inline size_t CollectionData::memoryUsage() const { return total; } -inline size_t CollectionData::nesting() const { - size_t maxChildNesting = 0; - for (VariantSlot* s = _head; s; s = s->next()) { - size_t childNesting = s->data()->nesting(); - if (childNesting > maxChildNesting) - maxChildNesting = childNesting; - } - return maxChildNesting + 1; -} - inline size_t CollectionData::size() const { - return slotSize(_head); + return slotSize(head_); } template @@ -228,10 +188,10 @@ inline void movePointer(T*& p, ptrdiff_t offset) { inline void CollectionData::movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance) { - movePointer(_head, variantDistance); - movePointer(_tail, variantDistance); - for (VariantSlot* slot = _head; slot; slot = slot->next()) + movePointer(head_, variantDistance); + movePointer(tail_, variantDistance); + for (VariantSlot* slot = head_; slot; slot = slot->next()) slot->movePointers(stringDistance, variantDistance); } -} // namespace ARDUINOJSON_NAMESPACE +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Configuration.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Configuration.hpp index ed5687a39b..ac0ea660a2 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Configuration.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Configuration.hpp @@ -1,31 +1,9 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once -#if __cplusplus >= 201103L -# define ARDUINOJSON_HAS_LONG_LONG 1 -# define ARDUINOJSON_HAS_RVALUE_REFERENCES 1 -#else -# define ARDUINOJSON_HAS_LONG_LONG 0 -# define ARDUINOJSON_HAS_RVALUE_REFERENCES 0 -#endif - -#ifndef ARDUINOJSON_HAS_NULLPTR -# if __cplusplus >= 201103L -# define ARDUINOJSON_HAS_NULLPTR 1 -# else -# define ARDUINOJSON_HAS_NULLPTR 0 -# endif -#endif - -#if defined(_MSC_VER) && !ARDUINOJSON_HAS_LONG_LONG -# define ARDUINOJSON_HAS_INT64 1 -#else -# define ARDUINOJSON_HAS_INT64 0 -#endif - // Support std::istream and std::ostream #ifndef ARDUINOJSON_ENABLE_STD_STREAM # ifdef __has_include @@ -83,8 +61,7 @@ // Store integral values with long (0) or long long (1) #ifndef ARDUINOJSON_USE_LONG_LONG -# if ARDUINOJSON_HAS_LONG_LONG && defined(__SIZEOF_POINTER__) && \ - __SIZEOF_POINTER__ >= 4 || \ +# if defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ >= 4 || \ defined(_MSC_VER) # define ARDUINOJSON_USE_LONG_LONG 1 # endif @@ -153,9 +130,13 @@ # define ARDUINOJSON_ENABLE_ARDUINO_PRINT 0 # endif -// Disable support for PROGMEM +// Enable PROGMEM support on AVR only # ifndef ARDUINOJSON_ENABLE_PROGMEM -# define ARDUINOJSON_ENABLE_PROGMEM 0 +# ifdef __AVR__ +# define ARDUINOJSON_ENABLE_PROGMEM 1 +# else +# define ARDUINOJSON_ENABLE_PROGMEM 0 +# endif # endif #endif // ARDUINO @@ -230,7 +211,7 @@ # endif #endif -#if ARDUINOJSON_HAS_NULLPTR && defined(nullptr) +#if defined(nullptr) # error nullptr is defined as a macro. Remove the faulty #define or #undef nullptr // See https://github.com/bblanchon/ArduinoJson/issues/1355 #endif diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/DeserializationError.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/DeserializationError.hpp index 96b3a178b1..1bfc393925 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/DeserializationError.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/DeserializationError.hpp @@ -1,21 +1,20 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once -#include #include +#include #include -#include #if ARDUINOJSON_ENABLE_STD_STREAM # include #endif -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE -class DeserializationError : public SafeBoolIdom { +class DeserializationError { public: enum Code { Ok, @@ -27,68 +26,68 @@ class DeserializationError : public SafeBoolIdom { }; DeserializationError() {} - DeserializationError(Code c) : _code(c) {} + DeserializationError(Code c) : code_(c) {} // Compare with DeserializationError friend bool operator==(const DeserializationError& lhs, const DeserializationError& rhs) { - return lhs._code == rhs._code; + return lhs.code_ == rhs.code_; } friend bool operator!=(const DeserializationError& lhs, const DeserializationError& rhs) { - return lhs._code != rhs._code; + return lhs.code_ != rhs.code_; } // Compare with Code friend bool operator==(const DeserializationError& lhs, Code rhs) { - return lhs._code == rhs; + return lhs.code_ == rhs; } friend bool operator==(Code lhs, const DeserializationError& rhs) { - return lhs == rhs._code; + return lhs == rhs.code_; } friend bool operator!=(const DeserializationError& lhs, Code rhs) { - return lhs._code != rhs; + return lhs.code_ != rhs; } friend bool operator!=(Code lhs, const DeserializationError& rhs) { - return lhs != rhs._code; + return lhs != rhs.code_; } - // Behaves like a bool - operator bool_type() const { - return _code != Ok ? safe_true() : safe_false(); + // Returns true if there is an error + explicit operator bool() const { + return code_ != Ok; } // Returns internal enum, useful for switch statement Code code() const { - return _code; + return code_; } const char* c_str() const { static const char* messages[] = { "Ok", "EmptyInput", "IncompleteInput", "InvalidInput", "NoMemory", "TooDeep"}; - ARDUINOJSON_ASSERT(static_cast(_code) < + ARDUINOJSON_ASSERT(static_cast(code_) < sizeof(messages) / sizeof(messages[0])); - return messages[_code]; + return messages[code_]; } #if ARDUINOJSON_ENABLE_PROGMEM const __FlashStringHelper* f_str() const { - ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s0, "Ok"); - ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s1, "EmptyInput"); - ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s2, "IncompleteInput"); - ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s3, "InvalidInput"); - ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s4, "NoMemory"); - ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s5, "TooDeep"); - ARDUINOJSON_DEFINE_STATIC_ARRAY( - const char*, messages, ARDUINOJSON_EXPAND6({s0, s1, s2, s3, s4, s5})); - return ARDUINOJSON_READ_STATIC_ARRAY(const __FlashStringHelper*, messages, - _code); + ARDUINOJSON_DEFINE_PROGMEM_ARRAY(char, s0, "Ok"); + ARDUINOJSON_DEFINE_PROGMEM_ARRAY(char, s1, "EmptyInput"); + ARDUINOJSON_DEFINE_PROGMEM_ARRAY(char, s2, "IncompleteInput"); + ARDUINOJSON_DEFINE_PROGMEM_ARRAY(char, s3, "InvalidInput"); + ARDUINOJSON_DEFINE_PROGMEM_ARRAY(char, s4, "NoMemory"); + ARDUINOJSON_DEFINE_PROGMEM_ARRAY(char, s5, "TooDeep"); + ARDUINOJSON_DEFINE_PROGMEM_ARRAY(const char*, messages, + {s0, s1, s2, s3, s4, s5}); + return reinterpret_cast( + detail::pgm_read(messages + code_)); } #endif private: - Code _code; + Code code_; }; #if ARDUINOJSON_ENABLE_STD_STREAM @@ -104,4 +103,4 @@ inline std::ostream& operator<<(std::ostream& s, DeserializationError::Code c) { } #endif -} // namespace ARDUINOJSON_NAMESPACE +ARDUINOJSON_END_PUBLIC_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/DeserializationOptions.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/DeserializationOptions.hpp new file mode 100644 index 0000000000..8400cc0b23 --- /dev/null +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/DeserializationOptions.hpp @@ -0,0 +1,35 @@ +// ArduinoJson - https://arduinojson.org +// Copyright © 2014-2023, Benoit BLANCHON +// MIT License + +#pragma once + +#include +#include + +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE + +template +struct DeserializationOptions { + TFilter filter; + DeserializationOption::NestingLimit nestingLimit; +}; + +template +inline DeserializationOptions makeDeserializationOptions( + TFilter filter, DeserializationOption::NestingLimit nestingLimit = {}) { + return {filter, nestingLimit}; +} + +template +inline DeserializationOptions makeDeserializationOptions( + DeserializationOption::NestingLimit nestingLimit, TFilter filter) { + return {filter, nestingLimit}; +} + +inline DeserializationOptions makeDeserializationOptions( + DeserializationOption::NestingLimit nestingLimit = {}) { + return {{}, nestingLimit}; +} + +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Filter.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Filter.hpp index 8a091bb1f8..39883027da 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Filter.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Filter.hpp @@ -1,45 +1,48 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once #include -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE +namespace DeserializationOption { class Filter { public: - explicit Filter(VariantConstRef v) : _variant(v) {} + explicit Filter(JsonVariantConst v) : variant_(v) {} bool allow() const { - return _variant; + return variant_; } bool allowArray() const { - return _variant == true || _variant.is(); + return variant_ == true || variant_.is(); } bool allowObject() const { - return _variant == true || _variant.is(); + return variant_ == true || variant_.is(); } bool allowValue() const { - return _variant == true; + return variant_ == true; } template Filter operator[](const TKey& key) const { - if (_variant == true) // "true" means "allow recursively" + if (variant_ == true) // "true" means "allow recursively" return *this; - VariantConstRef member = _variant[key]; - return Filter(member.isNull() ? _variant["*"] : member); + JsonVariantConst member = variant_[key]; + return Filter(member.isNull() ? variant_["*"] : member); } private: - VariantConstRef _variant; + JsonVariantConst variant_; }; +} // namespace DeserializationOption +namespace detail { struct AllowAllFilter { bool allow() const { return true; @@ -62,5 +65,6 @@ struct AllowAllFilter { return AllowAllFilter(); } }; +} // namespace detail -} // namespace ARDUINOJSON_NAMESPACE +ARDUINOJSON_END_PUBLIC_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/NestingLimit.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/NestingLimit.hpp index af5724d0af..6434275bec 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/NestingLimit.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/NestingLimit.hpp @@ -1,5 +1,5 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once @@ -7,23 +7,26 @@ #include #include -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE +namespace DeserializationOption { class NestingLimit { public: - NestingLimit() : _value(ARDUINOJSON_DEFAULT_NESTING_LIMIT) {} - explicit NestingLimit(uint8_t n) : _value(n) {} + NestingLimit() : value_(ARDUINOJSON_DEFAULT_NESTING_LIMIT) {} + explicit NestingLimit(uint8_t n) : value_(n) {} NestingLimit decrement() const { - ARDUINOJSON_ASSERT(_value > 0); - return NestingLimit(static_cast(_value - 1)); + ARDUINOJSON_ASSERT(value_ > 0); + return NestingLimit(static_cast(value_ - 1)); } bool reached() const { - return _value == 0; + return value_ == 0; } private: - uint8_t _value; + uint8_t value_; }; -} // namespace ARDUINOJSON_NAMESPACE +} // namespace DeserializationOption + +ARDUINOJSON_END_PUBLIC_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Reader.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Reader.hpp index 4e1958c750..5f18c7b302 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Reader.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Reader.hpp @@ -1,31 +1,32 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once #include +#include #include // for size_t -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE // The default reader is a simple wrapper for Readers that are not copiable template struct Reader { public: - Reader(TSource& source) : _source(&source) {} + Reader(TSource& source) : source_(&source) {} int read() { - return _source->read(); // Error here? You passed an unsupported input type + return source_->read(); // Error here? You passed an unsupported input type } size_t readBytes(char* buffer, size_t length) { - return _source->readBytes(buffer, length); + return source_->readBytes(buffer, length); } private: - TSource* _source; + TSource* source_; }; template @@ -33,7 +34,8 @@ struct BoundedReader { // no default implementation because we need to pass the size to the // constructor }; -} // namespace ARDUINOJSON_NAMESPACE + +ARDUINOJSON_END_PRIVATE_NAMESPACE #include #include @@ -54,3 +56,18 @@ struct BoundedReader { #if ARDUINOJSON_ENABLE_STD_STREAM # include #endif + +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE + +template +Reader::type> makeReader(TInput&& input) { + return Reader::type>{ + detail::forward(input)}; +} + +template +BoundedReader makeReader(TChar* input, size_t inputSize) { + return BoundedReader{input, inputSize}; +} + +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp index 179e376817..8a87388581 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp @@ -1,31 +1,31 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once #include -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE template struct Reader::value>::type> { public: - explicit Reader(Stream& stream) : _stream(&stream) {} + explicit Reader(Stream& stream) : stream_(&stream) {} int read() { - // don't use _stream.read() as it ignores the timeout + // don't use stream_.read() as it ignores the timeout char c; - return _stream->readBytes(&c, 1) ? static_cast(c) : -1; + return stream_->readBytes(&c, 1) ? static_cast(c) : -1; } size_t readBytes(char* buffer, size_t length) { - return _stream->readBytes(buffer, length); + return stream_->readBytes(buffer, length); } private: - Stream* _stream; + Stream* stream_; }; -} // namespace ARDUINOJSON_NAMESPACE +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp index 652409a0f6..14491f44a8 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp @@ -1,19 +1,19 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once #include -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE template struct Reader::value>::type> + typename enable_if::value>::type> : BoundedReader { explicit Reader(const ::String& s) : BoundedReader(s.c_str(), s.length()) {} }; -} // namespace ARDUINOJSON_NAMESPACE +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp index c48248c1d6..97714afb14 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp @@ -1,55 +1,56 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once -#include +#include -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE template <> struct Reader { - const char* _ptr; + const char* ptr_; public: explicit Reader(const __FlashStringHelper* ptr) - : _ptr(reinterpret_cast(ptr)) {} + : ptr_(reinterpret_cast(ptr)) {} int read() { - return pgm_read_byte(_ptr++); + return pgm_read_byte(ptr_++); } size_t readBytes(char* buffer, size_t length) { - memcpy_P(buffer, _ptr, length); - _ptr += length; + memcpy_P(buffer, ptr_, length); + ptr_ += length; return length; } }; template <> struct BoundedReader { - const char* _ptr; - const char* _end; + const char* ptr_; + const char* end_; public: explicit BoundedReader(const __FlashStringHelper* ptr, size_t size) - : _ptr(reinterpret_cast(ptr)), _end(_ptr + size) {} + : ptr_(reinterpret_cast(ptr)), end_(ptr_ + size) {} int read() { - if (_ptr < _end) - return pgm_read_byte(_ptr++); + if (ptr_ < end_) + return pgm_read_byte(ptr_++); else return -1; } size_t readBytes(char* buffer, size_t length) { - size_t available = static_cast(_end - _ptr); + size_t available = static_cast(end_ - ptr_); if (available < length) length = available; - memcpy_P(buffer, _ptr, length); - _ptr += length; + memcpy_P(buffer, ptr_, length); + ptr_ += length; return length; } }; -} // namespace ARDUINOJSON_NAMESPACE + +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp index 1c470c0483..c0ca4a7713 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp @@ -1,29 +1,30 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE template class IteratorReader { - TIterator _ptr, _end; + TIterator ptr_, end_; public: explicit IteratorReader(TIterator begin, TIterator end) - : _ptr(begin), _end(end) {} + : ptr_(begin), end_(end) {} int read() { - if (_ptr < _end) - return static_cast(*_ptr++); + if (ptr_ < end_) + return static_cast(*ptr_++); else return -1; } size_t readBytes(char* buffer, size_t length) { size_t i = 0; - while (i < length && _ptr < _end) buffer[i++] = *_ptr++; + while (i < length && ptr_ < end_) + buffer[i++] = *ptr_++; return i; } }; @@ -40,4 +41,5 @@ struct Reader::type> : IteratorReader(source.begin(), source.end()) {} }; -} // namespace ARDUINOJSON_NAMESPACE + +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/RamReader.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/RamReader.hpp index 1181297ed1..eff67bac35 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/RamReader.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/RamReader.hpp @@ -1,12 +1,12 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once #include -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE template struct IsCharOrVoid { @@ -21,18 +21,19 @@ struct IsCharOrVoid : IsCharOrVoid {}; template struct Reader::value>::type> { - const char* _ptr; + const char* ptr_; public: explicit Reader(const void* ptr) - : _ptr(ptr ? reinterpret_cast(ptr) : "") {} + : ptr_(ptr ? reinterpret_cast(ptr) : "") {} int read() { - return static_cast(*_ptr++); + return static_cast(*ptr_++); } size_t readBytes(char* buffer, size_t length) { - for (size_t i = 0; i < length; i++) buffer[i] = *_ptr++; + for (size_t i = 0; i < length; i++) + buffer[i] = *ptr_++; return length; } }; @@ -47,4 +48,4 @@ struct BoundedReader(ptr) + len) {} }; -} // namespace ARDUINOJSON_NAMESPACE +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp index c92f7931b7..41e0c00aac 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp @@ -1,29 +1,30 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once #include -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE template struct Reader::value>::type> { public: - explicit Reader(std::istream& stream) : _stream(&stream) {} + explicit Reader(std::istream& stream) : stream_(&stream) {} int read() { - return _stream->get(); + return stream_->get(); } size_t readBytes(char* buffer, size_t length) { - _stream->read(buffer, static_cast(length)); - return static_cast(_stream->gcount()); + stream_->read(buffer, static_cast(length)); + return static_cast(stream_->gcount()); } private: - std::istream* _stream; + std::istream* stream_; }; -} // namespace ARDUINOJSON_NAMESPACE + +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp index 569fa2c57e..b60f1cec87 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp @@ -1,34 +1,19 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once #include -#include +#include -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE -template -struct Reader, void> : Reader { - explicit Reader(const ElementProxy& x) +template +struct Reader::value>::type> + : Reader { + explicit Reader(const TVariant& x) : Reader(x.template as()) {} }; -template -struct Reader, void> : Reader { - explicit Reader(const MemberProxy& x) - : Reader(x.template as()) {} -}; - -template <> -struct Reader : Reader { - explicit Reader(VariantRef x) : Reader(x.as()) {} -}; - -template <> -struct Reader : Reader { - explicit Reader(VariantConstRef x) - : Reader(x.as()) {} -}; -} // namespace ARDUINOJSON_NAMESPACE +ARDUINOJSON_END_PRIVATE_NAMESPACE diff --git a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/deserialize.hpp b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/deserialize.hpp index 805cbb04c5..9f4d78e85e 100644 --- a/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/deserialize.hpp +++ b/lib/ArduinoJson-6.x/src/ArduinoJson/Deserialization/deserialize.hpp @@ -1,71 +1,66 @@ // ArduinoJson - https://arduinojson.org -// Copyright © 2014-2022, Benoit BLANCHON +// Copyright © 2014-2023, Benoit BLANCHON // MIT License #pragma once #include -#include -#include +#include #include +#include #include -namespace ARDUINOJSON_NAMESPACE { +ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE + +// A meta-function that returns the first type of the parameter pack +// or void if empty +template +struct first_or_void { + using type = void; +}; +template +struct first_or_void { + using type = T; +}; template