Skip to content

Commit c830c75

Browse files
sebastinassebastinas
committed
Update tests
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
1 parent 2cfa83b commit c830c75

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

‎bpython/test/test_curtsies_repl.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def setUp(self):
179179
def test_list_win_visible_match_selected_on_tab_multiple_options(self):
180180
self.repl._current_line = " './'"
181181
self.repl._cursor_offset = 2
182-
with mock.patch('bpython.autocomplete.get_completer_bpython') as m:
182+
with mock.patch('bpython.autocomplete.get_completer') as m:
183183
m.return_value = (['./abc', './abcd', './bcd'],
184184
autocomplete.FilenameCompletion())
185185
self.repl.update_completion()
@@ -191,7 +191,7 @@ def test_list_win_visible_match_selected_on_tab_multiple_options(self):
191191
def test_list_win_not_visible_and_cseq_if_cseq(self):
192192
self.repl._current_line = " './a'"
193193
self.repl._cursor_offset = 5
194-
with mock.patch('bpython.autocomplete.get_completer_bpython') as m:
194+
with mock.patch('bpython.autocomplete.get_completer') as m:
195195
m.return_value = (['./abcd', './abce'],
196196
autocomplete.FilenameCompletion())
197197
self.repl.update_completion()
@@ -204,7 +204,7 @@ def test_list_win_not_visible_and_cseq_if_cseq(self):
204204
def test_list_win_not_visible_and_match_selected_if_one_option(self):
205205
self.repl._current_line = " './a'"
206206
self.repl._cursor_offset = 5
207-
with mock.patch('bpython.autocomplete.get_completer_bpython') as m:
207+
with mock.patch('bpython.autocomplete.get_completer') as m:
208208
m.return_value = (['./abcd'], autocomplete.FilenameCompletion())
209209
self.repl.update_completion()
210210
self.assertEqual(self.repl.list_win_visible, False)

‎bpython/test/test_repl.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -316,24 +316,22 @@ def test_simple_global_complete(self):
316316
['def', 'del', 'delattr(', 'dict(', 'dir(',
317317
'divmod('])
318318

319-
@unittest.skip("disabled while non-simple completion is disabled")
320319
def test_substring_global_complete(self):
321320
self.repl = FakeRepl({'autocomplete_mode': autocomplete.SUBSTRING})
322321
self.set_input_line("time")
323322

324323
self.assertTrue(self.repl.complete())
325-
self.assertTrue(hasattr(self.repl.completer, 'matches'))
326-
self.assertEqual(self.repl.completer.matches,
324+
self.assertTrue(hasattr(self.repl.matches_iter, 'matches'))
325+
self.assertEqual(self.repl.matches_iter.matches,
327326
['RuntimeError(', 'RuntimeWarning('])
328327

329-
@unittest.skip("disabled while non-simple completion is disabled")
330328
def test_fuzzy_global_complete(self):
331329
self.repl = FakeRepl({'autocomplete_mode': autocomplete.FUZZY})
332330
self.set_input_line("doc")
333331

334332
self.assertTrue(self.repl.complete())
335-
self.assertTrue(hasattr(self.repl.completer, 'matches'))
336-
self.assertEqual(self.repl.completer.matches,
333+
self.assertTrue(hasattr(self.repl.matches_iter, 'matches'))
334+
self.assertEqual(self.repl.matches_iter.matches,
337335
['UnboundLocalError(', '__doc__'])
338336

339337
# 2. Attribute tests
@@ -349,7 +347,6 @@ def test_simple_attribute_complete(self):
349347
self.assertTrue(hasattr(self.repl.matches_iter, 'matches'))
350348
self.assertEqual(self.repl.matches_iter.matches, ['Foo.bar'])
351349

352-
@unittest.skip("disabled while non-simple completion is disabled")
353350
def test_substring_attribute_complete(self):
354351
self.repl = FakeRepl({'autocomplete_mode': autocomplete.SUBSTRING})
355352
self.set_input_line("Foo.az")
@@ -359,10 +356,9 @@ def test_substring_attribute_complete(self):
359356
self.repl.push(line)
360357

361358
self.assertTrue(self.repl.complete())
362-
self.assertTrue(hasattr(self.repl.completer, 'matches'))
363-
self.assertEqual(self.repl.completer.matches, ['Foo.baz'])
359+
self.assertTrue(hasattr(self.repl.matches_iter, 'matches'))
360+
self.assertEqual(self.repl.matches_iter.matches, ['Foo.baz'])
364361

365-
@unittest.skip("disabled while non-simple completion is disabled")
366362
def test_fuzzy_attribute_complete(self):
367363
self.repl = FakeRepl({'autocomplete_mode': autocomplete.FUZZY})
368364
self.set_input_line("Foo.br")
@@ -372,8 +368,8 @@ def test_fuzzy_attribute_complete(self):
372368
self.repl.push(line)
373369

374370
self.assertTrue(self.repl.complete())
375-
self.assertTrue(hasattr(self.repl.completer, 'matches'))
376-
self.assertEqual(self.repl.completer.matches, ['Foo.bar'])
371+
self.assertTrue(hasattr(self.repl.matches_iter, 'matches'))
372+
self.assertEqual(self.repl.matches_iter.matches, ['Foo.bar'])
377373

378374
# 3. Edge Cases
379375
def test_updating_namespace_complete(self):

0 commit comments

Comments
 (0)