Merge lp:~mhr3/dee/more-tests into lp:dee

[Michal Hruby]

Increase the test coverage

Increase the test coverage

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=raring,flavor=amd64/22/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/./build=pbuilder,distribution=raring,flavor=i386/22/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dee-mbs-ci/22//rebuild/?

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

54 + /* Let's also test dee_model_prev at least once */
55 + g_assert (dee_model_get_first_iter (m) == dee_model_prev (m, iter));

Can you add a couple more checks for _prev? E.g. prev originating from dee_model_last_iter and dee_model_prev (m, dee_model_get_first_iter (m))?

163 + dee_model_append (fix->txn, TRUE, 27, 27, 27,
164 + G_GINT64_CONSTANT (27), G_GUINT64_CONSTANT (27),
165 + 27.0, "TwentySeven");

I think it would be better to use different value for every column.

review: Needs Fixing

[lp:~mhr3/dee/more-tests]

406. By Michal Hruby on 2013-05-31

Merge trunk

407. By Michal Hruby on 2013-05-31

Act on review comments

[Michal Hruby (mhr3)]

> Can you add a couple more checks for _prev? E.g. prev originating from
> dee_model_last_iter and dee_model_prev (m, dee_model_get_first_iter (m))?

Added except prev(first) as that is an invalid operation in dee terms.

> I think it would be better to use different value for every column.

Right, fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:407
http://jenkins.qa.ubuntu.com/job/dee-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-raring-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-raring-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dee-raring-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dee-ci/2/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

=== modified file 'src/dee-marshal.list'
--- src/dee-marshal.list	2012-01-05 19:27:06 +0000
+++ src/dee-marshal.list	2013-05-31 12:41:39 +0000
@@ -1,12 +1,3 @@
-# DeeSharedModel::RowsAdded, DbusSharedModel::RowsChanged
-VOID:BOXED,BOXED,BOXED
-
-# DeeSharedModel::RowsRemoved
-VOID:BOXED,BOXED
-
 # DeeSharedModel
 VOID:UINT64,UINT64
 
-# DeePeer::bye
-VOID:STRING,STRING
-

=== modified file 'tests/test-filter-model.c'
--- tests/test-filter-model.c	2013-01-04 17:53:43 +0000
+++ tests/test-filter-model.c	2013-05-31 12:41:39 +0000
@@ -39,6 +39,8 @@
                                                 gconstpointer  data);
 static void test_discard_all_append_notify     (FilterFixture *fix,
                                                 gconstpointer  data);
+static void test_change_backend                (FilterFixture *fix,
+                                                gconstpointer  data);
 static void test_collator_asc                  (FilterFixture *fix,
                                                 gconstpointer  data);
 static void test_collator_desc                  (FilterFixture *fix,
@@ -64,6 +66,8 @@
               setup, test_discard_all, teardown);
   g_test_add (DOMAIN"/DiscardAllAppendNotify", FilterFixture, 0,
               setup, test_discard_all_append_notify, teardown);
+  g_test_add (DOMAIN"/ChangeBackend", FilterFixture, 0,
+              setup, test_change_backend, teardown);
   g_test_add (DOMAIN"/CollatorAscending", FilterFixture, 0,
               setup, test_collator_asc, teardown);
   g_test_add (DOMAIN"/CollatorDescending", FilterFixture, 0,
@@ -71,7 +75,7 @@
   g_test_add (DOMAIN"/Key", FilterFixture, 0,
               setup, test_key, teardown);
   g_test_add (DOMAIN"/Any", FilterFixture, 0,
-                setup, test_any, teardown);
+              setup, test_any, teardown);
   g_test_add (DOMAIN"/Regex", FilterFixture, 0,
               setup, test_regex, teardown);
 }
@@ -201,13 +205,15 @@
   g_assert (!dee_model_is_last (m, iter));
   g_assert_cmpint (1, ==, dee_model_get_int32 (m, iter, 0));
   g_assert_cmpstr ("One", ==, dee_model_get_string (m, iter, 1));
-  
+  g_assert (dee_model_get_first_iter (m) == dee_model_prev (m, iter));
+
   iter = dee_model_next (m, iter);
   g_assert (!dee_model_is_first (m, iter));
   g_assert (!dee_model_is_last (m, iter));
   g_assert_cmpint (2, ==, dee_model_get_int32 (m, iter, 0));
   g_assert_cmpstr ("Two", ==, dee_model_get_string (m, iter, 1));
-  
+  g_assert (iter == dee_model_prev (m, dee_model_get_last_iter (m)));
+
   iter = dee_model_next (m, iter);
   g_assert (!dee_model_is_first (m, iter));
   g_assert (dee_model_is_last (m, iter));
@@ -335,6 +341,62 @@
   g_object_unref (m);
 }
 
+static void
+test_change_backend (FilterFixture *fix, gconstpointer data)
+{
+  DeeFilter filter;
+
+  dee_filter_new (append_all_model_map,
+                  append_all_model_notify,
+                  fix,
+                  NULL,
+                  &filter);
+  
+  DeeModel *m = dee_filter_model_new (fix->model, &filter);
+  g_assert_cmpint (3, ==, dee_model_get_n_rows (fix->model));
+  
+  DeeModelIter *iter = dee_model_get_first_iter (m);
+  g_assert (dee_model_is_first (m, iter));
+  g_assert (!dee_model_is_last (m, iter));
+  g_assert_cmpint (0, ==, dee_model_get_int32 (m, iter, 0));
+  g_assert_cmpstr ("Zero", ==, dee_model_get_string (m, iter, 1));
+  g_assert_cmpuint (0, ==, dee_model_get_position (m, iter));
+
+  iter = dee_model_get_first_iter (fix->model);
+  dee_model_remove (fix->model, iter);
+
+  g_assert_cmpint (2, ==, dee_model_get_n_rows (fix->model));
+  g_assert_cmpint (2, ==, dee_model_get_n_rows (m));
+
+  iter = dee_model_get_first_iter (fix->model);
+  dee_model_remove (fix->model, iter);
+
+  g_assert_cmpint (1, ==, dee_model_get_n_rows (fix->model));
+  g_assert_cmpint (1, ==, dee_model_get_n_rows (m));
+
+  iter = dee_model_get_first_iter (m);
+  g_assert (dee_model_is_first (m, iter));
+  g_assert (!dee_model_is_last (m, iter));
+  g_assert_cmpint (2, ==, dee_model_get_int32 (m, iter, 0));
+  g_assert_cmpstr ("Two", ==, dee_model_get_string (m, iter, 1));
+
+  iter = dee_model_get_first_iter (fix->model);
+  dee_model_set (fix->model, iter, -1, "Minus one");
+
+  iter = dee_model_get_first_iter (m);
+  g_assert (dee_model_is_first (m, iter));
+  g_assert (!dee_model_is_last (m, iter));
+  g_assert_cmpint (-1, ==, dee_model_get_int32 (m, iter, 0));
+  g_assert_cmpstr ("Minus one", ==, dee_model_get_string (m, iter, 1));
+  g_assert_cmpuint (0, ==, dee_model_get_position (m, iter));
+
+  /* and finally remove the last row via the filter model */
+  dee_model_remove (m, iter);
+
+  g_assert_cmpint (0, ==, dee_model_get_n_rows (m));
+  g_assert_cmpint (0, ==, dee_model_get_n_rows (fix->model));
+}
+
 /* Test dee_filter_new_collator() ascending */
 static void
 test_collator_asc (FilterFixture *fix, gconstpointer data)

=== modified file 'tests/test-transaction.c'
--- tests/test-transaction.c	2012-02-03 13:24:05 +0000
+++ tests/test-transaction.c	2013-05-31 12:41:39 +0000
@@ -45,6 +45,16 @@
 }
 
 static void
+setup_basic_types (Fixture *fix, gconstpointer data)
+{
+  fix->model = dee_sequence_model_new ();
+  dee_model_set_schema (fix->model, "b", "y", "i", "u", "x", "t", "d", "s", NULL);
+
+  /* The txn must be created during the tests because we need to verify how
+   * it works when constructed on top of various states of the fix->model */
+}
+
+static void
 setup_proxy (Fixture *fix, gconstpointer data)
 {
   DeeModel *backend = dee_sequence_model_new ();
@@ -85,6 +95,8 @@
   g_assert_cmpint (dee_model_get_n_columns (fix->txn), == , 2);
   g_assert_cmpstr (dee_model_get_column_schema (fix->txn, 0), ==, "s");
   g_assert_cmpstr (dee_model_get_column_schema (fix->txn, 1), ==, "i");
+
+  g_assert (dee_transaction_get_target (DEE_TRANSACTION (fix->txn)) == fix->model);
 }
 
 static void
@@ -1140,6 +1152,40 @@
   g_assert_cmpint (dee_model_get_n_rows (fix->model), ==, 1);
 }
 
+static void
+test_basic_types (Fixture *fix, gconstpointer data)
+{
+  GError *error;
+  fix->txn = dee_transaction_new (fix->model);
+
+  dee_model_append (fix->txn, TRUE, 27, 28, 29,
+                    G_GINT64_CONSTANT (30), G_GUINT64_CONSTANT (31),
+                    32.0, "ThirtyThree");
+
+  DeeModelIter *iter = dee_model_get_first_iter (fix->txn);
+  g_assert (dee_model_get_bool (fix->txn, iter, 0) == TRUE);
+  g_assert (dee_model_get_uchar (fix->txn, iter, 1) == 27);
+  g_assert (dee_model_get_int32 (fix->txn, iter, 2) == 28);
+  g_assert (dee_model_get_uint32 (fix->txn, iter, 3) == 29);
+  g_assert (dee_model_get_int64 (fix->txn, iter, 4) == 30);
+  g_assert (dee_model_get_uint64 (fix->txn, iter, 5) == 31);
+  g_assert (ABS (dee_model_get_double (fix->txn, iter, 6) - 32.0) <= 0.001);
+  g_assert_cmpstr ("ThirtyThree", ==, dee_model_get_string (fix->txn, iter, 7));
+  g_assert_cmpstr ("s", ==, g_variant_get_type_string (dee_model_get_value (fix->txn, iter, 7)));
+
+  /* COMMIT */
+  error = NULL;
+  if (!dee_transaction_commit (DEE_TRANSACTION (fix->txn), &error))
+    {
+      g_critical ("Transaction failed to commit: %s", error->message);
+      g_error_free (error);
+    }
+  if (error)
+    {
+      g_assert_not_reached ();
+    }
+}
+
 // FIXME tags
 
 void
@@ -1238,5 +1284,8 @@
               setup, test_double_commit, teardown);
   g_test_add (PROXY_DOMAIN"/DoubleCommit", Fixture, 0,
               setup_proxy, test_double_commit, teardown);
+
+  g_test_add (DOMAIN"/BasicTypes", Fixture, 0,
+              setup_basic_types, test_basic_types, teardown);
 }