#1300 Test coverage for inventory metadata
For now it's random, needs more consistent coveragemaster
parent
f73e0d09aa
commit
3de223aecf
|
|
@ -39,6 +39,34 @@
|
|||
#pragma warning(disable: 4702)
|
||||
#endif
|
||||
|
||||
void set_random_inventory_metadata(LLInventoryObject* obj)
|
||||
{
|
||||
S32 extra = rand() % 4;
|
||||
switch (extra)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
LLUUID thumbnail_id;
|
||||
thumbnail_id.generate();
|
||||
obj->setThumbnailUUID(thumbnail_id);
|
||||
break;
|
||||
}
|
||||
case 1:
|
||||
obj->setFavorite(true);
|
||||
break;
|
||||
case 2:
|
||||
{
|
||||
LLUUID thumbnail_id;
|
||||
thumbnail_id.generate();
|
||||
obj->setThumbnailUUID(thumbnail_id);
|
||||
obj->setFavorite(true);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
LLPointer<LLInventoryItem> create_random_inventory_item()
|
||||
{
|
||||
LLUUID item_id;
|
||||
|
|
@ -75,6 +103,7 @@ LLPointer<LLInventoryItem> create_random_inventory_item()
|
|||
sale_info,
|
||||
flags,
|
||||
creation);
|
||||
set_random_inventory_metadata(item);
|
||||
return item;
|
||||
}
|
||||
|
||||
|
|
@ -90,6 +119,7 @@ LLPointer<LLInventoryCategory> create_random_inventory_cat()
|
|||
parent_id,
|
||||
LLFolderType::FT_NONE,
|
||||
std::string("Sample category"));
|
||||
set_random_inventory_metadata(cat);
|
||||
return cat;
|
||||
}
|
||||
|
||||
|
|
@ -290,6 +320,7 @@ namespace tut
|
|||
src->setCreationDate(new_creation);
|
||||
|
||||
// test a save/load cycle to LLSD and back again
|
||||
// Note: ll_create_sd_from_inventory_item does not support metadata
|
||||
LLSD sd = ll_create_sd_from_inventory_item(src);
|
||||
LLPointer<LLInventoryItem> dst = new LLInventoryItem;
|
||||
bool successful_parse = dst->fromLLSD(sd);
|
||||
|
|
@ -366,13 +397,13 @@ namespace tut
|
|||
ensure_equals("8.name::getName() failed", src1->getName(), src2->getName());
|
||||
ensure_equals("9.description::getDescription() failed", src1->getDescription(), src2->getDescription());
|
||||
ensure_equals("10.creation::getCreationDate() failed", src1->getCreationDate(), src2->getCreationDate());
|
||||
|
||||
ensure_equals("13.thumbnails::getThumbnailUUID() failed", src1->getThumbnailUUID(), src2->getThumbnailUUID());
|
||||
ensure_equals("14.favorites::getIsFavorite() failed", src1->getIsFavorite(), src2->getIsFavorite());
|
||||
}
|
||||
|
||||
template<> template<>
|
||||
void inventory_object::test<8>()
|
||||
{
|
||||
|
||||
LLPointer<LLInventoryItem> src1 = create_random_inventory_item();
|
||||
|
||||
std::ostringstream ostream;
|
||||
|
|
@ -392,8 +423,8 @@ namespace tut
|
|||
ensure_equals("8.name::getName() failed", src1->getName(), src2->getName());
|
||||
ensure_equals("9.description::getDescription() failed", src1->getDescription(), src2->getDescription());
|
||||
ensure_equals("10.creation::getCreationDate() failed", src1->getCreationDate(), src2->getCreationDate());
|
||||
|
||||
|
||||
ensure_equals("11.thumbnails::getThumbnailUUID() failed", src1->getThumbnailUUID(), src2->getThumbnailUUID());
|
||||
ensure_equals("12.favorites::getIsFavorite() failed", false, src2->getIsFavorite()); // not supposed to carry over
|
||||
}
|
||||
|
||||
template<> template<>
|
||||
|
|
@ -423,6 +454,8 @@ namespace tut
|
|||
ensure_equals("10.name::getName() failed", src1->getName(), src2->getName());
|
||||
ensure_equals("11.description::getDescription() failed", src1->getDescription(), src2->getDescription());
|
||||
ensure_equals("12.creation::getCreationDate() failed", src1->getCreationDate(), src2->getCreationDate());
|
||||
ensure_equals("13.thumbnails::getThumbnailUUID() failed", src1->getThumbnailUUID(), src2->getThumbnailUUID());
|
||||
ensure_equals("14.favorites::getIsFavorite() failed", src1->getIsFavorite(), src2->getIsFavorite());
|
||||
}
|
||||
|
||||
//******class LLInventoryCategory*******//
|
||||
|
|
@ -492,6 +525,8 @@ namespace tut
|
|||
ensure_equals("3.type::getType() failed", src1->getType(), src2->getType());
|
||||
ensure_equals("4.preferred type::getPreferredType() failed", src1->getPreferredType(), src2->getPreferredType());
|
||||
ensure_equals("5.name::getName() failed", src1->getName(), src2->getName());
|
||||
ensure_equals("6.thumbnails::getThumbnailUUID() failed", src1->getThumbnailUUID(), src2->getThumbnailUUID());
|
||||
ensure_equals("7.favorites::getIsFavorite() failed", src1->getIsFavorite(), src2->getIsFavorite());
|
||||
}
|
||||
|
||||
template<> template<>
|
||||
|
|
@ -511,6 +546,7 @@ namespace tut
|
|||
ensure_equals("3.type::getType() failed", src1->getType(), src2->getType());
|
||||
ensure_equals("4.preferred type::getPreferredType() failed", src1->getPreferredType(), src2->getPreferredType());
|
||||
ensure_equals("5.name::getName() failed", src1->getName(), src2->getName());
|
||||
|
||||
ensure_equals("13.thumbnails::getThumbnailUUID() failed", src1->getThumbnailUUID(), src2->getThumbnailUUID());
|
||||
ensure_equals("14.favorites::getIsFavorite() failed", false, src2->getIsFavorite()); // currently not supposed to carry over
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue