[1/2] git commit: Fix RoundTripTest

2013-01-18 Thread slebresne 
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/cassandra-1.2
Commit: 9dcec00dbbe19b4f8090eb023bb754021d228a19
Parents: 056f38c
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Jan 18 19:29:57 2013 +0100
Committer: Sylvain Lebresne sylv...@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(129956040L);
-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

[1/4] git commit: Fix RoundTripTest

2013-01-18 Thread vijay 
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 sylv...@datastax.com
Authored: Fri Jan 18 19:29:57 2013 +0100
Committer: Sylvain Lebresne sylv...@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(129956040L);
-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

[5/5] git commit: Fix RoundTripTest

2012-05-08 Thread jbellis 
Fix RoundTripTest


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ab4ec17
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ab4ec17
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ab4ec17

Branch: refs/heads/trunk
Commit: 1ab4ec1748617e7d2bd0f7d0037fecba0226e7b2
Parents: 4e2e547
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Sat May 5 12:43:26 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Sat May 5 12:44:04 2012 +0200

--
 .../org/apache/cassandra/db/marshal/DateType.java  |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ab4ec17/src/java/org/apache/cassandra/db/marshal/DateType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/DateType.java 
b/src/java/org/apache/cassandra/db/marshal/DateType.java
index 671d31c..09f0ecd 100644
--- a/src/java/org/apache/cassandra/db/marshal/DateType.java
+++ b/src/java/org/apache/cassandra/db/marshal/DateType.java
@@ -88,7 +88,6 @@ public class DateType extends AbstractTypeDate
 public static long dateStringToTimestamp(String source) throws 
MarshalException
 {
   long millis;
-  source = source.toLowerCase();
 
   if (source.toLowerCase().equals(now))
   {

git commit: Fix RoundTripTest

2012-05-05 Thread slebresne 
Updated Branches:
  refs/heads/cassandra-1.1 4e2e547d2 - 1ab4ec174


Fix RoundTripTest


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ab4ec17
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ab4ec17
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ab4ec17

Branch: refs/heads/cassandra-1.1
Commit: 1ab4ec1748617e7d2bd0f7d0037fecba0226e7b2
Parents: 4e2e547
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Sat May 5 12:43:26 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Sat May 5 12:44:04 2012 +0200

--
 .../org/apache/cassandra/db/marshal/DateType.java  |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ab4ec17/src/java/org/apache/cassandra/db/marshal/DateType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/DateType.java 
b/src/java/org/apache/cassandra/db/marshal/DateType.java
index 671d31c..09f0ecd 100644
--- a/src/java/org/apache/cassandra/db/marshal/DateType.java
+++ b/src/java/org/apache/cassandra/db/marshal/DateType.java
@@ -88,7 +88,6 @@ public class DateType extends AbstractTypeDate
 public static long dateStringToTimestamp(String source) throws 
MarshalException
 {
   long millis;
-  source = source.toLowerCase();
 
   if (source.toLowerCase().equals(now))
   {