tizen 2.4 release

[framework/web/wrt-commons.git] / tests / utils / widget_version.cpp

diff --git a/tests/utils/widget_version.cpp b/tests/utils/widget_version.cpp
index 5d2bc71..26be18a 100644 (file)
--- a/tests/utils/widget_version.cpp
+++ b/tests/utils/widget_version.cpp
@@ -21,6 +21,7 @@
  */
 #include <sstream>
 #include <dpl/test/test_runner.h>
+#include <dpl/optional_typedefs.h>
 #include <dpl/utils/widget_version.h>
 
 RUNNER_TEST_GROUP_INIT(DPL_WIDGET_VERSION)
@@ -38,8 +39,8 @@ RUNNER_TEST(WidgetVersion_M2_O0)
     RUNNER_ASSERT(version.IsWac() == true);
     RUNNER_ASSERT(version.Major() == DPL::String(L"1"));
     RUNNER_ASSERT(version.Minor() == DPL::String(L"2"));
-    RUNNER_ASSERT(version.Micro() == DPL::Optional<DPL::String>());
-    RUNNER_ASSERT(version.Optional() == DPL::Optional<DPL::String>());
+    RUNNER_ASSERT(version.Micro() == DPL::OptionalString());
+    RUNNER_ASSERT(version.Optional() == DPL::OptionalString());
     RUNNER_ASSERT(version.Raw() == raw);
 }
 
@@ -116,8 +117,8 @@ RUNNER_TEST(WidgetVersion_M2_O0_long)
                   DPL::String(L"123456789012345678901234567890"));
     RUNNER_ASSERT(version.Minor() ==
                   DPL::String(L"98765432109876543210987654321"));
-    RUNNER_ASSERT(version.Micro() == DPL::Optional<DPL::String>());
-    RUNNER_ASSERT(version.Optional() == DPL::Optional<DPL::String>());
+    RUNNER_ASSERT(version.Micro() == DPL::OptionalString());
+    RUNNER_ASSERT(version.Optional() == DPL::OptionalString());
     RUNNER_ASSERT(version.Raw() == raw);
 }
 
@@ -135,8 +136,8 @@ RUNNER_TEST(WidgetVersion_M3_O0)
     RUNNER_ASSERT(version.IsWac() == true);
     RUNNER_ASSERT(version.Major() == DPL::String(L"1"));
     RUNNER_ASSERT(version.Minor() == DPL::String(L"2"));
-    RUNNER_ASSERT(version.Micro() == DPL::Optional<DPL::String>(L"3"));
-    RUNNER_ASSERT(version.Optional() == DPL::Optional<DPL::String>());
+    RUNNER_ASSERT(version.Micro() == DPL::OptionalString(L"3"));
+    RUNNER_ASSERT(version.Optional() == DPL::OptionalString());
     RUNNER_ASSERT(version.Raw() == raw);
 }
 
@@ -196,8 +197,8 @@ RUNNER_TEST(WidgetVersion_M3_O1_1)
     RUNNER_ASSERT(version.IsWac() == true);
     RUNNER_ASSERT(version.Major() == DPL::String(L"1"));
     RUNNER_ASSERT(version.Minor() == DPL::String(L"2"));
-    RUNNER_ASSERT(version.Micro() == DPL::Optional<DPL::String>(L"3"));
-    RUNNER_ASSERT(version.Optional() == DPL::Optional<DPL::String>(L"test111"));
+    RUNNER_ASSERT(version.Micro() == DPL::OptionalString(L"3"));
+    RUNNER_ASSERT(version.Optional() == DPL::OptionalString(L"test111"));
     RUNNER_ASSERT(version.Raw() == raw);
 }
 
@@ -215,8 +216,8 @@ RUNNER_TEST(WidgetVersion_M3_O1_2)
     RUNNER_ASSERT(version.IsWac() == true);
     RUNNER_ASSERT(version.Major() == DPL::String(L"1"));
     RUNNER_ASSERT(version.Minor() == DPL::String(L"2"));
-    RUNNER_ASSERT(version.Micro() == DPL::Optional<DPL::String>(L"3"));
-    RUNNER_ASSERT(version.Optional() == DPL::Optional<DPL::String>(L"111"));
+    RUNNER_ASSERT(version.Micro() == DPL::OptionalString(L"3"));
+    RUNNER_ASSERT(version.Optional() == DPL::OptionalString(L"111"));
     RUNNER_ASSERT(version.Raw() == raw);
 }
 
@@ -249,8 +250,8 @@ RUNNER_TEST(WidgetVersion_M2_O1_1)
     RUNNER_ASSERT(version.IsWac() == true);
     RUNNER_ASSERT(version.Major() == DPL::String(L"1"));
     RUNNER_ASSERT(version.Minor() == DPL::String(L"2"));
-    RUNNER_ASSERT(version.Micro() == DPL::Optional<DPL::String>());
-    RUNNER_ASSERT(version.Optional() == DPL::Optional<DPL::String>(L"t"));
+    RUNNER_ASSERT(version.Micro() == DPL::OptionalString());
+    RUNNER_ASSERT(version.Optional() == DPL::OptionalString(L"t"));
     RUNNER_ASSERT(version.Raw() == raw);
 }
 
@@ -269,8 +270,8 @@ RUNNER_TEST(WidgetVersion_M2_O1_2)
     RUNNER_ASSERT(version.IsWac() == true);
     RUNNER_ASSERT(version.Major() == DPL::String(L"1"));
     RUNNER_ASSERT(version.Minor() == DPL::String(L"2"));
-    RUNNER_ASSERT(version.Micro() == DPL::Optional<DPL::String>());
-    RUNNER_ASSERT(version.Optional() == DPL::Optional<DPL::String>(L"1234"));
+    RUNNER_ASSERT(version.Micro() == DPL::OptionalString());
+    RUNNER_ASSERT(version.Optional() == DPL::OptionalString(L"1234"));
     RUNNER_ASSERT(version.Raw() == raw);
 }
 
@@ -285,8 +286,8 @@ RUNNER_TEST(WidgetVersion_M4_O0_1)
     DPL::String raw(L"1.1");
     DPL::String majorV(L"1");
     DPL::String minorV(L"1");
-    DPL::Optional<DPL::String> microV = DPL::Optional<DPL::String>();
-    DPL::Optional<DPL::String> optionalV = DPL::Optional<DPL::String>();
+    DPL::OptionalString microV = DPL::OptionalString();
+    DPL::OptionalString optionalV = DPL::OptionalString();
     WidgetVersion version(majorV, minorV, microV, optionalV);
 
     RUNNER_ASSERT(version.IsWac() == true);
@@ -305,7 +306,7 @@ Expected: Version should be recognized as non wac compatible.
 RUNNER_TEST(WidgetVersion_M4_O0_nonwac_1)
 {
     DPL::String raw(L"a1.1");
-    WidgetVersion version(L"a1", L"1", DPL::Optional<DPL::String>(), DPL::Optional<DPL::String>());
+    WidgetVersion version(L"a1", L"1", DPL::OptionalString(), DPL::OptionalString());
 
     RUNNER_ASSERT(version.IsWac() == false);
     RUNNER_ASSERT(version.Raw() == raw);
@@ -319,7 +320,7 @@ Expected: Version should not be recognized as wac compatible.
 RUNNER_TEST(WidgetVersion_M4_O0_nonwac_2)
 {
     DPL::String raw(L"1.1a");
-    WidgetVersion version(L"1", L"1a", DPL::Optional<DPL::String>(), DPL::Optional<DPL::String>());
+    WidgetVersion version(L"1", L"1a", DPL::OptionalString(), DPL::OptionalString());
 
     RUNNER_ASSERT(version.IsWac() == false);
     RUNNER_ASSERT(version.Raw() == raw);
@@ -336,8 +337,8 @@ RUNNER_TEST(WidgetVersion_M4_O1_1)
     DPL::String raw(L"1.1.1");
     DPL::String majorV(L"1");
     DPL::String minorV(L"1");
-    DPL::Optional<DPL::String> microV = DPL::Optional<DPL::String>(L"1");
-    DPL::Optional<DPL::String> optionalV = DPL::Optional<DPL::String>();
+    DPL::OptionalString microV = DPL::OptionalString(L"1");
+    DPL::OptionalString optionalV = DPL::OptionalString();
     WidgetVersion version(majorV, minorV, microV, optionalV);
 
     RUNNER_ASSERT(version.IsWac() == true);
@@ -357,7 +358,7 @@ RUNNER_TEST(WidgetVersion_M4_O1_nonwac_1)
 {
     DPL::String majorV(L"1");
     DPL::String minorV(L"1");
-    WidgetVersion version(L"1", L"1", DPL::Optional<DPL::String>(L"1a"), DPL::Optional<DPL::String>());
+    WidgetVersion version(L"1", L"1", DPL::OptionalString(L"1a"), DPL::OptionalString());
 
     RUNNER_ASSERT(version.IsWac() == false);
     RUNNER_ASSERT(version.Raw() == L"1.1.1a");
@@ -370,7 +371,7 @@ Expected: Version should not be recognized as wac compatible.
 */
 RUNNER_TEST(WidgetVersion_M4_O1_nonwac_2)
 {
-    WidgetVersion version(L"1", L"1", DPL::Optional<DPL::String>(L"a1"), DPL::Optional<DPL::String>());
+    WidgetVersion version(L"1", L"1", DPL::OptionalString(L"a1"), DPL::OptionalString());
 
     RUNNER_ASSERT(version.IsWac() == false);
     RUNNER_ASSERT(version.Raw() == L"1.1.a1");
@@ -387,8 +388,8 @@ RUNNER_TEST(WidgetVersion_M4_O2_1)
     DPL::String raw(L"1.1.1 a1");
     DPL::String majorV(L"1");
     DPL::String minorV(L"1");
-    DPL::Optional<DPL::String> microV = DPL::Optional<DPL::String>(L"1");
-    DPL::Optional<DPL::String> optionalV = DPL::Optional<DPL::String>(L"a1");
+    DPL::OptionalString microV = DPL::OptionalString(L"1");
+    DPL::OptionalString optionalV = DPL::OptionalString(L"a1");
     WidgetVersion version(majorV, minorV, microV, optionalV);
 
     RUNNER_ASSERT(version.IsWac() == true);
@@ -407,7 +408,7 @@ Expected: major, minor, micro and optional parts matches expected values.
 */
 RUNNER_TEST(WidgetVersion_M4_O2_nonwac_1)
 {
-    WidgetVersion version(L"1", L"1", DPL::Optional<DPL::String>(L"a1"), DPL::Optional<DPL::String>(L"b1"));
+    WidgetVersion version(L"1", L"1", DPL::OptionalString(L"a1"), DPL::OptionalString(L"b1"));
 
     RUNNER_ASSERT(version.IsWac() == false);
     RUNNER_ASSERT(version.Raw() == L"1.1.a1 b1");
@@ -504,7 +505,7 @@ Expected: Version should not be recognized as wac compatible.
 */
 RUNNER_TEST(WidgetVersion_Strange_6)
 {
-    WidgetVersion version(L"1", L"", DPL::Optional<DPL::String>(), DPL::Optional<DPL::String>());
+    WidgetVersion version(L"1", L"", DPL::OptionalString(), DPL::OptionalString());
 
     RUNNER_ASSERT(version.IsWac() == false);
     RUNNER_ASSERT(version.Raw() == L"1.");
@@ -517,7 +518,7 @@ Expected: Version should not be recognized as wac compatible.
 */
 RUNNER_TEST(WidgetVersion_Strange_7)
 {
-    WidgetVersion version(L"a", L"b", DPL::Optional<DPL::String>(), DPL::Optional<DPL::String>());
+    WidgetVersion version(L"a", L"b", DPL::OptionalString(), DPL::OptionalString());
 
     RUNNER_ASSERT(version.IsWac() == false);
     RUNNER_ASSERT(version.Raw() == L"a.b");
@@ -530,7 +531,7 @@ Expected: Version should not be recognized as wac compatible.
 */
 RUNNER_TEST(WidgetVersion_Strange_8)
 {
-    WidgetVersion version(L"", L"", DPL::Optional<DPL::String>(L"12"), DPL::Optional<DPL::String>(L"abcd123"));
+    WidgetVersion version(L"", L"", DPL::OptionalString(L"12"), DPL::OptionalString(L"abcd123"));
 
     RUNNER_ASSERT(version.IsWac() == false);
     RUNNER_ASSERT(version.Raw() == L"..12 abcd123");