eval-tester: change element output to be intuitive for inlines

elements are now inline, which creates intuitive output for exact mode - `expected` output now called `expect` for alignment with `actual`

this made it easier to fix `read-key` tests for exactness

Author: balupton

commands/eval-tester

@@ -407,7 +407,7 @@ function eval_tester() (
 	function __element {
 		local label="$1" style="$2" value="$3"
 		if [[ -n $value ]]; then
-			__print_style --"$style"+element="$label" --newline --="$value" --newline --"$style"+/element="$label" || return 223 # ECUSTOM 223 Tests broken
+			__print_style --"$style"+element="$label" --="$value" --"$style"+/element="$label" || return 223 # ECUSTOM 223 Tests broken
 		else
 			__print_style --"$style"+element/="$label" --commentary-empty || return 223 # ECUSTOM 223 Tests broken
 		fi
@@ -416,7 +416,7 @@ function eval_tester() (
 		local label="$1" style="$2" value="$3" escaped
 		if [[ -n $value ]]; then
 			printf -v escaped '%q' "$value" || return $?
-			__element "$label escaped" "$style" "$escaped" || return $?
+			__print_style --"$style"+element="$label escaped" --="$escaped" --"$style"+/element="$label escaped" || return 223 # ECUSTOM 223 Tests broken
 		else
 			__print_style --"$style"+element/="$label escaped" --commentary-empty || return 223 # ECUSTOM 223 Tests broken
 		fi
@@ -461,11 +461,11 @@ function eval_tester() (
 				__print_style --error="${name} is NOT EXPECTED" || return 223 # ECUSTOM 223 Tests broken
 				if ! __is_shapeshifter -- "$actual$expected"; then
 					__element "actual $name" red "$actual" || return $?
-					__element "expected $name" red "$expected" || return $?
+					__element "expect $name" red "$expected" || return $?
 				fi
 				if [[ $actual$expected =~ [[:cntrl:]] ]]; then
 					__escaped_element "actual $name" red "$actual" || return $?
-					__escaped_element "expected $name" red "$expected" || return $?
+					__escaped_element "expect $name" red "$expected" || return $?
 				fi
 				local diff actual_file expected_file
 				actual_file="$(fs-temp --directory='dorothy' --directory='eval-tester' --file)" || return 223 # ECUSTOM 223 Tests broken

commands/read-key

@@ -75,40 +75,40 @@ function read_key_test() (
 
 	{
 		printf '%s' "$ANSI_ALL"
-	} | eval-tester --name='all was detected' --stdout='all' -- \
+	} | eval-tester --name='all was detected' --stdout=$'all\n' -- \
 		read-key --timeout="$delay"
 
 	eval-tester --name='timeout was detected' --status='60' -- \
 		read-key --timeout="$delay"
 
 	{
 		__print_line
-	} | eval-tester --name='enter was detected' --stdout='enter' -- \
+	} | eval-tester --name='enter was detected' --stdout=$'enter\n' -- \
 		read-key --timeout="$delay"
 
 	{
 		printf '%s' $'\x0a'
-	} | eval-tester --name='enter was detected' --stdout='enter' -- \
+	} | eval-tester --name='enter was detected' --stdout=$'enter\n' -- \
 		read-key --timeout="$delay"
 
 	{
 		printf '%s' $'\e\e\e\e'
-	} | eval-tester --name='escapes were detected' --stdout=$'escape\nescape\nescape\nescape' -- \
+	} | eval-tester --name='escapes were detected' --stdout=$'escape\nescape\nescape\nescape\n' -- \
 		read-key --timeout="$delay"
 
 	{
 		printf '%s' $'\e[Ha\e[1~'
-	} | eval-tester --name='home variants were detected' --stdout=$'home\na\nhome' -- \
+	} | eval-tester --name='home variants were detected' --stdout=$'home\na\nhome\n' -- \
 		read-key --timeout="$delay"
 
 	{
 		printf '%s' $'\e[B'
-	} | eval-tester --name='down was detected' --stdout='down' -- \
+	} | eval-tester --name='down was detected' --stdout=$'down\n' -- \
 		read-key --timeout="$delay"
 
 	{
 		printf '%s' $'\e[F'
-	} | eval-tester --name='end was detected' --stdout='end' -- \
+	} | eval-tester --name='end was detected' --stdout=$'end\n' -- \
 		read-key --timeout="$delay"
 
 	local enter_if_not_ignored
@@ -119,17 +119,17 @@ function read_key_test() (
 	fi
 	{
 		printf '%s' $'\e\e\n\e[Hab\e[1~cd'
-	} | eval-tester --name='a series of characters were detected' --stdout=$'escape\nescape\n'"$enter_if_not_ignored"$'home\na\nb\nhome\nc\nd' -- \
+	} | eval-tester --name='a series of characters were detected' --stdout=$'escape\nescape\n'"$enter_if_not_ignored"$'home\na\nb\nhome\nc\nd\n' -- \
 		read-key --timeout="$delay"
 
 	{
 		printf '%s' $'\e[Hab\e[1~cd\e[F\e[Jef'
-	} | eval-tester --name='unknown read-key ANSI escape codes report failure' --status=94 --stdout=$'home\na\nb\nhome\nc\nd\nend' -- \
+	} | eval-tester --name='unknown read-key ANSI escape codes report failure' --status=94 --stdout=$'home\na\nb\nhome\nc\nd\nend\n' -- \
 		read-key --timeout="$delay"
 
 	{
 		printf '%s' $'\e[Hab\e[1~cd\e[F\e[Jef'
-	} | eval-tester --name='unknown read-key ANSI escape codes report verbal failure if verbose' --status=94 --stdout=$'home $\'\\E[H\'\na a\nb b\nhome $\'\\E[1~\'\nc c\nd d\nend $\'\\E[F\'' --stderr="unknown \$'\E[Jef'" -- \
+	} | eval-tester --name='unknown read-key ANSI escape codes report verbal failure if verbose' --status=94 --stdout=$'home $\'\\E[H\'\na a\nb b\nhome $\'\\E[1~\'\nc c\nd d\nend $\'\\E[F\'\n' --stderr=$'unknown $\'\\E[Jef\'\n' -- \
 		read-key --verbose --timeout="$delay"
 
 	return 0