Changeset 2255

Timestamp:

03/05/08 22:53:32 (2 months ago)

Author:

arj..@yirdis.nl

Message:

moved classes items to seperate package. More unit tests for interface item.

Files:

• gaphor/trunk/gaphor/diagram/classes (added)
• gaphor/trunk/gaphor/diagram/classes/__init__.py (added)
• gaphor/trunk/gaphor/diagram/classes/association.py (moved) (moved from gaphor/trunk/gaphor/diagram/association.py)
• gaphor/trunk/gaphor/diagram/classes/dependency.py (moved) (moved from gaphor/trunk/gaphor/diagram/dependency.py) (1 diff)
• gaphor/trunk/gaphor/diagram/classes/feature.py (moved) (moved from gaphor/trunk/gaphor/diagram/feature.py) (1 diff)
• gaphor/trunk/gaphor/diagram/classes/generalization.py (moved) (moved from gaphor/trunk/gaphor/diagram/generalization.py)
• gaphor/trunk/gaphor/diagram/classes/implementation.py (moved) (moved from gaphor/trunk/gaphor/diagram/implementation.py) (1 diff)
• gaphor/trunk/gaphor/diagram/classes/interface.py (moved) (moved from gaphor/trunk/gaphor/diagram/interface.py) (2 diffs)
• gaphor/trunk/gaphor/diagram/classes/klass.py (moved) (moved from gaphor/trunk/gaphor/diagram/klass.py) (1 diff)
• gaphor/trunk/gaphor/diagram/classes/package.py (moved) (moved from gaphor/trunk/gaphor/diagram/package.py)
• gaphor/trunk/gaphor/diagram/classes/tests (added)
• gaphor/trunk/gaphor/diagram/classes/tests/test_association.py (moved) (moved from gaphor/trunk/gaphor/diagram/tests/test_association.py) (1 diff)
• gaphor/trunk/gaphor/diagram/classes/tests/test_class.py (moved) (moved from gaphor/trunk/gaphor/diagram/tests/test_class.py) (5 diffs)
• gaphor/trunk/gaphor/diagram/classes/tests/test_interface.py (moved) (moved from gaphor/trunk/gaphor/diagram/tests/test_interface.py) (3 diffs)
• gaphor/trunk/gaphor/diagram/items.py (modified) (1 diff)

gaphor/trunk/gaphor/diagram/classes/dependency.py

@@ -25 +25 @@
-
-class DependencyItem(DiagramLine):
-
+
+
-
-    Normally a dependency looks like a dashed line with an arrow head.

gaphor/trunk/gaphor/diagram/classes/feature.py

@@ -1 +1 @@
-# vim:sw=4:et
-
+
-Feature diagram item. Feature is a super class of both Attribute, Operations and
-Methods.
-
+
-
-from gaphor import UML
-from gaphas.item import Item
-from diagramitem import DiagramItem
-from gaphor.diagram import DiagramItemMeta
+from gaphor.diagram.diagramitem import DiagramItem
-from gaphas.util import text_extents, text_set_font, text_align
-
+from gaphor.diagram 
-
-class FeatureItem(DiagramItem):

gaphor/trunk/gaphor/diagram/classes/implementation.py

@@ -16 +16 @@
-    def post_update(self, context):
-        # change look into solid line when connected to folded interface
-gaphor.diagram.
+
-        conn_to = self.head.connected_to
-        if isinstance(conn_to, InterfaceItem) \

gaphor/trunk/gaphor/diagram/classes/interface.py

@@ -9 +9 @@
-
-from gaphor import UML
-gaphor.diagram.
-gaphor.diagram.
-gaphor.diagram.
+
+
+
-from gaphor.diagram.nameditem import NamedItem
-from gaphor.diagram.style import ALIGN_TOP, ALIGN_BOTTOM, ALIGN_CENTER
@@ -57 +57 @@
-        self.add_watch(UML.Interface.ownedOperation, self.on_class_owned_operation)
-        self.add_watch(UML.Implementation.contract, self.on_implementation_contract)
+        #self.add_watch(UML.Interface.implementation)
+        self.add_watch(UML.Interface.supplierDependency)
+
-
-    @observed

gaphor/trunk/gaphor/diagram/classes/klass.py

@@ -8 +8 @@
-from gaphor.i18n import _
-
-
+gaphor.diagram.
-from feature import AttributeItem, OperationItem
-

gaphor/trunk/gaphor/diagram/classes/tests/test_association.py

@@ -7 +7 @@
-
-from gaphor import UML
-
-
+classes.
+classes.
-from gaphor.diagram.interfaces import IConnect
-from gaphas import View

gaphor/trunk/gaphor/diagram/classes/tests/test_class.py

@@ -3 +3 @@
-"""
-
-
+
-
-from gaphor import UML
-
+classes.
-from gaphor.diagram.interfaces import IEditor
-
@@ -12 +12 @@
-
-
-unittest.
+
-
-    def test_compartments(self):
@@ -18 +18 @@
-        Test creation of classes and working of compartments.
-        """
-UML.ElementFactory()
+self.element_factory
-        diagram = element_factory.create(UML.Diagram)
-        klass = diagram.create(ClassItem, subject=element_factory.create(UML.Class))
@@ -51 +51 @@
-    def test_attribute_removal(self):
-
-UML.ElementFactory()
+self.element_factory
-        diagram = element_factory.create(UML.Diagram)
-        klass = diagram.create(ClassItem, subject=element_factory.create(UML.Class))
@@ -81 +81 @@
-        Test working of item_at method.
-        """
-UML.ElementFactory()
+self.element_factory
-        diagram = element_factory.create(UML.Diagram)
-        klass = diagram.create(ClassItem, subject=element_factory.create(UML.Class))

gaphor/trunk/gaphor/diagram/classes/tests/test_interface.py

@@ -3 +3 @@
-"""
-
+from zope import component
-from gaphor.tests.testcase import TestCase
-from gaphor import UML
-
-
-
+
+
+
+
+
-
-
-class ClassTestCase(TestCase):
-
-
+, 'adapter_loader'
-
-    def test_interface(self):
@@ -21 +24 @@
-    def test_folding(self):
-        diagram = self.element_factory.create(UML.Diagram)
-Class
+Interface
-        klass.subject.name = 'Interface1'
-        assert klass.style.name_outside == False
@@ -30 +33 @@
-        #assert klass.style.name_align == (ALIGN_CENTER, ALIGN_BOTTOM)
-
+    def test_folding_required_provided(self):
+
+        class1 = self.create(ClassItem, UML.Class)
+        class2 = self.create(ClassItem, UML.Class)
+
+        item = self.create(InterfaceItem, UML.Interface)
+        item.folded = True
+        assert item.drawing_style == item.DRAW_ICON
+        assert not item._draw_required
+        assert not item._draw_provided
+
+        # Connect Usage dependency: should result in required interface
+
+        usage = self.create(DependencyItem, UML.Usage)
+        adapter = component.queryMultiAdapter((class1, usage), IConnect)
+        adapter.connect(usage.tail)
+
+        adapter = component.queryMultiAdapter((item, usage), IConnect)
+        adapter.connect(usage.head)
+
+        assert item.subject.supplierDependency, item.subject.supplierDependency
+        assert usage.head.connected_to is item
+        assert item._draw_required
+        assert not item._draw_provided
+
+        # TODO: check drawing state of dependency
+        
+        # Connect Implementation: should result in provided interface
+
+        impl = self.create(ImplementationItem, UML.Implementation)
+        adapter = component.queryMultiAdapter((class2, impl), IConnect)
+        adapter.connect(impl.tail)
+
+        adapter = component.queryMultiAdapter((item, impl), IConnect)
+        adapter.connect(impl.head)
+
+        assert item.subject in impl.subject.contract
+        assert usage.head.connected_to is item
+        assert item._draw_required
+        assert item._draw_provided
+
-# vim:sw=4:et:ai

gaphor/trunk/gaphor/diagram/items.py

@@ -17 +17 @@
-
-# Classes:
-
-
-
-
-
-
-
-
+classes.
+classes.
+classes.
+classes.
+classes.
+classes.
+classes.
+classes.
-
-# Components: