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

[Michal Hruby]

Increase the test coverage

Increase the test coverage

[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

Unmerged revisions

=== modified file 'src/dee-marshal.list'
--- src/dee-marshal.list	2012-01-05 19:27:06 +0000
+++ src/dee-marshal.list	2013-03-08 18:23:30 +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 'src/dee-model.c'
--- src/dee-model.c	2012-11-27 17:49:57 +0000
+++ src/dee-model.c	2013-03-08 18:23:30 +0000
@@ -1601,7 +1601,7 @@
  * dee_model_insert_row_sorted() to insert rows in the model.
  *
  * Returns: (transfer none) (type Dee.ModelIter): If @out_was_found is set to
- *           %TRUE then a #DeeModelIter pointing to the first matching row.
+ *           %TRUE then a #DeeModelIter pointing to the last matching row.
  *           If it is %FALSE then the iter pointing to the row just after where
  *           @row_spec_would have been inserted.
  */
@@ -1649,7 +1649,7 @@
  * to insert rows in the model.
  *
  * Returns: (transfer none) (type Dee.ModelIter): If @out_was_found is set to
- *           %TRUE then a #DeeModelIter pointing to the first matching row.
+ *           %TRUE then a #DeeModelIter pointing to the last matching row.
  *           If it is %FALSE then the iter pointing to the row just after where
  *           @row_spec_would have been inserted.
  */
@@ -1693,7 +1693,7 @@
  * dee_model_insert_row_sorted() to insert rows in the model.
  *
  * Returns: (transfer none) (type Dee.ModelIter): If @out_was_found is set to
- *           %TRUE then a #DeeModelIter pointing to the first matching row.
+ *           %TRUE then a #DeeModelIter pointing to the last matching row.
  *           If it is %FALSE then the iter pointing to the row just after where
  *           @row_spec_would have been inserted.
  */

=== modified file 'src/dee-serializable-model.c'
--- src/dee-serializable-model.c	2012-11-28 16:34:43 +0000
+++ src/dee-serializable-model.c	2013-03-08 18:23:30 +0000
@@ -849,13 +849,17 @@
                                           gpointer            user_data)
 {
   DeeModelIter *iter;
+  gboolean was_found;
 
   g_return_val_if_fail (DEE_IS_SERIALIZABLE_MODEL (self), NULL);
   g_return_val_if_fail (row_members != NULL, NULL);
   g_return_val_if_fail (cmp_func != NULL, NULL);
 
   iter = dee_model_find_row_sorted (self, row_members, cmp_func,
-                                    user_data, NULL);
+                                    user_data, &was_found);
+  if (was_found)
+    iter = dee_model_next (self, iter);
+
   return dee_model_insert_row_before (self, iter, row_members);
 }
 
@@ -866,14 +870,16 @@
                                           gpointer            user_data,
                                           gboolean           *out_was_found)
 {
-  DeeModelIter  *iter, *end;
+  DeeModelIter  *iter, *end, *last_matching;
   GVariant     **row_buf;
+  gint           cmp_result;
   guint          n_cols, i;
 
   g_return_val_if_fail (DEE_IS_SERIALIZABLE_MODEL (self), NULL);
   g_return_val_if_fail (row_spec != NULL, NULL);
   g_return_val_if_fail (cmp_func != NULL, NULL);
 
+  last_matching = NULL;
   if (out_was_found != NULL) *out_was_found = FALSE;
   n_cols = dee_model_get_n_columns (self);
 
@@ -885,10 +891,25 @@
   while (iter != end)
     {
       dee_model_get_row (self, iter, row_buf);
-      if (cmp_func(row_buf, row_spec, user_data) >= 0)
-        {
-          for (i = 0; i < n_cols; i++) g_variant_unref (row_buf[i]);
-          if (out_was_found != NULL) *out_was_found = TRUE;
+      cmp_result = cmp_func (row_buf, row_spec, user_data);
+      /* we're returning last matching row to make ordering
+       * of insert_row_sorted stable and fast */
+      while (cmp_result == 0)
+        {
+          last_matching = iter;
+          iter = dee_model_next (self, iter);
+          if (iter == end)
+            {
+              iter = last_matching;
+              break;
+            }
+          for (i = 0; i < n_cols; i++) g_variant_unref (row_buf[i]);
+          dee_model_get_row (self, iter, row_buf);
+          cmp_result = cmp_func (row_buf, row_spec, user_data);
+        }
+      if (cmp_result >= 0)
+        {
+          for (i = 0; i < n_cols; i++) g_variant_unref (row_buf[i]);
           break;
         }
 
@@ -896,7 +917,8 @@
       iter = dee_model_next (self, iter);
     }
 
-  return iter;
+  if (out_was_found != NULL && last_matching != NULL) *out_was_found = TRUE;
+  return last_matching ? last_matching : iter;
 }
 
 static void

=== 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-03-08 18:23:30 +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,7 +205,10 @@
   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));
-  
+
+  /* Let's also test dee_model_prev at least once */
+  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));
@@ -335,6 +342,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-model-rows.c'
--- tests/test-model-rows.c	2012-11-23 10:57:29 +0000
+++ tests/test-model-rows.c	2013-03-08 18:23:30 +0000
@@ -53,6 +53,7 @@
 static void test_iter_backwards  (RowsFixture *fix, gconstpointer data);
 static void test_illegal_access  (RowsFixture *fix, gconstpointer data);
 static void test_sorted          (RowsFixture *fix, gconstpointer data);
+static void test_sort_stable     (RowsFixture *fix, gconstpointer data);
 static void test_sorted_with_sizes (RowsFixture *fix, gconstpointer data);
 static void test_named_cols_append (RowsFixture *fix, gconstpointer data);
 static void test_named_cols_fields (RowsFixture *fix, gconstpointer data);
@@ -159,6 +160,13 @@
   g_test_add (TXN_DOMAIN"/Sorted/WithSizes", RowsFixture, 0,
               txn_rows_setup, test_sorted_with_sizes, txn_rows_teardown);
 
+  g_test_add (SEQ_DOMAIN"/StableSorted", RowsFixture, 0,
+              seq_rows_setup, test_sort_stable, seq_rows_teardown);
+  g_test_add (PROXY_DOMAIN"/StableSorted", RowsFixture, 0,
+              proxy_rows_setup, test_sort_stable, proxy_rows_teardown);
+  g_test_add (TXN_DOMAIN"/StableSorted", RowsFixture, 0,
+              txn_rows_setup, test_sort_stable, txn_rows_teardown);
+
   g_test_add (SEQ_DOMAIN"/NamedColumns/Append", RowsFixture, 0,
               seq_rows_setup, test_named_cols_append, seq_rows_teardown);
   g_test_add (PROXY_DOMAIN"/NamedColumns/Append", RowsFixture, 0,
@@ -593,6 +601,13 @@
 }
 
 static gint
+cmp_constant (GVariant **row1, GVariant **row2, gpointer user_data)
+{
+  g_assert_cmpstr (user_data, ==, "test-user-data");
+  return 0;
+}
+
+static gint
 cmp_col_0 (GVariant **row1, GVariant **row2, gpointer user_data)
 {
   g_assert_cmpstr (user_data, ==, "test-user-data");
@@ -679,6 +694,51 @@
   g_assert (result == hter);
 }
 
+static void
+test_sort_stable (RowsFixture *fix, gconstpointer data)
+{
+  DeeModelIter *hter, *iter, *jter, *kter;
+
+  /* FINAL MODEL: [(25,s), (26,s), (27,s), (28,s)]
+   *           ~= [hter, iter, jter, kter] */
+
+  /* Insert the first row */
+  iter = dee_model_insert_sorted (fix->model, cmp_constant, "test-user-data",
+                                  25, "Stable");
+  g_assert (iter != dee_model_get_last_iter (fix->model));
+  g_assert (iter == dee_model_get_first_iter (fix->model));
+
+  /* Second row */
+  kter = dee_model_insert_sorted (fix->model, cmp_constant, "test-user-data",
+                                  26, "Stable");
+  g_assert (kter != dee_model_get_last_iter (fix->model));
+  g_assert (kter != dee_model_get_first_iter (fix->model));
+  g_assert (iter == dee_model_get_first_iter (fix->model));
+  g_assert (kter != iter);
+
+  g_assert_cmpint (2, ==, dee_model_get_n_rows (fix->model));
+  g_assert (kter == dee_model_next (fix->model, iter));
+
+  /* Third row */
+  jter = dee_model_insert_sorted (fix->model, cmp_constant, "test-user-data",
+                                  27, "Stable");
+  g_assert (jter != dee_model_get_last_iter (fix->model));
+  g_assert (jter != dee_model_get_first_iter (fix->model));
+  g_assert (iter == dee_model_get_first_iter (fix->model));
+  g_assert (jter != iter);
+  g_assert (jter != kter);
+
+  g_assert (jter == dee_model_next (fix->model, kter));
+  g_assert (dee_model_get_last_iter (fix->model) == dee_model_next (fix->model, jter));
+
+  /* Fourth row */
+  hter = dee_model_insert_sorted (fix->model, cmp_constant, "test-user-data",
+                                  28, "Stable");
+  g_assert (hter == dee_model_next (fix->model, jter));
+
+  g_assert_cmpint (4, ==, dee_model_get_n_rows (fix->model));
+}
+
 static gint
 sized_cmp_col_0 (GVariant **row1, guint row1_length,
                  GVariant **row2, guint row2_length, gpointer user_data)

=== modified file 'tests/test-transaction.c'
--- tests/test-transaction.c	2012-02-03 13:24:05 +0000
+++ tests/test-transaction.c	2013-03-08 18:23:30 +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, 27, 27,
+                    G_GINT64_CONSTANT (27), G_GUINT64_CONSTANT (27),
+                    27.0, "TwentySeven");
+
+  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) == 27);
+  g_assert (dee_model_get_uint32 (fix->txn, iter, 3) == 27);
+  g_assert (dee_model_get_int64 (fix->txn, iter, 4) == 27);
+  g_assert (dee_model_get_uint64 (fix->txn, iter, 5) == 27);
+  g_assert (ABS (dee_model_get_double (fix->txn, iter, 6) - 27.0) <= 0.001);
+  g_assert_cmpstr ("TwentySeven", ==, 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);
 }