Skip to content

Commit

Permalink
refactor events
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgmacias95
mgmacias95 committed Apr 28, 2024
1 parent b064e1f commit 0fa01e0
Showing 1 changed file with 36 additions and 158 deletions.
194 changes: 36 additions & 158 deletions Lib/test/test_pyrepl.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ def multiline_input(reader, namespace=None):
reader.paste_mode = False


def code_to_events(code):
for c in code:
yield Event(evt='key', data=c, raw=bytearray(c.encode('utf-8')))


class FakeConsole(Console):
def __init__(self, events, encoding="utf-8"):
self.events = iter(events)
Expand All @@ -63,25 +68,14 @@ def prepare_reader(self, events):
return reader, console

def test_up_arrow(self):
events = [
Event(evt="key", data="d", raw=bytearray(b"d")),
Event(evt="key", data="e", raw=bytearray(b"e")),
Event(evt="key", data="f", raw=bytearray(b"f")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data="f", raw=bytearray(b"f")),
Event(evt="key", data="(", raw=bytearray(b"(")),
Event(evt="key", data=")", raw=bytearray(b")")),
Event(evt="key", data=":", raw=bytearray(b":")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
code = (
'def f():\n'
' ...\n'
)
events = itertools.chain(code_to_events(code), [
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]
])

reader, console = self.prepare_reader(events)

Expand All @@ -91,25 +85,14 @@ def test_up_arrow(self):
console.move_cursor.assert_called_with(1, 3)

def test_down_arrow(self):
events = [
Event(evt="key", data="d", raw=bytearray(b"d")),
Event(evt="key", data="e", raw=bytearray(b"e")),
Event(evt="key", data="f", raw=bytearray(b"f")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data="f", raw=bytearray(b"f")),
Event(evt="key", data="(", raw=bytearray(b"(")),
Event(evt="key", data=")", raw=bytearray(b")")),
Event(evt="key", data=":", raw=bytearray(b":")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
code = (
'def f():\n'
' ...\n'
)
events = itertools.chain(code_to_events(code), [
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]
])

reader, console = self.prepare_reader(events)

Expand All @@ -119,15 +102,10 @@ def test_down_arrow(self):
console.move_cursor.assert_called_with(1, 5)

def test_left_arrow(self):
events = [
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="+", raw=bytearray(b"+")),
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="1", raw=bytearray(b"1")),
events = itertools.chain(code_to_events('11+11'), [
Event(evt="key", data="left", raw=bytearray(b"\x1bOD")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]
])

reader, console = self.prepare_reader(events)

Expand All @@ -140,15 +118,10 @@ def test_left_arrow(self):
)

def test_right_arrow(self):
events = [
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="+", raw=bytearray(b"+")),
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="1", raw=bytearray(b"1")),
events = itertools.chain(code_to_events('11+11'), [
Event(evt="key", data="right", raw=bytearray(b"\x1bOC")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]
])

reader, console = self.prepare_reader(events)

Expand All @@ -170,35 +143,13 @@ def prepare_reader(self, events):
return reader

def test_basic(self):
events = [
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="+", raw=bytearray(b"+")),
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]
reader = self.prepare_reader(events)
reader = self.prepare_reader(code_to_events('1+1\n'))

output = multiline_input(reader)
self.assertEqual(output, "1+1")

def test_multiline_edit(self):
events = [
Event(evt="key", data="d", raw=bytearray(b"d")),
Event(evt="key", data="e", raw=bytearray(b"e")),
Event(evt="key", data="f", raw=bytearray(b"f")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data="f", raw=bytearray(b"f")),
Event(evt="key", data="(", raw=bytearray(b"(")),
Event(evt="key", data=")", raw=bytearray(b")")),
Event(evt="key", data=":", raw=bytearray(b":")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
events = itertools.chain(code_to_events('def f():\n ...\n\n'), [
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Expand All @@ -210,7 +161,7 @@ def test_multiline_edit(self):
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]
])
reader = self.prepare_reader(events)

output = multiline_input(reader)
Expand All @@ -219,22 +170,14 @@ def test_multiline_edit(self):
self.assertEqual(output, "def g():\n ...\n ")

def test_history_navigation_with_up_arrow(self):
events = [
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="+", raw=bytearray(b"+")),
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data="2", raw=bytearray(b"1")),
Event(evt="key", data="+", raw=bytearray(b"+")),
Event(evt="key", data="2", raw=bytearray(b"1")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
events = itertools.chain(code_to_events('1+1\n2+2\n'), [
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]
])

reader = self.prepare_reader(events)

Expand All @@ -248,46 +191,26 @@ def test_history_navigation_with_up_arrow(self):
self.assertEqual(output, "1+1")

def test_history_navigation_with_down_arrow(self):
events = [
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="+", raw=bytearray(b"+")),
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data="2", raw=bytearray(b"1")),
Event(evt="key", data="+", raw=bytearray(b"+")),
Event(evt="key", data="2", raw=bytearray(b"1")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
events = itertools.chain(code_to_events('1+1\n2+2\n'), [
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
]
])

reader = self.prepare_reader(events)

output = multiline_input(reader)
self.assertEqual(output, "1+1")

def test_history_search(self):
events = [
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="+", raw=bytearray(b"+")),
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data="2", raw=bytearray(b"2")),
Event(evt="key", data="+", raw=bytearray(b"+")),
Event(evt="key", data="2", raw=bytearray(b"2")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data="3", raw=bytearray(b"3")),
Event(evt="key", data="+", raw=bytearray(b"+")),
Event(evt="key", data="3", raw=bytearray(b"3")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
events = itertools.chain(code_to_events('1+1\n2+2\n3+3\n'), [
Event(evt="key", data="\x12", raw=bytearray(b"\x12")),
Event(evt="key", data="1", raw=bytearray(b"1")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]
])

reader = self.prepare_reader(events)

Expand All @@ -310,18 +233,7 @@ def prepare_reader(self, events, namespace):
return reader

def test_simple_completion(self):
events = [
Event(evt="key", data="o", raw=bytearray(b"o")),
Event(evt="key", data="s", raw=bytearray(b"s")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data="g", raw=bytearray(b"g")),
Event(evt="key", data="e", raw=bytearray(b"e")),
Event(evt="key", data="t", raw=bytearray(b"t")),
Event(evt="key", data="e", raw=bytearray(b"e")),
Event(evt="key", data="n", raw=bytearray(b"n")),
Event(evt="key", data="\t", raw=bytearray(b"\t")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]
events = code_to_events('os.geten\t\n')

namespace = {"os": os}
reader = self.prepare_reader(events, namespace)
Expand All @@ -330,19 +242,7 @@ def test_simple_completion(self):
self.assertEqual(output, "os.getenv")

def test_completion_with_many_options(self):
events = [
Event(evt="key", data="o", raw=bytearray(b"o")),
Event(evt="key", data="s", raw=bytearray(b"s")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data="\t", raw=bytearray(b"\t")),
Event(evt="key", data="\t", raw=bytearray(b"\t")),
Event(evt="key", data="O", raw=bytearray(b"O")),
Event(evt="key", data="_", raw=bytearray(b"_")),
Event(evt="key", data="A", raw=bytearray(b"A")),
Event(evt="key", data="S", raw=bytearray(b"S")),
Event(evt="key", data="\t", raw=bytearray(b"\t")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]
events = code_to_events('os.\t\tO_AS\t\n')

namespace = {"os": os}
reader = self.prepare_reader(events, namespace)
Expand All @@ -351,33 +251,15 @@ def test_completion_with_many_options(self):
self.assertEqual(output, "os.O_ASYNC")

def test_empty_namespace_completion(self):
events = [
Event(evt="key", data="o", raw=bytearray(b"o")),
Event(evt="key", data="s", raw=bytearray(b"s")),
Event(evt="key", data=".", raw=bytearray(b".")),
Event(evt="key", data="g", raw=bytearray(b"g")),
Event(evt="key", data="e", raw=bytearray(b"e")),
Event(evt="key", data="t", raw=bytearray(b"t")),
Event(evt="key", data="e", raw=bytearray(b"e")),
Event(evt="key", data="n", raw=bytearray(b"n")),
Event(evt="key", data="\t", raw=bytearray(b"\t")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]

events = code_to_events('os.geten\t\n')
namespace = {}
reader = self.prepare_reader(events, namespace)

output = multiline_input(reader, namespace)
self.assertEqual(output, "os.geten")

def test_global_namespace_completion(self):
events = [
Event(evt="key", data="p", raw=bytearray(b"p")),
Event(evt="key", data="y", raw=bytearray(b"y")),
Event(evt="key", data="\t", raw=bytearray(b"\t")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
]

events = code_to_events('py\t\n')
namespace = {"python": None}
reader = self.prepare_reader(events, namespace)
output = multiline_input(reader, namespace)
Expand Down Expand Up @@ -500,10 +382,6 @@ def prepare_reader(self, events):
reader.config.readline_completer = None
return reader

def code_to_events(self, code):
for c in code:
yield Event(evt='key', data=c, raw=bytearray(c.encode('utf-8')))

def test_paste(self):
code = (
'def a():\n'
Expand All @@ -516,7 +394,7 @@ def test_paste(self):

events = itertools.chain([
Event(evt='key', data='f3', raw=bytearray(b'\x1bOR')),
], self.code_to_events(code))
], code_to_events(code))
reader = self.prepare_reader(events)
output = multiline_input(reader)
self.assertEqual(output, code[:-1])
Expand All @@ -539,7 +417,7 @@ def test_paste_not_in_paste_mode(self):
' else:'
)

events = self.code_to_events(input_code)
events = code_to_events(input_code)
reader = self.prepare_reader(events)
output = multiline_input(reader)
self.assertEqual(output, output_code)
Expand Down

0 comments on commit 0fa01e0

Please sign in to comment.