From be083fe1b326634ad48692f5f3837b60bd7691da Mon Sep 17 00:00:00 2001
From: diego Dupin <diego.dupin@mariadb.com>
Date: Wed, 7 Sep 2022 15:52:43 +0200
Subject: [PATCH] [misc] test correction for NULL geometry value

---
 .../codec/GeometryCollectionCodecTest.java    | 44 +++++++++----------
 .../codec/MultiPolygonCodecTest.java          | 32 +++++++-------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/test/java/org/mariadb/jdbc/integration/codec/GeometryCollectionCodecTest.java b/src/test/java/org/mariadb/jdbc/integration/codec/GeometryCollectionCodecTest.java
index 6a398d616..c42b4e76d 100644
--- a/src/test/java/org/mariadb/jdbc/integration/codec/GeometryCollectionCodecTest.java
+++ b/src/test/java/org/mariadb/jdbc/integration/codec/GeometryCollectionCodecTest.java
@@ -203,32 +203,32 @@ public void getObjectTypePrepare() throws Exception {
   }
 
   public void getObjectType(ResultSet rs) throws Exception {
-    testErrObject(rs, Integer.class);
-    testErrObject(rs, String.class);
-    testErrObject(rs, Long.class);
-    testErrObject(rs, Short.class);
-    testErrObject(rs, BigDecimal.class);
-    testErrObject(rs, BigInteger.class);
-    testErrObject(rs, LineString.class);
-    testErrObject(rs, Point.class);
-    testErrObject(rs, Polygon.class);
-    testErrObject(rs, MultiLineString.class);
-    testErrObject(rs, MultiPoint.class);
-    testErrObject(rs, MultiPolygon.class);
-    testErrObject(rs, Double.class);
-    testErrObject(rs, Float.class);
-    testErrObject(rs, Byte.class);
+    testErrObject(rs, Integer.class, 1);
+    testErrObject(rs, String.class, 1);
+    testErrObject(rs, Long.class, 1);
+    testErrObject(rs, Short.class, 1);
+    testErrObject(rs, BigDecimal.class, 1);
+    testErrObject(rs, BigInteger.class, 1);
+    testErrObject(rs, LineString.class, 1);
+    testErrObject(rs, Point.class, 1);
+    testErrObject(rs, Polygon.class, 1);
+    testErrObject(rs, MultiLineString.class, 1);
+    testErrObject(rs, MultiPoint.class, 1);
+    testErrObject(rs, MultiPolygon.class, 1);
+    testErrObject(rs, Double.class, 1);
+    testErrObject(rs, Float.class, 1);
+    testErrObject(rs, Byte.class, 1);
 
     String hexa =
         "000000000107000000020000000101000000000000000000000000000000000000000102000000050000000000000000002440000000000000244000000000000034400000000000002440000000000000344000000000000034400000000000002440000000000000344000000000000024400000000000002440";
-    testArrObject(rs, MultiPolygonCodecTest.decodeHexString(hexa));
+    testArrObject(rs, MultiPolygonCodecTest.decodeHexString(hexa), 1);
 
-    testErrObject(rs, Boolean.class);
-    testErrObject(rs, Clob.class);
-    testErrObject(rs, NClob.class);
-    testErrObject(rs, InputStream.class);
-    testErrObject(rs, Reader.class);
-    testErrObject(rs, java.util.Date.class);
+    testErrObject(rs, Boolean.class, 1);
+    testErrObject(rs, Clob.class, 1);
+    testErrObject(rs, NClob.class, 1);
+    testErrObject(rs, InputStream.class, 1);
+    testErrObject(rs, Reader.class, 1);
+    testErrObject(rs, java.util.Date.class, 1);
   }
 
   @Test
diff --git a/src/test/java/org/mariadb/jdbc/integration/codec/MultiPolygonCodecTest.java b/src/test/java/org/mariadb/jdbc/integration/codec/MultiPolygonCodecTest.java
index 8c02d3c3f..19be97fd3 100644
--- a/src/test/java/org/mariadb/jdbc/integration/codec/MultiPolygonCodecTest.java
+++ b/src/test/java/org/mariadb/jdbc/integration/codec/MultiPolygonCodecTest.java
@@ -238,25 +238,25 @@ public static byte[] decodeHexString(String hexString) {
   }
 
   public void getObjectType(ResultSet rs) throws Exception {
-    testErrObject(rs, Integer.class);
-    testErrObject(rs, String.class);
-    testErrObject(rs, Long.class);
-    testErrObject(rs, Short.class);
-    testErrObject(rs, BigDecimal.class);
-    testErrObject(rs, BigInteger.class);
-    testErrObject(rs, Double.class);
-    testErrObject(rs, Float.class);
-    testErrObject(rs, Byte.class);
+    testErrObject(rs, Integer.class, 1);
+    testErrObject(rs, String.class, 1);
+    testErrObject(rs, Long.class, 1);
+    testErrObject(rs, Short.class, 1);
+    testErrObject(rs, BigDecimal.class, 1);
+    testErrObject(rs, BigInteger.class, 1);
+    testErrObject(rs, Double.class, 1);
+    testErrObject(rs, Float.class, 1);
+    testErrObject(rs, Byte.class, 1);
     String hexa =
         "0000000001060000000200000001030000000100000007000000000000000000F03F000000000000F03F000000000000F03F00000000000014400000000000001040000000000000224000000000000018400000000000002240000000000000224000000000000008400000000000001C400000000000000040000000000000F03F000000000000F03F010300000002000000050000000000000000000000000000000000000000000000000049400000000000000000000000000000494000000000000049400000000000000000000000000000494000000000000000000000000000000000050000000000000000002440000000000000244000000000000034400000000000002440000000000000344000000000000034400000000000002440000000000000344000000000000024400000000000002440";
-    testArrObject(rs, decodeHexString(hexa));
+    testArrObject(rs, decodeHexString(hexa), 1);
 
-    testErrObject(rs, Boolean.class);
-    testErrObject(rs, Clob.class);
-    testErrObject(rs, NClob.class);
-    testErrObject(rs, InputStream.class);
-    testErrObject(rs, Reader.class);
-    testErrObject(rs, java.util.Date.class);
+    testErrObject(rs, Boolean.class, 1);
+    testErrObject(rs, Clob.class, 1);
+    testErrObject(rs, NClob.class, 1);
+    testErrObject(rs, InputStream.class, 1);
+    testErrObject(rs, Reader.class, 1);
+    testErrObject(rs, java.util.Date.class, 1);
   }
 
   @Test