Skip to content

Commit 0f5aaad

Browse files
committed
fix test error on VS2012
1 parent cea0e94 commit 0f5aaad

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

modules/core/test/test_io.cpp

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,11 @@ TEST(Core_InputOutput, FileStorage_DMatch)
10591059

10601060
EXPECT_NO_THROW(fs << "d" << d);
10611061
cv::String fs_result = fs.releaseAndGetString();
1062+
#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */
1063+
EXPECT_STREQ(fs_result.c_str(), "%YAML:1.0\n---\nd: [ 1, 2, 3, -1.5000000000000000e+000 ]\n");
1064+
#else
10621065
EXPECT_STREQ(fs_result.c_str(), "%YAML:1.0\n---\nd: [ 1, 2, 3, -1.5000000000000000e+00 ]\n");
1066+
#endif
10631067

10641068
cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);
10651069

@@ -1086,12 +1090,21 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector)
10861090

10871091
EXPECT_NO_THROW(fs << "dv" << dv);
10881092
cv::String fs_result = fs.releaseAndGetString();
1093+
#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */
1094+
EXPECT_STREQ(fs_result.c_str(),
1095+
"%YAML:1.0\n"
1096+
"---\n"
1097+
"dv: [ 1, 2, 3, -1.5000000000000000e+000, 2, 3, 4,\n"
1098+
" 1.5000000000000000e+000, 3, 2, 1, 5.0000000000000000e-001 ]\n"
1099+
);
1100+
#else
10891101
EXPECT_STREQ(fs_result.c_str(),
10901102
"%YAML:1.0\n"
10911103
"---\n"
10921104
"dv: [ 1, 2, 3, -1.5000000000000000e+00, 2, 3, 4, 1.5000000000000000e+00,\n"
10931105
" 3, 2, 1, 5.0000000000000000e-01 ]\n"
10941106
);
1107+
#endif
10951108

10961109
cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);
10971110

@@ -1130,6 +1143,17 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector_vector)
11301143

11311144
EXPECT_NO_THROW(fs << "dvv" << dvv);
11321145
cv::String fs_result = fs.releaseAndGetString();
1146+
#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */
1147+
EXPECT_STREQ(fs_result.c_str(),
1148+
"%YAML:1.0\n"
1149+
"---\n"
1150+
"dvv:\n"
1151+
" - [ 1, 2, 3, -1.5000000000000000e+000, 2, 3, 4,\n"
1152+
" 1.5000000000000000e+000, 3, 2, 1, 5.0000000000000000e-001 ]\n"
1153+
" - [ 3, 2, 1, 5.0000000000000000e-001, 1, 2, 3,\n"
1154+
" -1.5000000000000000e+000 ]\n"
1155+
);
1156+
#else
11331157
EXPECT_STREQ(fs_result.c_str(),
11341158
"%YAML:1.0\n"
11351159
"---\n"
@@ -1138,6 +1162,7 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector_vector)
11381162
" 3, 2, 1, 5.0000000000000000e-01 ]\n"
11391163
" - [ 3, 2, 1, 5.0000000000000000e-01, 1, 2, 3, -1.5000000000000000e+00 ]\n"
11401164
);
1165+
#endif
11411166

11421167
cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);
11431168

0 commit comments

Comments
 (0)