Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move some test dummy attributes to instance.
  • Loading branch information
terryjreedy committed Jun 16, 2019
commit 845178b24c3042ba959866c6b75b6b7f6655d809
31 changes: 13 additions & 18 deletions Lib/idlelib/idle_test/test_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class Dummy_SectionName:
entry = Var()
entry_error = {}
def __init__(self, dummy_entry):
self.entry.set(dummy_entry)
self.entry = Var(value=dummy_entry)
self.entry_error['text'] = ''
def showerror(self, message):
self.entry_error['text'] = message
Expand Down Expand Up @@ -115,11 +115,9 @@ class ModuleNameTest(unittest.TestCase):
class Dummy_ModuleName:
entry_ok = query.ModuleName.entry_ok # Function being tested.
text0 = ''
entry = Var()
entry_error = {}
def __init__(self, dummy_entry):
self.entry.set(dummy_entry)
self.entry_error['text'] = ''
self.entry = Var(value=dummy_entry)
self.entry_error = {'text': ''}
def showerror(self, message):
self.entry_error['text'] = message

Expand All @@ -144,9 +142,7 @@ def test_good_module_name(self):
self.assertEqual(dialog.entry_error['text'], '')


# 3 HelpSource test classes each test one function.

orig_platform = query.platform
# 3 HelpSource test classes each test one method.

class HelpsourceBrowsefileTest(unittest.TestCase):
"Test browse_file method of ModuleName subclass of Query."
Expand Down Expand Up @@ -178,17 +174,16 @@ class HelpsourcePathokTest(unittest.TestCase):

class Dummy_HelpSource:
path_ok = query.HelpSource.path_ok
path = Var()
path_error = {}
def __init__(self, dummy_path):
self.path.set(dummy_path)
self.path_error['text'] = ''
self.path = Var(value=dummy_path)
self.path_error = {'text': ''}
def showerror(self, message, widget=None):
self.path_error['text'] = message

orig_platform = query.platform # Set in test_path_ok_file.
@classmethod
def tearDownClass(cls):
query.platform = orig_platform
query.platform = cls.orig_platform

def test_path_ok_blank(self):
dialog = self.Dummy_HelpSource(' ')
Expand Down Expand Up @@ -242,16 +237,16 @@ def test_entry_ok_helpsource(self):
self.assertEqual(dialog.entry_ok(), result)


# 2 CustomRun test classes each test one method.

class CustomRunCLIargsokTest(unittest.TestCase):
"Test cli_ok method of the CustomRun subclass of Query."

class Dummy_CustomRun:
cli_args_ok = query.CustomRun.cli_args_ok # Function being tested.
entry = Var()
entry_error = {}
cli_args_ok = query.CustomRun.cli_args_ok
def __init__(self, dummy_entry):
self.entry.set(dummy_entry)
self.entry_error['text'] = ''
self.entry = Var(value=dummy_entry)
self.entry_error = {'text': ''}
def showerror(self, message):
self.entry_error['text'] = message

Expand Down