8000 Brought CpTest inline with new default display settings · apache/commons-cli@43c4f66 · GitHub
Skip to content

Commit 43c4f66

Browse files
author
Robert James Oxspring
committed
Brought CpTest inline with new default display settings
Testtime console output back to none git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@130106 13f79535-47bb-0310-9956-ffa450edef68
1 parent e4925b2 commit 43c4f66

2 files changed

Lines changed: 21 additions & 22 deletions

File tree

‎src/test/org/apache/commons/cli2/application/CpTest.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -397,67 +397,67 @@ public void testHelp() throws IOException {
397397
"OPTIONS ",
398398
in.readLine());
399399
assertEquals(
400-
" -a (--archive) same as -dpR ",
400+
" -a (--archive) same as -dpR ",
401401
in.readLine());
402402
assertEquals(
403-
" -b (--backup) make backup before removal ",
403+
" -b (--backup) make backup before removal ",
404404
in.readLine());
405405
assertEquals(
406-
" -d (--no-dereference) preserve links ",
406+
" -d (--no-dereference) preserve links ",
407407
in.readLine());
408408
assertEquals(
409-
" -f (--force) remove existing destinations, never prompt ",
409+
" -f (--force) remove existing destinations, never prompt ",
410410
in.readLine());
411411
assertEquals(
412-
" -i (--interactive) prompt before overwrite ",
412+
" -i (--interactive) prompt before overwrite ",
413413
in.readLine());
414414
assertEquals(
415-
" -l (--link) link files instead of copying ",
415+
" -l (--link) link files instead of copying ",
416416
in.readLine());
417417
assertEquals(
418-
" -p (--preserve) preserve file attributes if possible ",
418+
" -p (--preserve) preserve file attributes if possible ",
419419
in.readLine());
420420
assertEquals(
421-
" -P (--parents) append source path to DIRECTORY ",
421+
" -P (--parents) append source path to DIRECTORY ",
422422
in.readLine());
423423
assertEquals(
424-
" -r copy recursively, non-directories as files ",
424+
" -r copy recursively, non-directories as files ",
425425
in.readLine());
426426
assertEquals(
427-
" --sparse control creation of sparse files ",
427+
" --sparse WHEN control creation of sparse files ",
428428
in.readLine());
429429
assertEquals(
430-
" -R (--recursive) copy directories recursively ",
430+
" -R (--recursive) copy directories recursively ",
431431
in.readLine());
432432
assertEquals(
433-
" -s (--symbolic-link) make symbolic links instead of copying ",
433+
" -s (--symbolic-link) make symbolic links instead of copying ",
434434
in.readLine());
435435
assertEquals(
436-
" -S (--suffix) override the usual backup suffix ",
436+
" -S (--suffix) SUFFIX override the usual backup suffix ",
437437
in.readLine());
438438
assertEquals(
439-
" -u (--update) copy only when the SOURCE file is newer than the ",
439+
" -u (--update) copy only when the SOURCE file is newer than ",
440440
in.readLine());
441441
assertEquals(
442-
" destination file or when the destination file is ",
442+
" the destination file or when the destination ",
443443
in.readLine());
444444
assertEquals(
445-
" missing ",
445+
" file is missing ",
446446
in.readLine());
447447
assertEquals(
448-
" -v (--verbose) explain what is being done ",
448+
" -v (--verbose) explain what is being done ",
449449
in.readLine());
450450
assertEquals(
451-
" -V (--version-contol) explain what is being done ",
451+
" -V (--version-contol) WORD explain what is being done ",
452452
in.readLine());
453453
assertEquals(
454-
" -x (--one-file-system) stay on this file system ",
454+
" -x (--one-file-system) stay on this file system ",
455455
in.readLine());
456456
assertEquals(
457-
" --help display this help and exit ",
457+
" --help display this help and exit ",
458458
in.readLine());
459459
assertEquals(
460-
" --version output version information and exit ",
460+
" --version output version information and exit ",
461461
in.readLine());
462462
assertEqual 77F4 s(
463463
" SOURCE [SOURCE ...] ",

‎src/test/org/apache/commons/cli2/util/HelpFormatterTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ public void testPrintHelp_TooNarrow() throws IOException {
199199
helpFormatter.setGroup(options);
200200
helpFormatter.setPrintWriter(new PrintWriter(writer));
201201
helpFormatter.printHelp();
202-
System.out.println(writer);
203202
final BufferedReader reader =
204203
new BufferedReader(new StringReader(writer.toString()));
205204
assertEquals(

0 commit comments

Comments
 (0)