Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback

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

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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.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
 {
     @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)
-            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));
         assertTrue(filter.isListed());
 
         filter.addToList();
         assertEquals(1, filterEngine.getListedFilters().size());
         assertEquals(filter, filterEngine.getListedFilters().get(0));
         assertTrue(filter.isListed());
 
         filter.removeFromList();
         assertEquals(0, filterEngine.getListedFilters().size());
         assertFalse(filter.isListed());
 
         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());
         subscription.addToList();
         assertEquals(1, filterEngine.getListedSubscriptions().size());
@@ skipping 284 matching lines @@
         assertFalse(filterEngine.isElemhideWhitelisted("http://example.com", emptyArray));
 
         String[] documentUrls1 = new String[]
         {
             "http://example.de"
         };
         assertTrue(filterEngine.isElemhideWhitelisted("http://example.com", documentUrls1));
         assertFalse(filterEngine.isElemhideWhitelisted("http://example.co.uk", documentUrls1));
     }
 }