equal
deleted
inserted
replaced
136 } |
136 } |
137 |
137 |
138 private Consumer<String> assertOrNull(String expected, String label) { |
138 private Consumer<String> assertOrNull(String expected, String label) { |
139 return expected == null |
139 return expected == null |
140 ? null |
140 ? null |
141 : s -> assertEquals(s.trim(), expected.trim(), label); |
141 : s -> assertEquals(s.replaceAll("\\r\\n?", "\n").trim(), expected.trim(), label); |
142 } |
142 } |
143 |
143 |
144 // Start and check the resultant: exit code (Ex), command output (Co), |
144 // Start and check the resultant: exit code (Ex), command output (Co), |
145 // user output (Uo), command error (Ce), and console output (Cn) |
145 // user output (Uo), command error (Ce), and console output (Cn) |
146 protected void startExCoUoCeCn(int expectedExitCode, |
146 protected void startExCoUoCeCn(int expectedExitCode, |