bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-18 13:02:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed unit test classes

Browse Source
This commit is contained in:
Benoit Blanchon
2014-07-14 10:33:24 +02:00
parent 4f56afe89e
commit f58a8b0ca5
6 changed files with 35 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JsonParserTests/TestGbathreeStrings.cpp → JsonParserTests/GbathreeBug.cpp
View File

@ -13,7 +13,7 @@ using namespace ArduinoJson::Parser;
namespace ArduinoJsonParserTests namespace ArduinoJsonParserTests
{ {
TEST_CLASS(TestGbathreeSample1) TEST_CLASS(GbathreeBug)
{ {
char json[1024]; char json[1024];
JsonParser<200> parser; JsonParser<200> parser;

22
JsonParserTests/TestArrays.cpp → JsonParserTests/JsonArrayTests.cpp
View File

@ -11,7 +11,7 @@ using namespace ArduinoJson::Parser;
namespace ArduinoJsonParserTests namespace ArduinoJsonParserTests
{ {
TEST_CLASS(TestArrays) TEST_CLASS(JsonArrayTests)
{ {
JsonParser<32> parser; JsonParser<32> parser;
@ -143,5 +143,25 @@ namespace ArduinoJsonParserTests
Assert::IsTrue(arrayB.success()); Assert::IsTrue(arrayB.success());
Assert::AreEqual(2, arrayB.getLength()); Assert::AreEqual(2, arrayB.getLength());
} }
TEST_METHOD(MatrixOfDoubles)
{
char json[] = "[[1.2,3.4],[5.6,7.8]]";
JsonArray array = parser.parseArray(json);
Assert::IsTrue(array.success());
Assert::AreEqual(2, array.getLength());
JsonArray innerArray0 = array.getArray(0);
Assert::AreEqual(2, innerArray0.getLength());
Assert::AreEqual(1.2, innerArray0.getDouble(0));
Assert::AreEqual(3.4, innerArray0.getDouble(1));
JsonArray innerArray1 = array.getArray(1);
Assert::AreEqual(2, innerArray1.getLength());
Assert::AreEqual(5.6, innerArray1.getDouble(0));
Assert::AreEqual(7.8, innerArray1.getDouble(1));
}
}; };
} }

2
JsonParserTests/TestHashTableExample.cpp → JsonParserTests/JsonHashTableTests.cpp
View File

@ -13,7 +13,7 @@ using namespace ArduinoJson::Parser;
namespace ArduinoJsonParserTests namespace ArduinoJsonParserTests
{ {
TEST_CLASS(TestHashTableExample) TEST_CLASS(JsonHashTableTests)
{ {
char json[128]; char json[128];
JsonParser<32> parser; JsonParser<32> parser;

7
JsonParserTests/JsonParserTests.vcxproj
View File

@ -89,10 +89,9 @@
<ClCompile Include="..\JsonParser\JsonArray.cpp" /> <ClCompile Include="..\JsonParser\JsonArray.cpp" />
<ClCompile Include="..\JsonParser\JsonHashTable.cpp" /> <ClCompile Include="..\JsonParser\JsonHashTable.cpp" />
<ClCompile Include="..\JsonParser\JsonObjectBase.cpp" /> <ClCompile Include="..\JsonParser\JsonObjectBase.cpp" />
<ClCompile Include="TestArrayExample.cpp" /> <ClCompile Include="JsonArrayTests.cpp" />
<ClCompile Include="TestArrays.cpp" /> <ClCompile Include="JsonHashTableTests.cpp" />
<ClCompile Include="TestHashTableExample.cpp" /> <ClCompile Include="GbathreeBug.cpp" />
<ClCompile Include="TestGbathreeStrings.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\JsonParser\jsmn.h" /> <ClInclude Include="..\JsonParser\jsmn.h" />

21
JsonParserTests/JsonParserTests.vcxproj.filters
View File

@ -15,18 +15,6 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="TestHashTableExample.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TestArrayExample.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TestGbathreeStrings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="TestArrays.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\JsonParser\jsmn.cpp"> <ClCompile Include="..\JsonParser\jsmn.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -39,6 +27,15 @@
<ClCompile Include="..\JsonParser\JsonObjectBase.cpp"> <ClCompile Include="..\JsonParser\JsonObjectBase.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="JsonArrayTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GbathreeBug.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JsonHashTableTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\JsonParser\jsmn.h"> <ClInclude Include="..\JsonParser\jsmn.h">

56
JsonParserTests/TestArrayExample.cpp
View File

@ -1,56 +0,0 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#include "CppUnitTest.h"
#include "JsonParser.h"
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
using namespace ArduinoJson::Parser;
namespace ArduinoJsonParserTests
{
TEST_CLASS(TestArrayExample)
{
char json[128];
JsonParser<32> parser;
JsonArray array;
public:
TEST_METHOD_INITIALIZE(Initialize)
{
strcpy(json, "[[1.2,3.4],[5.6,7.8]]");
array = parser.parseArray(json);
}
TEST_METHOD(Array_Success_ReturnsTrue)
{
Assert::IsTrue(array.success());
}
TEST_METHOD(Array_GetLength_Returns2)
{
Assert::AreEqual(2, array.getLength());
}
TEST_METHOD(Array_GetArray0_ReturnsInnerArray0)
{
JsonArray innerArray = array.getArray(0);
Assert::AreEqual(2, innerArray.getLength());
Assert::AreEqual(1.2, innerArray.getDouble(0));
Assert::AreEqual(3.4, innerArray.getDouble(1));
}
TEST_METHOD(Array_GetArray1_ReturnsInnerArray1)
{
JsonArray innerArray = array.getArray(1);
Assert::AreEqual(2, innerArray.getLength());
Assert::AreEqual(5.6, innerArray.getDouble(0));
Assert::AreEqual(7.8, innerArray.getDouble(1));
}
};
}