[pygobject] tests: Move cairo tests into test_cairo.py

[Simon Feltman <sfeltman src gnome org>]

commit 4ee91a4cd0018d069c7aaf66d83e2f8235f2262a
Author: Simon Feltman <sfeltman src gnome org>
Date:   Mon May 5 19:48:06 2014 -0700

    tests: Move cairo tests into test_cairo.py
    
    Move cairo related tests from test_everything.py into test_cairo.py
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694604

 tests/Makefile.am        |    1 +
 tests/test_cairo.py      |   67 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/test_everything.py |   43 +----------------------------
 3 files changed, 69 insertions(+), 42 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4094ce6..5529abc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -84,6 +84,7 @@ EXTRA_DIST = \
        test-unknown.h \
        te_ST nouppera \
        org.gnome.test.gschema.xml \
+       test_cairo.py \
        test_error.py \
        test_gio.py \
        test_glib.py \
diff --git a/tests/test_cairo.py b/tests/test_cairo.py
new file mode 100644
index 0000000..4674068
--- /dev/null
+++ b/tests/test_cairo.py
@@ -0,0 +1,67 @@
+# -*- Mode: Python; py-indent-offset: 4 -*-
+# coding=utf-8
+# vim: tabstop=4 shiftwidth=4 expandtab
+
+import unittest
+
+try:
+    import cairo
+    from gi.repository import Regress
+    has_cairo = True
+except ImportError:
+    has_cairo = False
+
+try:
+    from gi.repository import Gtk
+    Gtk  # pyflakes
+except:
+    Gtk = None
+
+
+ unittest skipUnless(has_cairo, 'built without cairo support')
+class Test(unittest.TestCase):
+    def test_cairo_context(self):
+        context = Regress.test_cairo_context_full_return()
+        self.assertTrue(isinstance(context, cairo.Context))
+
+        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 10, 10)
+        context = cairo.Context(surface)
+        Regress.test_cairo_context_none_in(context)
+
+    def test_cairo_surface(self):
+        surface = Regress.test_cairo_surface_none_return()
+        self.assertTrue(isinstance(surface, cairo.ImageSurface))
+        self.assertTrue(isinstance(surface, cairo.Surface))
+        self.assertEqual(surface.get_format(), cairo.FORMAT_ARGB32)
+        self.assertEqual(surface.get_width(), 10)
+        self.assertEqual(surface.get_height(), 10)
+
+        surface = Regress.test_cairo_surface_full_return()
+        self.assertTrue(isinstance(surface, cairo.ImageSurface))
+        self.assertTrue(isinstance(surface, cairo.Surface))
+        self.assertEqual(surface.get_format(), cairo.FORMAT_ARGB32)
+        self.assertEqual(surface.get_width(), 10)
+        self.assertEqual(surface.get_height(), 10)
+
+        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 10, 10)
+        Regress.test_cairo_surface_none_in(surface)
+
+        surface = Regress.test_cairo_surface_full_out()
+        self.assertTrue(isinstance(surface, cairo.ImageSurface))
+        self.assertTrue(isinstance(surface, cairo.Surface))
+        self.assertEqual(surface.get_format(), cairo.FORMAT_ARGB32)
+        self.assertEqual(surface.get_width(), 10)
+        self.assertEqual(surface.get_height(), 10)
+
+
+ unittest skipUnless(has_cairo, 'built without cairo support')
+ unittest skipUnless(Gtk, 'Gtk not available')
+class TestPango(unittest.TestCase):
+    def test_cairo_font_options(self):
+        screen = Gtk.Window().get_screen()
+        font_opts = screen.get_font_options()
+        self.assertEqual(type(font_opts.get_subpixel_order()), int)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/test_everything.py b/tests/test_everything.py
index cc79dc3..f6017e4 100644
--- a/tests/test_everything.py
+++ b/tests/test_everything.py
@@ -10,6 +10,7 @@ import sys
 
 try:
     import cairo
+    cairo  # Pyflakes
     has_cairo = True
     from gi.repository import Regress as Everything
 except ImportError:
@@ -46,39 +47,6 @@ class RawGList(ctypes.Structure):
 @unittest.skipUnless(has_cairo, 'built without cairo support')
 class TestEverything(unittest.TestCase):
 
-    def test_cairo_context(self):
-        context = Everything.test_cairo_context_full_return()
-        self.assertTrue(isinstance(context, cairo.Context))
-
-        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 10, 10)
-        context = cairo.Context(surface)
-        Everything.test_cairo_context_none_in(context)
-
-    def test_cairo_surface(self):
-        surface = Everything.test_cairo_surface_none_return()
-        self.assertTrue(isinstance(surface, cairo.ImageSurface))
-        self.assertTrue(isinstance(surface, cairo.Surface))
-        self.assertEqual(surface.get_format(), cairo.FORMAT_ARGB32)
-        self.assertEqual(surface.get_width(), 10)
-        self.assertEqual(surface.get_height(), 10)
-
-        surface = Everything.test_cairo_surface_full_return()
-        self.assertTrue(isinstance(surface, cairo.ImageSurface))
-        self.assertTrue(isinstance(surface, cairo.Surface))
-        self.assertEqual(surface.get_format(), cairo.FORMAT_ARGB32)
-        self.assertEqual(surface.get_width(), 10)
-        self.assertEqual(surface.get_height(), 10)
-
-        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 10, 10)
-        Everything.test_cairo_surface_none_in(surface)
-
-        surface = Everything.test_cairo_surface_full_out()
-        self.assertTrue(isinstance(surface, cairo.ImageSurface))
-        self.assertTrue(isinstance(surface, cairo.Surface))
-        self.assertEqual(surface.get_format(), cairo.FORMAT_ARGB32)
-        self.assertEqual(surface.get_width(), 10)
-        self.assertEqual(surface.get_height(), 10)
-
     def test_bool(self):
         self.assertEqual(Everything.test_boolean(False), False)
         self.assertEqual(Everything.test_boolean(True), True)
@@ -1346,12 +1314,3 @@ class TestSignals(unittest.TestCase):
         self.assertEqual(obj.callback_i, 42)
         self.assertEqual(type(rv), GLib.Array)
         self.assertEqual(rv.len, 2)
-
-
- unittest skipUnless(has_cairo, 'built without cairo support')
- unittest skipUnless(Gtk, 'Gtk not available')
-class TestPango(unittest.TestCase):
-    def test_cairo_font_options(self):
-        screen = Gtk.Window().get_screen()
-        font_opts = screen.get_font_options()
-        self.assertEqual(type(font_opts.get_subpixel_order()), int)