tizen 2.4 release

[framework/web/wrt-commons.git] / tests / files_localization / test_suite01.cpp

diff --git a/tests/files_localization/test_suite01.cpp b/tests/files_localization/test_suite01.cpp
index d163d1d..66e406a 100644 (file)
--- a/tests/files_localization/test_suite01.cpp
+++ b/tests/files_localization/test_suite01.cpp
@@ -22,11 +22,11 @@
  * @brief
  */
 
-#include <dpl/log/log.h>
 #include <dpl/test/test_runner.h>
 #include <dpl/static_block.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 #include <dpl/localization/w3c_file_localization.h>
+#include <dpl/optional_typedefs.h>
 #include <LanguageTagsProvider.h>
 
 namespace {
@@ -55,7 +55,7 @@ RUNNER_TEST(test01_getFilePathInWidgetPackageFromUrl){
     WrtDB::TizenAppId name = L"tizenid201"; //no difference if it is valid or invalid appId/pkgId, we fill database which has no intergrity constrainst
     WrtDB::WidgetDAOReadOnly dao(name);
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"widget://one"));
 
@@ -69,7 +69,7 @@ RUNNER_TEST(test02_getFilePathInWidgetPackageFromUrl){
     WrtDB::TizenAppId name = L"tizenid202";
     WrtDB::WidgetDAOReadOnly dao(name);
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"widget://one"));
 
@@ -83,7 +83,7 @@ RUNNER_TEST(test03_getFilePathInWidgetPackageFromUrl){
     WrtDB::TizenAppId name = L"tizenid202";
     WrtDB::WidgetDAOReadOnly dao(name);
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"widget://two.html"));
 
@@ -97,7 +97,7 @@ RUNNER_TEST(test04_getFilePathInWidgetPackageFromUrl)
 {
     WrtDB::TizenAppId name = L"tizenid202";
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"widget://two.html?a=1#b"));
 
@@ -111,7 +111,7 @@ RUNNER_TEST(test05_getFilePathInWidgetPackageFromUrl)
 {
     WrtDB::TizenAppId name = L"tizenid202";
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"widget://two.html#a?b"));
 
@@ -125,7 +125,7 @@ RUNNER_TEST(test06_getFilePathInWidgetPackageFromUrl)
 {
     WrtDB::TizenAppId name = L"tizenid202";
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"file://two.html"));
 
@@ -139,7 +139,7 @@ RUNNER_TEST(test07_getFilePathInWidgetPackageFromUrl)
 {
     WrtDB::TizenAppId name = L"tizenid202";
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"file:///opt/share/widget/tests/localization/widget2/res/wgt/two.html"));
 
@@ -153,7 +153,7 @@ RUNNER_TEST(test08_getFilePathInWidgetPackageFromUrl)
 {
     WrtDB::TizenAppId name = L"tizenid202";
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"file:///opt/share/widget/tests/localization/widget2/res/wgt/locales/pl-en/two.html"));
 
@@ -167,18 +167,18 @@ RUNNER_TEST(test09_getFilePathInWidgetPackageFromUrl)
 {
     WrtDB::TizenAppId name = L"tizenid202";
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"app://two.html"));
 
-    RUNNER_ASSERT(result.IsNull());
+    RUNNER_ASSERT(!result);
 }
 
 RUNNER_TEST(test10_getFilePathInWidgetPackageFromUrl)
 {
     WrtDB::TizenAppId name = L"tizenid202";
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"app://tizenid202/two.html"));
 
@@ -192,22 +192,22 @@ RUNNER_TEST(test11_getFilePathInWidgetPackageFromUrl)
 {
     WrtDB::TizenAppId name = L"tizenid202";
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"dummy"));
 
-    RUNNER_ASSERT(result.IsNull());
+    RUNNER_ASSERT(!result);
 }
 
 RUNNER_TEST(test12_getFilePathInWidgetPackageFromUrl)
 {
     WrtDB::TizenAppId name = L"tizenid202";
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackageFromUrl(
             name,
             DPL::String(L"app://tizenid202/notExisingFIle"));
 
-    RUNNER_ASSERT(result.IsNull());
+    RUNNER_ASSERT(!result);
 }
 
 RUNNER_TEST(test13_getFilePathInWidgetPackageFromUrl2)
@@ -311,7 +311,7 @@ RUNNER_TEST(test25_getFilePathInWidgetPackage)
     WrtDB::TizenAppId name = L"tizenid201";
     WrtDB::WidgetDAOReadOnly dao(name);
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackage(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackage(
             name,
             DPL::String(L"one"));
 
@@ -324,7 +324,7 @@ RUNNER_TEST(test26_getFilePathInWidgetPackage)
     WrtDB::TizenAppId name = L"tizenid202";
     WrtDB::WidgetDAOReadOnly dao(name);
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackage(
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackage(
             name,
             DPL::String(L"two.html"));
 
@@ -336,17 +336,17 @@ RUNNER_TEST(test27_getFilePathInWidgetPackage)
 {
     WrtDB::TizenAppId name = L"tizenid202";
 
-    DPL::Optional<DPL::String> result = W3CFileLocalization::getFilePathInWidgetPackage(name, L"");
-    RUNNER_ASSERT(result.IsNull());
+    DPL::OptionalString result = W3CFileLocalization::getFilePathInWidgetPackage(name, L"");
+    RUNNER_ASSERT(!result);
 
     result = W3CFileLocalization::getFilePathInWidgetPackage(name, L"/");
-    RUNNER_ASSERT(result.IsNull());
+    RUNNER_ASSERT(!result);
 
     result = W3CFileLocalization::getFilePathInWidgetPackage(name, L"//");
-    RUNNER_ASSERT(result.IsNull());
+    RUNNER_ASSERT(!result);
 
     result = W3CFileLocalization::getFilePathInWidgetPackage(name, L"dummy");
-    RUNNER_ASSERT(result.IsNull());
+    RUNNER_ASSERT(!result);
 
     result = W3CFileLocalization::getFilePathInWidgetPackage(name, L"/two.html/");
     RUNNER_ASSERT_MSG(!!result, "No result");
@@ -411,7 +411,7 @@ RUNNER_TEST(test32_getStartFileInfo)
     WrtDB::TizenAppId name = L"tizenid202";
 
     OptionalWidgetStartFileInfo result = W3CFileLocalization::getStartFileInfo(name);
-    RUNNER_ASSERT(result.IsNull());
+    RUNNER_ASSERT(!result);
 }
 
 
@@ -420,7 +420,7 @@ RUNNER_TEST(test33_getStartFileInfo)
     WrtDB::TizenAppId name = L"tizenid201";
 
     OptionalWidgetStartFileInfo result = W3CFileLocalization::getStartFileInfo(name);
-    RUNNER_ASSERT(!result.IsNull());
+    RUNNER_ASSERT(!!result);
     RUNNER_ASSERT(result->file == L"start_file");
     RUNNER_ASSERT(result->localizedPath == L"locales/en-en/start_file");
 }