update unittest

diff --git a/gui/brushmanager.py b/gui/brushmanager.py
index e3eeef5..0d2440d 100644 (file)
--- a/gui/brushmanager.py
+++ b/gui/brushmanager.py
@@ -147,6 +147,13 @@ class BrushManager:
         if os.path.exists(fn):
             os.remove(fn)
 
+    def get_brush_by_name(self, name):
+        # used only for testing
+        for group, brushes in self.groups.iteritems():
+            for b in brushes:
+                if b.name == name:
+                    return b
+
     def brushes_modified_cb(self, brushes):
         self.save_brushorder()
 

diff --git a/tests/test_mypaintlib.py b/tests/test_mypaintlib.py
index b044faf..432af2a 100755 (executable)
--- a/tests/test_mypaintlib.py
+++ b/tests/test_mypaintlib.py
@@ -11,7 +11,7 @@ from lib import mypaintlib, tiledsurface, brush, document, command
 def directPaint():
 
     s = tiledsurface.Surface()
-    events = load('painting30sec.dat.gz')
+    events = loadtxt('painting30sec.dat.gz')
 
     s.begin_atomic()
     for t, x, y, pressure in events:
@@ -28,7 +28,7 @@ def brushPaint():
     #b.load_from_string(open('../brushes/s006.myb').read())
     b.load_from_string(open('../brushes/charcoal.myb').read())
 
-    events = load('painting30sec.dat.gz')
+    events = loadtxt('painting30sec.dat.gz')
 
     b.set_color_rgb((0.0, 0.9, 1.0))
 
@@ -117,7 +117,7 @@ def docPaint():
     # test some actions
     doc = document.Document()
     doc.undo() # nop
-    events = load('painting30sec.dat.gz')
+    events = loadtxt('painting30sec.dat.gz')
     events = events[:len(events)/8]
     t_old = events[0][0]
     n = len(events)
@@ -231,7 +231,7 @@ def leakTest_generic(func):
 def leakTest_slow():
 
     def paint(doc):
-        events = load('painting30sec.dat.gz')
+        events = loadtxt('painting30sec.dat.gz')
         t_old = events[0][0]
         for i, (t, x, y, pressure) in enumerate(events):
             dtime = t - t_old

diff --git a/tests/test_performance.py b/tests/test_performance.py
index e229dc7..719097e 100755 (executable)
--- a/tests/test_performance.py
+++ b/tests/test_performance.py
@@ -86,14 +86,13 @@ def paint(app):
     dw = app.drawWindow
     tdw = dw.tdw
 
-    for b in app.brushes FIXME:
-        if b.name == brush:
-            app.select_brush(b)
+    b = app.brushmanager.get_brush_by_name('redbrush')
+    app.brushmanager.select_brush(b)
 
     dw.fullscreen_cb()
     yield wait_for_idle
 
-    events = load('painting30sec.dat.gz')
+    events = loadtxt('painting30sec.dat.gz')
     events = list(events)
     t0 = time()
     t_old = 0.0