Fix libadblockplus-android tests

adblock-android-tests/src/org/adblockplus/libadblockplus/BaseFilterEngineTest.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * 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;

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

Why is it moved from `tests` package?
Same about all other moved `Base..` tests: `BaseFilterEngineTest.java`,
`BaseJsEngineTest.java`, `BasePlatformTest.java`, `BaseTest.java`,
`UpdaterTest.java`.
Was it intentionally?

The original idea was to have test stub/impls in regular package and tests
classes in `test` package.

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

Yes, it was intentionally. Those four classes don't test anything as they are
base classes which only make sense when subclassed. This was the reason why I
moved them one up. As the package is named 'tests' I only wanted tests to be in
there. I can, of course, move them back if you insist.

 
 import android.os.SystemClock;
+import android.util.Log;
 
 import java.util.List;
 
 public abstract class BaseFilterEngineTest extends BaseJsEngineTest
 {
+  private final static String TAG = BaseFilterEngineTest.class.getSimpleName();
   protected final static int UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS = 5 * 1000;
   protected final static int UPDATE_SUBSCRIPTIONS_WAIT_CHUNKS = 50;
 
   @Override
   protected void setUp() throws Exception
   {
     super.setUp();
     this.setupFilterEngine();
   }
 
@@ skipping 32 matching lines @@
         if (getUpdateRequestCount() - init >= num)
         {
           break;
         }
         SystemClock.sleep(UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS / UPDATE_SUBSCRIPTIONS_WAIT_CHUNKS);
       }
     }
 
     return num;
   }
+
+  public boolean removeListedSubscriptions()
+  {
+    while (filterEngine.getListedSubscriptions().size() > 0)
+    {
+      int prev = filterEngine.getListedSubscriptions().size();
+      filterEngine.getListedSubscriptions().get(0).removeFromList();

[anton, 2018/09/17 06:55:13]

isn't it better to return `boolean` for `removeFromList` call (actually removed
or nor)? Probably it requires changes in `libadblockplus` module  though and can
be done in separate task..

+      if (prev == filterEngine.getListedSubscriptions().size())

[anton, 2018/10/16 13:24:55]

this still looks suspicious.
sergey: "removing should always work".
NOT LGTM - we need to double check it.

+      {
+        Log.e(TAG, "Failed to clear listed subscriptions.");
+        return false;
+      }
+    }
+    return true;
+  }
 }

[anton, 2018/10/18 11:40:13]

the file does not correspond to last revision of file in github:
https://github.com/rjeschke/libadblockplus-android/blob/f46de56d2adab2c361916...