Updated Branches: refs/heads/trunk 829688f9e -> daff1fce0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/daff1fce/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 89dbf01..b3e0760 100644 --- a/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java @@ -83,10 +83,6 @@ public class RoundTripTest public void testBytes() { byte[] v = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; - assert BytesSerializer.instance.getString(BytesType.instance.fromString(Hex.bytesToHex(v))) - .equals(Hex.bytesToHex(v)); - assert BytesType.instance.fromString(BytesSerializer.instance.getString(ByteBuffer.wrap(v))) - .equals(ByteBuffer.wrap(v)); assert BytesType.instance.compose(ByteBuffer.wrap(v)).equals(ByteBuffer.wrap(v)); assert BytesSerializer.instance.toString(ByteBuffer.wrap(v)).equals(Hex.bytesToHex(v)); } @@ -95,8 +91,6 @@ public class RoundTripTest public void testLexicalUUID() { UUID uuid = UUIDGen.getTimeUUID(); - assert UUIDSerializer.instance.getString(LexicalUUIDType.instance.fromString(uuid.toString())) - .equals(uuid.toString()); assert LexicalUUIDType.instance.fromString(LexicalUUIDType.instance.getString(ByteBuffer.wrap(UUIDGen.decompose(uuid)))) .equals(ByteBuffer.wrap(UUIDGen.decompose(uuid))); assert LexicalUUIDType.instance.compose(ByteBuffer.wrap(UUIDGen.decompose(uuid))).equals(uuid); http://git-wip-us.apache.org/repos/asf/cassandra/blob/daff1fce/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java b/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java index 877971e..67bef2e 100644 --- a/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java +++ b/test/unit/org/apache/cassandra/serializers/ClientUtilsTest.java @@ -37,35 +37,24 @@ public class ClientUtilsTest @Test public void test() throws UnknownHostException { - AsciiSerializer.instance.serialize(AsciiSerializer.instance.deserialize("string")); - BooleanSerializer.instance.serialize(BooleanSerializer.instance.deserialize(true)); - BytesSerializer.instance.serialize(BytesSerializer.instance.deserialize(ByteBuffer.wrap("string".getBytes()))); + AsciiSerializer.instance.deserialize(AsciiSerializer.instance.serialize("string")); + BooleanSerializer.instance.deserialize(BooleanSerializer.instance.serialize(true)); + BytesSerializer.instance.deserialize(BytesSerializer.instance.serialize(ByteBuffer.wrap("string".getBytes()))); Date date = new Date(System.currentTimeMillis()); - ByteBuffer dateBB = TimestampSerializer.instance.deserialize(date); - TimestampSerializer.instance.serialize(dateBB); - assert (TimestampSerializer.instance.toString(date).equals(TimestampSerializer.instance.getString(dateBB))); + ByteBuffer dateBB = TimestampSerializer.instance.serialize(date); + TimestampSerializer.instance.deserialize(dateBB); - DecimalSerializer.instance.serialize(DecimalSerializer.instance.deserialize(new BigDecimal(1))); - DoubleSerializer.instance.serialize(DoubleSerializer.instance.deserialize(new Double(1.0d))); - FloatSerializer.instance.serialize(FloatSerializer.instance.deserialize(new Float(1.0f))); - Int32Serializer.instance.serialize(Int32Serializer.instance.deserialize(1)); - IntegerSerializer.instance.serialize(IntegerSerializer.instance.deserialize(new BigInteger("1"))); - LongSerializer.instance.serialize(LongSerializer.instance.deserialize(1L)); - UTF8Serializer.instance.serialize(UTF8Serializer.instance.deserialize("string")); + DecimalSerializer.instance.deserialize(DecimalSerializer.instance.serialize(new BigDecimal(1))); + DoubleSerializer.instance.deserialize(DoubleSerializer.instance.serialize(new Double(1.0d))); + FloatSerializer.instance.deserialize(FloatSerializer.instance.serialize(new Float(1.0f))); + Int32Serializer.instance.deserialize(Int32Serializer.instance.serialize(1)); + IntegerSerializer.instance.deserialize(IntegerSerializer.instance.serialize(new BigInteger("1"))); + LongSerializer.instance.deserialize(LongSerializer.instance.serialize(1L)); + UTF8Serializer.instance.deserialize(UTF8Serializer.instance.serialize("string")); // UUIDGen UUID uuid = UUIDGen.getTimeUUID(); - UUIDSerializer.instance.serialize(UUIDSerializer.instance.deserialize(uuid)); - - // Raise a MarshalException - try - { - UUIDSerializer.instance.getString(ByteBuffer.wrap("notauuid".getBytes())); - } - catch (MarshalException me) - { - // Success - } + UUIDSerializer.instance.deserialize(UUIDSerializer.instance.serialize(uuid)); } }
