Issue 4081 - Fix failing MockWebRequestTest test for libadblockplus-android

libadblockplus-android/jni/JniWebRequest.cpp

 /*
  * 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/>.
  */
 
 #include "JniCallbacks.h"
+#include "Utils.h"
 
 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
 {
   try
   {
     return JniPtrToLong(new AdblockPlus::WebRequestPtr(new JniWebRequest(env, callbackObject)));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
@@ skipping 46 matching lines @@
           *response, "status");
       sResponse.responseStatus = JniGetIntField(*env,
           serverResponseClass->Get(), *response, "responseStatus");
       sResponse.responseText = JniGetStringField(*env,
           serverResponseClass->Get(), *response, "response");
 
       // map headers
       jobjectArray responseHeadersArray = JniGetStringArrayField(*env,
         serverResponseClass->Get(), *response, "headers");
 
-      if (responseHeadersArray) {
+      if (responseHeadersArray)
+      {
         int itemsCount = env->GetArrayLength(responseHeadersArray) / 2;
-        for (int i=0; i<itemsCount; i++) {
-          // key
+        for (int i = 0; i < itemsCount; i++)
+        {
           jstring jKey = (jstring)env->GetObjectArrayElement(responseHeadersArray, i * 2);
-          const char *cKey = env->GetStringUTFChars(jKey, 0);
-          std::string stdCKey(cKey);
-          env->ReleaseStringUTFChars(jKey, cKey);
-
-          // value
+          std::string stdKey = JniJavaToStdString(*env, jKey);
+          
           jstring jValue = (jstring)env->GetObjectArrayElement(responseHeadersArray, i * 2 + 1);
-          const char *cValue = env->GetStringUTFChars(jValue, 0);
-          std::string stdCValue(cValue);
-          env->ReleaseStringUTFChars(jValue, cValue);
-
-          std::pair<std::string,std::string>  keyValue(stdCKey, stdCValue);
+          std::string stdValue = JniJavaToStdString(*env, jValue);
+          
+          std::pair<std::string,std::string>  keyValue(stdKey, stdValue);
           sResponse.responseHeaders.push_back(keyValue);
         }
       }
     }
   }
 
   CheckAndLogJavaException(*env);
 
   return sResponse;
 }
@@ skipping 13 matching lines @@
 static JNINativeMethod methods[] =
 {
   { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_WebRequest_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }