[Skencil-commits] r533 - skencil/trunk/test
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sun Mar 5 01:07:40 CET 2006
Author: bh
Date: 2006-03-05 01:07:40 +0100 (Sun, 05 Mar 2006)
New Revision: 533
Modified:
skencil/trunk/test/ChangeLog
skencil/trunk/test/test_tools.py
Log:
* test_tools.py (TestTools.setUp, TestTools.tearDown): Don't
create/delete a Context instance anymore.
(TestTools.test_edittool_with_temporary)
(TestTools.test_polyline_tool_with_temporaries_chain)
(TestTools.test_clear_chain, TestTools.test_cancel_temporary):
call the editor's SetTool method directly.
(TestZoomTool.setUp, TestZoomTool.tearDown): Don't create/delete a
Context instance anymore. It wasn't used anyway.
Modified: skencil/trunk/test/ChangeLog
===================================================================
--- skencil/trunk/test/ChangeLog 2006-03-05 00:04:09 UTC (rev 532)
+++ skencil/trunk/test/ChangeLog 2006-03-05 00:07:40 UTC (rev 533)
@@ -1,5 +1,16 @@
2006-03-05 Bernhard Herzog <bh at intevation.de>
+ * test_tools.py (TestTools.setUp, TestTools.tearDown): Don't
+ create/delete a Context instance anymore.
+ (TestTools.test_edittool_with_temporary)
+ (TestTools.test_polyline_tool_with_temporaries_chain)
+ (TestTools.test_clear_chain, TestTools.test_cancel_temporary):
+ call the editor's SetTool method directly.
+ (TestZoomTool.setUp, TestZoomTool.tearDown): Don't create/delete a
+ Context instance anymore. It wasn't used anyway.
+
+2006-03-05 Bernhard Herzog <bh at intevation.de>
+
* test_context.py (TestContext.test_set_tool): New. Test the
context objects SetTool method
(MockEditor.SetTool): New for test_set_tool.
Modified: skencil/trunk/test/test_tools.py
===================================================================
--- skencil/trunk/test/test_tools.py 2006-03-05 00:04:09 UTC (rev 532)
+++ skencil/trunk/test/test_tools.py 2006-03-05 00:07:40 UTC (rev 533)
@@ -30,7 +30,7 @@
from Sketch import Point, CreatePath, Rect
from Sketch.Base.const import TOOL
from Sketch.Graphics import PolyBezier
-from Sketch.Editor import EditorWithSelection, InteractiveDocument, Context, \
+from Sketch.Editor import EditorWithSelection, InteractiveDocument, \
Button1Mask, ZoomOutMask, toolmap, Button1
from Sketch.Editor.selectiontool import SelectionRectangle
from Sketch.Editor.tools import ToolInfo, TemporaryToolInstance
@@ -97,8 +97,6 @@
self.document = InteractiveDocument(create_layer = 1)
self.editor = EditorWithSelection(self.document)
self.editor.Subscribe(TOOL, self.tool_changed)
- self.context = Context(None)
- self.context.set_editor(self.editor)
self.canvas = MockCanvas()
# Make sure snapping is off
@@ -112,7 +110,7 @@
def tearDown(self):
if self.editor is not None:
self.editor.Destroy()
- self.editor = self.document = self.canvas = self.context = None
+ self.editor = self.document = self.canvas = None
toolmap.clear()
toolmap.update(self.old_toolmap)
@@ -147,7 +145,7 @@
poly = PolyBezier(paths = (path,))
self.editor.Insert(poly)
self.editor.SelectObject(poly)
- self.context.SetTool('EditTool')
+ self.editor.SetTool('EditTool')
self.assertToolActive('EditTool')
self.assertToolMessages([('EditTool',)])
# remember the tool instance
@@ -162,7 +160,7 @@
self.failUnless(editor.CurrentObject().Paths()[0].SegmentSelected(0))
# Switch to a temporary tool
- self.context.SetTool('Tool_B')
+ self.editor.SetTool('Tool_B')
self.assertToolActive('Tool_B')
self.assertToolMessages([('Tool_B',)])
tool_b = editor.Tool()
@@ -206,7 +204,7 @@
Click (this creates a second segment)
Activate SelectionTool and check the created object
"""
- self.context.SetTool('CreatePoly')
+ self.editor.SetTool('CreatePoly')
self.assertToolMessages([('CreatePoly',)])
editor = self.editor
canvas = self.canvas
@@ -219,7 +217,7 @@
editor.ButtonRelease(canvas, Point(200, 200), Button1, Button1Mask)
# Switch to the temporary tool A
- self.context.SetTool('Tool_A')
+ self.editor.SetTool('Tool_A')
self.assertToolActive('Tool_A')
self.assertToolMessages([('Tool_A',)])
tool_a = editor.Tool()
@@ -236,7 +234,7 @@
Point(20, 20), Point(20, 20), Button1Mask))
# Switch to the temporary tool B
- self.context.SetTool('Tool_B')
+ self.editor.SetTool('Tool_B')
self.assertToolActive('Tool_B')
self.assertToolMessages([('Tool_B',)])
tool_b = editor.Tool()
@@ -276,7 +274,7 @@
editor.ButtonClick(canvas, Point(200, 0), Button1, Button1Mask)
# Switch to SelectionTool
- self.context.SetTool('SelectionTool')
+ self.editor.SetTool('SelectionTool')
self.assertToolMessages([('SelectionTool',)])
obj = self.editor.CurrentObject()
self.failIf(obj is None)
@@ -293,26 +291,26 @@
This must cause the editor to call the End() method on all
temporary tools it kept in its stack.
"""
- self.context.SetTool('SelectionTool')
+ self.editor.SetTool('SelectionTool')
self.assertToolActive('SelectionTool')
# the SelectionTool is active by default. There shouldn't have
# been a TOOL message yet.
self.assertToolMessages([])
# start Tool_A
- self.context.SetTool('Tool_A')
+ self.editor.SetTool('Tool_A')
self.assertToolActive('Tool_A')
self.assertToolMessages([('Tool_A',)])
tool_a = self.editor.Tool()
# start Tool_B
- self.context.SetTool('Tool_B')
+ self.editor.SetTool('Tool_B')
self.assertToolActive('Tool_B')
self.assertToolMessages([('Tool_B',)])
tool_b = self.editor.Tool()
# swith to a non-temporary tool
- self.context.SetTool('EditTool')
+ self.editor.SetTool('EditTool')
self.assertToolActive('EditTool')
self.assertToolMessages([('EditTool',)])
@@ -326,7 +324,7 @@
"""Test canceling a temporary tool."""
canvas = self.canvas
editor = self.editor
- self.context.SetTool('Tool_A')
+ self.editor.SetTool('Tool_A')
self.assertToolActive('Tool_A')
self.assertToolMessages([('Tool_A',)])
tool_a = editor.Tool()
@@ -362,8 +360,6 @@
def setUp(self):
self.document = InteractiveDocument(create_layer = 1)
self.editor = EditorWithSelection(self.document)
- self.context = Context(None)
- self.context.set_editor(self.editor)
self.canvas = MockZoomCanvas()
# Make sure snapping is off
@@ -374,7 +370,7 @@
def tearDown(self):
if self.editor is not None:
self.editor.Destroy()
- self.editor = self.document = self.canvas = self.context = None
+ self.editor = self.document = self.canvas = None
def test_area_zoom_in(self):
"""Test an area zoom that zooms in"""
More information about the Skencil-commits
mailing list