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 java.util.List;
+
+public abstract class BaseFilterEngineTest extends BaseJsEngineTest
+{
+  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();
+  }
+
+  protected int getUpdateRequestCount()
+  {
+    return 0;
+  }
+
+  protected int updateSubscriptions()
+  {
+    return updateSubscriptions(false);
+  }
+
+  protected int updateSubscriptions(boolean noWait)
+  {
+    final int init = getUpdateRequestCount();
+
+    List<Subscription> subscriptions = filterEngine.getListedSubscriptions();
+    final int num = subscriptions.size();
+    for (final Subscription s : subscriptions)
+    {
+      try
+      {
+        s.updateFilters();
+      }
+      finally
+      {
+        s.dispose();
+      }
+    }
+
+    if (!noWait)
+    {
+      for (int i = 0; i < UPDATE_SUBSCRIPTIONS_WAIT_CHUNKS; i++)
+      {
+        if (getUpdateRequestCount() - init >= num)
+        {
+          break;
+        }
+        SystemClock.sleep(UPDATE_SUBSCRIPTIONS_WAIT_DELAY_MS / UPDATE_SUBSCRIPTIONS_WAIT_CHUNKS);
+      }
+    }
+
+    return num;
+  }
+}