Issue 5136 - Add test for AndroidWebRequestResourceWrapper

libadblockplus-android/src/org/adblockplus/libadblockplus/android/AndroidWebRequestResourceWrapper.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 94 matching lines @@
 
   public void setListener(Listener listener)
   {
     this.listener = listener;
   }
 
   @Override
   public ServerResponse httpGET(String url, List<HeaderEntry> headers)
   {
     // since parameters may vary we need to ignore them
-    String urlWithoutParams = url.substring(0, url.indexOf("?"));
+    String urlWithoutParams = Utils.getUrlWithoutParams(url);
     Integer resourceId = urlToResourceIdMap.get(urlWithoutParams);
 
     if (resourceId != null)
     {
       if (!storage.contains(urlWithoutParams))
       {
         Log.w(TAG, "Intercepting request for " + url + " with resource #" + resourceId.intValue());
         ServerResponse response = buildResourceContentResponse(resourceId);
         storage.put(urlWithoutParams);
 
@@ skipping 121 matching lines @@
         .commit();
     }
 
     @Override
     public synchronized boolean contains(String url)
     {
       return urls.contains(url);
     }
   }
 }