Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback

libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/FilterEngineTest.java

Index: libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/FilterEngineTest.java
===================================================================
--- a/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/FilterEngineTest.java
+++ b/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/FilterEngineTest.java
@@ -12,17 +12,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.libadblockplus.tests;
 
-import android.util.Log;
 import org.adblockplus.libadblockplus.Filter;
 import org.adblockplus.libadblockplus.FilterEngine;
 import org.adblockplus.libadblockplus.MockFilterChangeCallback;
 import org.adblockplus.libadblockplus.Subscription;
 
 import org.junit.Test;
 
 public class FilterEngineTest extends FilterEngineGenericTest
@@ -40,19 +39,16 @@
         assertEquals(Filter.Type.ELEMHIDE_EXCEPTION, filter4.getType());
         Filter filter5 = filterEngine.getFilter("  foo  ");
         assertEquals(filter1, filter5);
     }
 
     @Test
     public void testAddRemoveFilters()
     {
-        while (filterEngine.getListedFilters().size() > 0)
-            filterEngine.getListedFilters().get(0).removeFromList();
-
         assertEquals(0, filterEngine.getListedFilters().size());
         Filter filter = filterEngine.getFilter("foo");
         assertEquals(0, filterEngine.getListedFilters().size());
         assertFalse(filter.isListed());
 
         filter.addToList();
         assertEquals(1, filterEngine.getListedFilters().size());
         assertEquals(filter, filterEngine.getListedFilters().get(0));
@@ -70,19 +66,16 @@
         filter.removeFromList();
         assertEquals(0, filterEngine.getListedFilters().size());
         assertFalse(filter.isListed());
     }
 
     @Test
     public void testAddRemoveSubscriptions()
     {
-        while (filterEngine.getListedSubscriptions().size() > 0)
-            filterEngine.getListedSubscriptions().get(0).removeFromList();
-
         assertEquals(0, filterEngine.getListedSubscriptions().size());
         Subscription subscription = filterEngine.getSubscription("foo");
         assertEquals(0, filterEngine.getListedSubscriptions().size());
         assertFalse(subscription.isListed());
         subscription.addToList();
         assertEquals(1, filterEngine.getListedSubscriptions().size());
         assertEquals(subscription, filterEngine.getListedSubscriptions().get(0));
         assertTrue(subscription.isListed());