From: Karol Pawlowski <k.pawlowski@samsung.com>
Date: Tue, 23 Apr 2013 07:24:19 +0000 (+0200)
Subject: Fixing building wrt-installer with tests
X-Git-Tag: 2.1b_release^2~12
X-Git-Url: http://review.tizen.org/git/?p=framework%2Fweb%2Fwrt-installer.git;a=commitdiff_plain;h=e6866e8abdea6d4c990fe21e4a1eaeb59e3f3760

Fixing building wrt-installer with tests

[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] build wrt-installer 'WITH_TESTS ON'

Change-Id: I2bcaa759a66b02ba79b4031ab94645bfd908a270
---

diff --git a/tests/general/ParsingTizenAppserviceTests.cpp b/tests/general/ParsingTizenAppserviceTests.cpp
index 0ac368b..5896f41 100644
--- a/tests/general/ParsingTizenAppserviceTests.cpp
+++ b/tests/general/ParsingTizenAppserviceTests.cpp
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <algorithm>
+#include <dpl/log/log.h>
 #include <dpl/test/test_runner.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 #include <InstallerWrapper.h>
@@ -46,16 +47,17 @@ RUNNER_TEST(tizen_appservice_disposition)
             tizenId) == InstallerWrapper::Success);
 
     WrtDB::WidgetDAOReadOnly dao(DPL::FromASCIIString(tizenId));
-    WidgetApplicationServiceList appsvcList;
-    dao.getAppServiceList(appsvcList);
+    WrtDB::WidgetAppControlList appsvcList;
+    dao.getAppControlList(appsvcList);
     uninstall(tizenId);
 
+    LogDebug("Actual size" << appsvcList.size());
     RUNNER_ASSERT_MSG(appsvcList.size() == 4, "Incorrect list size");
-    WidgetApplicationService s;
+    WrtDB::WidgetAppControl s;
     s.src = DPL::FromUTF8String("edit1.html");
     s.operation = DPL::FromUTF8String("http://tizen.org/appsvc/operation/edit");
     s.mime = DPL::FromUTF8String("image/jpg");      /* mime type */
-    s.disposition = WidgetApplicationService::Disposition::WINDOW;
+    s.disposition = WrtDB::WidgetAppControl::Disposition::WINDOW;
     RUNNER_ASSERT_MSG(
         std::find(appsvcList.begin(), appsvcList.end(), s) != appsvcList.end(),
         "Unable to find service #");
@@ -63,7 +65,7 @@ RUNNER_TEST(tizen_appservice_disposition)
     s.src = DPL::FromUTF8String("edit2.html");
     s.operation = DPL::FromUTF8String("http://tizen.org/appsvc/operation/view");
     s.mime = DPL::FromUTF8String("audio/ogg");      /* mime type */
-    s.disposition = WidgetApplicationService::Disposition::WINDOW;
+    s.disposition = WrtDB::WidgetAppControl::Disposition::WINDOW;
     RUNNER_ASSERT_MSG(
         std::find(appsvcList.begin(), appsvcList.end(), s) != appsvcList.end(),
         "Unable to find service ##");
@@ -71,7 +73,7 @@ RUNNER_TEST(tizen_appservice_disposition)
     s.src = DPL::FromUTF8String("edit3.html");
     s.operation = DPL::FromUTF8String("http://tizen.org/appsvc/operation/call");
     s.mime = DPL::FromUTF8String("image/png");      /* mime type */
-    s.disposition = WidgetApplicationService::Disposition::INLINE;
+    s.disposition = WrtDB::WidgetAppControl::Disposition::INLINE;
     RUNNER_ASSERT_MSG(
         std::find(appsvcList.begin(), appsvcList.end(), s) != appsvcList.end(),
         "Unable to find service ###");
@@ -79,7 +81,7 @@ RUNNER_TEST(tizen_appservice_disposition)
     s.src = DPL::FromUTF8String("edit4.html");
     s.operation = DPL::FromUTF8String("http://tizen.org/appsvc/operation/send");
     s.mime = DPL::FromUTF8String("text/css");      /* mime type */
-    s.disposition = WidgetApplicationService::Disposition::WINDOW;
+    s.disposition = WrtDB::WidgetAppControl::Disposition::WINDOW;
     RUNNER_ASSERT_MSG(
         std::find(appsvcList.begin(), appsvcList.end(), s) != appsvcList.end(),
         "Unable to find service ####");