bwalding 2003/04/05 06:09:55
Modified: src/plugins-build/changelog/src/test/org/apache/maven/cvslib
CvsChangeLogGeneratorTest.java
src/plugins-build/changelog/src/main/org/apache/maven/cvslib
CvsChangeLogGenerator.java
Log:
An offshoot of 297 was looking at how the bogus info got parsed. Turns out the
changelog parser
only looks to see if there is a minimum of 6 dividers. Now it checks to make sure
there is a max of 6 as well.
PR: MAVEN-297
Revision Changes Path
1.3 +12 -9
maven/src/plugins-build/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java
Index: CvsChangeLogGeneratorTest.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsChangeLogGeneratorTest.java 21 Feb 2003 22:00:51 -0000 1.2
+++ CvsChangeLogGeneratorTest.java 5 Apr 2003 14:09:55 -0000 1.3
@@ -58,7 +58,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.StringTokenizer;
import org.apache.tools.ant.types.Commandline;
@@ -102,23 +101,27 @@
{
new Test("asd:asd", "", IllegalArgumentException.class),
new Test(
- "scm:csvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-turbine-maven:anoncvs",
+ "scm:csvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-turbine-maven",
"",
IllegalArgumentException.class),
new Test(
- "scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-turbine-maven:anoncvs",
+ "scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-turbine-maven",
"cvs|-d|:pserver:[EMAIL PROTECTED]:/home/cvspublic|log",
null),
new Test(
- "scm|cvs|pserver|[EMAIL
PROTECTED]|D:\\home\\cvspublic|jakarta-turbine-maven|anoncvs",
+ "scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-turbine-maven:anoncvs",
+ "",
+ IllegalArgumentException.class),
+ new Test(
+ "scm|cvs|pserver|[EMAIL
PROTECTED]|D:\\home\\cvspublic|jakarta-turbine-maven",
"cvs|-d|:pserver:[EMAIL PROTECTED]:D:\\home\\cvspublic|log",
null),
new Test(
- "scm|cvs|pserver|[EMAIL
PROTECTED]|D:/home/cvspublic|jakarta-turbine-maven|anoncvs",
+ "scm|cvs|pserver|[EMAIL
PROTECTED]|D:/home/cvspublic|jakarta-turbine-maven",
"cvs|-d|:pserver:[EMAIL PROTECTED]:D:/home/cvspublic|log",
null),
new Test(
-
"scm|cvs|local|local|D:/home/cvspublic|jakarta-turbine-maven|anoncvs",
+ "scm|cvs|local|local|D:/home/cvspublic|jakarta-turbine-maven",
"cvs|-d|D:/home/cvspublic|log",
null)};
@@ -165,7 +168,7 @@
}
else
{
- throw t;
+ throw new RuntimeException("Caught unexpected exception \"" +
t.getLocalizedMessage() + "\" testing " + test.conn);
}
}
1.4 +8 -2
maven/src/plugins-build/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
Index: CvsChangeLogGenerator.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CvsChangeLogGenerator.java 21 Feb 2003 22:00:50 -0000 1.3
+++ CvsChangeLogGenerator.java 5 Apr 2003 14:09:55 -0000 1.4
@@ -111,8 +111,14 @@
StringTokenizer tokenizer = new StringTokenizer(getConnection(),
inputDelim);
if (tokenizer.countTokens() < 6)
{
- throw new IllegalArgumentException("repository connection string" + "
contains less than six tokens");
+ throw new IllegalArgumentException("repository connection string
contains less than six tokens");
}
+
+ if (tokenizer.countTokens() > 6)
+ {
+ throw new IllegalArgumentException("repository connection string
contains more than six tokens");
+ }
+
tokenizer.nextToken(); // skip 'scm'
if (!tokenizer.nextToken().equals("cvs"))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
