Destroying each FloatCanvas instance before tearDown avoids exceptions like

this:

wx/lib/floatcanvas/FCObjects.py, line 746, in _Draw
    dc.DrawLines(Points)
TypeError: DC.DrawLines(): argument 1 has unexpected type 'numpy.ndarray'

There's a lot of code duplication between test methods in this class.
It might be better to replace each "fccanvas" with "self.fccanvas", and then
do the common tearDown stuff like "self.fccanvas.Destroy()" in one place.
However, this commit aims to make minimal changes, hencing avoiding replacing
all instances of "fccanvas" with "self.fccanvas"
This commit is contained in:
James Wettenhall
2017-03-23 22:01:06 +11:00
parent 79bd87a0e4
commit f5aca9d312

View File

@@ -14,9 +14,11 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
def test_lib_floatcanvas_floatcanvasCtor(self): def test_lib_floatcanvas_floatcanvasCtor(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
fccanvas.Destroy()
def test_lib_floatcanvas_navcanvasCtor(self): def test_lib_floatcanvas_navcanvasCtor(self):
self.navcanvas = nc.NavCanvas(self.frame) self.navcanvas = nc.NavCanvas(self.frame)
self.navcanvas.Destroy()
def test_lib_floatcanvas_fc_arc(self): def test_lib_floatcanvas_fc_arc(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -24,6 +26,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.Arc((10, 10), (20, 20), (5, 5)) obj = fc.Arc((10, 10), (20, 20), (5, 5))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_arrow(self): def test_lib_floatcanvas_fc_arrow(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -31,6 +34,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.Arrow((10, 10), 10, 10) obj = fc.Arrow((10, 10), 10, 10)
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_arrowline(self): def test_lib_floatcanvas_fc_arrowline(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -38,6 +42,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.ArrowLine((10, 10)) obj = fc.ArrowLine((10, 10))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_bitmap(self): def test_lib_floatcanvas_fc_bitmap(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -46,6 +51,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.Bitmap(bmp, (2, 2)) obj = fc.Bitmap(bmp, (2, 2))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_circle(self): def test_lib_floatcanvas_fc_circle(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -53,6 +59,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.Circle((2, 2), 2) obj = fc.Circle((2, 2), 2)
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_line(self): def test_lib_floatcanvas_fc_line(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -60,6 +67,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.Line((2, 2)) obj = fc.Line((2, 2))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_point(self): def test_lib_floatcanvas_fc_point(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -67,6 +75,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.Point((2, 2)) obj = fc.Point((2, 2))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_pointset(self): def test_lib_floatcanvas_fc_pointset(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -74,6 +83,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.PointSet((2, 2)) obj = fc.PointSet((2, 2))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_polygon(self): def test_lib_floatcanvas_fc_polygon(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -81,6 +91,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.Polygon((2, 2)) obj = fc.Polygon((2, 2))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_rectangle(self): def test_lib_floatcanvas_fc_rectangle(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -88,6 +99,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.Rectangle((2, 2), (2, 2)) obj = fc.Rectangle((2, 2), (2, 2))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_recteclips(self): def test_lib_floatcanvas_fc_recteclips(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -95,6 +107,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.RectEllipse((2, 2), (2, 2)) obj = fc.RectEllipse((2, 2), (2, 2))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_scaledbitmap(self): def test_lib_floatcanvas_fc_scaledbitmap(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -103,6 +116,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.ScaledBitmap(bmp, (2, 2), 100) obj = fc.ScaledBitmap(bmp, (2, 2), 100)
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_scaledbitmap2(self): def test_lib_floatcanvas_fc_scaledbitmap2(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -111,6 +125,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.ScaledBitmap2(bmp, (2, 2), 100) obj = fc.ScaledBitmap2(bmp, (2, 2), 100)
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_scaledtext(self): def test_lib_floatcanvas_fc_scaledtext(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -118,6 +133,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.ScaledText("some text", (2, 2), 100) obj = fc.ScaledText("some text", (2, 2), 100)
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_scaledtextbox(self): def test_lib_floatcanvas_fc_scaledtextbox(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -125,6 +141,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.ScaledTextBox("some text", (2, 2), 100) obj = fc.ScaledTextBox("some text", (2, 2), 100)
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_spline(self): def test_lib_floatcanvas_fc_spline(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -132,6 +149,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.Spline((2, 2)) obj = fc.Spline((2, 2))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_squarepoint(self): def test_lib_floatcanvas_fc_squarepoint(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -139,6 +157,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.SquarePoint((2, 2)) obj = fc.SquarePoint((2, 2))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_fc_text(self): def test_lib_floatcanvas_fc_text(self):
fccanvas = fc.FloatCanvas(self.frame) fccanvas = fc.FloatCanvas(self.frame)
@@ -146,6 +165,7 @@ class lib_floatcanvas_floatcanvas_Tests(wtc.WidgetTestCase):
obj = fc.Text("some text", (2, 2)) obj = fc.Text("some text", (2, 2))
fccanvas.AddObject(obj) fccanvas.AddObject(obj)
fccanvas.Destroy()
def test_lib_floatcanvas_floatcanvasEvents(self): def test_lib_floatcanvas_floatcanvasEvents(self):