Bommels05/maven-plugins
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

An offshoot of 297 was looking at how the bogus info got parsed. Turns out the changelog parser

Browse Source 
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


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113266 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
bwalding committed 2003-04-05 14:09:55 +00:00
1 parent c5f988832a
commit 3d9460cc15
2 files changed
+20 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
+8 -2
View File
@@ -83,7 +83,7 @@ import org.apache.tools.ant.types.Commandline;
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
* @author <a href="mailto:pete-apache-dev@kazmier.com">Pete Kazmier</a>
* @version
* $Id: CvsChangeLogGenerator.java,v 1.3 2003/02/21 22:00:50 bwalding Exp $
* $Id: CvsChangeLogGenerator.java,v 1.4 2003/04/05 14:09:55 bwalding Exp $
*/
class CvsChangeLogGenerator extends AbstractChangeLogGenerator
{
@@ -111,8 +111,14 @@ class CvsChangeLogGenerator extends AbstractChangeLogGenerator
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"))
{
changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java
+12 -9
View File
@@ -58,7 +58,6 @@ package org.apache.maven.cvslib;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
import org.apache.tools.ant.types.Commandline;
@@ -66,7 +65,7 @@ import junit.framework.TestCase;
/**
* @author <a href="bwalding@jakarta.org">Ben Walding</a>
* @version $Id: CvsChangeLogGeneratorTest.java,v 1.2 2003/02/21 22:00:51 bwalding Exp $
* @version $Id: CvsChangeLogGeneratorTest.java,v 1.3 2003/04/05 14:09:55 bwalding Exp $
*/
class ExposeGenerator extends CvsChangeLogGenerator
{
@@ -79,7 +78,7 @@ class ExposeGenerator extends CvsChangeLogGenerator
/**
* @author <a href="bwalding@jakarta.org">Ben Walding</a>
* @version $Id: CvsChangeLogGeneratorTest.java,v 1.2 2003/02/21 22:00:51 bwalding Exp $
* @version $Id: CvsChangeLogGeneratorTest.java,v 1.3 2003/04/05 14:09:55 bwalding Exp $
*/
public class CvsChangeLogGeneratorTest extends TestCase
{
@@ -102,23 +101,27 @@ public class CvsChangeLogGeneratorTest extends TestCase
{
new Test("asd:asd", "", IllegalArgumentException.class),
new Test(
"scm:csvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven:anoncvs",
"scm:csvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven",
"",
IllegalArgumentException.class),
new Test(
"scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven:anoncvs",
"scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven",
"cvs|-d|:pserver:anoncvs@cvs.apache.org:/home/cvspublic|log",
null),
new Test(
"scm|cvs|pserver|anoncvs@cvs.apache.org|D:\\home\\cvspublic|jakarta-turbine-maven|anoncvs",
"scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven:anoncvs",
"",
IllegalArgumentException.class),
new Test(
"scm|cvs|pserver|anoncvs@cvs.apache.org|D:\\home\\cvspublic|jakarta-turbine-maven",
"cvs|-d|:pserver:anoncvs@cvs.apache.org:D:\\home\\cvspublic|log",
null),
new Test(
"scm|cvs|pserver|anoncvs@cvs.apache.org|D:/home/cvspublic|jakarta-turbine-maven|anoncvs",
"scm|cvs|pserver|anoncvs@cvs.apache.org|D:/home/cvspublic|jakarta-turbine-maven",
"cvs|-d|:pserver:anoncvs@cvs.apache.org: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 @@ public class CvsChangeLogGeneratorTest extends TestCase
}
else
{
throw t;
throw new RuntimeException("Caught unexpected exception \"" + t.getLocalizedMessage() + "\" testing " + test.conn);
}
}