From 0f5aaade6108671f0b283761ac2479fe6065b89f Mon Sep 17 00:00:00 2001 From: Tomoaki Teshima Date: Fri, 21 Apr 2017 23:07:46 +0900 Subject: [PATCH] fix test error on VS2012 --- modules/core/test/test_io.cpp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/modules/core/test/test_io.cpp b/modules/core/test/test_io.cpp index 33af4c8b76..2b35f91d43 100644 --- a/modules/core/test/test_io.cpp +++ b/modules/core/test/test_io.cpp @@ -1059,7 +1059,11 @@ TEST(Core_InputOutput, FileStorage_DMatch) EXPECT_NO_THROW(fs << "d" << d); cv::String fs_result = fs.releaseAndGetString(); +#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */ + EXPECT_STREQ(fs_result.c_str(), "%YAML:1.0\n---\nd: [ 1, 2, 3, -1.5000000000000000e+000 ]\n"); +#else EXPECT_STREQ(fs_result.c_str(), "%YAML:1.0\n---\nd: [ 1, 2, 3, -1.5000000000000000e+00 ]\n"); +#endif cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY); @@ -1086,12 +1090,21 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector) EXPECT_NO_THROW(fs << "dv" << dv); cv::String fs_result = fs.releaseAndGetString(); +#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */ + EXPECT_STREQ(fs_result.c_str(), +"%YAML:1.0\n" +"---\n" +"dv: [ 1, 2, 3, -1.5000000000000000e+000, 2, 3, 4,\n" +" 1.5000000000000000e+000, 3, 2, 1, 5.0000000000000000e-001 ]\n" +); +#else EXPECT_STREQ(fs_result.c_str(), "%YAML:1.0\n" "---\n" "dv: [ 1, 2, 3, -1.5000000000000000e+00, 2, 3, 4, 1.5000000000000000e+00,\n" " 3, 2, 1, 5.0000000000000000e-01 ]\n" ); +#endif cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY); @@ -1130,6 +1143,17 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector_vector) EXPECT_NO_THROW(fs << "dvv" << dvv); cv::String fs_result = fs.releaseAndGetString(); +#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */ + EXPECT_STREQ(fs_result.c_str(), +"%YAML:1.0\n" +"---\n" +"dvv:\n" +" - [ 1, 2, 3, -1.5000000000000000e+000, 2, 3, 4,\n" +" 1.5000000000000000e+000, 3, 2, 1, 5.0000000000000000e-001 ]\n" +" - [ 3, 2, 1, 5.0000000000000000e-001, 1, 2, 3,\n" +" -1.5000000000000000e+000 ]\n" +); +#else EXPECT_STREQ(fs_result.c_str(), "%YAML:1.0\n" "---\n" @@ -1138,6 +1162,7 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector_vector) " 3, 2, 1, 5.0000000000000000e-01 ]\n" " - [ 3, 2, 1, 5.0000000000000000e-01, 1, 2, 3, -1.5000000000000000e+00 ]\n" ); +#endif cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);