66from zulipterminal .config import keys
77
88
9- AVAILABLE_COMMANDS = list (keys .KEY_BINDINGS .keys ())
9+ AVAILABLE_COMMANDS = list (keys .key_config . KEY_BINDINGS .keys ())
1010
11- USED_KEYS = {key for values in keys .KEY_BINDINGS .values () for key in values ["keys" ]}
11+ USED_KEYS = {
12+ key for values in keys .key_config .KEY_BINDINGS .values () for key in values ["keys" ]
13+ }
1214
1315
14- @pytest .fixture (params = keys .KEY_BINDINGS .keys ())
16+ @pytest .fixture (params = keys .key_config . KEY_BINDINGS .keys ())
1517def valid_command (request : Any ) -> str :
1618 return request .param
1719
@@ -22,20 +24,20 @@ def invalid_command(request: Any) -> str:
2224
2325
2426def test_keys_for_command (valid_command : str ) -> None :
25- assert keys .KEY_BINDINGS [valid_command ]["keys" ] == keys . keys_for_command (
26- valid_command
27- )
27+ assert keys .key_config . KEY_BINDINGS [valid_command ][
28+ "keys"
29+ ] == keys . key_config . keys_for_command ( valid_command )
2830
2931
3032def test_primary_key_for_command (valid_command : str ) -> None :
31- assert keys .KEY_BINDINGS [valid_command ]["keys" ][0 ] == keys . primary_key_for_command (
32- valid_command
33- )
33+ assert keys .key_config . KEY_BINDINGS [valid_command ]["keys" ][
34+ 0
35+ ] == keys . key_config . key_config . key_config . primary_key_for_command ( valid_command )
3436
3537
3638def test_keys_for_command_invalid_command (invalid_command : str ) -> None :
37- with pytest .raises (keys .InvalidCommand ):
38- keys .keys_for_command (invalid_command )
39+ with pytest .raises (keys .key_config . InvalidCommand ):
40+ keys .key_config . keys_for_command (invalid_command )
3941
4042
4143def test_keys_for_command_identity (valid_command : str ) -> None :
@@ -44,30 +46,37 @@ def test_keys_for_command_identity(valid_command: str) -> None:
4446 new list which validates that the original keys don't get altered
4547 elsewhere unintentionally.
4648 """
47- assert id (keys .KEY_BINDINGS [valid_command ]["keys" ]) != id (
48- keys .keys_for_command (valid_command )
49+ assert id (keys .key_config . KEY_BINDINGS [valid_command ]["keys" ]) != id (
50+ keys .key_config . keys_for_command (valid_command )
4951 )
5052
5153
5254def test_is_command_key_matching_keys (valid_command : str ) -> None :
53- for key in keys .keys_for_command (valid_command ):
54- assert keys .is_command_key (valid_command , key )
55+ for key in keys .key_config . keys_for_command (valid_command ):
56+ assert keys .key_config . key_config . key_config . is_command_key (valid_command , key )
5557
5658
5759def test_is_command_key_nonmatching_keys (valid_command : str ) -> None :
58- keys_to_test = USED_KEYS - set (keys .keys_for_command (valid_command ))
60+ keys_to_test = USED_KEYS - set (keys .key_config . keys_for_command (valid_command ))
5961 for key in keys_to_test :
60- assert not keys .is_command_key (valid_command , key )
62+ assert not keys .key_config .key_config .key_config .is_command_key (
63+ valid_command , key
64+ )
6165
6266
6367def test_is_command_key_invalid_command (invalid_command : str ) -> None :
64- with pytest .raises (keys .InvalidCommand ):
65- keys .is_command_key (invalid_command , "esc" ) # key doesn't matter
68+ with pytest .raises (keys .key_config .InvalidCommand ):
69+ keys .key_config .key_config .key_config .is_command_key (
70+ invalid_command , "esc"
71+ ) # key doesn't matter
6672
6773
6874def test_HELP_is_not_allowed_as_tip () -> None :
69- assert keys .KEY_BINDINGS ["HELP" ]["excluded_from_random_tips" ] is True
70- assert keys .KEY_BINDINGS ["HELP" ] not in keys .commands_for_random_tips ()
75+ assert keys .key_config .KEY_BINDINGS ["HELP" ]["excluded_from_random_tips" ] is True
76+ assert (
77+ keys .key_config .KEY_BINDINGS ["HELP" ]
78+ not in keys .key_config .commands_for_random_tips ()
79+ )
7180
7281
7382def test_commands_for_random_tips (mocker : MockerFixture ) -> None :
@@ -96,20 +105,22 @@ def test_commands_for_random_tips(mocker: MockerFixture) -> None:
96105 "excluded_from_random_tips" : True ,
97106 },
98107 }
99- mocker .patch .dict (keys .KEY_BINDINGS , new_key_bindings , clear = True )
100- result = keys .commands_for_random_tips ()
108+ mocker .patch .dict (keys .key_config . KEY_BINDINGS , new_key_bindings , clear = True )
109+ result = keys .key_config . commands_for_random_tips ()
101110 assert len (result ) == 2
102111 assert new_key_bindings ["BETA" ] in result
103112 assert new_key_bindings ["GAMMA" ] in result
104113
105114
106115def test_updated_urwid_command_map () -> None :
107- urwid_to_zt_mapping = {v : k for k , v in keys .ZT_TO_URWID_CMD_MAPPING .items ()}
116+ urwid_to_zt_mapping = {
117+ v : k for k , v in keys .key_config .ZT_TO_URWID_CMD_MAPPING .items ()
118+ }
108119 # Check if keys in command map are actually the ones in KEY_BINDINGS
109- for key , urwid_cmd in keys .command_map ._command .items ():
120+ for key , urwid_cmd in keys .key_config . command_map ._command .items ():
110121 try :
111122 zt_cmd = urwid_to_zt_mapping [urwid_cmd ]
112- assert key in keys .keys_for_command (zt_cmd )
123+ assert key in keys .key_config . keys_for_command (zt_cmd )
113124 except KeyError :
114125 pass
115126
@@ -138,7 +149,7 @@ def test_updated_urwid_command_map() -> None:
138149 ],
139150)
140151def test_display_key_for_urwid_key (urwid_key : str , display_key : str ) -> None :
141- assert keys .display_key_for_urwid_key (urwid_key ) == display_key
152+ assert keys .key_config . display_key_for_urwid_key (urwid_key ) == display_key
142153
143154
144155COMMAND_TO_DISPLAY_KEYS = [
@@ -150,14 +161,20 @@ def test_display_key_for_urwid_key(urwid_key: str, display_key: str) -> None:
150161
151162@pytest .mark .parametrize ("command, display_keys" , COMMAND_TO_DISPLAY_KEYS )
152163def test_display_keys_for_command (command : str , display_keys : List [str ]) -> None :
153- assert keys .display_keys_for_command (command ) == display_keys
164+ assert (
165+ keys .key_config .key_config .key_config .display_keys_for_command (command )
166+ == display_keys
167+ )
154168
155169
156170@pytest .mark .parametrize ("command, display_keys" , COMMAND_TO_DISPLAY_KEYS )
157171def test_primary_display_key_for_command (command : str , display_keys : List [str ]) -> None :
158- assert keys .primary_display_key_for_command (command ) == display_keys [0 ]
172+ assert (
173+ keys .key_config .key_config .key_config .primary_display_key_for_command (command )
174+ == display_keys [0 ]
175+ )
159176
160177
161178def test_display_keys_for_command_invalid_command (invalid_command : str ) -> None :
162- with pytest .raises (keys .InvalidCommand ):
163- keys .display_keys_for_command (invalid_command )
179+ with pytest .raises (keys .key_config . InvalidCommand ):
180+ keys .key_config . key_config . key_config . display_keys_for_command (invalid_command )
0 commit comments