Improve a couple of tests

Author: vietj

vertx-pg-client/src/test/java/io/vertx/pgclient/data/BooleanTypeExtendedCodecTest.java

@@ -9,9 +9,10 @@
 import org.junit.Test;
 
 public class BooleanTypeExtendedCodecTest extends ExtendedQueryDataTypeCodecTestBase {
+
   @Test
   public void testDecodeBoolean(TestContext ctx) {
-    testGeneric(ctx, "SELECT $1::BOOLEAN \"Boolean\"", new Boolean[]{true}, Tuple::getBoolean);
+    testDecode(ctx, "SELECT true", Tuple::getBoolean, true);
   }
 
   @Test
@@ -38,14 +39,12 @@ public void testEncodeBoolean(TestContext ctx) {
   }
 
   @Test
-  public void testBooleanArray(TestContext ctx) {
-    testGeneric(ctx,
-      "SELECT c FROM (VALUES ($1 :: BOOL[])) AS t (c)",
-      new Boolean[][]{new Boolean[]{true, null, false}}, Tuple::getArrayOfBooleans);
+  public void testDecodeBooleanArray(TestContext ctx) {
+    testDecode(ctx, "SELECT '{ true, false }'::BOOL[]", Tuple::getArrayOfBooleans, (Object)(new Boolean[] { true, false }));
   }
 
   @Test
-  public void testDecodeBooleanArray(TestContext ctx) {
+  public void testDecodeBooleanArray_(TestContext ctx) {
     Async async = ctx.async();
     PgConnection.connect(vertx, options, ctx.asyncAssertSuccess(conn -> {
       conn.prepare("SELECT \"Boolean\" FROM \"ArrayDataType\" WHERE \"id\" = $1",

vertx-pg-client/src/test/java/io/vertx/pgclient/data/CharacterTypesExtendedCodecTest.java

@@ -9,9 +9,10 @@
 import org.junit.Test;
 
 public class CharacterTypesExtendedCodecTest extends ExtendedQueryDataTypeCodecTestBase {
+
   @Test
   public void testDecodeName(TestContext ctx) {
-    testGeneric(ctx, "SELECT $1::NAME \"Name\"", new String[]{"What is my name ?"}, Tuple::getString);
+    testDecode(ctx, "SELECT 'What is my name ?'::NAME", Tuple::getString, "What is my name ?");
   }
 
   @Test
@@ -37,10 +38,9 @@ public void testEncodeName(TestContext ctx) {
     }));
   }
 
-
   @Test
   public void testDecodeChar(TestContext ctx) {
-    testGeneric(ctx, "SELECT $1::CHAR \"SingleChar\"", new String[]{"A"}, Tuple::getString);
+    testDecode(ctx, "SELECT 'A'::CHAR", Tuple::getString, "A");
   }
 
   @Test
@@ -68,7 +68,7 @@ public void testEncodeChar(TestContext ctx) {
 
   @Test
   public void testDecodeFixedChar(TestContext ctx) {
-    testGeneric(ctx, "SELECT $1::CHAR(3) \"FixedChar\"", new String[]{"YES"}, Tuple::getString);
+    testDecode(ctx, "SELECT 'YES'::CHAR(3)", Tuple::getString, "YES");
   }
 
   @Test
@@ -96,7 +96,7 @@ public void testEncodeFixedChar(TestContext ctx) {
 
   @Test
   public void testDecodeText(TestContext ctx) {
-    testGeneric(ctx, "SELECT $1::TEXT \"Text\"", new String[]{"Hello World"}, Tuple::getString);
+    testDecode(ctx, "SELECT 'Hello World'::TEXT", Tuple::getString, "Hello World");
   }
 
   @Test
@@ -123,8 +123,8 @@ public void testEncodeText(TestContext ctx) {
   }
 
   @Test
-  public void testDecodeVarCharacter(TestContext ctx) {
-    testGeneric(ctx, "SELECT $1::VARCHAR \"VarCharacter\"", new String[]{"Great!"}, Tuple::getString);
+  public void testDecodeVarchar(TestContext ctx) {
+    testDecode(ctx, "SELECT 'Great!'::VARCHAR", Tuple::getString, "Great!");
   }
 
   @Test
@@ -171,8 +171,8 @@ public void testEncodeLargeVarchar(TestContext ctx) {
   }
 
   @Test
-  public void testDecodeStringArray(TestContext ctx) {
-    testGeneric(ctx, "SELECT $1::TEXT[]\"Text\"", new String[][]{new String[]{"Knock, knock.Who’s there?very long pause….Java."}}, Tuple::getArrayOfStrings);
+  public void testDecodeTextArray(TestContext ctx) {
+    testDecode(ctx, "SELECT '{ \"Knock, knock.Who’s there?very long pause... Java.\" }'::TEXT[]", Tuple::getArrayOfStrings, (Object) new String[] {"Knock, knock.Who’s there?very long pause... Java."});
   }
 
   @Test

vertx-pg-client/src/test/java/io/vertx/pgclient/data/MoneyTypeSimpleCodecTest.java renamed to vertx-pg-client/src/test/java/io/vertx/pgclient/data/MonetaryTypeSimpleCodecTest.java

@@ -15,7 +15,7 @@
 import io.vertx.sqlclient.Tuple;
 import org.junit.Test;
 
-public class MoneyTypeSimpleCodecTest extends SimpleQueryDataTypeCodecTestBase {
+public class MonetaryTypeSimpleCodecTest extends SimpleQueryDataTypeCodecTestBase {
 
   @Test
   public void testMoney(TestContext ctx) {

vertx-pg-client/src/test/java/io/vertx/pgclient/data/UUIDTypeExtendedCodecTest.java

@@ -11,9 +11,10 @@
 import java.util.UUID;
 
 public class UUIDTypeExtendedCodecTest extends ExtendedQueryDataTypeCodecTestBase {
+
   @Test
   public void testDecodeUUID(TestContext ctx) {
-    testGeneric(ctx, "SELECT $1::UUID \"uuid\"", new UUID[]{uuid}, Tuple::getUUID);
+    testDecode(ctx, "SELECT '" + uuid + "'::UUID", Tuple::getUUID, uuid);
   }
 
   @Test
@@ -41,7 +42,7 @@ public void testEncodeUUID(TestContext ctx) {
 
   @Test
   public void testDecodeUUIDArray(TestContext ctx) {
-    testGeneric(ctx, "SELECT $1::UUID[] \"UUID\"", new UUID[][]{new UUID[]{uuid}}, Tuple::getArrayOfUUIDs);
+    testDecode(ctx, "SELECT '{ " + uuid + " }'::UUID[]", Tuple::getArrayOfUUIDs, (Object)(new UUID[] { uuid }));
   }
 
   @Test