--- a/web/test/unittest_viewselector.py Wed Sep 29 16:16:32 2010 +0200
+++ b/web/test/unittest_viewselector.py Wed Sep 29 16:46:47 2010 +0200
@@ -467,37 +467,19 @@
def test_properties(self):
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/web/test/unittest_viewselector.py
- self.assertEquals(sorted(k for k in self.vreg['propertydefs'].keys()
+ self.assertEqual(sorted(k for k in self.vreg['propertydefs'].keys()
if k.startswith('ctxcomponents.edit_box')),
['ctxcomponents.edit_box.context',
'ctxcomponents.edit_box.order',
'ctxcomponents.edit_box.visible'])
- self.assertEquals([k for k in self.vreg['propertyvalues'].keys()
-=======
- self.assertEqual(sorted(k for k in self.vreg['propertydefs'].keys()
- if k.startswith('boxes.edit_box')),
- ['boxes.edit_box.context',
- 'boxes.edit_box.order',
- 'boxes.edit_box.visible'])
self.assertEqual([k for k in self.vreg['propertyvalues'].keys()
->>>>>>> /tmp/unittest_viewselector.py~other.F5zfDM
if not k.startswith('system.version')],
[])
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/web/test/unittest_viewselector.py
- self.assertEquals(self.vreg.property_value('ctxcomponents.edit_box.visible'), True)
- self.assertEquals(self.vreg.property_value('ctxcomponents.edit_box.order'), 2)
- self.assertEquals(self.vreg.property_value('ctxcomponents.possible_views_box.visible'), False)
- self.assertEquals(self.vreg.property_value('ctxcomponents.possible_views_box.order'), 10)
+ self.assertEqual(self.vreg.property_value('ctxcomponents.edit_box.visible'), True)
+ self.assertEqual(self.vreg.property_value('ctxcomponents.edit_box.order'), 2)
+ self.assertEqual(self.vreg.property_value('ctxcomponents.possible_views_box.visible'), False)
+ self.assertEqual(self.vreg.property_value('ctxcomponents.possible_views_box.order'), 10)
self.assertRaises(UnknownProperty, self.vreg.property_value, 'ctxcomponents.actions_box')
-=======
- self.assertEqual(self.vreg.property_value('boxes.edit_box.visible'), True)
- self.assertEqual(self.vreg.property_value('boxes.edit_box.order'), 2)
- self.assertEqual(self.vreg.property_value('boxes.possible_views_box.visible'), False)
- self.assertEqual(self.vreg.property_value('boxes.possible_views_box.order'), 10)
- self.assertRaises(UnknownProperty, self.vreg.property_value, 'boxes.actions_box')
->>>>>>> /tmp/unittest_viewselector.py~other.F5zfDM
-