Improved version checks when in font outline tests.

Author: cherez

test/font_test.py

@@ -688,6 +688,9 @@ def test_point_size_method(self):
         self.assertRaises(ValueError, f.set_point_size, -500)
         self.assertRaises(TypeError, f.set_point_size, "15")
 
+    @unittest.skipIf(
+        pygame.font.get_sdl_ttf_version() < (2, 0, 12), "outlines were added in SDL_TTF 2.0.12"
+    )
     def test_outline_property(self):
         if pygame_font.__name__ == "pygame.ftfont":
             return  # not a pygame.ftfont feature
@@ -698,14 +701,6 @@ def test_outline_property(self):
         )
         f = pygame_font.Font(pathlib.Path(font_path), 25)
 
-        ttf_version = pygame_font.get_sdl_ttf_version()
-        if ttf_version < (2, 0, 12):
-            with self.assertRaises(pygame.error):
-                f.outline = 0
-            with self.assertRaises(pygame.error):
-                _ = f.outline
-            return
-
         # Default outline should be an integer >= 0 (typically 0)
         self.assertIsInstance(f.outline, int)
         self.assertGreaterEqual(f.outline, 0)
@@ -727,7 +722,10 @@ def test_incorrect_type():
         self.assertRaises(ValueError, test_neg)
         self.assertRaises(TypeError, test_incorrect_type)
 
-    def test_outline_method(self):
+    @unittest.skipIf(
+        pygame.font.get_sdl_ttf_version() >= (2, 0, 12), "outlines were added in SDL_TTF 2.0.12"
+    )
+    def test_outline_property_stub(self):
         if pygame_font.__name__ == "pygame.ftfont":
             return  # not a pygame.ftfont feature
 
@@ -737,11 +735,24 @@ def test_outline_method(self):
         )
         f = pygame_font.Font(pathlib.Path(font_path), 25)
 
-        ttf_version = pygame_font.get_sdl_ttf_version()
-        if ttf_version < (2, 0, 12):
-            self.assertRaises(pygame.error, f.get_outline)
-            self.assertRaises(pygame.error, f.set_outline, 1)
-            return
+        with self.assertRaises(pygame.error):
+            f.outline = 0
+        with self.assertRaises(pygame.error):
+            _ = f.outline
+
+
+    @unittest.skipIf(
+        pygame.font.get_sdl_ttf_version() < (2, 0, 12), "outlines were added in SDL_TTF 2.0.12"
+    )
+    def test_outline_method(self):
+        if pygame_font.__name__ == "pygame.ftfont":
+            return  # not a pygame.ftfont feature
+
+        pygame_font.init()
+        font_path = os.path.join(
+            os.path.split(pygame.__file__)[0], pygame_font.get_default_font()
+        )
+        f = pygame_font.Font(pathlib.Path(font_path), 25)
 
         val0 = f.get_outline()
         self.assertIsInstance(val0, int)
@@ -752,6 +763,22 @@ def test_outline_method(self):
         self.assertRaises(ValueError, f.set_outline, -1)
         self.assertRaises(TypeError, f.set_outline, "2")
 
+    @unittest.skipIf(
+        pygame.font.get_sdl_ttf_version() >= (2, 0, 12), "outlines were added in SDL_TTF 2.0.12"
+    )
+    def test_outline_method_stub(self):
+        if pygame_font.__name__ == "pygame.ftfont":
+            return  # not a pygame.ftfont feature
+
+        pygame_font.init()
+        font_path = os.path.join(
+            os.path.split(pygame.__file__)[0], pygame_font.get_default_font()
+        )
+        f = pygame_font.Font(pathlib.Path(font_path), 25)
+
+        self.assertRaises(pygame.error, f.get_outline)
+        self.assertRaises(pygame.error, f.set_outline, 1)
+
     def test_font_name(self):
         f = pygame_font.Font(None, 20)
         self.assertEqual(f.name, "FreeSans")
@@ -1208,15 +1235,17 @@ def query(
         f.set_italic(italic)
         f.set_underline(underline)
         f.set_strikethrough(strikethrough)
-        f.set_outline(outline)
+        if pygame.font.get_sdl_ttf_version() >= (2, 0, 12):
+            f.set_outline(outline)
         s = f.render(text, antialiase, (0, 0, 0))
         screen.blit(s, (offset, y))
         y += s.get_size()[1] + spacing
         f.set_bold(False)
         f.set_italic(False)
         f.set_underline(False)
         f.set_strikethrough(False)
-        f.set_outline(0)
+        if pygame.font.get_sdl_ttf_version() >= (2, 0, 12):
+            f.set_outline(0)
         s = f.render("(some comparison text)", False, (0, 0, 0))
         screen.blit(s, (offset, y))
         pygame.display.flip()
@@ -1258,6 +1287,9 @@ def test_italic_underline(self):
     def test_bold_strikethrough(self):
         self.assertTrue(self.query(bold=True, strikethrough=True))
 
+    @unittest.skipIf(
+        pygame.font.get_sdl_ttf_version() < (2, 0, 12), "outlines were added in SDL_TTF 2.0.12"
+    )
     def test_outline(self):
         self.assertTrue(self.query(outline=1))