nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split list of command / config directives in tests. (#2345) 

This makes adding new directives less prone to merge conflicts.
This commit is contained in:
Ingo Bürk 2016-05-11 20:11:04 +02:00 committed by Michael Stapelberg
parent 4bec3b9d24
commit f5945b7c6e
2 changed files with 74 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
testcases/t/187-commands-parser.t
View File

@ -144,34 +144,35 @@ is(parser_calls("\nworkspace test"),
################################################################################ ################################################################################
is(parser_calls('unknown_literal'), is(parser_calls('unknown_literal'),
"ERROR: Expected one of these tokens: <end>, '[', " . "ERROR: Expected one of these tokens: <end>, '[', '" . join("', '", qw(
"'move', " . move
"'exec', " . exec
"'exit', " . exit
"'restart', " . restart
"'reload', " . reload
"'shmlog', " . shmlog
"'debuglog', " . debuglog
"'border', " . border
"'layout', " . layout
"'append_layout', " . append_layout
"'workspace', " . workspace
"'focus', " . focus
"'kill', " . kill
"'open', " . open
"'fullscreen', " . fullscreen
"'sticky', " . sticky
"'split', " . split
"'floating', " . floating
"'mark', " . mark
"'unmark', " . unmark
"'resize', " . resize
"'rename', " . rename
"'nop', " . nop
"'scratchpad', " . scratchpad
"'title_format', " . title_format
"'mode', " . mode
"'bar'\n" . bar
)) . "'\n" .
"ERROR: Your command: unknown_literal\n" . "ERROR: Your command: unknown_literal\n" .
"ERROR: ^^^^^^^^^^^^^^^", "ERROR: ^^^^^^^^^^^^^^^",
'error for unknown literal ok'); 'error for unknown literal ok');

48
testcases/t/201-config-parser.t
View File

@ -442,9 +442,51 @@ hide_edge_border both
client.focused #4c7899 #285577 #ffffff #2e9ef4 client.focused #4c7899 #285577 #ffffff #2e9ef4
EOT EOT
my $expected_all_tokens = <<'EOT'; my $expected_all_tokens = "ERROR: CONFIG: Expected one of these tokens: <end>, '#', '" . join("', '", qw(
ERROR: CONFIG: Expected one of these tokens: <end>, '#', 'set', 'set_from_resource', 'bindsym', 'bindcode', 'bind', 'bar', 'font', 'mode', 'floating_minimum_size', 'floating_maximum_size', 'floating_modifier', 'default_orientation', 'workspace_layout', 'new_window', 'new_float', 'hide_edge_borders', 'for_window', 'assign', 'no_focus', 'focus_follows_mouse', 'mouse_warping', 'force_focus_wrapping', 'force_xinerama', 'force-xinerama', 'workspace_auto_back_and_forth', 'fake_outputs', 'fake-outputs', 'force_display_urgency_hint', 'focus_on_window_activation', 'show_marks', 'workspace', 'ipc_socket', 'ipc-socket', 'restart_state', 'popup_during_fullscreen', 'exec_always', 'exec', 'client.background', 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent', 'client.placeholder' set
EOT set_from_resource
bindsym
bindcode
bind
bar
font
mode
floating_minimum_size
floating_maximum_size
floating_modifier
default_orientation
workspace_layout
new_window
new_float
hide_edge_borders
for_window
assign
no_focus
focus_follows_mouse
mouse_warping
force_focus_wrapping
force_xinerama
force-xinerama
workspace_auto_back_and_forth
fake_outputs
fake-outputs
force_display_urgency_hint
focus_on_window_activation
show_marks
workspace
ipc_socket
ipc-socket
restart_state
popup_during_fullscreen
exec_always
exec
client.background
client.focused_inactive
client.focused
client.unfocused
client.urgent
client.placeholder
)) . "'\n";
my $expected_end = <<'EOT'; my $expected_end = <<'EOT';
ERROR: CONFIG: (in file <stdin>) ERROR: CONFIG: (in file <stdin>)