You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by vi...@apache.org on 2013/01/18 19:58:49 UTC
[1/4] git commit: Fix RoundTripTest
Fix RoundTripTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dcec00d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dcec00d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dcec00d
Branch: refs/heads/trunk
Commit: 9dcec00dbbe19b4f8090eb023bb754021d228a19
Parents: 056f38c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 18 19:29:57 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 18 19:29:57 2013 +0100
----------------------------------------------------------------------
.../apache/cassandra/db/marshal/RoundTripTest.java | 26 ---------------
1 files changed, 0 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dcec00d/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java b/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java
index ef34ac5..282bfc3 100644
--- a/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java
@@ -118,32 +118,6 @@ public class RoundTripTest
assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString(uuid.toString())));
assert JdbcTimeUUID.instance.toString(uuid).equals(uuid.toString());
-
- TimeZone.setDefault(TimeZone.getTimeZone("America/New_York"));
- Calendar c = Calendar.getInstance();
- c.set(Calendar.YEAR, 2011);
- c.set(Calendar.MONTH, Calendar.MARCH);
- c.set(Calendar.DAY_OF_MONTH, 8);
- c.set(Calendar.HOUR_OF_DAY, 0);
- c.set(Calendar.MINUTE, 0);
- c.set(Calendar.SECOND, 0);
- c.set(Calendar.MILLISECOND, 0);
- Long ts = new Long(1299560400000L);
- assert ts.equals(c.getTimeInMillis()) : c.getTimeInMillis();
-
- // create a uuid with a known time.
- uuid = TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString(ts.toString()));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString(uuid.toString())));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString("2011-03-08 00:00")));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString("2011-03-08 00:00:00")));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString("2011-03-08 00:00-0500")));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString("2011-03-08 00:00:00-0500")));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString("2011-03-08T00:00")));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString("2011-03-08T00:00-0500")));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString("2011-03-08T00:00:00")));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString("2011-03-08T00:00:00-0500")));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString("2011-03-08")));
- assert uuid.equals(TimeUUIDType.instance.compose(TimeUUIDType.instance.fromString("2011-03-08-0500")));
}
@Test