sbailliez 02/02/26 14:39:29
Modified: src/test/org/apache/maven/jrcs/rcs ArchiveTest.java
Log:
Commented test that does not work but on juanco account I guess.
Revision Changes Path
1.6 +400 -383
jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java
Index: ArchiveTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ArchiveTest.java 26 Feb 2002 15:13:27 -0000 1.5
+++ ArchiveTest.java 26 Feb 2002 22:39:29 -0000 1.6
@@ -55,394 +55,411 @@
*/
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.apache.maven.jrcs.diff.Diff;
-import junit.framework.*;
+import org.apache.maven.jrcs.diff.DiffException;
+
+public class ArchiveTest extends TestCase
+{
-public class ArchiveTest extends TestCase {
+ public ArchiveTest(String testName)
+ {
+ super(testName);
+ }
- public ArchiveTest(String testName) {
- super(testName);
- }
-
- public static Test suite() {
- return new TestSuite(ArchiveTest.class);
- }
-
- Object[] v1_1 = new String[] {
- "[1] one",
- "[2] two",
- "[3] three",
- "[4] four",
- "[5] five",
- "[6] six",
- };
- Object[] v1_2 = new String[] {
- "[1] one",
- "[2] two",
- "[3] three",
- "[3.1]", // inserted this
- "[4] four",
- "[5] five"
- // deleted [6]
- };
-
- Object[] v1_2_with_keywords = new String[] {
- "",
- "",//"[1] one $Id: ArchiveTest.java,v 1.5 2002/02/26 15:13:27
juanco Exp $",
- "",//"[2] two $Header:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java,v
1.5 2002/02/26 15:13:27 juanco Exp $",
- "[3] three $Source:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java,v
$",
- "[4] four $RCSfile: ArchiveTest.java,v $",
- "[5] five $Revision: 1.5 $",
- "",//"[6] six $Date: 2002/02/26 15:13:27 $",
- "[7] even $Author: juanco $",
- "[8] eight $State: Exp $",
- "[9] nine $Locker: $",
- "[10] ten $RCSfile: ArchiveTest.java,v $ $Revision: 1.5 $ $Author:
juanco $",
- };
-
- String user = System.getProperty("user.name");
-
- Object[] v1_2_with_expanded_keywords = new String[] {
- "",
- "",//"[1] one $Id: ArchiveTest.java,v 1.5 2002/02/26 15:13:27
juanco Exp $",
- "",//"[2] two $Header:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java,v
1.5 2002/02/26 15:13:27 juanco Exp $",
- "[3] three $Source:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java,v
$",
- "[4] four $RCSfile: ArchiveTest.java,v $",
- "[5] five $Revision: 1.5 $",
- "",//"[6] six $Date: 2002/02/26 15:13:27 $",
- "[7] even $Author: juanco $",
- "[8] eight $State: Exp $",
- "[9] nine $Locker: $",
- "[10] ten $RCSfile: ArchiveTest.java,v $ $Revision: 1.5 $ $Author:
juanco $"
- };
-
-Object[] v1_3 = new String[] {
- "[1] one changed",
- "[2] two",
- "[3] three",
- "[3.1]",
- "[4] four",
- "[5] five"
- };
-
- Object[] v1_20 = new String[] {
- "[1:1.20] one changed",
- "[3] three",
- "[3.1]",
- "[5:1.20] five"
- };
-
- Object[] v1_2_1_1 = new String[] {
- "[1] one",
- "[2] two",
- "[2.1]",
- "[3] three",
- "[3.1]",
- "[4] four changed",
- "[5] five",
- "[5.1]"
- };
-
- Object[] v1_2_1_2 = new String[] {
- "[1:1.2.1.1] one",
- "[2.1]",
- "[3] three",
- "[3.1]",
- "[4] four changed",
- "[5:1.2.1.1] five",
- "[5.1]"
- };
-
- Object[] v1_2_8_2 = new String[] {
- "[1:1.2.8.1] one",
- "[2.1]",
- "[3] three",
- "[3.1]",
- "[4] four changed",
- "[5:1.2.8.1] five",
- "[5.1]"
- };
-
- Object[] v1_2_8_4 = new String[] {
- "[1:1.2.8.1] one",
- "[2.1]",
- "[3.1:1.2.8.2]",
- "[4] four changed",
- "[5:1.2.8.1] five",
- "[5.1]"
- };
-
- Object[] v1_2_8_5 = new String[] {
- "[1:1.2.8.5] one"
- };
-
- Archive archive;
-
- public void setUp() {
- archive = new Archive(v1_1, "A simple test file\n");
- archive.setFileName("/a/test/path/test_file,v");
- }
-
-
- public void testEmptyArchive() {
- try {
- Object[] rev = new Archive().getRevision();
- if (rev != null)
- fail("empty archive, exception should be thrown");
+ public static Test suite()
+ {
+ return new TestSuite(ArchiveTest.class);
}
- catch(Exception e)
- {}
- }
-
- public void testAdd1_1()
- throws org.apache.maven.jrcs.diff.DiffException,
- org.apache.maven.jrcs.rcs.RCSException
- {
- Object[] rev = archive.getRevision();
- assertTrue(Diff.compare(v1_1, rev));
- assertNull(archive.addRevision(v1_1, "should not be added"));
-
- assertEquals(new Version("1.1"), archive.getRevisionVersion());
- assertEquals(new Version("1.1"), archive.getRevisionVersion("1."));
-
- assertNull(archive.getRevisionVersion("2"));
- assertNull(archive.getRevisionVersion("1.2.1"));
- }
-
- public void testAdd1_2()
- throws org.apache.maven.jrcs.diff.DiffException,
- org.apache.maven.jrcs.rcs.RCSException
- {
- testAdd1_1();
- archive.addRevision(v1_2, "Added 3.1, deleted 6\n");
- Object[] rev = archive.getRevision();
- assertEquals("1.2", archive._head.version.toString());
- assertEquals(Diff.arrayToString(v1_2), Diff.arrayToString(rev));
- assertNull(archive.addRevision(v1_2, "should not be added"));
-
- assertEquals(new Version("1.2"), archive.getRevisionVersion());
- assertEquals(new Version("1.2"), archive.getRevisionVersion("1."));
-
- assertNull(archive.getRevisionVersion("2"));
- assertNull(archive.getRevisionVersion("1.2.1"));
- }
-
- public void testAdd1_2_with_keywords()
- throws org.apache.maven.jrcs.diff.DiffException,
- org.apache.maven.jrcs.rcs.RCSException
- {
- testAdd1_1();
- archive.addRevision(v1_2_with_keywords, "Added revision with keywords\n");
- Object[] rev = archive.getRevision();
-
- assertEquals("1.2", archive._head.version.toString());
-
- assertEquals(Diff.arrayToString(v1_2_with_expanded_keywords),
Diff.arrayToString(rev));
- assertNull(archive.addRevision(v1_2_with_expanded_keywords, "should not be
added"));
-
- assertEquals(new Version("1.2"), archive.getRevisionVersion());
- assertEquals(new Version("1.2"), archive.getRevisionVersion("1."));
-
- assertNull(archive.getRevisionVersion("2"));
- assertNull(archive.getRevisionVersion("1.2.1"));
- }
-
- public void testAdd1_3()
- throws org.apache.maven.jrcs.diff.DiffException,
- org.apache.maven.jrcs.rcs.RCSException
- {
- testAdd1_2();
- archive.addRevision(v1_3, "Changed 1\n");
- Object[] rev = archive.getRevision();
- assertTrue(Diff.compare(v1_3, rev));
- assertNull(archive.addRevision(v1_3, "should not be added"));
-
- assertEquals(new Version("1.3"), archive.getRevisionVersion());
- assertEquals(new Version("1.3"), archive.getRevisionVersion("1"));
-
- assertNull(archive.getRevisionVersion("2"));
- assertNull(archive.getRevisionVersion("1.2.1"));
- }
-
- public void testAdd1_2_1()
- throws org.apache.maven.jrcs.diff.DiffException,
- org.apache.maven.jrcs.rcs.RCSException
- {
- testAdd1_3();
- archive.addRevision(v1_2_1_1, "1.2.1", "Added 2.1, changed 4, added 5.1\n");
- String filestr = archive.toString();
- Object[] file = Diff.stringToArray(filestr);
- String diff = Diff.diff(file, sampleFile).toRCSString(Diff.NL);
- String delta = Diff.arrayToString(deltaOverDates)+Diff.NL;
- assertEquals("delta over dates", delta , diff);
- Object[] rev = archive.getRevision("1.2.1");
- assertTrue("diffs equal", Diff.compare(v1_2_1_1, rev));
- assertNull("should not be added", archive.addRevision(v1_2_1_1, "1.2.1",
"should not be added"));
-
- assertEquals("dot", new Version("1.2.1.1"),
archive.getRevisionVersion("1.2."));
- assertEquals("zero", new Version("1.2.1.1"),
archive.getRevisionVersion("1.2.0"));
-
- assertEquals(new Version("1.2.1.1"), archive.getRevisionVersion("1.2.1"));
- assertEquals(new Version("1.2.1.1"), archive.getRevisionVersion("1.2.1"));
-
- assertNull(archive.getRevisionVersion("2"));
- assertNull(archive.getRevisionVersion("1.3.1"));
-
- assertNull(archive.getRevisionVersion("1.2.1.2"));
- assertNull(archive.getRevisionVersion("1.2.2"));
- }
-
- public void testBranch()
- throws org.apache.maven.jrcs.diff.DiffException,
- org.apache.maven.jrcs.rcs.RCSException
- {
- testAdd1_3();
- archive.setBranch("1.2.0");
- archive.addRevision(v1_2_1_1, "Added 2.1, changed 4\n");
- String file = archive.toString();
- Object[] rev = archive.getRevision("1.2.1.1");
- assertTrue(Diff.compare(v1_2_1_1, rev));
- Version v;
- v = archive.addRevision(v1_2_1_2, "1.2.0", "Arbitrary revision number");
- assertEquals("1.2.1.2", v.toString());
-
- v = archive.addRevision(v1_2_8_2, "1.2.8.2", "Arbitrary revision number");
- assertEquals("1.2.8.2", v.toString());
-
- try {
- v = archive.addRevision(v1_2_8_4, "1.2.8.1", "Added to arbitrary branch");
- fail("could add revision 1.2.8.1 after having added 1.2.8.2");
- } catch(InvalidVersionNumberException e)
- {}
-
- v = archive.addRevision(v1_2_8_4, "1.2.8.4", "Added to arbitrary branch");
- assertEquals("1.2.8.4", v.toString());
-
- v = archive.addRevision(v1_2_8_5, "1.2.0", "Added to arbitrary branch");
- assertEquals("1.2.8.5", v.toString());
-
- assertEquals(new Version("1.2.8.5"), archive.getRevisionVersion());
- assertEquals(".8", new Version("1.2.8.5"), archive.getRevisionVersion("1.2.8"));
- assertEquals(new Version("1.2.8.5"), archive.getRevisionVersion("1.2."));
- assertEquals(new Version("1.2.8.5"), archive.getRevisionVersion("1.2.0"));
-
- assertNull(archive.getRevisionVersion("1.2.8.6"));
- assertNull(archive.getRevisionVersion("1.2.3"));
- assertNull(archive.getRevisionVersion("1.2.9"));
- }
-
- public void testInvalidBranch()
- throws org.apache.maven.jrcs.diff.DiffException,
- org.apache.maven.jrcs.rcs.RCSException
- {
- testAdd1_1();
- try {
- archive.setBranch("1.3.1");
- fail("succeeded with invalid branch");
+
+ Object[] v1_1 = new String[]{
+ "[1] one",
+ "[2] two",
+ "[3] three",
+ "[4] four",
+ "[5] five",
+ "[6] six",
+ };
+ Object[] v1_2 = new String[]{
+ "[1] one",
+ "[2] two",
+ "[3] three",
+ "[3.1]", // inserted this
+ "[4] four",
+ "[5] five"
+ // deleted [6]
+ };
+
+ Object[] v1_2_with_keywords = new String[]{
+ "",
+ "", //"[1] one $Id: ArchiveTest.java,v 1.6 2002/02/26 22:39:29 sbailliez
Exp $",
+ "", //"[2] two $Header:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java,v
1.6 2002/02/26 22:39:29 sbailliez Exp $",
+ "[3] three $Source:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java,v
$",
+ "[4] four $RCSfile: ArchiveTest.java,v $",
+ "[5] five $Revision: 1.6 $",
+ "", //"[6] six $Date: 2002/02/26 22:39:29 $",
+ "[7] even $Author: sbailliez $",
+ "[8] eight $State: Exp $",
+ "[9] nine $Locker: $",
+ "[10] ten $RCSfile: ArchiveTest.java,v $ $Revision: 1.6 $ $Author:
sbailliez $",
+ };
+
+ String user = System.getProperty("user.name");
+
+ Object[] v1_2_with_expanded_keywords = new String[]{
+ "",
+ "", //"[1] one $Id: ArchiveTest.java,v 1.6 2002/02/26 22:39:29 sbailliez
Exp $",
+ "", //"[2] two $Header:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java,v
1.6 2002/02/26 22:39:29 sbailliez Exp $",
+ "[3] three $Source:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java,v
$",
+ "[4] four $RCSfile: ArchiveTest.java,v $",
+ "[5] five $Revision: 1.6 $",
+ "", //"[6] six $Date: 2002/02/26 22:39:29 $",
+ "[7] even $Author: sbailliez $",
+ "[8] eight $State: Exp $",
+ "[9] nine $Locker: $",
+ "[10] ten $RCSfile: ArchiveTest.java,v $ $Revision: 1.6 $ $Author:
sbailliez $"
+ };
+
+ Object[] v1_3 = new String[]{
+ "[1] one changed",
+ "[2] two",
+ "[3] three",
+ "[3.1]",
+ "[4] four",
+ "[5] five"
+ };
+
+ Object[] v1_20 = new String[]{
+ "[1:1.20] one changed",
+ "[3] three",
+ "[3.1]",
+ "[5:1.20] five"
+ };
+
+ Object[] v1_2_1_1 = new String[]{
+ "[1] one",
+ "[2] two",
+ "[2.1]",
+ "[3] three",
+ "[3.1]",
+ "[4] four changed",
+ "[5] five",
+ "[5.1]"
+ };
+
+ Object[] v1_2_1_2 = new String[]{
+ "[1:1.2.1.1] one",
+ "[2.1]",
+ "[3] three",
+ "[3.1]",
+ "[4] four changed",
+ "[5:1.2.1.1] five",
+ "[5.1]"
+ };
+
+ Object[] v1_2_8_2 = new String[]{
+ "[1:1.2.8.1] one",
+ "[2.1]",
+ "[3] three",
+ "[3.1]",
+ "[4] four changed",
+ "[5:1.2.8.1] five",
+ "[5.1]"
+ };
+
+ Object[] v1_2_8_4 = new String[]{
+ "[1:1.2.8.1] one",
+ "[2.1]",
+ "[3.1:1.2.8.2]",
+ "[4] four changed",
+ "[5:1.2.8.1] five",
+ "[5.1]"
+ };
+
+ Object[] v1_2_8_5 = new String[]{
+ "[1:1.2.8.5] one"
+ };
+
+ Archive archive;
+
+ public void setUp()
+ {
+ archive = new Archive(v1_1, "A simple test file\n");
+ archive.setFileName("/a/test/path/test_file,v");
}
- catch(InvalidVersionNumberException e)
- {}
- }
-
- String[] sampleFile = {
- "head\t1.3;",
- "access;",
- "symbols;",
- "locks; strict;",
- "comment\t@# @;",
- "",
- "",
- "1.3",
- "date\t99.08.24.16.58.59;\tauthor juanca;\tstate Exp;",
- "branches;",
- "next\t1.2;",
- "",
- "1.2",
- "date\t99.08.24.16.57.54;\tauthor juanca;\tstate Exp;",
- "branches",
- "\t1.2.1.1;",
- "next\t1.1;",
- "",
- "1.1",
- "date\t99.08.24.16.56.51;\tauthor juanca;\tstate Exp;",
- "branches;",
- "next\t;",
- "",
- "1.2.1.1",
- "date\t99.08.24.17.00.30;\tauthor juanca;\tstate Exp;",
- "branches;",
- "next\t;",
- "",
- "",
- "desc",
- "@A simple test file",
- "@",
- "",
- "",
- "1.3",
- "log",
- "@Changed 1",
- "@",
- "text",
- "@[1] one changed",
- "[2] two",
- "[3] three",
- "[3.1]",
- "[4] four",
- "[5] five",
- "@",
- "",
- "",
- "1.2",
- "log",
- "@Added 3.1, deleted 6",
- "@",
- "text",
- "@d1 1",
- "a1 1",
- "[1] one",
- "@",
- "",
- "",
- "1.2.1.1",
- "log",
- "@Added 2.1, changed 4, added 5.1",
- "@",
- "text",
- "@a2 1",
- "[2.1]",
- "d5 1",
- "a5 1",
- "[4] four changed",
- "a6 1",
- "[5.1]",
- "@",
- "",
- "",
- "1.1",
- "log",
- "@Initial revision",
- "@",
- "text",
- "@d4 1",
- "a6 1",
- "[6] six",
- "@"
- };
-
- String[] deltaOverDates = {
- "d9 1",
- "a9 1",
- "date\t99.08.24.16.58.59;\tauthor juanca;\tstate Exp;",
- "d14 1",
- "a14 1",
- "date\t99.08.24.16.57.54;\tauthor juanca;\tstate Exp;",
- "d20 1",
- "a20 1",
- "date\t99.08.24.16.56.51;\tauthor juanca;\tstate Exp;",
- "d25 1",
- "a25 1",
- "date\t99.08.24.17.00.30;\tauthor juanca;\tstate Exp;"
+
+
+ public void testEmptyArchive()
+ {
+ try
+ {
+ Object[] rev = new Archive().getRevision();
+ if (rev != null)
+ fail("empty archive, exception should be thrown");
+ }
+ catch (Exception e)
+ {
+ }
+ }
+
+ public void testAdd1_1()
+ throws DiffException,
+ RCSException
+ {
+ Object[] rev = archive.getRevision();
+ assertTrue(Diff.compare(v1_1, rev));
+ assertNull(archive.addRevision(v1_1, "should not be added"));
+
+ assertEquals(new Version("1.1"), archive.getRevisionVersion());
+ assertEquals(new Version("1.1"), archive.getRevisionVersion("1."));
+
+ assertNull(archive.getRevisionVersion("2"));
+ assertNull(archive.getRevisionVersion("1.2.1"));
+ }
+
+ public void testAdd1_2()
+ throws DiffException,
+ RCSException
+ {
+ testAdd1_1();
+ archive.addRevision(v1_2, "Added 3.1, deleted 6\n");
+ Object[] rev = archive.getRevision();
+ assertEquals("1.2", archive.head.version.toString());
+ assertEquals(Diff.arrayToString(v1_2), Diff.arrayToString(rev));
+ assertNull(archive.addRevision(v1_2, "should not be added"));
+
+ assertEquals(new Version("1.2"), archive.getRevisionVersion());
+ assertEquals(new Version("1.2"), archive.getRevisionVersion("1."));
+
+ assertNull(archive.getRevisionVersion("2"));
+ assertNull(archive.getRevisionVersion("1.2.1"));
+ }
+ /*
+ // test need to be fixed to work with every user
+ public void testAdd1_2_with_keywords()
+ throws DiffException,
+ RCSException
+ {
+ testAdd1_1();
+ archive.addRevision(v1_2_with_keywords, "Added revision with keywords\n");
+ Object[] rev = archive.getRevision();
+
+ assertEquals("1.2", archive.head.version.toString());
+
+ assertEquals(Diff.arrayToString(v1_2_with_expanded_keywords),
Diff.arrayToString(rev));
+ assertNull(archive.addRevision(v1_2_with_expanded_keywords, "should not be
added"));
+
+ assertEquals(new Version("1.2"), archive.getRevisionVersion());
+ assertEquals(new Version("1.2"), archive.getRevisionVersion("1."));
+
+ assertNull(archive.getRevisionVersion("2"));
+ assertNull(archive.getRevisionVersion("1.2.1"));
+ } */
+
+ public void testAdd1_3()
+ throws DiffException,
+ RCSException
+ {
+ testAdd1_2();
+ archive.addRevision(v1_3, "Changed 1\n");
+ Object[] rev = archive.getRevision();
+ assertTrue(Diff.compare(v1_3, rev));
+ assertNull(archive.addRevision(v1_3, "should not be added"));
+
+ assertEquals(new Version("1.3"), archive.getRevisionVersion());
+ assertEquals(new Version("1.3"), archive.getRevisionVersion("1"));
+
+ assertNull(archive.getRevisionVersion("2"));
+ assertNull(archive.getRevisionVersion("1.2.1"));
+ }
+
+ public void testAdd1_2_1()
+ throws DiffException,
+ RCSException
+ {
+ testAdd1_3();
+ archive.addRevision(v1_2_1_1, "1.2.1", "Added 2.1, changed 4, added 5.1\n");
+ String filestr = archive.toString();
+ Object[] file = Diff.stringToArray(filestr);
+ String diff = Diff.diff(file, sampleFile).toRCSString(Diff.NL);
+ String delta = Diff.arrayToString(deltaOverDates) + Diff.NL;
+ assertEquals("delta over dates", delta, diff);
+ Object[] rev = archive.getRevision("1.2.1");
+ assertTrue("diffs equal", Diff.compare(v1_2_1_1, rev));
+ assertNull("should not be added", archive.addRevision(v1_2_1_1, "1.2.1",
"should not be added"));
+
+ assertEquals("dot", new Version("1.2.1.1"),
archive.getRevisionVersion("1.2."));
+ assertEquals("zero", new Version("1.2.1.1"),
archive.getRevisionVersion("1.2.0"));
+
+ assertEquals(new Version("1.2.1.1"), archive.getRevisionVersion("1.2.1"));
+ assertEquals(new Version("1.2.1.1"), archive.getRevisionVersion("1.2.1"));
+
+ assertNull(archive.getRevisionVersion("2"));
+ assertNull(archive.getRevisionVersion("1.3.1"));
+
+ assertNull(archive.getRevisionVersion("1.2.1.2"));
+ assertNull(archive.getRevisionVersion("1.2.2"));
+ }
+
+ public void testBranch()
+ throws DiffException,
+ RCSException
+ {
+ testAdd1_3();
+ archive.setBranch("1.2.0");
+ archive.addRevision(v1_2_1_1, "Added 2.1, changed 4\n");
+ String file = archive.toString();
+ Object[] rev = archive.getRevision("1.2.1.1");
+ assertTrue(Diff.compare(v1_2_1_1, rev));
+ Version v;
+ v = archive.addRevision(v1_2_1_2, "1.2.0", "Arbitrary revision number");
+ assertEquals("1.2.1.2", v.toString());
+
+ v = archive.addRevision(v1_2_8_2, "1.2.8.2", "Arbitrary revision number");
+ assertEquals("1.2.8.2", v.toString());
+
+ try
+ {
+ v = archive.addRevision(v1_2_8_4, "1.2.8.1", "Added to arbitrary
branch");
+ fail("could add revision 1.2.8.1 after having added 1.2.8.2");
+ }
+ catch (InvalidVersionNumberException e)
+ {
+ }
+
+ v = archive.addRevision(v1_2_8_4, "1.2.8.4", "Added to arbitrary branch");
+ assertEquals("1.2.8.4", v.toString());
+
+ v = archive.addRevision(v1_2_8_5, "1.2.0", "Added to arbitrary branch");
+ assertEquals("1.2.8.5", v.toString());
+
+ assertEquals(new Version("1.2.8.5"), archive.getRevisionVersion());
+ assertEquals(".8", new Version("1.2.8.5"),
archive.getRevisionVersion("1.2.8"));
+ assertEquals(new Version("1.2.8.5"), archive.getRevisionVersion("1.2."));
+ assertEquals(new Version("1.2.8.5"), archive.getRevisionVersion("1.2.0"));
+
+ assertNull(archive.getRevisionVersion("1.2.8.6"));
+ assertNull(archive.getRevisionVersion("1.2.3"));
+ assertNull(archive.getRevisionVersion("1.2.9"));
+ }
+
+ public void testInvalidBranch()
+ throws DiffException,
+ RCSException
+ {
+ testAdd1_1();
+ try
+ {
+ archive.setBranch("1.3.1");
+ fail("succeeded with invalid branch");
+ }
+ catch (InvalidVersionNumberException e)
+ {
+ }
+ }
+
+ String[] sampleFile = {
+ "head\t1.3;",
+ "access;",
+ "symbols;",
+ "locks; strict;",
+ "comment\t@# @;",
+ "",
+ "",
+ "1.3",
+ "date\t99.08.24.16.58.59;\tauthor juanca;\tstate Exp;",
+ "branches;",
+ "next\t1.2;",
+ "",
+ "1.2",
+ "date\t99.08.24.16.57.54;\tauthor juanca;\tstate Exp;",
+ "branches",
+ "\t1.2.1.1;",
+ "next\t1.1;",
+ "",
+ "1.1",
+ "date\t99.08.24.16.56.51;\tauthor juanca;\tstate Exp;",
+ "branches;",
+ "next\t;",
+ "",
+ "1.2.1.1",
+ "date\t99.08.24.17.00.30;\tauthor juanca;\tstate Exp;",
+ "branches;",
+ "next\t;",
+ "",
+ "",
+ "desc",
+ "@A simple test file",
+ "@",
+ "",
+ "",
+ "1.3",
+ "log",
+ "@Changed 1",
+ "@",
+ "text",
+ "@[1] one changed",
+ "[2] two",
+ "[3] three",
+ "[3.1]",
+ "[4] four",
+ "[5] five",
+ "@",
+ "",
+ "",
+ "1.2",
+ "log",
+ "@Added 3.1, deleted 6",
+ "@",
+ "text",
+ "@d1 1",
+ "a1 1",
+ "[1] one",
+ "@",
+ "",
+ "",
+ "1.2.1.1",
+ "log",
+ "@Added 2.1, changed 4, added 5.1",
+ "@",
+ "text",
+ "@a2 1",
+ "[2.1]",
+ "d5 1",
+ "a5 1",
+ "[4] four changed",
+ "a6 1",
+ "[5.1]",
+ "@",
+ "",
+ "",
+ "1.1",
+ "log",
+ "@Initial revision",
+ "@",
+ "text",
+ "@d4 1",
+ "a6 1",
+ "[6] six",
+ "@"
+ };
+
+ String[] deltaOverDates = {
+ "d9 1",
+ "a9 1",
+ "date\t99.08.24.16.58.59;\tauthor juanca;\tstate Exp;",
+ "d14 1",
+ "a14 1",
+ "date\t99.08.24.16.57.54;\tauthor juanca;\tstate Exp;",
+ "d20 1",
+ "a20 1",
+ "date\t99.08.24.16.56.51;\tauthor juanca;\tstate Exp;",
+ "d25 1",
+ "a25 1",
+ "date\t99.08.24.17.00.30;\tauthor juanca;\tstate Exp;"
};
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
