You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by br...@apache.org on 2002/10/09 07:11:19 UTC
cvs commit: jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser EnterpriseUnixFTPEntryParserTest.java FTPParseTestFramework.java NTFTPEntryParserTest.java OS2FTPEntryParserTest.java UnixFTPEntryParserTest.java VMSFTPEntryParserTest.java
brekke 2002/10/08 22:11:19
Modified: net/src/test/org/apache/commons/net/ftp/ftp2/parser
EnterpriseUnixFTPEntryParserTest.java
FTPParseTestFramework.java
NTFTPEntryParserTest.java
OS2FTPEntryParserTest.java
UnixFTPEntryParserTest.java
VMSFTPEntryParserTest.java
Log:
We were using the default string format for the Date object to compare timestamps.
The format prints the time zone so the tests were failing on the assertion.
Added a date format that doesn't print the time zone which is used for testing
the date strings.
Revision Changes Path
1.2 +3 -3 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/EnterpriseUnixFTPEntryParserTest.java
Index: EnterpriseUnixFTPEntryParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/EnterpriseUnixFTPEntryParserTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnterpriseUnixFTPEntryParserTest.java 15 Aug 2002 17:47:44 -0000 1.1
+++ EnterpriseUnixFTPEntryParserTest.java 9 Oct 2002 05:11:19 -0000 1.2
@@ -144,8 +144,8 @@
file.getUser());
assertEquals("18128",
file.getGroup());
- assertEquals("Mon Aug 12 13:56:00 CDT 2002",
- file.getTimestamp().getTime().toString());
+ assertEquals("Mon Aug 12 13:56:00 2002",
+ df.format(file.getTimestamp().getTime()));
checkPermisions(file);
}
1.4 +6 -3 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/FTPParseTestFramework.java
Index: FTPParseTestFramework.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/FTPParseTestFramework.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FTPParseTestFramework.java 7 Aug 2002 18:26:19 -0000 1.3
+++ FTPParseTestFramework.java 9 Oct 2002 05:11:19 -0000 1.4
@@ -55,6 +55,7 @@
*/
import junit.framework.TestCase;
+import java.text.SimpleDateFormat;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.ftp2.FTPFileEntryParser;
@@ -65,7 +66,8 @@
public abstract class FTPParseTestFramework extends TestCase
{
private FTPFileEntryParser parser = null;
-
+ protected SimpleDateFormat df = null;
+
/**
* @see junit.framework.TestCase#TestCase(String)
*/
@@ -154,5 +156,6 @@
{
super.setUp();
parser = getParser();
+ df = new SimpleDateFormat("EEE MMM dd kk:mm:ss yyyy");
}
-}
\ No newline at end of file
+}
1.4 +5 -5 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/NTFTPEntryParserTest.java
Index: NTFTPEntryParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/NTFTPEntryParserTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NTFTPEntryParserTest.java 7 Aug 2002 18:26:19 -0000 1.3
+++ NTFTPEntryParserTest.java 9 Oct 2002 05:11:19 -0000 1.4
@@ -137,8 +137,8 @@
{
FTPFile dir = getParser().parseFTPEntry("12-05-96 05:03PM <DIR> absoft2");
assertNotNull("Could not parse entry.", dir);
- assertEquals("Thu Dec 05 17:03:00 CST 1996",
- dir.getTimestamp().getTime().toString());
+ assertEquals("Thu Dec 05 17:03:00 1996",
+ df.format(dir.getTimestamp().getTime()));
assertTrue("Should have been a directory.",
dir.isDirectory());
assertEquals("absoft2", dir.getName());
@@ -152,8 +152,8 @@
{
FTPFile f = getParser().parseFTPEntry("05-22-97 08:08AM 828 AUTOEXEC.BAK");
assertNotNull("Could not parse entry.", f);
- assertEquals("Thu May 22 08:08:00 CDT 1997",
- f.getTimestamp().getTime().toString());
+ assertEquals("Thu May 22 08:08:00 1997",
+ df.format(f.getTimestamp().getTime()));
assertTrue("Should have been a file.",
f.isFile());
assertEquals("AUTOEXEC.BAK", f.getName());
1.4 +6 -6 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/OS2FTPEntryParserTest.java
Index: OS2FTPEntryParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/OS2FTPEntryParserTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OS2FTPEntryParserTest.java 7 Aug 2002 18:26:19 -0000 1.3
+++ OS2FTPEntryParserTest.java 9 Oct 2002 05:11:19 -0000 1.4
@@ -121,8 +121,8 @@
dir.isDirectory());
assertEquals(0,dir.getSize());
assertEquals("PC", dir.getName());
- assertEquals("Fri Nov 28 09:42:00 CST 1997",
- dir.getTimestamp().getTime().toString());
+ assertEquals("Fri Nov 28 09:42:00 1997",
+ df.format(dir.getTimestamp().getTime()));
}
/**
@@ -136,8 +136,8 @@
file.isFile());
assertEquals(149473,file.getSize());
assertEquals("POPUPLOG.OS2", file.getName());
- assertEquals("Tue Nov 17 16:07:00 CST 1998",
- file.getTimestamp().getTime().toString());
+ assertEquals("Tue Nov 17 16:07:00 1998",
+ df.format(file.getTimestamp().getTime()));
}
/**
@@ -166,4 +166,4 @@
return (new OS2FTPEntryParser());
}
-}
\ No newline at end of file
+}
1.5 +5 -5 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/UnixFTPEntryParserTest.java
Index: UnixFTPEntryParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/UnixFTPEntryParserTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UnixFTPEntryParserTest.java 8 Aug 2002 20:01:41 -0000 1.4
+++ UnixFTPEntryParserTest.java 9 Oct 2002 05:11:19 -0000 1.5
@@ -156,8 +156,8 @@
f.getName());
assertEquals(4096,
f.getSize());
- assertEquals("Sat Mar 02 15:13:00 CST 2002",
- f.getTimestamp().getTime().toString());
+ assertEquals("Sat Mar 02 15:13:00 2002",
+ df.format(f.getTimestamp().getTime()));
}
/**
@@ -217,8 +217,8 @@
f.getName());
assertEquals(4096,
f.getSize());
- assertEquals("Sat Mar 02 15:13:00 CST 2002",
- f.getTimestamp().getTime().toString());
+ assertEquals("Sat Mar 02 15:13:00 2002",
+ df.format(f.getTimestamp().getTime()));
}
/**
1.4 +6 -6 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/VMSFTPEntryParserTest.java
Index: VMSFTPEntryParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/VMSFTPEntryParserTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VMSFTPEntryParserTest.java 7 Aug 2002 18:26:19 -0000 1.3
+++ VMSFTPEntryParserTest.java 9 Oct 2002 05:11:19 -0000 1.4
@@ -112,8 +112,8 @@
dir.getName());
assertEquals(512,
dir.getSize());
- assertEquals("Tue Jun 02 07:32:04 CDT 1998",
- dir.getTimestamp().getTime().toString());
+ assertEquals("Tue Jun 02 07:32:04 1998",
+ df.format(dir.getTimestamp().getTime()));
assertEquals("GROUP",
dir.getGroup());
assertEquals("OWNER",
@@ -133,8 +133,8 @@
file.getName());
assertEquals(9 * 512,
file.getSize());
- assertEquals("Tue Jun 02 07:32:04 CDT 1998",
- file.getTimestamp().getTime().toString());
+ assertEquals("Tue Jun 02 07:32:04 1998",
+ df.format(file.getTimestamp().getTime()));
assertEquals("GROUP",
file.getGroup());
assertEquals("OWNER",
@@ -213,4 +213,4 @@
{
return(new TestSuite(VMSFTPEntryParserTest.class));
}
-}
\ No newline at end of file
+}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
[NET] [PATCH] Make tests Locale independent
Posted by Stefan Bodewig <bo...@apache.org>.
On 9 Oct 2002, <br...@apache.org> wrote:
> We were using the default string format for the Date object to
> compare timestamps.
Still fails on my box.
Testcase: testParseFieldsOnFile took 0,033 sec
FAILED
expected:<...n...> but was:<......>
junit.framework.ComparisonFailure: expected:<...n...> but was:<......>
at org.apache.commons.net.ftp.ftp2.parser.EnterpriseUnixFTPEntryParserTest.testParseFieldsOnFile(EnterpriseUnixFTPEntryParserTest.java:147)
I'm running a different locale than you (mine is German) and live in a
different time-zone.
Throwing in
System.err.println(df.format(file.getTimestamp().getTime()));
before line 147 of EnterpriseUnixFTPEntryParserTest.java:147, I get
'Mo Aug 12 13:56:00 2002'. With the trivial patch below, all tests
pass on my machine.
Stefan
Index: FTPParseTestFramework.java
===================================================================
RCS file: /home/cvspublic/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/FTPParseTestFramework.java,v
retrieving revision 1.4
diff -u -r1.4 FTPParseTestFramework.java
--- FTPParseTestFramework.java 9 Oct 2002 05:11:19 -0000 1.4
+++ FTPParseTestFramework.java 9 Oct 2002 06:16:01 -0000
@@ -56,6 +56,7 @@
import junit.framework.TestCase;
import java.text.SimpleDateFormat;
+import java.util.Locale;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.ftp2.FTPFileEntryParser;
@@ -156,6 +157,6 @@
{
super.setUp();
parser = getParser();
- df = new SimpleDateFormat("EEE MMM dd kk:mm:ss yyyy");
+ df = new SimpleDateFormat("EEE MMM dd kk:mm:ss yyyy", Locale.US);
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>