From 3d9460cc1528b7a8465118dc2bf04d213e0ae9d6 Mon Sep 17 00:00:00 2001 From: bwalding Date: Sat, 5 Apr 2003 14:09:55 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113266 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/cvslib/CvsChangeLogGenerator.java | 10 +++++++-- .../cvslib/CvsChangeLogGeneratorTest.java | 21 +++++++++++-------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java index 4108c05b..f260227e 100644 --- a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java +++ b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java @@ -83,7 +83,7 @@ import org.apache.tools.ant.types.Commandline; * @author Peter Donald * @author Pete Kazmier * @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")) { diff --git a/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java b/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java index ca5cab9d..56fd7d50 100644 --- a/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java +++ b/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java @@ -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 Ben Walding - * @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 Ben Walding - * @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); } }