Fix bug where empty observable lists weren't being removed from a Mer…

…geObservableList Fixes #168
evant · Nov 11, 2019 · 41e7a4e · 41e7a4e
1 parent 4ae356e
commit 41e7a4e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/...r/src/main/java/me/tatarka/bindingcollectionadapter2/collections/MergeObservableList.java b/...r/src/main/java/me/tatarka/bindingcollectionadapter2/collections/MergeObservableList.java
@@ -103,9 +103,6 @@ public boolean removeList(@NonNull ObservableList<? extends T> listToRemove) {
      */
     public void removeAll() {
         int size = size();
-        if (size == 0) {
-            return;
-        }
         for (int i = 0, listSize = lists.size(); i < listSize; i++) {
             List<? extends T> list = lists.get(i);
             if (list instanceof ObservableList) {
@@ -114,7 +111,9 @@ public void removeAll() {
         }
         lists.clear();
         modCount += 1;
-        listeners.notifyRemoved(this, 0, size);
+        if (size > 0) {
+            listeners.notifyRemoved(this, 0, size);
+        }
     }
 
     /**

diff --git a/...ectionadapter/src/test/java/me/tatarka/bindingcollectionadapter2/MergeObservableTest.java b/...ectionadapter/src/test/java/me/tatarka/bindingcollectionadapter2/MergeObservableTest.java
@@ -12,7 +12,10 @@
 import me.tatarka.bindingcollectionadapter2.collections.MergeObservableList;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -188,4 +191,18 @@ public void removingAllRemovesInsertedListFromTheList() {
         assertThat(list).isEmpty();
         verify(callback).onItemRangeRemoved(list, 0, 2);
     }
+
+    @Test
+    public void removingAllRemovesEmptyListsFromTheList() {
+        MergeObservableList<String> list = new MergeObservableList<>();
+        ObservableArrayList<String> backingList = new ObservableArrayList<>();
+        list.insertList(backingList);
+        ObservableList.OnListChangedCallback callback = mock(ObservableList.OnListChangedCallback.class);
+        list.addOnListChangedCallback(callback);
+        list.removeAll();
+        backingList.add("test");
+
+        assertThat(list).isEmpty();
+        verify(callback, never()).onItemRangeRemoved(any(MergeObservableList.class), anyInt(), anyInt());
+    }
 }