roxspring 2004/12/23 07:04:40
Modified: cli/src/test/org/apache/commons/cli2/util
HelpFormatterTest.java
cli/src/test/org/apache/commons/cli2/application CpTest.java
Log:
Brought CpTest inline with new default display settings
Testtime console output back to none
Revision Changes Path
1.4 +0 -1
jakarta-commons/cli/src/test/org/apache/commons/cli2/util/HelpFormatterTest.java
Index: HelpFormatterTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/util/HelpFormatterTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HelpFormatterTest.java 14 Oct 2004 22:50:31 -0000 1.3
+++ HelpFormatterTest.java 23 Dec 2004 15:04:40 -0000 1.4
@@ -199,7 +199,6 @@
helpFormatter.setGroup(options);
helpFormatter.setPrintWriter(new PrintWriter(writer));
helpFormatter.printHelp();
- System.out.println(writer);
final BufferedReader reader =
new BufferedReader(new StringReader(writer.toString()));
assertEquals(
1.3 +21 -21
jakarta-commons/cli/src/test/org/apache/commons/cli2/application/CpTest.java
Index: CpTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/cli/src/test/org/apache/commons/cli2/application/CpTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CpTest.java 22 Apr 2004 23:00:13 -0000 1.2
+++ CpTest.java 23 Dec 2004 15:04:40 -0000 1.3
@@ -397,67 +397,67 @@
"OPTIONS
",
in.readLine());
assertEquals(
- " -a (--archive) same as -dpR
",
+ " -a (--archive) same as -dpR
",
in.readLine());
assertEquals(
- " -b (--backup) make backup before removal
",
+ " -b (--backup) make backup before removal
",
in.readLine());
assertEquals(
- " -d (--no-dereference) preserve links
",
+ " -d (--no-dereference) preserve links
",
in.readLine());
assertEquals(
- " -f (--force) remove existing destinations, never
prompt ",
+ " -f (--force) remove existing destinations,
never prompt ",
in.readLine());
assertEquals(
- " -i (--interactive) prompt before overwrite
",
+ " -i (--interactive) prompt before overwrite
",
in.readLine());
assertEquals(
- " -l (--link) link files instead of copying
",
+ " -l (--link) link files instead of copying
",
in.readLine());
assertEquals(
- " -p (--preserve) preserve file attributes if
possible ",
+ " -p (--preserve) preserve file attributes if
possible ",
in.readLine());
assertEquals(
- " -P (--parents) append source path to DIRECTORY
",
+ " -P (--parents) append source path to DIRECTORY
",
in.readLine());
assertEquals(
- " -r copy recursively, non-directories
as files ",
+ " -r copy recursively,
non-directories as files ",
in.readLine());
assertEquals(
- " --sparse control creation of sparse files
",
+ " --sparse WHEN control creation of sparse
files ",
in.readLine());
assertEquals(
- " -R (--recursive) copy directories recursively
",
+ " -R (--recursive) copy directories recursively
",
in.readLine());
assertEquals(
- " -s (--symbolic-link) make symbolic links instead of
copying ",
+ " -s (--symbolic-link) make symbolic links instead of
copying ",
in.readLine());
assertEquals(
- " -S (--suffix) override the usual backup suffix
",
+ " -S (--suffix) SUFFIX override the usual backup
suffix ",
in.readLine());
assertEquals(
- " -u (--update) copy only when the SOURCE file is
newer than the ",
+ " -u (--update) copy only when the SOURCE file
is newer than ",
in.readLine());
assertEquals(
- " destination file or when the
destination file is ",
+ " the destination file or when
the destination ",
in.readLine());
assertEquals(
- " missing
",
+ " file is missing
",
in.readLine());
assertEquals(
- " -v (--verbose) explain what is being done
",
+ " -v (--verbose) explain what is being done
",
in.readLine());
assertEquals(
- " -V (--version-contol) explain what is being done
",
+ " -V (--version-contol) WORD explain what is being done
",
in.readLine());
assertEquals(
- " -x (--one-file-system) stay on this file system
",
+ " -x (--one-file-system) stay on this file system
",
in.readLine());
assertEquals(
- " --help display this help and exit
",
+ " --help display this help and exit
",
in.readLine());
assertEquals(
- " --version output version information and exit
",
+ " --version output version information and
exit ",
in.readLine());
assertEquals(
" SOURCE [SOURCE ...]
",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
