Refactor test_configure_highlightthickness.

Author: serhiy-storchaka

Lib/test/test_tkinter/test_widgets.py

@@ -144,11 +144,7 @@ def test_configure_labelwidget(self):
 
 class AbstractLabelTest(AbstractWidgetTest, IntegerSizeTests):
     _conv_pixels = False
-
-    def test_configure_highlightthickness(self):
-        widget = self.create()
-        self.checkPixelsParam(widget, 'highlightthickness',
-                              0, 1.3, 2.6, 6, -2, '10p')
+    clip_highlightthickness = False
 
 
 @add_standard_options(StandardOptionsTests)
@@ -280,6 +276,7 @@ class MenubuttonTest(AbstractLabelTest, unittest.TestCase):
         'underline', 'width', 'wraplength',
     )
     _conv_pixels = round
+    clip_highlightthickness = True
 
     def create(self, **kwargs):
         return tkinter.Menubutton(self.root, **kwargs)
@@ -293,9 +290,6 @@ def test_configure_height(self):
         widget = self.create()
         self.checkIntegerParam(widget, 'height', 100, -100, 0, conv=str)
 
-    test_configure_highlightthickness = \
-        StandardOptionsTests.test_configure_highlightthickness
-
     def test_configure_image(self):
         widget = self.create()
         image = tkinter.PhotoImage(master=self.root, name='image1')
@@ -1482,6 +1476,7 @@ class MessageTest(AbstractWidgetTest, unittest.TestCase):
     _conv_pad_pixels = False
     if tk_version >= (8, 7):
         _conv_pixels = False
+        clip_highlightthickness = False
 
     def create(self, **kwargs):
         return tkinter.Message(self.root, **kwargs)
@@ -1490,14 +1485,6 @@ def test_configure_aspect(self):
         widget = self.create()
         self.checkIntegerParam(widget, 'aspect', 250, 0, -300)
 
-    def test_configure_highlightthickness(self):
-        widget = self.create()
-        self.checkPixelsParam(widget, 'highlightthickness',
-                              0, 1.3, 2.6, 6, '10p')
-        expected = -2 if tk_version >= (8, 7) else 0
-        self.checkParam(widget, 'highlightthickness', -2, expected=expected,
-                        conv=self._conv_pad_pixels)
-
 
 class DefaultRootTest(AbstractDefaultRootTest, unittest.TestCase):
 

Lib/test/test_tkinter/widget_tests.py

@@ -13,6 +13,7 @@ class AbstractWidgetTest(AbstractTkTest):
     _conv_pixels = round
     _conv_pad_pixels = None
     _stringify = False
+    clip_highlightthickness = True
 
     @property
     def scaling(self):
@@ -305,7 +306,8 @@ def test_configure_highlightthickness(self):
         widget = self.create()
         self.checkPixelsParam(widget, 'highlightthickness',
                               0, 1.3, 2.6, 6, '10p')
-        self.checkParam(widget, 'highlightthickness', -2, expected=0,
+        expected = 0 if self.clip_highlightthickness else -2
+        self.checkParam(widget, 'highlightthickness', -2, expected=expected,
                         conv=self._conv_pixels)
 
     def test_configure_image(self):