Navigation

← Previous Changeset
Next Changeset →

Changeset 1247

Timestamp:

04/24/07 05:51:59 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Updated some unit tests

Files:

gaphor/trunk/gaphor/actions/tests/test_itemactions.py (modified) (3 diffs)
gaphor/trunk/gaphor/actions/tests/test_placementactions.py (modified) (3 diffs)
gaphor/trunk/gaphor/adapters/tests/test_editor.py (modified) (4 diffs)
gaphor/trunk/gaphor/tests/test_application.py (modified) (1 diff)
gaphor/trunk/gaphor/tests/test_storage.py (modified) (11 diffs)
gaphor/trunk/gaphor/ui/stock.py (modified) (1 diff)
gaphor/trunk/setup.py (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

gaphor/trunk/gaphor/actions/tests/test_itemactions.py

r1239	r1247
2	2	import unittest
3	3
4		from gaphor import ~~resource,~~ UML
	4	from gaphor import UML
5	5	from gaphor.application import Application
6	6	from gaphor.ui.mainwindow import MainWindow
…	…
19	19
20	20	def setUp(self):
	21	Application.init()
	22	self.main_window = Application.get_service('gui_manager').main_window
	23	self.action_manager = Application.get_service('action_manager')
21	24	self.diagram = UML.create(UML.Diagram)
22	25	self.main_window.show_diagram(self.diagram)
23		~~Application.init()~~
24		~~self.main_window = Application.get_service('gui_manager').main_window~~
25	26
26	27	self.class_ = self.diagram.create(items.ClassItem, subject=UML.create(UML.Class))
…	…
32	33
33	34	def _test_action(self, action_id):
34		action = self.~~main_window.get_action_pool()~~.get_action(action_id)
	35	action = self.action_manager.get_action(action_id)
35	36	assert action is not None
36	37	action.update()

gaphor/trunk/gaphor/actions/tests/test_placementactions.py

r1243	r1247
1	1
2	2	import unittest
3		~~from gaphor import resource~~
4	3	from gaphor.application import Application
5		~~#from gaphor.ui.mainwindow import MainWindow~~
6	4	from gaphor.diagram.tool import PlacementTool
7	5	from gaphor.actions import placementactions
…	…
15	13	class PlacementToolTestCase(unittest.TestCase):
16	14
17		# main_window = MainWindow()
18		# try:
19		# main_window.construct()
20		# except:
21		# pass
22
23		def setUp(self):
	15	def __init__(self, arg2):
	16	unittest.TestCase.__init__(self, arg2)
24	17	Application.init()
25	18	self.main_window = Application.get_service('gui_manager').main_window
26	19
27		def tearDown(self):
28		Application.shutdown()
	20	# def setUp(self):
	21	# Application.init()
	22	# self.main_window = Application.get_service('gui_manager').main_window
	23
	24	# def tearDown(self):
	25	# Application.shutdown()
29	26
30	27	def do_test_placement(self, action):
…	…
83	80	self.do_test_placement(placementactions.IncludePlacementAction())
84	81
85
86	82	def test_artifact_placement(self):
87	83	self.do_test_placement(placementactions.ArtifactPlacementAction())

gaphor/trunk/gaphor/adapters/tests/test_editor.py

r1121	r1247
3	3	from zope import component
4	4	from gaphor import UML
	5	from gaphor.UML.elementfactory import ElementFactory
5	6	from gaphor.diagram import items
6	7	from gaphor.diagram.interfaces import IEditor
…	…
12	13	class EditorTestCase(TestCase):
13	14
	15	def setUp(self):
	16	self.factory = ElementFactory()
	17	self.factory.init(None)
	18
	19	def tearDown(self):
	20	self.factory.shutdown()
	21
14	22	def test_association_editor(self):
15		diagram = ~~UML~~.create(UML.Diagram)
	23	diagram = self.factory.create(UML.Diagram)
16	24	assoc = diagram.create(items.AssociationItem)
17	25	adapter = IEditor(assoc)
…	…
20	28
21	29	# Intermezzo: connect the association between two classes
22		class1 = diagram.create(items.ClassItem, subject=UML.create(UML.Class))
23		class2 = diagram.create(items.ClassItem, subject=UML.create(UML.Class))
	30	class1 = diagram.create(items.ClassItem, subject=self.factory.create(UML.Class))
	31	class2 = diagram.create(items.ClassItem, subject=self.factory.create(UML.Class))
	32	from gaphor.interfaces import IService
	33	component.provideUtility(self.factory, IService, 'element_factory')
	34
24	35	from gaphor.diagram.interfaces import IConnect
25	36	connector = component.queryMultiAdapter((class1, assoc), IConnect)
…	…
45	56
46	57	def test_objectnode_editor(self):
47		diagram = ~~UML~~.create(UML.Diagram)
48		node = diagram.create(items.ObjectNodeItem, subject=~~UML~~.create(UML.ObjectNode))
	58	diagram = self.factory.create(UML.Diagram)
	59	node = diagram.create(items.ObjectNodeItem, subject=self.factory.create(UML.ObjectNode))
49	60	diagram.canvas.update_now()
50	61

gaphor/trunk/gaphor/tests/test_application.py

r1180	r1247
21	21
22	22	Application.load_services()
	23	assert Application.get_service('undo_manager')
	24	assert Application.get_service('plugin_manager')
	25
	26	# After that, services are also available as Utilities:
23	27	assert component.queryUtility(IService, 'undo_manager')
24	28	assert component.queryUtility(IService, 'plugin_manager')

gaphor/trunk/gaphor/tests/test_storage.py

r1121	r1247
1		"""Unittest the storage and parser modules
	1	"""
	2	Unittest the storage and parser modules
2	3	"""
3	4
…	…
5	6	import unittest
6	7	from gaphor import UML
	8	from gaphor.UML.elementfactory import ElementFactory
	9	from gaphor.application import Application
7	10	from gaphor import storage
8	11	from gaphor.misc.xmlwriter import XMLWriter
…	…
30	33	class StorageTestCase(unittest.TestCase):
31	34
	35	def setUp(self):
	36	self.factory = ElementFactory()
	37	self.factory.init(None)
	38
32	39	def tearDown(self):
33		UML.flush()
	40	self.factory.flush()
	41	self.factory.shutdown()
34	42
35	43	def test_save_uml(self):
36	44	"""Saving gaphor.UML model elements.
37	45	"""
38		~~UML~~.create(UML.Package)
39		~~UML~~.create(UML.Diagram)
40		~~UML~~.create(UML.Comment)
41		~~UML~~.create(UML.Class)
	46	self.factory.create(UML.Package)
	47	self.factory.create(UML.Diagram)
	48	self.factory.create(UML.Comment)
	49	self.factory.create(UML.Class)
42	50
43	51	out = PseudoFile()
44		storage.save(XMLWriter(out))
	52	storage.save(XMLWriter(out), factory=self.factory)
45	53	out.close()
46	54
…	…
54	62	"""Save a diagranm item too.
55	63	"""
56		diagram = ~~UML~~.create(UML.Diagram)
57		diagram.create(items.CommentItem, subject=~~UML~~.create(UML.Comment))
	64	diagram = self.factory.create(UML.Diagram)
	65	diagram.create(items.CommentItem, subject=self.factory.create(UML.Comment))
58	66
59	67	out = PseudoFile()
60		storage.save(XMLWriter(out))
	68	storage.save(XMLWriter(out), factory=self.factory)
61	69	out.close()
62	70
…	…
73	81	filename = '%s.gaphor' % __module__
74	82
75		~~UML~~.create(UML.Package)
76		~~UML~~.create(UML.Diagram)
77		~~UML~~.create(UML.Comment)
78		~~UML~~.create(UML.Class)
	83	self.factory.create(UML.Package)
	84	self.factory.create(UML.Diagram)
	85	self.factory.create(UML.Comment)
	86	self.factory.create(UML.Class)
79	87
80	88	fd = open(filename, 'w')
81		storage.save(XMLWriter(fd))
82		fd.close()
83
84		~~UML~~.flush()
85		assert not list(~~UML~~.select())
86
87		storage.load(filename)
88
89		assert len(~~UML~~.lselect()) == 4
90		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Package))) == 1
91		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Diagram))) == 1
92		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Comment))) == 1
93		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Class))) == 1
	89	storage.save(XMLWriter(fd), factory=self.factory)
	90	fd.close()
	91
	92	self.factory.flush()
	93	assert not list(self.factory.select())
	94
	95	storage.load(filename, factory=self.factory)
	96
	97	assert len(self.factory.lselect()) == 4
	98	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Package))) == 1
	99	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Diagram))) == 1
	100	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Comment))) == 1
	101	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Class))) == 1
94	102
95	103
…	…
100	108	filename = '%s.gaphor' % __module__
101	109
102		~~UML~~.create(UML.Package)
103		diagram = ~~UML~~.create(UML.Diagram)
104		diagram.create(items.CommentItem, subject=~~UML~~.create(UML.Comment))
105		diagram.create(items.ClassItem, subject=~~UML~~.create(UML.Class))
106		iface = diagram.create(items.InterfaceItem, subject=~~UML~~.create(UML.Interface))
	110	self.factory.create(UML.Package)
	111	diagram = self.factory.create(UML.Diagram)
	112	diagram.create(items.CommentItem, subject=self.factory.create(UML.Comment))
	113	diagram.create(items.ClassItem, subject=self.factory.create(UML.Class))
	114	iface = diagram.create(items.InterfaceItem, subject=self.factory.create(UML.Interface))
107	115	iface.subject.name = 'Circus'
108	116	iface.matrix.translate(10, 10)
109	117
110	118	fd = open(filename, 'w')
111		storage.save(XMLWriter(fd))
112		fd.close()
113
114		~~UML~~.flush()
115		assert not list(~~UML~~.select())
116
117		storage.load(filename)
118
119		assert len(~~UML~~.lselect()) == 5
120		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Package))) == 1
121		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Diagram))) == 1
122		d = ~~UML~~.lselect(lambda e: e.isKindOf(UML.Diagram))[0]
123		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Comment))) == 1
124		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Class))) == 1
125		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Interface))) == 1
126
127		c = ~~UML~~.lselect(lambda e: e.isKindOf(UML.Class))[0]
	119	storage.save(XMLWriter(fd), factory=self.factory)
	120	fd.close()
	121
	122	self.factory.flush()
	123	assert not list(self.factory.select())
	124
	125	storage.load(filename, factory=self.factory)
	126
	127	assert len(self.factory.lselect()) == 5
	128	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Package))) == 1
	129	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Diagram))) == 1
	130	d = self.factory.lselect(lambda e: e.isKindOf(UML.Diagram))[0]
	131	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Comment))) == 1
	132	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Class))) == 1
	133	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Interface))) == 1
	134
	135	c = self.factory.lselect(lambda e: e.isKindOf(UML.Class))[0]
128	136	assert c.presentation
129	137	assert c.presentation[0].subject is c
130	138	#assert c.presentation[0].subject.name.startwith('Class')
131	139
132		iface = ~~UML~~.lselect(lambda e: e.isKindOf(UML.Interface))[0]
	140	iface = self.factory.lselect(lambda e: e.isKindOf(UML.Interface))[0]
133	141	assert iface.name == 'Circus'
134	142	assert len(iface.presentation) == 1
…	…
150	158	filename = '%s.gaphor' % __module__
151	159
152		~~UML~~.create(UML.Package)
153		diagram = ~~UML~~.create(UML.Diagram)
154		diagram.create(items.CommentItem, subject=~~UML~~.create(UML.Comment))
155		c1 = diagram.create(items.ClassItem, subject=~~UML~~.create(UML.Class))
	160	self.factory.create(UML.Package)
	161	diagram = self.factory.create(UML.Diagram)
	162	diagram.create(items.CommentItem, subject=self.factory.create(UML.Comment))
	163	c1 = diagram.create(items.ClassItem, subject=self.factory.create(UML.Class))
156	164
157	165	a = diagram.create(items.AssociationItem)
…	…
163	171
164	172	fd = open(filename, 'w')
165		storage.save(XMLWriter(fd))
166		fd.close()
167
168		~~UML~~.flush()
169		assert not list(~~UML~~.select())
170
171		storage.load(filename)
172
173		assert len(~~UML~~.lselect()) == 4
174		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Package))) == 1
175		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Diagram))) == 1
176		d = ~~UML~~.lselect(lambda e: e.isKindOf(UML.Diagram))[0]
177		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Comment))) == 1
178		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Class))) == 1
179		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Association))) == 0
	173	storage.save(XMLWriter(fd), factory=self.factory)
	174	fd.close()
	175
	176	self.factory.flush()
	177	assert not list(self.factory.select())
	178
	179	storage.load(filename, factory=self.factory)
	180
	181	assert len(self.factory.lselect()) == 4
	182	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Package))) == 1
	183	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Diagram))) == 1
	184	d = self.factory.lselect(lambda e: e.isKindOf(UML.Diagram))[0]
	185	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Comment))) == 1
	186	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Class))) == 1
	187	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Association))) == 0
180	188
181	189	# Check load/save of other canvas items.
…	…
198	206	filename = '%s_c.gaphor' % __module__
199	207
200		diagram = ~~UML~~.create(UML.Diagram)
201		c1 = diagram.create(items.ClassItem, subject=~~UML~~.create(UML.Class))
202		c2 = diagram.create(items.ClassItem, subject=~~UML~~.create(UML.Class))
	208	diagram = self.factory.create(UML.Diagram)
	209	c1 = diagram.create(items.ClassItem, subject=self.factory.create(UML.Class))
	210	c2 = diagram.create(items.ClassItem, subject=self.factory.create(UML.Class))
203	211	c2.matrix.translate(200, 200)
204	212	diagram.canvas.update_matrix(c2)
…	…
206	214
207	215	a = diagram.create(items.AssociationItem)
	216
	217	# Provide our element factory as Utility, since the connect adapters
	218	# depend on it.
	219	from gaphor.interfaces import IService
	220	component.provideUtility(self.factory, IService, 'element_factory')
208	221
209	222	adapter = component.queryMultiAdapter((c1, a), IConnect)
…	…
227	240
228	241	fd = open(filename, 'w')
229		storage.save(XMLWriter(fd))
	242	storage.save(XMLWriter(fd), factory=self.factory)
230	243	fd.close()
231	244
232	245	old_a_subject_id = a.subject.id
233	246
234		~~UML~~.flush()
235		assert not list(~~UML~~.select())
236
237		storage.load(filename)
238
239		assert len(~~UML~~.lselect(lambda e: e.isKindOf(UML.Diagram))) == 1
240		d = ~~UML~~.lselect(lambda e: e.isKindOf(UML.Diagram))[0]
	247	self.factory.flush()
	248	assert not list(self.factory.select())
	249
	250	storage.load(filename, factory=self.factory)
	251
	252	assert len(self.factory.lselect(lambda e: e.isKindOf(UML.Diagram))) == 1
	253	d = self.factory.lselect(lambda e: e.isKindOf(UML.Diagram))[0]
241	254	a = d.canvas.select(lambda e: isinstance(e, items.AssociationItem))[0]
242	255	assert a.subject

gaphor/trunk/gaphor/ui/stock.py

r1239	r1247
126	126
127	127	filename = pkg_resources.resource_filename('gaphor', 'data/icons.xml')
128		if os.name == 'nt' ~~and data_dir[1] == ':'~~:
	128	if os.name == 'nt':
129	129	# Make the filename a full URL
130	130	filename = 'file:' + filename.replace('\\\\', '/')

gaphor/trunk/setup.py

r1245	r1247
63	63	# 'PyGTK >= 2.8.0', - Exclude, since it will not build anyway
64	64	'decorator >= 2.0.1',
65		'gaphas >= 0.1.5',
	65	'gaphas >= 0.1.5.dev-r1235',
66	66	'zope.component >= 3.3.0', # - won't compile on windows.
67	67	# Add dependency on zope.testing to work around bug in zope.component

Download in other formats: