equal
deleted
inserted
replaced
436 if (userinput != null) { |
436 if (userinput != null) { |
437 setUserInput(userinput); |
437 setUserInput(userinput); |
438 } |
438 } |
439 setCommandInput(cmd + "\n"); |
439 setCommandInput(cmd + "\n"); |
440 } else { |
440 } else { |
441 assertOutput(getCommandOutput(), out, "command output: " + cmd); |
441 assertOutput(getCommandOutput().trim(), out==null? out : out.trim(), "command output: " + cmd); |
442 assertOutput(getCommandErrorOutput(), err, "command error: " + cmd); |
442 assertOutput(getCommandErrorOutput(), err, "command error: " + cmd); |
443 assertOutput(getUserOutput(), print, "user output: " + cmd); |
443 assertOutput(getUserOutput(), print, "user output: " + cmd); |
444 assertOutput(getUserErrorOutput(), usererr, "user error: " + cmd); |
444 assertOutput(getUserErrorOutput(), usererr, "user error: " + cmd); |
445 } |
445 } |
446 } |
446 } |