Repository: ignite Updated Branches: refs/heads/ignite-1786 f1ee5650e -> cd439823f
IGNITE-2495: Added tests for row. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c0c6752 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c0c6752 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c0c6752 Branch: refs/heads/ignite-1786 Commit: 8c0c675207c954a58abc9bb065dff055577aa9b8 Parents: d55dc36 Author: isapego <[email protected]> Authored: Thu Jan 28 17:13:01 2016 +0300 Committer: isapego <[email protected]> Committed: Thu Jan 28 17:13:01 2016 +0300 ---------------------------------------------------------------------- .../project/vs/odbc-test.vcxproj.filters | 54 ++++++++++---------- .../platforms/cpp/odbc-test/src/row_test.cpp | 41 +++++++++++++++ 2 files changed, 68 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8c0c6752/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters b/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters index cf44ba9..3031b1c 100644 --- a/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters +++ b/modules/platforms/cpp/odbc-test/project/vs/odbc-test.vcxproj.filters @@ -5,20 +5,17 @@ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> </Filter> - <Filter Include="Externals"> - <UniqueIdentifier>{cc75fc86-c08d-428a-8ae3-f9979e4588ab}</UniqueIdentifier> - </Filter> <Filter Include="Code\teamcity"> <UniqueIdentifier>{5438a56d-1009-412a-86e3-ceb1112af275}</UniqueIdentifier> </Filter> + <Filter Include="External"> + <UniqueIdentifier>{cc75fc86-c08d-428a-8ae3-f9979e4588ab}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\src\configuration_test.cpp"> <Filter>Code</Filter> </ClCompile> - <ClCompile Include="..\..\..\odbc-driver\src\utility.cpp"> - <Filter>Externals</Filter> - </ClCompile> <ClCompile Include="..\..\src\connection_info_test.cpp"> <Filter>Code</Filter> </ClCompile> @@ -37,38 +34,41 @@ <ClCompile Include="..\..\src\row_test.cpp"> <Filter>Code</Filter> </ClCompile> - <ClCompile Include="..\..\..\odbc-driver\src\row.cpp"> - <Filter>Externals</Filter> - </ClCompile> - <ClCompile Include="..\..\..\odbc-driver\src\result_page.cpp"> - <Filter>Externals</Filter> - </ClCompile> <ClCompile Include="..\..\src\cursor_test.cpp"> <Filter>Code</Filter> </ClCompile> - <ClCompile Include="..\..\..\odbc-driver\src\cursor.cpp"> - <Filter>Externals</Filter> - </ClCompile> <ClCompile Include="..\..\src\utility_test.cpp"> <Filter>Code</Filter> </ClCompile> - <ClCompile Include="..\..\..\odbc-driver\src\config\configuration.cpp"> - <Filter>Externals</Filter> + <ClCompile Include="..\..\src\column_test.cpp"> + <Filter>Code</Filter> </ClCompile> - <ClCompile Include="..\..\..\odbc-driver\src\config\connection_info.cpp"> - <Filter>Externals</Filter> + <ClCompile Include="..\..\..\odbc\src\app\application_data_buffer.cpp"> + <Filter>External</Filter> </ClCompile> - <ClCompile Include="..\..\..\odbc-driver\src\app\application_data_buffer.cpp"> - <Filter>Externals</Filter> + <ClCompile Include="..\..\..\odbc\src\column.cpp"> + <Filter>External</Filter> </ClCompile> - <ClCompile Include="..\..\..\odbc-driver\src\decimal.cpp"> - <Filter>Externals</Filter> + <ClCompile Include="..\..\..\odbc\src\config\configuration.cpp"> + <Filter>External</Filter> </ClCompile> - <ClCompile Include="..\..\..\odbc-driver\src\column.cpp"> - <Filter>Externals</Filter> + <ClCompile Include="..\..\..\odbc\src\config\connection_info.cpp"> + <Filter>External</Filter> </ClCompile> - <ClCompile Include="..\..\src\column_test.cpp"> - <Filter>Code</Filter> + <ClCompile Include="..\..\..\odbc\src\cursor.cpp"> + <Filter>External</Filter> + </ClCompile> + <ClCompile Include="..\..\..\odbc\src\decimal.cpp"> + <Filter>External</Filter> + </ClCompile> + <ClCompile Include="..\..\..\odbc\src\result_page.cpp"> + <Filter>External</Filter> + </ClCompile> + <ClCompile Include="..\..\..\odbc\src\row.cpp"> + <Filter>External</Filter> + </ClCompile> + <ClCompile Include="..\..\..\odbc\src\utility.cpp"> + <Filter>External</Filter> </ClCompile> </ItemGroup> <ItemGroup> http://git-wip-us.apache.org/repos/asf/ignite/blob/8c0c6752/modules/platforms/cpp/odbc-test/src/row_test.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/src/row_test.cpp b/modules/platforms/cpp/odbc-test/src/row_test.cpp index e655cf7..bbf0e3d 100644 --- a/modules/platforms/cpp/odbc-test/src/row_test.cpp +++ b/modules/platforms/cpp/odbc-test/src/row_test.cpp @@ -140,8 +140,11 @@ BOOST_AUTO_TEST_CASE(TestRowMoveToNext) for (size_t i = 0; i < rowNum - 1; ++i) { BOOST_REQUIRE(row.GetSize() == 4); + BOOST_REQUIRE(row.MoveToNext()); } + + BOOST_REQUIRE(row.GetSize() == 4); } BOOST_AUTO_TEST_CASE(TestRowRead) @@ -162,6 +165,44 @@ BOOST_AUTO_TEST_CASE(TestRowRead) BOOST_REQUIRE(row.MoveToNext()); } + + CheckRowData(row, rowNum - 1); +} + +BOOST_AUTO_TEST_CASE(TestSingleRow) +{ + ignite::impl::interop::InteropUnpooledMemory mem(4096); + + const size_t rowNum = 1; + + FillMemWithData(mem, 1); + + Row row(mem); + + BOOST_REQUIRE(row.GetSize() == 4); + + CheckRowData(row, 0); +} + +BOOST_AUTO_TEST_CASE(TestTwoRows) +{ + ignite::impl::interop::InteropUnpooledMemory mem(4096); + + const size_t rowNum = 2; + + FillMemWithData(mem, 2); + + Row row(mem); + + BOOST_REQUIRE(row.GetSize() == 4); + + CheckRowData(row, 0); + + BOOST_REQUIRE(row.MoveToNext()); + + BOOST_REQUIRE(row.GetSize() == 4); + + CheckRowData(row, 1); } BOOST_AUTO_TEST_SUITE_END() \ No newline at end of file
