Make getMetadataFromIndex signature more strict and improve tests

Author: pomadchin

src/main/java/io/tiledb/java/api/Array.java

@@ -684,10 +684,10 @@ public BigInteger getMetadataNum() throws TileDBError {
    * otherwise the function will error out.
    *
    * @param index index to retrieve metadata from
-   * @return a pair, key and the metadata NativeArray
+   * @return a pair, key and the metadata
    * @throws TileDBError A TileDB exception
    */
-  public Pair getMetadataFromIndex(BigInteger index) throws TileDBError {
+  public Pair<String, NativeArray> getMetadataFromIndex(BigInteger index) throws TileDBError {
     checkIsOpen();
 
     SWIGTYPE_p_p_char key = tiledb.new_charpp();
@@ -711,7 +711,7 @@ public Pair getMetadataFromIndex(BigInteger index) throws TileDBError {
     tiledb.delete_charpp(key);
     tiledb.delete_tiledb_datatype_tp(value_type);
 
-    return new Pair(keyString, result);
+    return new Pair<String, NativeArray>(keyString, result);
   }
 
   /**

src/test/java/io/tiledb/java/api/ArrayTest.java

@@ -34,6 +34,16 @@ public void tearDown() throws Exception {
     ctx.close();
   }
 
+  private Object[] getArray(Object val) {
+    if (val instanceof Object[]) return (Object[]) val;
+    int arrlength = java.lang.reflect.Array.getLength(val);
+    Object[] outputArray = new Object[arrlength];
+    for (int i = 0; i < arrlength; i++) {
+      outputArray[i] = java.lang.reflect.Array.get(val, i);
+    }
+    return outputArray;
+  }
+
   public ArraySchema schemaCreate() throws Exception {
     Dimension<Long> d1 =
         new Dimension<Long>(ctx, "d1", Long.class, new Pair<Long, Long>(1l, 4l), 2l);
@@ -287,7 +297,7 @@ public void testArrayMetadata() throws Exception {
 
     arrayw.putMetadata(intKey, metadataInt);
     arrayw.putMetadata(floatKey, metadataFloat);
-    // commit changes
+    // submit changes
     arrayw.close();
 
     // open a new session
@@ -309,17 +319,13 @@ public void testArrayMetadata() throws Exception {
         (float[]) metadataFloat.toJavaArray(), (float[]) metadataFloatActual.toJavaArray(), 1e-10f);
 
     // fromIndex tests
-    String[] keys = new String[] {floatKey, intKey};
+    String[] expectedKeys = new String[] {floatKey, intKey};
+    Object[] expectedArrays = new Object[] {metadataFloat.toJavaArray(), metadataInt.toJavaArray()};
+
     for (int i = 0; i < arrayn.getMetadataNum().intValue(); i++) {
       Pair<String, NativeArray> p = arrayn.getMetadataFromIndex(BigInteger.valueOf(i));
-      Assert.assertEquals(p.getFirst(), keys[i]);
-      if (i == 0) {
-        Assert.assertArrayEquals(
-            (float[]) metadataFloat.toJavaArray(), (float[]) p.getSecond().toJavaArray(), 1e-10f);
-      } else {
-        Assert.assertArrayEquals(
-            (int[]) metadataInt.toJavaArray(), (int[]) p.getSecond().toJavaArray());
-      }
+      Assert.assertEquals(p.getFirst(), expectedKeys[i]);
+      Assert.assertArrayEquals(getArray(expectedArrays[i]), getArray(p.getSecond().toJavaArray()));
     }
 
     arrayn.close();