Updated Branches: refs/heads/trunk 663bdfbd6 -> 20c0baf08
Fix unit tests Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/20c0baf0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20c0baf0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20c0baf0 Branch: refs/heads/trunk Commit: 20c0baf08565fbae1b6fb52f80155039a847f93a Parents: 663bdfb Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Jul 15 09:45:54 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Jul 15 09:45:54 2013 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java | 2 ++ test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java | 2 +- .../org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/20c0baf0/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java b/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java index 22750be..dc5dad0 100644 --- a/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java +++ b/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java @@ -22,6 +22,8 @@ import java.nio.ByteBuffer; public class TimeUUIDSerializer extends UUIDSerializer { + public static final TimeUUIDSerializer instance = new TimeUUIDSerializer(); + @Override public void validate(ByteBuffer bytes) throws MarshalException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/20c0baf0/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java index afb3913..1039fb6 100644 --- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java @@ -145,7 +145,7 @@ public class CompositeTypeTest extends SchemaLoader } catch (MarshalException e) { - assert e.toString().contains("TimeUUID should be 16 or 0 bytes"); + assert e.toString().contains("should be 16 or 0 bytes"); } key = createCompositeKey("test1", UUID.randomUUID(), 42, false); http://git-wip-us.apache.org/repos/asf/cassandra/blob/20c0baf0/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java index e959b5f..f8e2fb6 100644 --- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java @@ -144,7 +144,7 @@ public class DynamicCompositeTypeTest extends SchemaLoader } catch (MarshalException e) { - assert e.toString().contains("TimeUUID should be 16 or 0 bytes"); + assert e.toString().contains("should be 16 or 0 bytes"); } key = createDynamicCompositeKey("test1", UUID.randomUUID(), 42, false);
