Moved ancillary files to extras/ (fixes #1011)

extras/tests/TextFormatter/CMakeLists.txt

@@ -0,0 +1,11 @@
+# ArduinoJson - arduinojson.org
+# Copyright Benoit Blanchon 2014-2019
+# MIT License
+
+add_executable(JsonWriterTests 
+	writeFloat.cpp
+	writeString.cpp
+)
+
+target_link_libraries(JsonWriterTests catch)
+add_test(TextFormatter JsonWriterTests)

extras/tests/TextFormatter/writeFloat.cpp

@@ -0,0 +1,119 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2019
+// MIT License
+
+#include <catch.hpp>
+#include <limits>
+#include <string>
+
+#define ARDUINOJSON_ENABLE_NAN 1
+#define ARDUINOJSON_ENABLE_INFINITY 1
+#include <ArduinoJson/Json/TextFormatter.hpp>
+#include <ArduinoJson/Serialization/DynamicStringWriter.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+template <typename TFloat>
+void check(TFloat input, const std::string& expected) {
+  std::string output;
+  DynamicStringWriter<std::string> sb(output);
+  TextFormatter<DynamicStringWriter<std::string> > writer(sb);
+  writer.writeFloat(input);
+  REQUIRE(writer.bytesWritten() == output.size());
+  CHECK(expected == output);
+}
+
+TEST_CASE("TextFormatter::writeFloat(double)") {
+  SECTION("Pi") {
+    check<double>(3.14159265359, "3.141592654");
+  }
+
+  SECTION("Signaling NaN") {
+    double nan = std::numeric_limits<double>::signaling_NaN();
+    check<double>(nan, "NaN");
+  }
+
+  SECTION("Quiet NaN") {
+    double nan = std::numeric_limits<double>::quiet_NaN();
+    check<double>(nan, "NaN");
+  }
+
+  SECTION("Infinity") {
+    double inf = std::numeric_limits<double>::infinity();
+    check<double>(inf, "Infinity");
+    check<double>(-inf, "-Infinity");
+  }
+
+  SECTION("Zero") {
+    check<double>(0.0, "0");
+    check<double>(-0.0, "0");
+  }
+
+  SECTION("Espilon") {
+    check<double>(2.2250738585072014E-308, "2.225073859e-308");
+    check<double>(-2.2250738585072014E-308, "-2.225073859e-308");
+  }
+
+  SECTION("Max double") {
+    check<double>(1.7976931348623157E+308, "1.797693135e308");
+    check<double>(-1.7976931348623157E+308, "-1.797693135e308");
+  }
+
+  SECTION("Big exponent") {
+    // this test increases coverage of normalize()
+    check<double>(1e255, "1e255");
+    check<double>(1e-255, "1e-255");
+  }
+
+  SECTION("Exponentation when <= 1e-5") {
+    check<double>(1e-4, "0.0001");
+    check<double>(1e-5, "1e-5");
+
+    check<double>(-1e-4, "-0.0001");
+    check<double>(-1e-5, "-1e-5");
+  }
+
+  SECTION("Exponentation when >= 1e7") {
+    check<double>(9999999.999, "9999999.999");
+    check<double>(10000000.0, "1e7");
+
+    check<double>(-9999999.999, "-9999999.999");
+    check<double>(-10000000.0, "-1e7");
+  }
+
+  SECTION("Rounding when too many decimals") {
+    check<double>(0.000099999999999, "0.0001");
+    check<double>(0.0000099999999999, "1e-5");
+    check<double>(0.9999999996, "1");
+  }
+
+  SECTION("9 decimal places") {
+    check<double>(0.100000001, "0.100000001");
+    check<double>(0.999999999, "0.999999999");
+
+    check<double>(9.000000001, "9.000000001");
+    check<double>(9.999999999, "9.999999999");
+  }
+
+  SECTION("10 decimal places") {
+    check<double>(0.1000000001, "0.1");
+    check<double>(0.9999999999, "1");
+
+    check<double>(9.0000000001, "9");
+    check<double>(9.9999999999, "10");
+  }
+}
+
+TEST_CASE("TextFormatter::writeFloat(float)") {
+  SECTION("Pi") {
+    check<float>(3.14159265359f, "3.141593");
+  }
+
+  SECTION("999.9") {  // issue #543
+    check<float>(999.9f, "999.9");
+  }
+
+  SECTION("24.3") {  // # issue #588
+    check<float>(24.3f, "24.3");
+  }
+}

extras/tests/TextFormatter/writeString.cpp

@@ -0,0 +1,61 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2019
+// MIT License
+
+#include <catch.hpp>
+
+#include <ArduinoJson/Json/TextFormatter.hpp>
+#include <ArduinoJson/Serialization/StaticStringWriter.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+void check(const char* input, std::string expected) {
+  char output[1024];
+  StaticStringWriter sb(output, sizeof(output));
+  TextFormatter<StaticStringWriter> writer(sb);
+  writer.writeString(input);
+  REQUIRE(expected == output);
+  REQUIRE(writer.bytesWritten() == expected.size());
+}
+
+TEST_CASE("TextFormatter::writeString()") {
+  SECTION("Null") {
+    check(0, "null");
+  }
+
+  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\"");
+  }
+}