1 files changed, 56 insertions, 193 deletions
diff --git a/Lib/idlelib/idle_test/test_textview.py b/Lib/idlelib/idle_test/test_textview.py
index 7189378..fa437fc 100644
--- a/Lib/idlelib/idle_test/test_textview.py
+++ b/Lib/idlelib/idle_test/test_textview.py
@@ -1,232 +1,95 @@
-"""Test textview, coverage 100%.
+'''Test the functions and main class method of textView.py.'''
 
-Since all methods and functions create (or destroy) a ViewWindow, which
-is a widget containing a widget, etcetera, all tests must be gui tests.
-Using mock Text would not change this.  Other mocks are used to retrieve
-information about calls.
-"""
-from idlelib import textview as tv
-from test.support import requires
-requires('gui')
-
-import os
 import unittest
-from tkinter import Tk, TclError, CHAR, NONE, WORD
-from tkinter.ttk import Button
+import os
+from test.test_support import requires
+from Tkinter import Tk
+from idlelib import textView as tv
 from idlelib.idle_test.mock_idle import Func
-from idlelib.idle_test.mock_tk import Mbox_func
-
-def setUpModule():
-    global root
-    root = Tk()
-    root.withdraw()
-
-def tearDownModule():
-    global root
-    root.update_idletasks()
-    root.destroy()
-    del root
-
-# If we call ViewWindow or wrapper functions with defaults
-# modal=True, _utest=False, test hangs on call to wait_window.
-# Have also gotten tk error 'can't invoke "event" command'.
+from idlelib.idle_test.mock_tk import Mbox
 
 
-class VW(tv.ViewWindow):  # Used in ViewWindowTest.
+class TV(tv.TextViewer):  # Use in TextViewTest
     transient = Func()
     grab_set = Func()
     wait_window = Func()
 
-
-# Call wrapper class VW with mock wait_window.
-class ViewWindowTest(unittest.TestCase):
-
-    def setUp(self):
-        VW.transient.__init__()
-        VW.grab_set.__init__()
-        VW.wait_window.__init__()
-
-    def test_init_modal(self):
-        view = VW(root, 'Title', 'test text')
-        self.assertTrue(VW.transient.called)
-        self.assertTrue(VW.grab_set.called)
-        self.assertTrue(VW.wait_window.called)
-        view.ok()
-
-    def test_init_nonmodal(self):
-        view = VW(root, 'Title', 'test text', modal=False)
-        self.assertFalse(VW.transient.called)
-        self.assertFalse(VW.grab_set.called)
-        self.assertFalse(VW.wait_window.called)
-        view.ok()
-
-    def test_ok(self):
-        view = VW(root, 'Title', 'test text', modal=False)
-        view.destroy = Func()
-        view.ok()
-        self.assertTrue(view.destroy.called)
-        del view.destroy  # Unmask real function.
-        view.destroy()
-
-
-class AutoHideScrollbarTest(unittest.TestCase):
-    # Method set is tested in ScrollableTextFrameTest
-    def test_forbidden_geometry(self):
-        scroll = tv.AutoHideScrollbar(root)
-        self.assertRaises(TclError, scroll.pack)
-        self.assertRaises(TclError, scroll.place)
-
-
-class ScrollableTextFrameTest(unittest.TestCase):
+class textviewClassTest(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.root = root = Tk()
-        root.withdraw()
+        requires('gui')
+        cls.root = Tk()
+        cls.root.withdraw()
 
     @classmethod
     def tearDownClass(cls):
-        cls.root.update_idletasks()
         cls.root.destroy()
         del cls.root
 
-    def make_frame(self, wrap=NONE, **kwargs):
-        frame = tv.ScrollableTextFrame(self.root, wrap=wrap, **kwargs)
-        def cleanup_frame():
-            frame.update_idletasks()
-            frame.destroy()
-        self.addCleanup(cleanup_frame)
-        return frame
-
-    def test_line1(self):
-        frame = self.make_frame()
-        frame.text.insert('1.0', 'test text')
-        self.assertEqual(frame.text.get('1.0', '1.end'), 'test text')
+    def setUp(self):
+        TV.transient.__init__()
+        TV.grab_set.__init__()
+        TV.wait_window.__init__()
 
-    def test_horiz_scrollbar(self):
-        # The horizontal scrollbar should be shown/hidden according to
-        # the 'wrap' setting: It should only be shown when 'wrap' is
-        # set to NONE.
+    def test_init_modal(self):
+        view = TV(self.root, 'Title', 'test text')
+        self.assertTrue(TV.transient.called)
+        self.assertTrue(TV.grab_set.called)
+        self.assertTrue(TV.wait_window.called)
+        view.Ok()
 
-        # wrap = NONE -> with horizontal scrolling
-        frame = self.make_frame(wrap=NONE)
-        self.assertEqual(frame.text.cget('wrap'), NONE)
-        self.assertIsNotNone(frame.xscroll)
+    def test_init_nonmodal(self):
+        view = TV(self.root, 'Title', 'test text', modal=False)
+        self.assertFalse(TV.transient.called)
+        self.assertFalse(TV.grab_set.called)
+        self.assertFalse(TV.wait_window.called)
+        view.Ok()
 
-        # wrap != NONE -> no horizontal scrolling
-        for wrap in [CHAR, WORD]:
-            with self.subTest(wrap=wrap):
-                frame = self.make_frame(wrap=wrap)
-                self.assertEqual(frame.text.cget('wrap'), wrap)
-                self.assertIsNone(frame.xscroll)
+    def test_ok(self):
+        view = TV(self.root, 'Title', 'test text', modal=False)
+        view.destroy = Func()
+        view.Ok()
+        self.assertTrue(view.destroy.called)
+        del view.destroy  # Unmask the real function.
+        view.destroy()
 
 
-class ViewFrameTest(unittest.TestCase):
+class ViewFunctionTest(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.root = root = Tk()
-        root.withdraw()
-        cls.frame = tv.ViewFrame(root, 'test text')
+        requires('gui')
+        cls.root = Tk()
+        cls.root.withdraw()
+        cls.orig_mbox = tv.tkMessageBox
+        tv.tkMessageBox = Mbox
 
     @classmethod
     def tearDownClass(cls):
-        del cls.frame
-        cls.root.update_idletasks()
         cls.root.destroy()
         del cls.root
-
-    def test_line1(self):
-        get = self.frame.text.get
-        self.assertEqual(get('1.0', '1.end'), 'test text')
-
-
-# Call ViewWindow with modal=False.
-class ViewFunctionTest(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.orig_error = tv.showerror
-        tv.showerror = Mbox_func()
-
-    @classmethod
-    def tearDownClass(cls):
-        tv.showerror = cls.orig_error
-        del cls.orig_error
+        tv.tkMessageBox = cls.orig_mbox
+        del cls.orig_mbox
 
     def test_view_text(self):
-        view = tv.view_text(root, 'Title', 'test text', modal=False)
-        self.assertIsInstance(view, tv.ViewWindow)
-        self.assertIsInstance(view.viewframe, tv.ViewFrame)
-        view.viewframe.ok()
+        # If modal True, get tkinter error 'can't invoke "event" command'.
+        view = tv.view_text(self.root, 'Title', 'test text', modal=False)
+        self.assertIsInstance(view, tv.TextViewer)
+        view.Ok()
 
     def test_view_file(self):
-        view = tv.view_file(root, 'Title', __file__, 'ascii', modal=False)
-        self.assertIsInstance(view, tv.ViewWindow)
-        self.assertIsInstance(view.viewframe, tv.ViewFrame)
-        get = view.viewframe.textframe.text.get
-        self.assertIn('Test', get('1.0', '1.end'))
-        view.ok()
-
-    def test_bad_file(self):
-        # Mock showerror will be used; view_file will return None.
-        view = tv.view_file(root, 'Title', 'abc.xyz', 'ascii', modal=False)
-        self.assertIsNone(view)
-        self.assertEqual(tv.showerror.title, 'File Load Error')
-
-    def test_bad_encoding(self):
-        p = os.path
-        fn = p.abspath(p.join(p.dirname(__file__), '..', 'CREDITS.txt'))
-        view = tv.view_file(root, 'Title', fn, 'ascii', modal=False)
+        test_dir = os.path.dirname(__file__)
+        testfile = os.path.join(test_dir, 'test_textview.py')
+        view = tv.view_file(self.root, 'Title', testfile, modal=False)
+        self.assertIsInstance(view, tv.TextViewer)
+        self.assertIn('Test', view.textView.get('1.0', '1.end'))
+        view.Ok()
+
+        # Mock messagebox will be used; view_file will return None.
+        testfile = os.path.join(test_dir, '../notthere.py')
+        view = tv.view_file(self.root, 'Title', testfile, modal=False)
         self.assertIsNone(view)
-        self.assertEqual(tv.showerror.title, 'Unicode Decode Error')
-
-    def test_nowrap(self):
-        view = tv.view_text(root, 'Title', 'test', modal=False, wrap='none')
-        text_widget = view.viewframe.textframe.text
-        self.assertEqual(text_widget.cget('wrap'), 'none')
-
-
-# Call ViewWindow with _utest=True.
-class ButtonClickTest(unittest.TestCase):
-
-    def setUp(self):
-        self.view = None
-        self.called = False
-
-    def tearDown(self):
-        if self.view:
-            self.view.destroy()
-
-    def test_view_text_bind_with_button(self):
-        def _command():
-            self.called = True
-            self.view = tv.view_text(root, 'TITLE_TEXT', 'COMMAND', _utest=True)
-        button = Button(root, text='BUTTON', command=_command)
-        button.invoke()
-        self.addCleanup(button.destroy)
-
-        self.assertEqual(self.called, True)
-        self.assertEqual(self.view.title(), 'TITLE_TEXT')
-        self.assertEqual(self.view.viewframe.textframe.text.get('1.0', '1.end'),
-                         'COMMAND')
-
-    def test_view_file_bind_with_button(self):
-        def _command():
-            self.called = True
-            self.view = tv.view_file(root, 'TITLE_FILE', __file__,
-                                     encoding='ascii', _utest=True)
-        button = Button(root, text='BUTTON', command=_command)
-        button.invoke()
-        self.addCleanup(button.destroy)
-
-        self.assertEqual(self.called, True)
-        self.assertEqual(self.view.title(), 'TITLE_FILE')
-        get = self.view.viewframe.textframe.text.get
-        with open(__file__) as f:
-            self.assertEqual(get('1.0', '1.end'), f.readline().strip())
-            f.readline()
-            self.assertEqual(get('3.0', '3.end'), f.readline().strip())
 
 
 if __name__ == '__main__':