fix: trim space in test comparisons (reubeno#950)

Author: reubeno

brush-core/src/extendedtests.rs

@@ -126,7 +126,8 @@ pub(crate) fn apply_unary_predicate_to_str(
             }
         }
         ast::UnaryPredicate::FdIsOpenTerminal => {
-            if let Ok(fd) = operand.parse::<ShellFd>() {
+            // Trim whitespace before parsing, matching bash behavior.
+            if let Ok(fd) = operand.trim().parse::<ShellFd>() {
                 if let Some(open_file) = params.try_fd(shell, fd) {
                     Ok(open_file.is_terminal())
                 } else {
@@ -548,8 +549,9 @@ fn apply_test_binary_arithmetic_predicate(
     right: &str,
     op: fn(i64, i64) -> bool,
 ) -> bool {
-    let left: Result<i64, _> = left.parse();
-    let right: Result<i64, _> = right.parse();
+    // We trim leading/trailing whitespace (including newlines) before parsing integers.
+    let left: Result<i64, _> = left.trim().parse();
+    let right: Result<i64, _> = right.trim().parse();
 
     if let (Ok(left), Ok(right)) = (left, right) {
         op(left, right)

brush-shell/tests/cases/compat/builtins/test.yaml

@@ -311,3 +311,47 @@ cases:
       test "a	b" = "a	b" && echo "tabs match"
       test 'a"b' = 'a"b' && echo "quotes match"
       test "a'b" = "a'b" && echo "single quotes match"
+
+  - name: "test: arithmetic comparison with spaces/tabs in operand"
+    stdin: |
+      # Leading/trailing spaces
+      test 0 -eq ' 0'
+      echo "leading space: $?"
+
+      test 0 -eq '0 '
+      echo "trailing space: $?"
+
+      test 0 -eq ' 0 '
+      echo "both spaces: $?"
+
+      # Tabs
+      test 0 -eq '	0'
+      echo "leading tab: $?"
+
+      test 0 -eq '0	'
+      echo "trailing tab: $?"
+
+  - name: "test: arithmetic comparison with newline in operand"
+    min_oracle_version: "5.3"
+    stdin: |
+      # Newline trimming seems to have changed in or around bash 5.3
+      test 0 -eq ' 0
+      '
+      echo "newline trailing: $?"
+
+  - name: "test: -t operator with whitespace in fd"
+    stdin: |
+      # -t operator should trim whitespace before parsing fd number
+      # These should all behave identically (false since not a terminal)
+      test -t 0
+      r1=$?
+      test -t ' 0'
+      r2=$?
+      test -t '0 '
+      r3=$?
+      test -t ' 0 '
+      r4=$?
+
+      # All should have the same result
+      [ $r1 -eq $r2 ] && [ $r2 -eq $r3 ] && [ $r3 -eq $r4 ] && echo "All -t results match"
+

brush-shell/tests/cases/compat/extended_tests.yaml

@@ -340,3 +340,42 @@ cases:
   - name: "Regex with newline"
     stdin: |
       [[ $'\n' =~ . ]] && echo "1. Matches"
+
+  - name: "Arithmetic comparisons with whitespace in operands"
+    stdin: |
+      # Leading/trailing whitespace should be trimmed before comparison
+      [[ 0 -eq ' 0' ]] && echo "1. leading space"
+      [[ 0 -eq '0 ' ]] && echo "2. trailing space"
+      [[ 0 -eq ' 0 ' ]] && echo "3. both spaces"
+
+      # Tabs
+      [[ 0 -eq '	0' ]] && echo "4. leading tab"
+      [[ 0 -eq '0	' ]] && echo "5. trailing tab"
+
+      # Newlines
+      [[ 0 -eq ' 0
+      ' ]] && echo "6. newline"
+
+      # Other operators
+      [[ 5 -lt ' 10' ]] && echo "7. -lt with space"
+      [[ 10 -gt ' 5' ]] && echo "8. -gt with space"
+      [[ 5 -ne ' 6' ]] && echo "9. -ne with space"
+      [[ 5 -le ' 5' ]] && echo "10. -le with space"
+      [[ 5 -ge ' 5' ]] && echo "11. -ge with space"
+
+      # Negative numbers with whitespace
+      [[ -5 -eq ' -5' ]] && echo "12. negative with space"
+
+  - name: "Terminal fd check with whitespace"
+    stdin: |
+      # -t operator should trim whitespace before parsing fd number
+      # These should all behave identically (false since not a terminal)
+      [[ -t 0 ]]
+      r1=$?
+      [[ -t ' 0' ]]
+      r2=$?
+      [[ -t '0 ' ]]
+      r3=$?
+
+      # All should have the same result
+      [[ $r1 -eq $r2 && $r2 -eq $r3 ]] && echo "All -t results match"