From 310929b2e1ec1e10bd35f181511b29ecfc61dc9d Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Thu, 19 Sep 2024 18:48:01 -0400 Subject: [PATCH] Just reuse constants for assertions --- .../com/datastax/cdm/cql/codec/ASCII_BLOBCodecTest.java | 8 ++++---- .../com/datastax/cdm/cql/codec/BLOB_ASCIICodecTest.java | 6 +++--- .../com/datastax/cdm/cql/codec/BLOB_TextCodecTest.java | 6 +++--- .../com/datastax/cdm/cql/codec/TEXT_BLOBCodecTest.java | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/test/java/com/datastax/cdm/cql/codec/ASCII_BLOBCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/ASCII_BLOBCodecTest.java index b725f49..9d79f5b 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/ASCII_BLOBCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/ASCII_BLOBCodecTest.java @@ -25,6 +25,7 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; public class ASCII_BLOBCodecTest { + private final String INPUT = "Encode this Text string to Blob"; private ASCII_BLOBCodec codec; @@ -35,11 +36,10 @@ public void setup() { @Test public void encodeDecode() { - ByteBuffer buffer = codec.encode(ByteBuffer.wrap("Encode this Text string to Blob".getBytes()), - ProtocolVersion.V4); + ByteBuffer buffer = codec.encode(ByteBuffer.wrap(INPUT.getBytes()), ProtocolVersion.V4); ByteBuffer retBuffer = codec.decode(buffer, ProtocolVersion.V4); - assertEquals("'Encode this Text string to Blob'", codec.format(retBuffer)); - assertEquals(retBuffer, codec.parse("Encode this Text string to Blob")); + assertEquals("'" + INPUT + "'", codec.format(retBuffer)); + assertEquals(retBuffer, codec.parse(INPUT)); } } diff --git a/src/test/java/com/datastax/cdm/cql/codec/BLOB_ASCIICodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/BLOB_ASCIICodecTest.java index f3c4320..8548653 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/BLOB_ASCIICodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/BLOB_ASCIICodecTest.java @@ -15,7 +15,6 @@ */ package com.datastax.cdm.cql.codec; -import static com.datastax.oss.protocol.internal.ProtocolConstants.Version.V4; import static org.junit.jupiter.api.Assertions.assertEquals; import java.nio.ByteBuffer; @@ -26,6 +25,7 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; public class BLOB_ASCIICodecTest { + private final String INPUT = "Encode this Text string to Blob"; private BLOB_ASCIICodec codec; @@ -36,9 +36,9 @@ public void setup() { @Test public void testEncode() { - ByteBuffer buffer = codec.encode("Encode this Text string to Blob", ProtocolVersion.V4); + ByteBuffer buffer = codec.encode(INPUT, ProtocolVersion.V4); String retBuffer = codec.decode(buffer, ProtocolVersion.V4); - assertEquals("Encode this Text string to Blob", retBuffer); + assertEquals(INPUT, retBuffer); } } diff --git a/src/test/java/com/datastax/cdm/cql/codec/BLOB_TextCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/BLOB_TextCodecTest.java index 6307cf8..7a6707d 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/BLOB_TextCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/BLOB_TextCodecTest.java @@ -15,7 +15,6 @@ */ package com.datastax.cdm.cql.codec; -import static com.datastax.oss.protocol.internal.ProtocolConstants.Version.V4; import static org.junit.jupiter.api.Assertions.assertEquals; import java.nio.ByteBuffer; @@ -26,6 +25,7 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; public class BLOB_TextCodecTest { + private final String INPUT = "Encode this Text string to Blob"; private BLOB_TEXTCodec codec; @@ -36,9 +36,9 @@ public void setup() { @Test public void testEncode() { - ByteBuffer buffer = codec.encode("Encode this Text string to Blob", ProtocolVersion.V4); + ByteBuffer buffer = codec.encode(INPUT, ProtocolVersion.V4); String retBuffer = codec.decode(buffer, ProtocolVersion.V4); - assertEquals("Encode this Text string to Blob", retBuffer); + assertEquals(INPUT, retBuffer); } } diff --git a/src/test/java/com/datastax/cdm/cql/codec/TEXT_BLOBCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/TEXT_BLOBCodecTest.java index fa71967..0639c10 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/TEXT_BLOBCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/TEXT_BLOBCodecTest.java @@ -25,6 +25,7 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; public class TEXT_BLOBCodecTest { + private final String INPUT = "Encode this Text string to Blob"; private TEXT_BLOBCodec codec; @@ -35,11 +36,10 @@ public void setup() { @Test public void encodeDecode() { - ByteBuffer buffer = codec.encode(ByteBuffer.wrap("Encode this Text string to Blob".getBytes()), - ProtocolVersion.V4); + ByteBuffer buffer = codec.encode(ByteBuffer.wrap(INPUT.getBytes()), ProtocolVersion.V4); ByteBuffer retBuffer = codec.decode(buffer, ProtocolVersion.V4); - assertEquals("'Encode this Text string to Blob'", codec.format(retBuffer)); - assertEquals(retBuffer, codec.parse("Encode this Text string to Blob")); + assertEquals("'" + INPUT + "'", codec.format(retBuffer)); + assertEquals(retBuffer, codec.parse(INPUT)); } }