Fix filter tests

4 files changed, 25 insertions, 30 deletions

diff --git a/tests/test_fft.py b/tests/test_fft.py
index 98f0011..409fc19 100644
--- a/tests/test_fft.py
+++ b/tests/test_fft.py
@@ -12,19 +12,19 @@ class TestFFT(ufotest.UfoTestCase):
 
         ufotest.write_lena(src)
 
-        rd = self.g.get_filter('reader')
-        fft = self.g.get_filter('fft')
-        ifft = self.g.get_filter('ifft')
-        wr = self.g.get_filter('writer')
+        rd = self.pm.get_filter('reader')
+        fft = self.pm.get_filter('fft')
+        ifft = self.pm.get_filter('ifft')
+        wr = self.pm.get_filter('writer')
 
         rd.set_properties(path=src)
         wr.set_properties(path='.', prefix='foo-')
         fft.set_properties(dimensions=1)
         ifft.set_properties(dimensions=1)
 
-        rd.connect_to(fft)
-        fft.connect_to(ifft)
-        ifft.connect_to(wr)
+        self.g.connect_filters(rd, fft)
+        self.g.connect_filters(fft, ifft)
+        self.g.connect_filters(ifft, wr)
         self.g.run()
 
         original = TIFF.open(src, mode='r').read_image()
@@ -42,19 +42,19 @@ class TestFFT(ufotest.UfoTestCase):
 
         ufotest.write_lena(src)
 
-        rd = self.g.get_filter('reader')
-        fft = self.g.get_filter('fft')
-        ifft = self.g.get_filter('ifft')
-        wr = self.g.get_filter('writer')
+        rd = self.pm.get_filter('reader')
+        fft = self.pm.get_filter('fft')
+        ifft = self.pm.get_filter('ifft')
+        wr = self.pm.get_filter('writer')
 
         rd.set_properties(path=src)
         wr.set_properties(path='.', prefix='foo-')
         fft.set_properties(dimensions=2)
         ifft.set_properties(dimensions=2)
 
-        rd.connect_to(fft)
-        fft.connect_to(ifft)
-        ifft.connect_to(wr)
+        self.g.connect_filters(rd, fft)
+        self.g.connect_filters(fft, ifft)
+        self.g.connect_filters(ifft, wr)
         self.g.run()
 
         original = TIFF.open(src, mode='r').read_image()
diff --git a/tests/test_rw.py b/tests/test_rw.py
index b664b9a..46421e4 100644
--- a/tests/test_rw.py
+++ b/tests/test_rw.py
@@ -12,12 +12,12 @@ class TestWriteEqual(ufotest.UfoTestCase):
 
         ufotest.write_lena(src)
 
-        rd = self.g.get_filter('reader')
-        wr = self.g.get_filter('writer')
+        rd = self.pm.get_filter('reader')
+        wr = self.pm.get_filter('writer')
         rd.set_properties(path=src)
         wr.set_properties(path='.', prefix='foo-')
 
-        rd.connect_to(wr)
+        self.g.connect_filters(rd, wr)
         self.g.run()
 
         original = TIFF.open(src, mode='r').read_image()
diff --git a/tests/test_rw_partial.py b/tests/test_rw_partial.py
index 237aead..aeb8b52 100644
--- a/tests/test_rw_partial.py
+++ b/tests/test_rw_partial.py
@@ -12,12 +12,12 @@ class TestWriteRoi(ufotest.UfoTestCase):
 
         ufotest.write_lena(src)
 
-        rd = self.g.get_filter('reader')
-        wr = self.g.get_filter('writer')
+        rd = self.pm.get_filter('reader')
+        wr = self.pm.get_filter('writer')
         rd.set_properties(path=src, region_of_interest=True, x=32, y=16, width=512-32, height=256)
         wr.set_properties(path='.', prefix='foo-')
 
-        rd.connect_to(wr)
+        self.g.connect_filters(rd, wr)
         self.g.run()
 
         original = TIFF.open(src, mode='r').read_image()
diff --git a/tests/ufotest.py b/tests/ufotest.py
index de4dd13..7688992 100644
--- a/tests/ufotest.py
+++ b/tests/ufotest.py
@@ -13,20 +13,15 @@ def write_lena(path):
 
 class UfoTestCase(unittest.TestCase):
     def setUp(self):
-        def ignore_message(domain, level, message, user):
-            pass
-
-        GLib.log_set_handler("Ufo", GLib.LogLevelFlags.LEVEL_MASK,
-                ignore_message, None)
-
-        GLib.log_set_handler("GLib-GObject", GLib.LogLevelFlags.LEVEL_MASK,
-                ignore_message, None)
-
         fp = 'UFO_FILTER_PATH'
+
         if fp in os.environ:
-            self.g = Ufo.Graph(paths=os.environ[fp])
+            paths = os.environ[fp]
+            self.g = Ufo.Graph(paths=paths)
+            self.pm = Ufo.PluginManager(paths=paths)
         else:
             self.g = Ufo.Graph()
+            self.pm = Ufo.PluginManager()
 
     def assertEqualDelta(self, a, b, delta):
         assert(abs(a - b) < delta)