pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Add check for return values from LoadFromKML.

Browse source
This commit is contained in:
vng 2013-01-30 15:57:00 +03:00 • committed by Alex Zolotarev
parent 60abc31cdf
commit 2260ccfbf4
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
map/map_tests/bookmarks_test.cpp
View file

@ -149,7 +149,7 @@ char const * kmlString =
UNIT_TEST(Bookmarks_ImportKML)
{
BookmarkCategory cat("Default");
cat.LoadFromKML(new MemReader(kmlString, strlen(kmlString)));
TEST(cat.LoadFromKML(new MemReader(kmlString, strlen(kmlString))), ());
CheckBookmarks(cat);
@ -163,7 +163,7 @@ UNIT_TEST(Bookmarks_ExportKML)
char const * BOOKMARKS_FILE_NAME = "UnitTestBookmarks.kml";
BookmarkCategory cat("Default");
cat.LoadFromKML(new MemReader(kmlString, strlen(kmlString)));
TEST(cat.LoadFromKML(new MemReader(kmlString, strlen(kmlString))), ());
CheckBookmarks(cat);
TEST_EQUAL(cat.IsVisible(), false, ());
@ -179,7 +179,7 @@ UNIT_TEST(Bookmarks_ExportKML)
cat.ClearBookmarks();
TEST_EQUAL(cat.GetBookmarksCount(), 0, ());
cat.LoadFromKML(new FileReader(BOOKMARKS_FILE_NAME));
TEST(cat.LoadFromKML(new FileReader(BOOKMARKS_FILE_NAME)), ());
CheckBookmarks(cat);
TEST_EQUAL(cat.IsVisible(), true, ());
@ -447,7 +447,7 @@ char const * kmlString2 =
UNIT_TEST(Bookmarks_InnerFolder)
{
BookmarkCategory cat("Default");
cat.LoadFromKML(new MemReader(kmlString2, strlen(kmlString2)));
TEST(cat.LoadFromKML(new MemReader(kmlString2, strlen(kmlString2))), ());
TEST_EQUAL(cat.GetBookmarksCount(), 1, ());
}

3
map/map_tests/kmz_unarchive_test.cpp
View file

@ -30,8 +30,9 @@ UNIT_TEST(Open_KMZ_Test)
string const KMLFILE = GetPlatform().WritablePathForFile("newKml.kml");
MY_SCOPE_GUARD(fileGuard, bind(&FileWriter::DeleteFileX, KMLFILE));
ZipFileReader::UnzipFile(KMZFILE, "doc.kml", KMLFILE);
BookmarkCategory cat("Default");
cat.LoadFromKML(new FileReader(KMLFILE));
TEST(cat.LoadFromKML(new FileReader(KMLFILE)), ());
TEST_EQUAL(files.size(), 6, ("KMZ file wrong number of files"));