testinggtk r400 - trunk/tests

[bjornl svn gnome org]

Author: bjornl
Date: Sat Aug 30 01:06:17 2008
New Revision: 400
URL: http://svn.gnome.org/viewvc/testinggtk?rev=400&view=rev

Log:
Reverse and merge the two None adjustment tests. It is ok to set None adjustments

Modified:
   trunk/tests/test_treeview.py

Modified: trunk/tests/test_treeview.py
==============================================================================
--- trunk/tests/test_treeview.py	(original)
+++ trunk/tests/test_treeview.py	Sat Aug 30 01:06:17 2008
@@ -180,39 +180,18 @@
         assert wx == bx
         assert wy == by + 1
 
-def test_set_none_adjustments():
+def test_none_adjustments():
     '''
-    Ensure that setting the adjustments to None throws TypeError.
+    Ensure that setting the vertical and horizontal adjustments to
+    ``None`` works.
+
+    :bug: #529623
     '''
     view = gtk.TreeView()
-    try:
-        view.set_hadjustment(None)
-        assert False
-    except TypeError:
-        assert True
-    try:
-        view.set_vadjustment(None)
-        assert False
-    except TypeError:
-        assert True
-
-
-def test_set_adjustment_properties():
-    '''
-    Ensure that setting the hadjustment and vadjustment properties to
-    None throws TypeError.
-    '''
-    view = gtk.TreeView()
-    try:
-        view.set_property('hadjustment', None)
-        assert False
-    except TypeError:
-        assert True
-    try:
-        view.set_property('vadjustment', None)
-        assert False
-    except TypeError:
-        assert True
+    view.set_hadjustment(None)
+    view.set_vadjustment(None)
+    view.set_property('hadjustment', None)
+    view.set_property('vadjustment', None)
 
 def test_non_string_tooltip_column():
     '''