texthandle: Set a bigger input shape, covering the line height

[~andy/gtk] / gtk / tests / gtktreemodelrefcount.c

diff --git a/gtk/tests/gtktreemodelrefcount.c b/gtk/tests/gtktreemodelrefcount.c
index b4945402c2a03e73ac95718dc738adeb5fb26b75..7f29f994e15f7242ed6db3f0b5052e9c139c7518 100644 (file)
--- a/gtk/tests/gtktreemodelrefcount.c
+++ b/gtk/tests/gtktreemodelrefcount.c
@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -60,6 +58,28 @@ G_DEFINE_TYPE_WITH_CODE (GtkTreeModelRefCount, gtk_tree_model_ref_count, GTK_TYP
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
                                                 gtk_tree_model_ref_count_tree_model_init))
 
+static void
+row_removed (GtkTreeModelRefCount *ref_model,
+             GtkTreePath *path)
+{
+  GHashTableIter iter;
+  GtkTreeIter tree_iter;
+
+  if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ref_model), &tree_iter))
+    {
+      g_hash_table_remove_all (ref_model->priv->node_hash);
+      return;
+    }
+
+  g_hash_table_iter_init (&iter, ref_model->priv->node_hash);
+
+  while (g_hash_table_iter_next (&iter, &tree_iter.user_data, NULL))
+    {
+      if (!gtk_tree_store_iter_is_valid (GTK_TREE_STORE (ref_model), &tree_iter))
+        g_hash_table_iter_remove (&iter);
+    }
+}
+
 static void
 gtk_tree_model_ref_count_init (GtkTreeModelRefCount *ref_model)
 {
@@ -71,6 +91,8 @@ gtk_tree_model_ref_count_init (GtkTreeModelRefCount *ref_model)
                                                       g_direct_equal,
                                                       NULL,
                                                       (GDestroyNotify)node_info_free);
+
+  g_signal_connect (ref_model, "row-deleted", G_CALLBACK (row_removed), NULL);
 }
 
 static void
@@ -217,17 +239,33 @@ gtk_tree_model_ref_count_dump (GtkTreeModelRefCount *ref_model)
 static gboolean
 check_iter (GtkTreeModelRefCount *ref_model,
             GtkTreeIter          *iter,
-            gint                  expected_ref_count)
+            gint                  expected_ref_count,
+            gboolean              may_assert)
 {
   NodeInfo *info;
 
+  if (may_assert)
+    g_assert (gtk_tree_store_iter_is_valid (GTK_TREE_STORE (ref_model), iter));
+
   info = g_hash_table_lookup (ref_model->priv->node_hash, iter->user_data);
   if (!info)
     {
       if (expected_ref_count == 0)
         return TRUE;
       else
-        return FALSE;
+        {
+          if (may_assert)
+            g_error ("Expected ref count %d, but node has never been referenced.\n", expected_ref_count);
+          return FALSE;
+        }
+    }
+
+  if (may_assert)
+    {
+      if (expected_ref_count == 0)
+        g_assert_cmpint (expected_ref_count, ==, info->ref_count);
+      else
+        g_assert_cmpint (expected_ref_count, <=, info->ref_count);
     }
 
   return expected_ref_count == info->ref_count;
@@ -237,7 +275,8 @@ gboolean
 gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
                                       GtkTreeIter          *parent,
                                       gint                  expected_ref_count,
-                                      gboolean              recurse)
+                                      gboolean              recurse,
+                                      gboolean              may_assert)
 {
   GtkTreeIter iter;
 
@@ -247,7 +286,7 @@ gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
 
   do
     {
-      if (!check_iter (ref_model, &iter, expected_ref_count))
+      if (!check_iter (ref_model, &iter, expected_ref_count, may_assert))
         return FALSE;
 
       if (recurse &&
@@ -255,7 +294,7 @@ gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
         {
           if (!gtk_tree_model_ref_count_check_level (ref_model, &iter,
                                                      expected_ref_count,
-                                                     recurse))
+                                                     recurse, may_assert))
             return FALSE;
         }
     }
@@ -267,7 +306,8 @@ gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
 gboolean
 gtk_tree_model_ref_count_check_node (GtkTreeModelRefCount *ref_model,
                                      GtkTreeIter          *iter,
-                                     gint                  expected_ref_count)
+                                     gint                  expected_ref_count,
+                                     gboolean              may_assert)
 {
-  return check_iter (ref_model, iter, expected_ref_count);
+  return check_iter (ref_model, iter, expected_ref_count, may_assert);
 }