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 11 matching lines @@
 import org.adblockplus.libadblockplus.BaseFilterEngineTest;
 import org.adblockplus.libadblockplus.Filter;
 import org.adblockplus.libadblockplus.FilterEngine;
 import org.adblockplus.libadblockplus.MockFilterChangeCallback;
 import org.adblockplus.libadblockplus.Subscription;
 
 import org.junit.Test;
 
 import java.util.List;
 
 public class FilterEngineTest extends BaseFilterEngineTest

[anton, 2018/07/16 06:58:52]

i was unable to apply diff patch so just looking the sources.
Since `BaseFilterEngineTest` is deleted
(https://codereview.adblockplus.org/29819555/patch/29819556/29819558) how can
this file be compiled?

What about deleted `BasePlatformTest`
https://codereview.adblockplus.org/29819555/diff/29819556/adblock-android-tes...
?

[René Jeschke, 2018/08/16 11:47:15]

Yeah, somehow 'upload.py' missed that I moved the files ... will see if a
re-upload will help.

 {
   private static final String TAG = FilterEngineTest.class.getSimpleName();
 
   @Test
   public void testFilterCreation()
   {
     Filter filter1 = filterEngine.getFilter("foo");
     assertEquals(Filter.Type.BLOCKING, filter1.getType());
     Filter filter2 = filterEngine.getFilter("@@foo");
     assertEquals(Filter.Type.EXCEPTION, filter2.getType());
     Filter filter3 = filterEngine.getFilter("example.com##foo");
     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/07/11 13:58:30]

extra not required space

[René Jeschke, 2018/08/16 11:47:15]

Done.

-      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)
-    {
-      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 220 matching lines @@
       FilterEngine.ContentType.IMAGE,
       new String[]
         {
           "http://ads.com/frame/",
           "http://example.org/",
           "http://example.com/"
         });
     assertNotNull(match5);
     assertEquals(Filter.Type.EXCEPTION, match5.getType());
   }
 

[anton, 2018/07/16 06:58:52]

i still can see first run flag test in c++ source:
https://github.com/adblockplus/libadblockplus/blob/master/test/FilterEngine.c...

but here it's just deleted.

[René Jeschke, 2018/08/16 11:47:15]

There's an extra test for the first run flag:
org.adblockplus.libadblockplus.tests.FilterEngineFirstRunTest

   @Test
   public void testSetRemoveFilterChangeCallback()
   {
     MockFilterChangeCallback callback = new MockFilterChangeCallback("subscription.added", "defaults", "blocking");
 
     filterEngine.setFilterChangeCallback(callback);
     Filter filter = filterEngine.getFilter("foo");
     assertFalse(filter.isListed());
     filter.addToList();
     assertEquals(1, callback.getTimesCalled());
@@ skipping 140 matching lines @@
     listedSubscriptions = filterEngine.getListedSubscriptions();
     for (Subscription eachSubscription : listedSubscriptions)
     {
       if (eachSubscription.isAcceptableAds())
       {
         assertFalse(eachSubscription.isDisabled());
       }
     }
   }
 }