You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by jv...@apache.org on 2004/04/21 19:15:09 UTC
cvs commit: maven-scm/scm-providers/starteam/src/test/resources/starteam/changelog starteamlog_en.txt starteamlog_fr.txt starteamlog.txt
jvanzyl 2004/04/21 10:15:09
Modified: scm-providers/starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog
StarteamChangeLogConsumer.java
scm-providers/starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog
StarteamChangeLogConsumerTest.java
Added: scm-providers/starteam/src/test/resources/starteam/changelog
starteamlog_en.txt starteamlog_fr.txt
Removed: scm-providers/starteam/src/test/resources/starteam/changelog
starteamlog.txt
Log:
o adjusting testing to pickup a starteam log with localized dates.
Emmanuel, I am no i18n expert so if you have a better way feel free, also
is this something we can push to an abstract class somewhere so we can
handle different dates across the board. I'm surprised I didn't run into
problems with other providers. Anyway we'll work things out as we
move toward 1.0.
Revision Changes Path
1.2 +9 -8 maven-scm/scm-providers/starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java
Index: StarteamChangeLogConsumer.java
===================================================================
RCS file: /home/cvs/maven-scm/scm-providers/starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StarteamChangeLogConsumer.java 20 Apr 2004 19:05:58 -0000 1.1
+++ StarteamChangeLogConsumer.java 21 Apr 2004 17:15:09 -0000 1.2
@@ -17,19 +17,18 @@
* ====================================================================
*/
-import java.text.SimpleDateFormat;
+import org.apache.maven.scm.command.changelog.ChangeLogConsumer;
+import org.apache.maven.scm.command.changelog.ChangeLogEntry;
+import org.apache.maven.scm.command.changelog.ChangeLogFile;
+
import java.text.ParseException;
-import java.util.Date;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Collections;
+import java.util.Date;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.maven.scm.command.changelog.ChangeLogConsumer;
-import org.apache.maven.scm.command.changelog.ChangeLogEntry;
-import org.apache.maven.scm.command.changelog.ChangeLogFile;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -322,6 +321,8 @@
}
catch (ParseException e)
{
+ e.printStackTrace();
+
//LOG.error("ParseException Caught", e);
return null;
}
1.2 +8 -2 maven-scm/scm-providers/starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumerTest.java
Index: StarteamChangeLogConsumerTest.java
===================================================================
RCS file: /home/cvs/maven-scm/scm-providers/starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StarteamChangeLogConsumerTest.java 20 Apr 2004 19:05:59 -0000 1.1
+++ StarteamChangeLogConsumerTest.java 21 Apr 2004 17:15:09 -0000 1.2
@@ -22,6 +22,7 @@
import java.io.InputStreamReader;
import java.util.Collection;
import java.util.Iterator;
+import java.util.Locale;
import junit.framework.TestCase;
@@ -54,8 +55,13 @@
public void setUp() throws Exception
{
String baseDir = System.getProperty("basedir");
+
assertNotNull("The system property basedir was not defined.", baseDir);
- testFile = baseDir + "/src/test/resources/starteam/changelog/starteamlog.txt";
+
+ String language = Locale.getDefault().getLanguage();
+
+ testFile = baseDir + "/src/test/resources/starteam/changelog/starteamlog_" + language + ".txt";
+
instance = new StarteamChangeLogConsumer();
}
1.1 maven-scm/scm-providers/starteam/src/test/resources/starteam/changelog/starteamlog_en.txt
Index: starteamlog_en.txt
===================================================================
Folder: maven (working dir: C:\Test\maven)
Folder: src (working dir: C:\Test\maven\src)
History for: File2.java
Description: First release
Locked by:
Status: Current
----------------------------
Revision: 2 View: GRP_Dev Branch Revision: 1.1
Author: Emmanuel VENISSE Date: 4/21/04 1:05 PM
Add method print
----------------------------
Revision: 1 View: GRP_Dev Branch Revision: 1.0
Author: Emmanuel VENISSE Date: 4/21/04 1:05 PM
=============================================================================
History for: File1.java
Description: First release
Locked by:
Status: Current
----------------------------
Revision: 2 View: GRP_Dev Branch Revision: 1.1
Author: Emmanuel VENISSE Date: 4/21/04 1:05 PM
Add method main
----------------------------
Revision: 1 View: GRP_Dev Branch Revision: 1.0
Author: Emmanuel VENISSE Date: 4/21/04 1:05 PM
=============================================================================
Folder: test (working dir: C:\Test\maven\test)
History for: TestFile1.java
Description: First release
Locked by:
Status: Current
----------------------------
Revision: 2 View: GRP_Dev Branch Revision: 1.1
Author: Emmanuel VENISSE Date: 4/21/04 1:05 PM
Add method main
----------------------------
Revision: 1 View: GRP_Dev Branch Revision: 1.0
Author: Emmanuel VENISSE Date: 4/21/04 1:05 PM
=============================================================================
1.1 maven-scm/scm-providers/starteam/src/test/resources/starteam/changelog/starteamlog_fr.txt
Index: starteamlog_fr.txt
===================================================================
Folder: maven (working dir: C:\Test\maven)
Folder: src (working dir: C:\Test\maven\src)
History for: File2.java
Description: First release
Locked by:
Status: Current
----------------------------
Revision: 2 View: GRP_Dev Branch Revision: 1.1
Author: Emmanuel VENISSE Date: 11/09/02 15:08:20 GMT+02:00
Add method print
----------------------------
Revision: 1 View: GRP_Dev Branch Revision: 1.0
Author: Emmanuel VENISSE Date: 11/09/02 15:06:55 GMT+02:00
=============================================================================
History for: File1.java
Description: First release
Locked by:
Status: Current
----------------------------
Revision: 2 View: GRP_Dev Branch Revision: 1.1
Author: Emmanuel VENISSE Date: 11/09/02 15:08:41 GMT+02:00
Add method main
----------------------------
Revision: 1 View: GRP_Dev Branch Revision: 1.0
Author: Emmanuel VENISSE Date: 11/09/02 15:06:55 GMT+02:00
=============================================================================
Folder: test (working dir: C:\Test\maven\test)
History for: TestFile1.java
Description: First release
Locked by:
Status: Current
----------------------------
Revision: 2 View: GRP_Dev Branch Revision: 1.1
Author: Emmanuel VENISSE Date: 11/09/02 15:08:42 GMT+02:00
Add method main
----------------------------
Revision: 1 View: GRP_Dev Branch Revision: 1.0
Author: Emmanuel VENISSE Date: 11/09/02 15:06:55 GMT+02:00
=============================================================================