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

Cleaned JsonValue tests

Browse Source
This commit is contained in:
Benoit Blanchon
2014-08-01 14:38:28 +02:00
parent c1f4128ccd
commit ae6beb9340
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JsonGeneratorTests/JsonGeneratorTests.vcxproj
View File

@ -88,7 +88,7 @@
<ClCompile Include="JsonArrayTests.cpp" /> <ClCompile Include="JsonArrayTests.cpp" />
<ClCompile Include="JsonObject_Indexer_Tests.cpp" /> <ClCompile Include="JsonObject_Indexer_Tests.cpp" />
<ClCompile Include="JsonObject_PrintTo_Tests.cpp" /> <ClCompile Include="JsonObject_PrintTo_Tests.cpp" />
<ClCompile Include="JsonValueTests.cpp" /> <ClCompile Include="JsonValue_PrintTo_Tests.cpp" />
<ClCompile Include="StringBuilderTests.cpp" /> <ClCompile Include="StringBuilderTests.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters
View File

@ -18,9 +18,6 @@
<ClCompile Include="JsonArrayTests.cpp"> <ClCompile Include="JsonArrayTests.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="JsonValueTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="StringBuilderTests.cpp"> <ClCompile Include="StringBuilderTests.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -33,5 +30,8 @@
<ClCompile Include="JsonObject_Indexer_Tests.cpp"> <ClCompile Include="JsonObject_Indexer_Tests.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="JsonValue_PrintTo_Tests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

24
JsonGeneratorTests/JsonValueTests.cpp → JsonGeneratorTests/JsonValue_PrintTo_Tests.cpp
View File

@ -13,7 +13,7 @@ using namespace ArduinoJson::Internals;
namespace JsonGeneratorTests namespace JsonGeneratorTests
{ {
TEST_CLASS(JsonValueTests) TEST_CLASS(JsonValue_PrintTo_Tests)
{ {
char buffer[1024]; char buffer[1024];
size_t returnValue; size_t returnValue;
@ -22,62 +22,62 @@ namespace JsonGeneratorTests
TEST_METHOD(String) TEST_METHOD(String)
{ {
whenInputIs("hello"); setValueTo("hello");
outputMustBe("\"hello\""); outputMustBe("\"hello\"");
} }
TEST_METHOD(Float) TEST_METHOD(Float)
{ {
whenInputIs(3.1415f); setValueTo(3.1415f);
outputMustBe("3.14"); outputMustBe("3.14");
} }
TEST_METHOD(DoubleZeroDigits) TEST_METHOD(DoubleZeroDigits)
{ {
whenInputIs<0>(3.14159265358979323846); setValueTo<0>(3.14159265358979323846);
outputMustBe("3"); outputMustBe("3");
} }
TEST_METHOD(DoubleOneDigit) TEST_METHOD(DoubleOneDigit)
{ {
whenInputIs<1>(3.14159265358979323846); setValueTo<1>(3.14159265358979323846);
outputMustBe("3.1"); outputMustBe("3.1");
} }
TEST_METHOD(DoubleTwoDigits) TEST_METHOD(DoubleTwoDigits)
{ {
whenInputIs<2>(3.14159265358979323846); setValueTo<2>(3.14159265358979323846);
outputMustBe("3.14"); outputMustBe("3.14");
} }
TEST_METHOD(Integer) TEST_METHOD(Integer)
{ {
whenInputIs(314); setValueTo(314);
outputMustBe("314"); outputMustBe("314");
} }
TEST_METHOD(Char) TEST_METHOD(Char)
{ {
whenInputIs('A'); setValueTo('A');
outputMustBe("65"); outputMustBe("65");
} }
TEST_METHOD(Short) TEST_METHOD(Short)
{ {
whenInputIs((short)314); setValueTo((short)314);
outputMustBe("314"); outputMustBe("314");
} }
TEST_METHOD(Long) TEST_METHOD(Long)
{ {
whenInputIs(314159265L); setValueTo(314159265L);
outputMustBe("314159265"); outputMustBe("314159265");
} }
private: private:
template<int DIGITS> template<int DIGITS>
void whenInputIs(double value) void setValueTo(double value)
{ {
StringBuilder sb(buffer, sizeof(buffer)); StringBuilder sb(buffer, sizeof(buffer));
JsonValue jsonValue; JsonValue jsonValue;
@ -86,7 +86,7 @@ namespace JsonGeneratorTests
} }
template<typename T> template<typename T>
void whenInputIs(T value) void setValueTo(T value)
{ {
StringBuilder sb(buffer, sizeof(buffer)); StringBuilder sb(buffer, sizeof(buffer));
JsonValue jsonValue; JsonValue jsonValue;