fixed some tests

git-svn-id: file:///Users/arjan/backup/gaphor/gaphor/trunk@2712 a8418922-720d-0410-834f-a69b97ada669

gaphor/UML/uml2.override

@@ -48,7 +48,6 @@ override Class.extension
 def class_extension(self):
     extension = []
     for e in self._factory.select(lambda e: e.isKindOf(Extension) and self in e.endType):
-
         extension.append(e)
     return extension
 

gaphor/diagram/classes/tests/test_association.py

@@ -2,6 +2,8 @@
 Unnit tests for AssociationItem.
 """
 
+from zope import component
+from gaphor.diagram.interfaces import IConnect
 from gaphor.tests import TestCase
 from gaphor import UML
 from gaphor.diagram.items import AssociationItem, ClassItem, InterfaceItem, \

gaphor/plugins/diagramlayout/tests/test_diagramlayout.py

@@ -9,7 +9,7 @@ from gaphor.application import Application
 class DiagramLayoutTestCase(unittest.TestCase):
 
     def setUp(self):
-        Application.init(services=['element_factory', 'gui_manager', 'properties', 'action_manager', 'diagram_layout'])
+        Application.init(services=['element_factory', 'gui_manager', 'properties', 'action_manager', 'diagram_layout', 'property_based_dispatcher'])
 
     def tearDown(self):
         Application.shutdown()

gaphor/tests/testcase.py

@@ -21,10 +21,11 @@ log.set_log_level(log.WARNING)
 
 class TestCase(unittest.TestCase):
     
+    core_services = ['property_based_dispatcher']
     services = ['element_factory', 'adapter_loader']
     
     def setUp(self):
-        Application.init(services=self.services)
+        Application.init(services=self.core_services+self.services)
         self.element_factory = Application.get_service('element_factory')
         assert len(list(self.element_factory.select())) == 0, list(self.element_factory.select())
         self.diagram = self.element_factory.create(UML.Diagram)
@@ -32,6 +33,7 @@ class TestCase(unittest.TestCase):
 
 
     def tearDown(self):
+        self.element_factory.shutdown()
         Application.shutdown()
         
 

gaphor/ui/tests/test_diagramtab.py

@@ -10,7 +10,7 @@ from gaphor.ui.mainwindow import MainWindow
 class DiagramTabTestCase(unittest.TestCase):
 
     def setUp(self):
-        Application.init(services=['element_factory', 'gui_manager', 'action_manager', 'properties'])
+        Application.init(services=['element_factory', 'gui_manager', 'action_manager', 'properties', 'property_based_dispatcher'])
         main_window = Application.get_service('gui_manager').main_window
         element_factory = Application.get_service('element_factory')
         self.element_factory = element_factory

gaphor/ui/tests/test_handletool.py

@@ -23,7 +23,7 @@ class HandleToolTestCase(unittest.TestCase):
     """
 
     def setUp(self):
-        Application.init(services=['adapter_loader', 'element_factory', 'gui_manager', 'properties_manager', 'action_manager', 'properties'])
+        Application.init(services=['adapter_loader', 'element_factory', 'gui_manager', 'properties_manager', 'action_manager', 'properties', 'property_based_dispatcher'])
         self.main_window = Application.get_service('gui_manager').main_window
 
     def shutDown(self):

tests/test_association_undo.py

@@ -18,7 +18,7 @@ from gaphor.application import Application
 class AssociationUndoTestCase(unittest.TestCase):
     
     def setUp(self):
-        Application.init(services=['adapter_loader', 'element_factory', 'undo_manager'])
+        Application.init(services=['adapter_loader', 'element_factory', 'undo_manager', 'property_based_dispatcher'])
 
     def tearDown(self):
         Application.shutdown()

tests/test_diagramitems.py

@@ -1,6 +1,6 @@
 # vim:sw=4:et:ai
 
-import unittest
+from gaphor.tests import TestCase
 from weakref import ref as wref
 from sys import getrefcount
 from gaphor import UML
@@ -13,7 +13,9 @@ factory = UML.ElementFactory()
 factory.init(Application)
 
 
-class TestDiagramItems(unittest.TestCase):
+class TestDiagramItems(TestCase):
+
+    services = ['element_factory', 'property_based_dispatcher']
 
     def gc_collect(self):
         import gc