Issue 5136 - Add test for AndroidWebRequestResourceWrapper

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

Index: libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsTest.java
diff --git a/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsTest.java b/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsTest.java
index c8c66f67396a8a5321b7755068748df226ae1c0d..289110e8c205d7101e81f2d4fdc6a1528b4aa66c 100644
--- a/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsTest.java
+++ b/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/tests/BaseJsTest.java
@@ -22,9 +22,10 @@ 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;
 
@@ -38,4 +39,9 @@ public abstract class BaseJsTest extends AndroidTestCase
     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

+  }
 }