Skip to content

Commit 382543d

Browse files
Clean up even more tests.
1 parent b9f8b58 commit 382543d

1 file changed

Lines changed: 4 additions & 26 deletions

File tree

Lib/test/test_tkinter/test_widgets.py

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -678,11 +678,6 @@ def test_configure_insertunfocussed(self):
678678
self.checkEnumParam(widget, 'insertunfocussed',
679679
'hollow', 'none', 'solid')
680680

681-
def test_configure_selectborderwidth(self):
682-
widget = self.create()
683-
self.checkPixelsParam(widget, 'selectborderwidth',
684-
1.3, 2.6, -2, '10p', conv=False)
685-
686681
def test_configure_spacing1(self):
687682
widget = self.create()
688683
self.checkPixelsParam(widget, 'spacing1', 20, 21.4, 22.6, -5, '0.5c')
@@ -1276,7 +1271,7 @@ def test_set(self):
12761271
self.assertRaises(TypeError, sb.set, 0.6, 0.7, 0.8)
12771272

12781273

1279-
@add_configure_tests(StandardOptionsTests)
1274+
@add_configure_tests(PixelSizeTests, StandardOptionsTests)
12801275
class PanedWindowTest(AbstractWidgetTest, unittest.TestCase):
12811276
OPTIONS = (
12821277
'background', 'borderwidth', 'cursor',
@@ -1301,13 +1296,7 @@ def test_configure_handlepad(self):
13011296

13021297
def test_configure_handlesize(self):
13031298
widget = self.create()
1304-
self.checkPixelsParam(widget, 'handlesize', 8, 9.4, 10.6, -3, '2m',
1305-
conv=False)
1306-
1307-
def test_configure_height(self):
1308-
widget = self.create()
1309-
self.checkPixelsParam(widget, 'height', 100, 101.2, 102.6, -100, 0, '1i',
1310-
conv=False)
1299+
self.checkPixelsParam(widget, 'handlesize', 8, 9.4, 10.6, -3, '2m')
13111300

13121301
def test_configure_opaqueresize(self):
13131302
widget = self.create()
@@ -1322,8 +1311,7 @@ def test_configure_proxybackground(self):
13221311
def test_configure_proxyborderwidth(self):
13231312
widget = self.create()
13241313
self.checkPixelsParam(widget, 'proxyborderwidth',
1325-
0, 1.3, 2.9, 6, -2, '10p',
1326-
conv=False)
1314+
0, 1.3, 2.9, 6, -2, '10p')
13271315

13281316
@requires_tk(8, 6, 5)
13291317
def test_configure_proxyrelief(self):
@@ -1345,18 +1333,12 @@ def test_configure_sashrelief(self):
13451333

13461334
def test_configure_sashwidth(self):
13471335
widget = self.create()
1348-
self.checkPixelsParam(widget, 'sashwidth', 10, 11.1, 15.6, -3, '1m',
1349-
conv=False)
1336+
self.checkPixelsParam(widget, 'sashwidth', 10, 11.1, 15.6, -3, '1m')
13501337

13511338
def test_configure_showhandle(self):
13521339
widget = self.create()
13531340
self.checkBooleanParam(widget, 'showhandle')
13541341

1355-
def test_configure_width(self):
1356-
widget = self.create()
1357-
self.checkPixelsParam(widget, 'width', 402, 403.4, 404.6, -402, 0, '5i',
1358-
conv=False)
1359-
13601342
def create2(self):
13611343
p = self.create()
13621344
b = tkinter.Button(p)
@@ -1552,10 +1534,6 @@ def test_configure_aspect(self):
15521534
widget = self.create()
15531535
self.checkIntegerParam(widget, 'aspect', 250, 0, -300)
15541536

1555-
def test_configure_width(self):
1556-
widget = self.create()
1557-
self.checkPixelsParam(widget, 'width', 402, 403.4, 404.6, 0, -402, '5i')
1558-
15591537

15601538
class DefaultRootTest(AbstractDefaultRootTest, unittest.TestCase):
15611539

0 commit comments

Comments
 (0)