Issue 4181 - Fix FilterEngineTest tests

libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsTest.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
@@ skipping 13 matching lines @@
 
 import android.test.AndroidTestCase;
 
 import java.io.File;
 import java.io.IOException;
 
 public abstract class BaseJsTest extends AndroidTestCase
 {
   protected JsEngine jsEngine;
   protected File tmpFileSystemPath;
-  protected FileSystemUtils fileSystemUtils = new FileSystemUtils();
-
+  
   protected File buildTmpFileSystemPath() throws IOException
   {
-    File tmpFileSystemPath = fileSystemUtils
-      .generateUniqueFileName(null, ".fs", getContext().getCacheDir());
+    File tmpFileSystemPath = FileSystemUtils
+      .generateUniqueFile(null, ".fs", getContext().getCacheDir());
     tmpFileSystemPath.mkdirs();
     return tmpFileSystemPath;
   }
 
   @Override
   protected void setUp() throws Exception
   {
     super.setUp();
 
     jsEngine = new JsEngine(AppInfo.builder().build());
     jsEngine.setDefaultLogSystem();
 
     // we need to generate new file system path in order
     // not to have JsEngine state from the previous test
     tmpFileSystemPath = buildTmpFileSystemPath();
     jsEngine.setDefaultFileSystem(tmpFileSystemPath.getAbsolutePath());
     jsEngine.setWebRequest(new ThrowingWebRequest());
   }
 
   protected void cleanupFileSystem()
   {
     if (tmpFileSystemPath != null && tmpFileSystemPath.exists())
     {
-      fileSystemUtils.delete(tmpFileSystemPath, true);
+      FileSystemUtils.delete(tmpFileSystemPath, true);
       tmpFileSystemPath = null;
     }
   }
 
   @Override
   protected void tearDown() throws Exception
   {
     cleanupFileSystem();
     super.tearDown();
   }
 }