Issue 5136 - Add test for AndroidWebRequestResourceWrapper

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
  * 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 org.adblockplus.libadblockplus.AppInfo;
 import org.adblockplus.libadblockplus.JsEngine;
 import org.adblockplus.libadblockplus.LazyLogSystem;
 import org.adblockplus.libadblockplus.ThrowingWebRequest;
 
-import android.test.AndroidTestCase;
+import android.content.Context;
+import android.test.InstrumentationTestCase;
 
-public abstract class BaseJsTest extends AndroidTestCase
+public abstract class BaseJsTest extends InstrumentationTestCase

[anton, 2017/04/13 13:46:50]

I had to change base class to more powerful as now we need access to test
resources (previously we were able to access only library resources and now we
need tests resources too). Otherwise we will be able to compile and runtime
exception (resoruce not found) will be thrown as it's in test resources not in
the library.

 {
   protected JsEngine jsEngine;
 
   @Override
   protected void setUp() throws Exception
   {
     super.setUp();
 
     jsEngine = new JsEngine(AppInfo.builder().build());
     jsEngine.setDefaultLogSystem();
     jsEngine.setDefaultFileSystem(getContext().getFilesDir().getAbsolutePath());
     jsEngine.setWebRequest(new ThrowingWebRequest());
   }
+
+  protected Context getContext()

[anton, 2017/04/13 13:46:50]

for back compatibility for existing tests

+  {
+    return getInstrumentation().getTargetContext();

[anton, 2017/04/13 13:46:50]

target context = library context so it will work for existing tests just like
previously

+  }
 }