From f5945b7c6ec11dd8f7a27e2f908ed00b1d8ff3a8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ingo=20B=C3=BCrk?= <admin@airblader.de>
Date: Wed, 11 May 2016 20:11:04 +0200
Subject: [PATCH] Split list of command / config directives in tests. (#2345)

This makes adding new directives less prone to merge conflicts.
---
 testcases/t/187-commands-parser.t | 57 ++++++++++++++++---------------
 testcases/t/201-config-parser.t   | 48 ++++++++++++++++++++++++--
 2 files changed, 74 insertions(+), 31 deletions(-)

diff --git a/testcases/t/187-commands-parser.t b/testcases/t/187-commands-parser.t
index e3481b0a..73c443f9 100644
--- a/testcases/t/187-commands-parser.t
+++ b/testcases/t/187-commands-parser.t
@@ -144,34 +144,35 @@ is(parser_calls("\nworkspace test"),
 ################################################################################
 
 is(parser_calls('unknown_literal'),
-   "ERROR: Expected one of these tokens: <end>, '[', " .
-   "'move', " .
-   "'exec', " .
-   "'exit', " .
-   "'restart', " .
-   "'reload', " .
-   "'shmlog', " .
-   "'debuglog', " .
-   "'border', " .
-   "'layout', " .
-   "'append_layout', " .
-   "'workspace', " .
-   "'focus', " .
-   "'kill', " .
-   "'open', " .
-   "'fullscreen', " .
-   "'sticky', " .
-   "'split', " .
-   "'floating', " .
-   "'mark', " .
-   "'unmark', " .
-   "'resize', " .
-   "'rename', " .
-   "'nop', " .
-   "'scratchpad', " .
-   "'title_format', " .
-   "'mode', " .
-   "'bar'\n" .
+   "ERROR: Expected one of these tokens: <end>, '[', '" . join("', '", qw(
+       move
+       exec
+       exit
+       restart
+       reload
+       shmlog
+       debuglog
+       border
+       layout
+       append_layout
+       workspace
+       focus
+       kill
+       open
+       fullscreen
+       sticky
+       split
+       floating
+       mark
+       unmark
+       resize
+       rename
+       nop
+       scratchpad
+       title_format
+       mode
+       bar
+    )) . "'\n" .
    "ERROR: Your command: unknown_literal\n" .
    "ERROR:               ^^^^^^^^^^^^^^^",
    'error for unknown literal ok');
diff --git a/testcases/t/201-config-parser.t b/testcases/t/201-config-parser.t
index d3da4235..d92d3b20 100644
--- a/testcases/t/201-config-parser.t
+++ b/testcases/t/201-config-parser.t
@@ -442,9 +442,51 @@ hide_edge_border both
 client.focused          #4c7899 #285577 #ffffff #2e9ef4
 EOT
 
-my $expected_all_tokens = <<'EOT';
-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'
-EOT
+my $expected_all_tokens = "ERROR: CONFIG: Expected one of these tokens: <end>, '#', '" . join("', '", qw(
+        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
+    )) . "'\n";
 
 my $expected_end = <<'EOT';
 ERROR: CONFIG: (in file <stdin>)
-- 
2.39.2