Fix broken database tests (#705)

Author: SUPERCILEX

database/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
 apply from: '../library/quality/quality.gradle'
+check.dependsOn 'compileDebugAndroidTestJavaWithJavac'
 
 android {
     compileSdkVersion compileSdk

database/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java

@@ -36,14 +36,14 @@
 public class FirebaseArrayTest {
     private static final int INITIAL_SIZE = 3;
     private DatabaseReference mRef;
-    private FirebaseArray mArray;
+    private FirebaseArray<Integer> mArray;
     private ChangeEventListener mListener;
 
     @Before
     public void setUp() throws Exception {
         FirebaseApp app = getAppInstance(InstrumentationRegistry.getContext());
         mRef = FirebaseDatabase.getInstance(app).getReference().child("firebasearray");
-        mArray = new FirebaseArray(mRef);
+        mArray = new FirebaseArray<>(mRef, Integer.class);
         mRef.removeValue();
         mListener = runAndWaitUntil(mArray, new Runnable() {
             @Override
@@ -91,7 +91,7 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.get(3).getValue(Integer.class).equals(4);
+                return mArray.getObject(3).equals(4);
             }
         });
     }
@@ -106,8 +106,8 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.get(3).getValue(Integer.class).equals(3)
-                        && mArray.get(0).getValue(Integer.class).equals(4);
+                return mArray.getObject(3).equals(3)
+                        && mArray.getObject(0).equals(4);
             }
         });
     }

database/src/androidTest/java/com/firebase/ui/database/FirebaseIndexArrayTest.java

@@ -37,7 +37,7 @@ public class FirebaseIndexArrayTest {
 
     private DatabaseReference mRef;
     private DatabaseReference mKeyRef;
-    private ObservableSnapshotArray<?> mArray;
+    private ObservableSnapshotArray<Integer> mArray;
     private ChangeEventListener mListener;
 
     @Before
@@ -47,7 +47,7 @@ public void setUp() throws Exception {
         mRef = databaseInstance.getReference().child("firebasearray");
         mKeyRef = databaseInstance.getReference().child("firebaseindexarray");
 
-        mArray = new FirebaseIndexArray(mKeyRef, mRef);
+        mArray = new FirebaseIndexArray<>(mKeyRef, mRef, Integer.class);
         mRef.removeValue();
         mKeyRef.removeValue();
 
@@ -97,7 +97,7 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.get(3).getValue(Integer.class).equals(4);
+                return mArray.getObject(3).equals(4);
             }
         });
     }
@@ -112,8 +112,8 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.get(3).getValue(Integer.class).equals(3)
-                        && mArray.get(0).getValue(Integer.class).equals(4);
+                return mArray.getObject(3).equals(3)
+                        && mArray.getObject(0).equals(4);
             }
         });
     }

database/src/androidTest/java/com/firebase/ui/database/TestUtils.java

@@ -74,10 +74,10 @@ public void onCancelled(DatabaseError error) {
         return listener;
     }
 
-    public static boolean isValuesEqual(ObservableSnapshotArray<?> array, int[] expected) {
+    public static boolean isValuesEqual(ObservableSnapshotArray<Integer> array, int[] expected) {
         if (array.size() != expected.length) return false;
         for (int i = 0; i < array.size(); i++) {
-            if (!array.get(i).getValue(Integer.class).equals(expected[i])) {
+            if (!array.getObject(i).equals(expected[i])) {
                 return false;
             }
         }