github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 08:42:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Can now set the double value precision.

Browse Source
This commit is contained in:
Benoît Blanchon
2014-07-03 13:35:39 +02:00
parent 2222714d68
commit 81c7b9f700
4 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JsonGenerator/JsonValue.cpp
View File

@@ -12,7 +12,7 @@ size_t JsonValue::printBoolTo(Print& p) const
size_t JsonValue::printDoubleTo(Print& p) const
{
return p.print(content.asDouble);
return p.print(content.asDouble.value, content.asDouble.digits);
}
size_t JsonValue::printFloatTo(Print& p) const

11
JsonGenerator/JsonValue.h
View File

@@ -22,10 +22,11 @@ public:
content.asBool = value;
}
JsonValue(double value)
JsonValue(double value, int digits=2)
: implementation(&JsonValue::printDoubleTo)
{
content.asDouble = value;
content.asDouble.value = value;
content.asDouble.digits = digits;
}
JsonValue(float value)
@@ -69,11 +70,15 @@ private:
union Content
{
bool asBool;
double asDouble;
float asFloat;
long asLong;
Printable* asPrintable;
const char* asString;
struct {
double value;
int digits;
} asDouble;
};
Content content;

53
JsonGeneratorTests/JsonValueTests.cpp
View File

@@ -16,107 +16,102 @@ namespace JsonGeneratorTests
TEST_METHOD(Null)
{
write((char*)0);
assertReturns(4);
assertResultIs("null");
}
TEST_METHOD(EmptyString)
{
write("");
assertReturns(2);
assertResultIs("\"\"");
}
TEST_METHOD(QuotationMark)
{
write("\"");
assertReturns(4);
assertResultIs("\"\\\"\"");
}
TEST_METHOD(ReverseSolidus)
{
write("\\");
assertReturns(4);
assertResultIs("\"\\\\\"");
}
TEST_METHOD(Solidus)
{
write("/");
assertReturns(3);
assertResultIs("\"/\""); // but the JSON format allows \/
}
TEST_METHOD(Backspace)
{
write("\b");
assertReturns(4);
assertResultIs("\"\\b\"");
}
TEST_METHOD(Formfeed)
{
write("\f");
assertReturns(4);
assertResultIs("\"\\f\"");
}
TEST_METHOD(Newline)
{
write("\n");
assertReturns(4);
assertResultIs("\"\\n\"");
}
TEST_METHOD(CarriageReturn)
{
write("\r");
assertReturns(4);
assertResultIs("\"\\r\"");
}
TEST_METHOD(HorizontalTab)
{
write("\t");
assertReturns(4);
assertResultIs("\"\\t\"");
}
TEST_METHOD(Float)
TEST_METHOD(DoubleDefaultDigits)
{
write(3.40282346e38F);
// assertReturns(4);
assertResultIs("3.40282347e+038");
write(3.14159265358979323846);
assertResultIs("3.14");
}
TEST_METHOD(Double)
TEST_METHOD(DoubleZeroDigits)
{
write(1.7976931348623157e308);
// assertReturns(4);
assertResultIs("1.7976931348623157e+308");
write(3.14159265358979323846, 0);
assertResultIs("3");
}
TEST_METHOD(DoubleOneDigit)
{
write(3.14159265358979323846, 1);
assertResultIs("3.1");
}
TEST_METHOD(DoubleTwoDigits)
{
write(3.14159265358979323846, 2);
assertResultIs("3.14");
}
TEST_METHOD(Integer)
{
write(314);
assertReturns(3);
assertResultIs("314");
}
TEST_METHOD(Short)
{
write((short)314);
assertReturns(3);
assertResultIs("314");
}
TEST_METHOD(Long)
{
write(314L);
assertReturns(3);
assertResultIs("314");
}
@@ -127,14 +122,16 @@ namespace JsonGeneratorTests
returnValue = JsonValue(value).printTo(sb);
}
void write(double value, int digits)
{
StringBuilder sb(buffer, sizeof(buffer));
returnValue = JsonValue(value, digits).printTo(sb);
}
void assertResultIs(const char* expected)
{
Assert::AreEqual(expected, buffer);
}
void assertReturns(size_t expected)
{
Assert::AreEqual(expected, returnValue);
Assert::AreEqual(strlen(expected), returnValue);
}
};
}

2
JsonGeneratorTests/Print.cpp
View File

@@ -22,7 +22,7 @@ size_t Print::write(const char* s)
size_t Print::print(double value, int digits)
{
char tmp[32];
sprintf(tmp, "%.*lg", digits, value);
sprintf(tmp, "%.*lg", digits+1, value);
return write(tmp);
}