Fix libadblockplus-android tests

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

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 33 matching lines @@
     assertEquals(Filter.Type.ELEMHIDE, filter3.getType());
     Filter filter4 = filterEngine.getFilter("example.com#@#foo");
     assertEquals(Filter.Type.ELEMHIDE_EXCEPTION, filter4.getType());
     Filter filter5 = filterEngine.getFilter("  foo  ");
     assertEquals(filter1, filter5);
   }
 
   @Test
   public void testAddRemoveFilters()
   {
-    while (filterEngine.getListedFilters().size() > 0)
-    {
-      int prev = filterEngine.getListedFilters().size();

[anton, 2018/08/24 12:25:04]

Can you please explain what's happening here?
Is it to make sure `removeFromList()` really deletes a filter?

Originally it was just removing all the filters until we have it.

[René Jeschke, 2018/08/27 20:02:15]

There was a change in the way subscriptions work in libapb. The AA subscription
can not be removed from listed subscriptions as soon as it has been enabled.
Disabling is possible, but it will stay listed. This caused many tests to fail
or run in endless loops. The 'prev' thing now checks if we really removed a
subscription and breaks the loop otherwise. So we only end up with failing test
in the worst case and not endless loops.

-      filterEngine.getListedFilters().get(0).removeFromList();
-      if (prev == filterEngine.getListedFilters().size())
-      {
-        Log.e(TAG, "Failed to clear listed filters.");
-      }
-    }
+    this.removeListedSubscriptions();
 
     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));
     assertTrue(filter.isListed());
@@ skipping 44 matching lines @@
     filterEngine.setFilterChangeCallback(callback);
     subscription.setDisabled(false);
     assertEquals(1, callback.getTimesCalled());
     assertFalse(subscription.isDisabled());
     filterEngine.removeFilterChangeCallback();
   }
 
   @Test
   public void testAddRemoveSubscriptions()
   {
-    while (filterEngine.getListedSubscriptions().size() > 0)

[anton, 2018/08/24 12:25:04]

copy-paste from above. Can you create separate function like `clearFilters()`
and call it from there and here?
I agree it was also copy-paster before but it was 2 lines and now it's much
more.

[René Jeschke, 2018/08/27 20:02:15]

Done.

-    {
-      int prev = filterEngine.getListedSubscriptions().size();
-      filterEngine.getListedSubscriptions().get(0).removeFromList();
-      if (prev == filterEngine.getListedSubscriptions().size())
-      {
-        Log.e(TAG, "Failed to clear listed subscriptions.");
-        break;
-      }
-    }
+    this.removeListedSubscriptions();
 
     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());
     subscription.addToList();
@@ skipping 381 matching lines @@
     listedSubscriptions = filterEngine.getListedSubscriptions();
     for (Subscription eachSubscription : listedSubscriptions)
     {
       if (eachSubscription.isAcceptableAds())
       {
         assertFalse(eachSubscription.isDisabled());
       }
     }
   }
 }