tizen 2.4 release

[framework/web/wrt-commons.git] / tests / db / test_orm.cpp

diff --git a/tests/db/test_orm.cpp b/tests/db/test_orm.cpp
index c7c9ea9..6726bc2 100644 (file)
--- a/tests/db/test_orm.cpp
+++ b/tests/db/test_orm.cpp
@@ -16,6 +16,7 @@
 #include <dpl/test/test_runner.h>
 #include <dpl/foreach.h>
 #include <dpl/db/thread_database_support.h>
+#include <dpl/optional_typedefs.h>
 #include <generator_dpl_orm_test.h>
 #include <sstream>
 
@@ -70,11 +71,16 @@ bool ContainerContentsEqual(const ContainerType1& container1,
          it != set1.end();
          it++)
     {
-        LogDebug("Set1 element: " << *it);
+        std::stringstream ss;
+        ss << *it;
+        WrtLogD("Set1 element: %s", ss.str().c_str());
     }
 
-    for (typename Set2::iterator it = set2.begin(); it != set2.end(); it++) {
-        LogDebug("Set2 element: " << *it);
+    for (typename Set2::iterator it = set2.begin(); it != set2.end(); it++)
+    {
+        std::stringstream ss;
+        ss << *it;
+        WrtLogD("Set2 element: %s", ss.str().c_str());
     }
 
     return set1 == set2;
@@ -298,21 +304,21 @@ RUNNER_TEST(ORM_SelectValueList)
     //Getting each column
     {
         TestTable::Select select(interface.get());
-        select.Where(Is<TestTable::ColumnOptInt>(DPL::Optional<int>::Null));
+        select.Where(Is<TestTable::ColumnOptInt>(DPL::OptionalInt()));
         RUNNER_ASSERT(ContainerContentsEqual(select.GetValueList<TestTable::
                                                                      ColumnInt>(),
                                              makeList(99, 99)));
     }
     {
         TestTable::Select select(interface.get());
-        select.Where(Is<TestTable::ColumnOptInt>(DPL::Optional<int>::Null));
+        select.Where(Is<TestTable::ColumnOptInt>(DPL::OptionalInt()));
         RUNNER_ASSERT(ContainerContentsEqual(select.GetValueList<TestTable::
                                                                      ColumnInt2>(),
                                              makeList(11, 13)));
     }
     {
         TestTable::Select select(interface.get());
-        select.Where(Is<TestTable::ColumnOptInt>(DPL::Optional<int>::Null));
+        select.Where(Is<TestTable::ColumnOptInt>(DPL::OptionalInt()));
         RUNNER_ASSERT(ContainerContentsEqual(select.GetValueList<TestTable::
                                                                      ColumnText>(),
                                              makeList(DPL::String(L"twelve"),
@@ -320,27 +326,24 @@ RUNNER_TEST(ORM_SelectValueList)
     }
     {
         TestTable::Select select(interface.get());
-        select.Where(Is<TestTable::ColumnOptInt>(DPL::Optional<int>::Null));
+        select.Where(Is<TestTable::ColumnOptInt>(DPL::OptionalInt()));
         RUNNER_ASSERT(ContainerContentsEqual(select.GetValueList<TestTable::
                                                                      ColumnOptText>(),
-                                             makeList(DPL::Optional<DPL::String>
-                                                          ::Null,
-                                                      DPL::Optional<DPL::String>
-                                                          ::Null)));
+                                             makeList(DPL::OptionalString(),
+                                                      DPL::OptionalString())));
     }
 
     //Where on each column
     {
         TestTable::Select select(interface.get());
-        select.Where(Is<TestTable::ColumnOptInt>(DPL::Optional<int>::Null));
+        select.Where(Is<TestTable::ColumnOptInt>(DPL::OptionalInt()));
         RUNNER_ASSERT(ContainerContentsEqual(select.GetValueList<TestTable::
                                                                      ColumnInt2>(),
                                              makeList(11, 13)));
     }
     {
         TestTable::Select select(interface.get());
-        select.Where(Is<TestTable::ColumnOptText>(DPL::Optional<DPL::String>::
-                                                      Null));
+        select.Where(Is<TestTable::ColumnOptText>(DPL::OptionalString()));
         RUNNER_ASSERT(ContainerContentsEqual(select.GetValueList<TestTable::
                                                                      ColumnInt2>(),
                                              makeList(11, 13)));
@@ -565,8 +568,7 @@ RUNNER_TEST(ORM_Delete)
         list.remove(vector[3]);
 
         TestTableDelete::Delete del(interface.get());
-        del.Where(Is<TestTableDelete::ColumnOptText>(DPL::Optional<DPL::String>
-                                                         ::Null));
+        del.Where(Is<TestTableDelete::ColumnOptText>(DPL::OptionalString()));
         del.Execute();
 
         TestTableDelete::Select select(interface.get());
@@ -991,7 +993,7 @@ RUNNER_TEST(ORM_Join)
         rowlist2.size() == 4, "Expected 4 rows while received: " <<
         rowlist.size());
     cnt = 0;
-    DPL::Optional<DPL::String> optext;
+    DPL::OptionalString optext;
     FOREACH(rowit, rowlist2)
     {
         cnt++;