Changeset 2267

Show
Ignore:
Timestamp:
03/12/08 21:48:55 (2 months ago)
Author:
arj..@yirdis.nl
Message:

fixed few unit tests

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gaphor/trunk/gaphor/UML/tests/test_elementfactory.py

    r2264 r2267  
    127127        try: 
    128128            c = Class() 
     129            del events[:] 
    129130            c.name = 'name' 
    130131            assert len(events) == 1, events 

  • gaphor/trunk/gaphor/adapters/states/__init__.py

    r2165 r2267  
     1import propertypages 
     2import vertexconnect 

  • gaphor/trunk/gaphor/adapters/tests/test_connector_extend_line.py

    r2129 r2267  
    3434 
    3535        assert handle.connected_to is uc2 
    36         assert handle._connect_constraint is not None 
     36        assert handle.connection_data is not None 
    3737 
    3838        adapter.disconnect(handle) 
    3939 
    4040        assert handle.connected_to is None, handle.connected_to 
    41         assert handle._connect_constraint is None 
     41        assert handle.connection_data is None 
    4242 
    4343 

  • gaphor/trunk/gaphor/diagram/tests/test_simpleitem.py

    r1442 r2267  
    55import unittest 
    66 
     7from gaphor.tests import TestCase 
    78from gaphor import UML 
    89from gaphor.diagram.simpleitem import Line, Box, Ellipse 
    …… 
    1011 
    1112 
    12 class SimpleItemTestCase(unittest.TestCase): 
     13class SimpleItemTestCase(TestCase): 
    1314 
    1415    def setUp(self): 
    15         self.diagram = diagram = UML.ElementFactory().create(UML.Diagram) 
    16         self.view = View(diagram.canvas) 
    17  
    18     def tearDown(self): 
    19         pass 
     16        super(SimpleItemTestCase, self).setUp() 
     17        self.view = View(self.diagram.canvas) 
    2018 
    2119    def test_line(self): 

  • gaphor/trunk/gaphor/services/adapterloader.py

    r2168 r2267  
    1414    def init(self, app): 
    1515        self._app = app 
     16        import gaphor.adapters 
    1617        import gaphor.adapters.connectors 
    17         #reload(gaphor.adapters.connectors) 
    1818        import gaphor.adapters.editors 
    19         #reload(gaphor.adapters.editors) 
    2019        import gaphor.adapters.grouping 
    21         #reload(gaphor.adapters.grouping) 
    2220        import gaphor.adapters.propertypages 
    23         #reload(gaphor.adapters.propertypages) 
     21        import gaphor.adapters.states 
    2422 
    2523    def shutdown(self): 

  • gaphor/trunk/gaphor/ui/tests/test_handletool.py

    r2116 r2267  
    7676        handle.x, handle.y = 245, 248 
    7777        tool.connect(view, line, handle, 245, 248) 
    78         self.assertTrue(hasattr(handle, '_connect_constraint')) 
    79         self.assertTrue(handle._connect_constraint is not None) 
     78        self.assertTrue(handle.connection_data is not None) 
    8079        self.assertTrue(handle.connected_to is actor, handle.connected_to) 
    8180        self.assertEquals((238, 248), view.get_matrix_i2v(line).transform_point(handle.x, handle.y)) 
    …… 
    8483         
    8584        self.assertTrue(handle.connected_to is actor) 
    86         self.assertTrue(handle._connect_constraint is None) 
     85        self.assertTrue(handle.connection_data is None) 
    8786 
    8887 
    …… 
    117116        handle.pos = view.get_matrix_v2i(line).transform_point(45, 48) 
    118117        tool.connect(view, line, handle, 45, 48) 
    119         self.assertTrue(hasattr(handle, '_connect_constraint')) 
    120         self.assertTrue(handle._connect_constraint is not None) 
     118        self.assertTrue(hasattr(handle, 'connection_data')) 
     119        self.assertTrue(handle.connection_data is not None) 
    121120        self.assertTrue(handle.connected_to is comment) 
    122121        self.assertEquals((45, 50), view.get_matrix_i2v(line).transform_point(handle.x, handle.y)) 
    …… 
    130129        self.assertTrue(glued is actor) 
    131130        tool.connect(view, line, handle, 200, 200) 
    132         self.assertTrue(hasattr(handle, '_connect_constraint')) 
    133         self.assertTrue(handle._connect_constraint is not None) 
     131        self.assertTrue(hasattr(handle, 'connection_data')) 
     132        self.assertTrue(handle.connection_data is not None) 
    134133        self.assertTrue(handle.connected_to is actor) 
    135134        self.assertEquals((200, 200), view.get_matrix_i2v(line).transform_point(handle.x, handle.y)) 
    …… 
    143142        self.assertEquals((200, 200), view.canvas.get_matrix_i2c(line).transform_point(handle.x, handle.y)) 
    144143        self.assertTrue(handle.connected_to is actor, handle.connected_to) 
    145         self.assertTrue(handle._connect_constraint is None) 
     144        self.assertTrue(handle.connection_data is None) 
    146145 
    147146        # Try to connect far away from any item will only do a full disconnect 
    …… 
    154153        self.assertEquals((200, 200), view.canvas.get_matrix_i2c(line).transform_point(handle.x, handle.y)) 
    155154        self.assertTrue(handle.connected_to is None) 
    156         self.assertTrue(handle._connect_constraint is None) 
     155        self.assertTrue(handle.connection_data is None) 
    157156 
    158157 
    …… 
    191190        self.assertEquals((0, 0), view.canvas.get_matrix_i2c(line).transform_point(handle.x, handle.y)) 
    192191        self.assertTrue(handle.connected_to is comment, 'c = ' + str(handle.connected_to)) 
    193         self.assertTrue(handle._connect_constraint is not None) 
     192        self.assertTrue(handle.connection_data is not None) 
    194193 
    195194        # Grab the second handle and drag it to the actor 
    …… 
    202201        self.assertEquals((200, 200), view.canvas.get_matrix_i2c(line).transform_point(handle.x, handle.y)) 
    203202        self.assertTrue(handle.connected_to is actor) 
    204         self.assertTrue(handle._connect_constraint is not None) 
     203        self.assertTrue(handle.connection_data is not None) 
    205204        self.assertTrue(actor.subject in comment.subject.annotatedElement) 
    206205 
    …… 
    214213        self.assertEquals((200, 200), view.canvas.get_matrix_i2c(line).transform_point(handle.x, handle.y)) 
    215214        self.assertTrue(handle.connected_to is actor) 
    216         self.assertTrue(handle._connect_constraint is not None) 
     215        self.assertTrue(handle.connection_data is not None) 
    217216        self.assertTrue(actor.subject in comment.subject.annotatedElement) 
    218217 
    …… 
    226225        self.assertEquals((500, 500), view.canvas.get_matrix_i2c(line).transform_point(handle.x, handle.y)) 
    227226        self.assertTrue(handle.connected_to is None) 
    228         self.assertTrue(handle._connect_constraint is None) 
     227        self.assertTrue(handle.connection_data is None) 
    229228        self.assertEquals(len(comment.subject.annotatedElement), 0) 
    230229