[Issue#] Switching APIs.
[Bug] N/A
[Cause] N/A
[Solution] Changed Pkgname type, changed api methods.
[Verification] Build commons, installer. Run all tests.
Change-Id: I3c7b8bf85f0fc2406976ff4a5e6e90ba8cc4e337
WidgetPkgNameList WidgetDAOReadOnly::getPkgnameList()
{
- LogDebug("Getting Pkgname List");
- WidgetPkgNameList_TEMPORARY_API pkgnameList_TEMPORARY_API = getPkgnameList_TEMPORARY_API();
- WidgetPkgNameList pkgnameList;
- FOREACH(it,pkgnameList_TEMPORARY_API ){
- pkgnameList.push_back(DPL::Optional<WidgetPkgName>(*it));
+ LogDebug("Getting Pkgname List ");
+ SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
+ {
+ WRT_DB_SELECT(select, WidgetInfo, &WrtDatabase::interface())
+ return select->GetValueList<WidgetInfo::pkgname>();
}
- return pkgnameList;
+ SQL_CONNECTION_EXCEPTION_HANDLER_END("Failed to get Pkgname list")
}
WidgetPkgNameList_TEMPORARY_API WidgetDAOReadOnly::getPkgnameList_TEMPORARY_API()
*/
typedef std::list<DbWidgetHandle> DbWidgetHandleList;
-typedef std::list<DPL::Optional<WidgetPkgName> > WidgetPkgNameList; //TODO: this cannot be null -> appropriate changes in db schema needed
+typedef std::list<WidgetPkgName> WidgetPkgNameList; //TODO: this cannot be null -> appropriate changes in db schema needed
typedef std::list<WidgetPkgName> WidgetPkgNameList_TEMPORARY_API; //TODO: this cannot be null -> appropriate changes in db schema needed
class WidgetDAOReadOnly; //forward declaration
{
WidgetPkgName pkgname;
Try {
- auto previous = WidgetDAO::getPkgnameList_TEMPORARY_API();
+ auto previous = WidgetDAO::getPkgnameList();
// register widget
pkgname = WidgetDAO::registerWidgetGenerateTizenId(regInfo, sec);
RUNNER_ASSERT_MSG(!pkgname.empty(),
"(called from line " << line << ")");
- auto current = WidgetDAO::getPkgnameList_TEMPORARY_API();
+ auto current = WidgetDAO::getPkgnameList();
RUNNER_ASSERT_MSG(previous.size()+1 == current.size(),
"(called from line " << line << ")");
*/
RUNNER_TEST(widget_dao_test_get_widget_pkgname_list)
{
- WidgetPkgNameList_TEMPORARY_API pkgnames = WidgetDAO::getPkgnameList_TEMPORARY_API();
+ WidgetPkgNameList pkgnames = WidgetDAO::getPkgnameList();
RUNNER_ASSERT(pkgnames.size() >= 3);
}