mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add two tests.

Browse Source 
- one test for type_id;
- another for comments in JSON;
This commit is contained in:
MYLS 2016-08-24 17:01:57 +08:00
parent d99832163a
commit 47f2e618ee
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/persistence.cpp
View File

@ -3286,7 +3286,10 @@ icvJSONSkipSpaces( CvFileStorage* fs, char* ptr )
if ( !ptr ) { is_eof = true; break; }
}
if ( *ptr == '/' )
{
ptr++;
break;
}
}
else
{

35
modules/core/test/test_io.cpp
View File

@ -643,6 +643,8 @@ TEST(Core_InputOutput, filestorage_base64_basic)
cv::Mat _nd_out, _nd_in;
cv::Mat _rd_out(64, 64, CV_64FC1), _rd_in;
bool no_type_id = true;
{ /* init */
/* a normal mat */
@ -703,6 +705,12 @@ TEST(Core_InputOutput, filestorage_base64_basic)
fs["normal_nd_mat"] >> _nd_in;
fs["random_mat"] >> _rd_in;
if ( !fs["empty_2d_mat"]["type_id"].empty() ||
!fs["normal_2d_mat"]["type_id"].empty() ||
!fs["normal_nd_mat"]["type_id"].empty() ||
!fs[ "random_mat"]["type_id"].empty() )
no_type_id = false;
/* raw data */
std::vector<data_t>(1000).swap(rawdata);
cvReadRawData(*fs, fs["rawdata"].node, rawdata.data(), data_t::signature());
@ -722,6 +730,8 @@ TEST(Core_InputOutput, filestorage_base64_basic)
//EXPECT_EQ(rawdata[i].i4, i);
}
EXPECT_TRUE(no_type_id);
EXPECT_EQ(_em_in.rows , _em_out.rows);
EXPECT_EQ(_em_in.cols , _em_out.cols);
EXPECT_EQ(_em_in.depth(), _em_out.depth());
@ -893,3 +903,28 @@ TEST(Core_InputOutput, filestorage_yml_vec2i)
remove(file_name.c_str());
}
TEST(Core_InputOutput, filestorage_json_comment)
{
String mem_str =
"{ /* comment */\n"
" \"key\": \"value\"\n"
" /************\n"
" * multiline comment\n"
" ************/\n"
" // 233\n"
" // \n"
"}\n"
;
String str;
EXPECT_NO_THROW(
{
cv::FileStorage fs(mem_str, cv::FileStorage::READ | cv::FileStorage::MEMORY);
fs["key"] >> str;
fs.release();
});
EXPECT_EQ(str, String("value"));
}