1 files changed, 14 insertions, 28 deletions
diff --git a/Lib/idlelib/idle_test/test_autoexpand.py b/Lib/idlelib/idle_test/test_autoexpand.py
index e734a8b..6be4fbf 100644
--- a/Lib/idlelib/idle_test/test_autoexpand.py
+++ b/Lib/idlelib/idle_test/test_autoexpand.py
@@ -1,12 +1,12 @@
-"Test autoexpand, coverage 100%."
-
-from idlelib.autoexpand import AutoExpand
+"""Unit tests for idlelib.AutoExpand"""
 import unittest
-from test.support import requires
-from tkinter import Text, Tk
+from test.test_support import requires
+from Tkinter import Text, Tk
+#from idlelib.idle_test.mock_tk import Text
+from idlelib.AutoExpand import AutoExpand
 
 
-class DummyEditwin:
+class Dummy_Editwin:
     # AutoExpand.__init__ only needs .text
     def __init__(self, text):
         self.text = text
@@ -15,26 +15,13 @@ class AutoExpandTest(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        requires('gui')
-        cls.tk = Tk()
-        cls.text = Text(cls.tk)
-        cls.auto_expand = AutoExpand(DummyEditwin(cls.text))
-        cls.auto_expand.bell = lambda: None
-
-# If mock_tk.Text._decode understood indexes 'insert' with suffixed 'linestart',
-# 'wordstart', and 'lineend', used by autoexpand, we could use the following
-# to run these test on non-gui machines (but check bell).
-##        try:
-##            requires('gui')
-##            #raise ResourceDenied()  # Uncomment to test mock.
-##        except ResourceDenied:
-##            from idlelib.idle_test.mock_tk import Text
-##            cls.text = Text()
-##            cls.text.bell = lambda: None
-##        else:
-##            from tkinter import Tk, Text
-##            cls.tk = Tk()
-##            cls.text = Text(cls.tk)
+        if 'Tkinter' in str(Text):
+            requires('gui')
+            cls.tk = Tk()
+            cls.text = Text(cls.tk)
+        else:
+            cls.text = Text()
+        cls.auto_expand = AutoExpand(Dummy_Editwin(cls.text))
 
     @classmethod
     def tearDownClass(cls):
@@ -91,7 +78,7 @@ class AutoExpandTest(unittest.TestCase):
         equal(previous(), 'a')
 
     def test_after_only(self):
-        # Also add punctuation 'noise' that should be ignored.
+        # Also add punctuation 'noise' that shoud be ignored.
         text = self.text
         previous = self.auto_expand.getprevword
         expand = self.auto_expand.expand_word_event
@@ -150,6 +137,5 @@ class AutoExpandTest(unittest.TestCase):
         new_state = self.auto_expand.state
         self.assertNotEqual(initial_state, new_state)
 
-
 if __name__ == '__main__':
     unittest.main(verbosity=2)