The Big Kahuna of firebase-ui-database

app/src/main/java/com/firebase/uidemo/database/ChatActivity.java

@@ -148,7 +148,7 @@ public void populateViewHolder(ChatHolder holder, Chat chat, int position) {
             }
 
             @Override
-            protected void onDataChanged() {
+            public void onDataChanged() {
                 // If there are no chat messages, show a view that invites the user to add a message.
                 mEmptyListMessage.setVisibility(mAdapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
             }

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

@@ -30,4 +30,16 @@ public String getText() {
     public boolean isBool() {
         return mBool;
     }
+
+    public void setNumber(int number) {
+        mNumber = number;
+    }
+
+    public void setText(String text) {
+        mText = text;
+    }
+
+    public void setBool(boolean bool) {
+        mBool = bool;
+    }
 }

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

@@ -29,15 +29,15 @@
 import java.util.concurrent.Callable;
 
 import static com.firebase.ui.database.TestUtils.getAppInstance;
-import static com.firebase.ui.database.TestUtils.getBean;
 import static com.firebase.ui.database.TestUtils.runAndWaitUntil;
 
 @RunWith(AndroidJUnit4.class)
 public class FirebaseArrayOfObjectsTest {
     private static final int INITIAL_SIZE = 3;
 
     private DatabaseReference mRef;
-    private FirebaseArray mArray;
+    private FirebaseArray<Bean> mArray;
+    private ChangeEventListener mListener;
 
     @Before
     public void setUp() throws Exception {
@@ -46,9 +46,9 @@ public void setUp() throws Exception {
                 .getReference()
                 .child("firebasearray")
                 .child("objects");
-        mArray = new FirebaseArray(mRef);
+        mArray = new FirebaseArray<>(mRef, Bean.class);
         mRef.removeValue();
-        runAndWaitUntil(mArray, new Runnable() {
+        mListener = runAndWaitUntil(mArray, new Runnable() {
             @Override
             public void run() {
                 for (int i = 1; i <= INITIAL_SIZE; i++) {
@@ -58,14 +58,14 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getCount() == INITIAL_SIZE;
+                return mArray.size() == INITIAL_SIZE;
             }
         });
     }
 
     @After
     public void tearDown() throws Exception {
-        mArray.cleanup();
+        mArray.removeChangeEventListener(mListener);
         mRef.getRoot().removeValue();
     }
 
@@ -79,7 +79,7 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getCount() == 4;
+                return mArray.size() == 4;
             }
         });
     }
@@ -94,7 +94,7 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getItem(3).getValue(Bean.class).getNumber() == 4;
+                return mArray.getObject(3).getNumber() == 4;
             }
         });
     }
@@ -109,9 +109,8 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getItem(3).getValue(Bean.class).getNumber() == 3 && mArray.getItem(0)
-                        .getValue(Bean.class)
-                        .getNumber() == 4;
+                return mArray.getObject(3).getNumber() == 3
+                        && mArray.getObject(0).getNumber() == 4;
             }
         });
     }
@@ -121,16 +120,47 @@ public void testChangePriorities() throws Exception {
         runAndWaitUntil(mArray, new Runnable() {
             @Override
             public void run() {
-                mArray.getItem(2).getRef().setPriority(0.5);
+                mArray.get(2).getRef().setPriority(0.5);
             }
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return getBean(mArray, 0).getNumber() == 3
-                        && getBean(mArray, 1).getNumber() == 1
-                        && getBean(mArray, 2).getNumber() == 2;
+                return mArray.getObject(0).getNumber() == 3
+                        && mArray.getObject(1).getNumber() == 1
+                        && mArray.getObject(2).getNumber() == 2;
                 //return isValuesEqual(mArray, new int[]{3, 1, 2});
             }
         });
     }
+
+    @Test
+    public void testCacheInvalidates() throws Exception {
+        final DatabaseReference pushRef = mRef.push();
+
+        // Set initial value to "5"
+        runAndWaitUntil(mArray, new Runnable() {
+            @Override
+            public void run() {
+                pushRef.setValue(new Bean(5), 100);
+            }
+        }, new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                return mArray.getObject(3).getNumber() == 5;
+            }
+        });
+
+        // Change the value to "6" and ensure that the change is propagated
+        runAndWaitUntil(mArray, new Runnable() {
+            @Override
+            public void run() {
+                pushRef.setValue(new Bean(6), 100);
+            }
+        }, new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                return mArray.getObject(3).getNumber() == 6;
+            }
+        });
+    }
 }

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

@@ -37,14 +37,15 @@ public class FirebaseArrayTest {
     private static final int INITIAL_SIZE = 3;
     private DatabaseReference mRef;
     private FirebaseArray 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);
         mRef.removeValue();
-        runAndWaitUntil(mArray, new Runnable() {
+        mListener = runAndWaitUntil(mArray, new Runnable() {
             @Override
             public void run() {
                 for (int i = 1; i <= INITIAL_SIZE; i++) {
@@ -54,14 +55,14 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getCount() == INITIAL_SIZE;
+                return mArray.size() == INITIAL_SIZE;
             }
         });
     }
 
     @After
     public void tearDown() throws Exception {
-        mArray.cleanup();
+        mArray.removeChangeEventListener(mListener);
         mRef.getRoot().removeValue();
     }
 
@@ -75,7 +76,7 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getCount() == 4;
+                return mArray.size() == 4;
             }
         });
     }
@@ -90,7 +91,7 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getItem(3).getValue(Integer.class).equals(4);
+                return mArray.get(3).getValue(Integer.class).equals(4);
             }
         });
     }
@@ -105,8 +106,8 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getItem(3).getValue(Integer.class).equals(3)
-                        && mArray.getItem(0).getValue(Integer.class).equals(4);
+                return mArray.get(3).getValue(Integer.class).equals(3)
+                        && mArray.get(0).getValue(Integer.class).equals(4);
             }
         });
     }
@@ -116,7 +117,7 @@ public void testChangePriorityBackToFront() throws Exception {
         runAndWaitUntil(mArray, new Runnable() {
             @Override
             public void run() {
-                mArray.getItem(2).getRef().setPriority(0.5);
+                mArray.get(2).getRef().setPriority(0.5);
             }
         }, new Callable<Boolean>() {
             @Override
@@ -131,7 +132,7 @@ public void testChangePriorityFrontToBack() throws Exception {
         runAndWaitUntil(mArray, new Runnable() {
             @Override
             public void run() {
-                mArray.getItem(0).getRef().setPriority(4);
+                mArray.get(0).getRef().setPriority(4);
             }
         }, new Callable<Boolean>() {
             @Override

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

@@ -28,7 +28,6 @@
 import java.util.concurrent.Callable;
 
 import static com.firebase.ui.database.TestUtils.getAppInstance;
-import static com.firebase.ui.database.TestUtils.getBean;
 import static com.firebase.ui.database.TestUtils.runAndWaitUntil;
 
 @RunWith(AndroidJUnit4.class)
@@ -37,7 +36,8 @@ public class FirebaseIndexArrayOfObjectsTest {
 
     private DatabaseReference mRef;
     private DatabaseReference mKeyRef;
-    private FirebaseArray mArray;
+    private ObservableSnapshotArray<Bean> mArray;
+    private ChangeEventListener mListener;
 
     @Before
     public void setUp() throws Exception {
@@ -46,11 +46,11 @@ public void setUp() throws Exception {
         mRef = databaseInstance.getReference().child("firebasearray").child("objects");
         mKeyRef = databaseInstance.getReference().child("firebaseindexarray").child("objects");
 
-        mArray = new FirebaseIndexArray(mKeyRef, mRef);
+        mArray = new FirebaseIndexArray<>(mKeyRef, mRef, Bean.class);
         mRef.removeValue();
         mKeyRef.removeValue();
 
-        runAndWaitUntil(mArray, new Runnable() {
+        mListener = runAndWaitUntil(mArray, new Runnable() {
             @Override
             public void run() {
                 for (int i = 1; i <= INITIAL_SIZE; i++) {
@@ -60,14 +60,14 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getCount() == INITIAL_SIZE;
+                return mArray.size() == INITIAL_SIZE;
             }
         });
     }
 
     @After
     public void tearDown() throws Exception {
-        mArray.cleanup();
+        mArray.removeChangeEventListener(mListener);
         mRef.getRoot().removeValue();
     }
 
@@ -81,7 +81,7 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getCount() == 4;
+                return mArray.size() == 4;
             }
         });
     }
@@ -96,7 +96,7 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getItem(3).getValue(Bean.class).getNumber() == 4;
+                return mArray.getObject(3).getNumber() == 4;
             }
         });
     }
@@ -111,9 +111,8 @@ public void run() {
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return mArray.getItem(3).getValue(Bean.class).getNumber() == 3 && mArray.getItem(0)
-                        .getValue(Bean.class)
-                        .getNumber() == 4;
+                return mArray.getObject(3).getNumber() == 3
+                        && mArray.getObject(0).getNumber() == 4;
             }
         });
     }
@@ -123,14 +122,14 @@ public void testChangePriorities() throws Exception {
         runAndWaitUntil(mArray, new Runnable() {
             @Override
             public void run() {
-                mKeyRef.child(mArray.getItem(2).getKey()).setPriority(0.5);
+                mKeyRef.child(mArray.get(2).getKey()).setPriority(0.5);
             }
         }, new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                return getBean(mArray, 0).getNumber() == 3
-                        && getBean(mArray, 1).getNumber() == 1
-                        && getBean(mArray, 2).getNumber() == 2;
+                return mArray.getObject(0).getNumber() == 3
+                        && mArray.getObject(1).getNumber() == 1
+                        && mArray.getObject(2).getNumber() == 2;
                 //return isValuesEqual(mArray, new int[]{3, 1, 2});
             }
         });