juanco 02/02/26 18:10:50
Modified: src/java/org/apache/maven/jrcs/rcs ArchiveFormat.java
src/test/org/apache/maven/jrcs/rcs ArchiveTest.java
Log:
Fixed the test data for keyword substitution so CVS does'nt mangle it on check
ins/outs
Revision Changes Path
1.3 +2 -0
jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/ArchiveFormat.java
Index: ArchiveFormat.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/ArchiveFormat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArchiveFormat.java 26 Feb 2002 22:56:23 -0000 1.2
+++ ArchiveFormat.java 27 Feb 2002 02:10:50 -0000 1.3
@@ -160,6 +160,8 @@
*/
String reset(String text)
{
+ //WARNING: Do not remove the string concatenations
+ // or CVS will mangle the strings on check in/out.
String data = text;
data = substitute(data, ID_RE, '$' + "Id$");
data = substitute(data, HEADER_RE, '$' + "Header$");
1.7 +28 -26
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ArchiveTest.java 26 Feb 2002 22:39:29 -0000 1.6
+++ ArchiveTest.java 27 Feb 2002 02:10:50 -0000 1.7
@@ -94,36 +94,39 @@
// deleted [6]
};
- Object[] v1_2_with_keywords = new String[]{
+ String user = System.getProperty("user.name");
+
+ // WARNING: there apparently uneeded string concatenations
+ // are there to prevent CVS from mangling our test data.
+
+ 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 $",
+ "[3] three $" + "Source: trash #3$",
+ "[4] four $" + "RCSfile: trash #4$",
+ "[5] five $" + "Revision: trash # 5 $",
+ "[7] seven $" + "Author: trash #7 $",
+ "[8] eight $" + "State: trash 8 $",
"[9] nine $Locker: $",
- "[10] ten $RCSfile: ArchiveTest.java,v $ $Revision: 1.6 $ $Author:
sbailliez $",
+ "[10] ten $" + "RCSfile: trash #10 $ "
+ + "$" + "Revision: trash #10 $ "
+ + "$" + "Author: trash $",
+ ""
};
- String user = System.getProperty("user.name");
-
- Object[] v1_2_with_expanded_keywords = new String[]{
+ 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 $",
+ "[3] three $" + "Source: /a/test/path/test_file,v $",
+ "[4] four $" + "RCSfile: test_file,v $",
+ "[5] five $" + "Revision: 1.2 $",
+ "[7] seven $" + "Author: " + user + " $",
+ "[8] eight $" + "State: Exp $",
"[9] nine $Locker: $",
- "[10] ten $RCSfile: ArchiveTest.java,v $ $Revision: 1.6 $ $Author:
sbailliez $"
+ "[10] ten $" + "RCSfile: test_file,v $ "
+ + "$" + "Revision: 1.2 $ "
+ + "$" + "Author: " + user + " $",
+ ""
};
-
+
Object[] v1_3 = new String[]{
"[1] one changed",
"[2] two",
@@ -238,8 +241,7 @@
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
@@ -258,7 +260,7 @@
assertNull(archive.getRevisionVersion("2"));
assertNull(archive.getRevisionVersion("1.2.1"));
- } */
+ }
public void testAdd1_3()
throws DiffException,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
