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
@@ skipping 59 matching lines @@
             *arrayList));
 
     if (!env->ExceptionCheck())
     {
       sResponse.status = JniGetLongField(*env, serverResponseClass->Get(),
           *response, "status");
       sResponse.responseStatus = JniGetIntField(*env,
           serverResponseClass->Get(), *response, "responseStatus");
       sResponse.responseText = JniGetStringField(*env,
           serverResponseClass->Get(), *response, "response");
-      // TODO: transform Headers
+
+      // map headers
+      jobjectArray responseHeadersArray = JniGetStringArrayField(*env,
+        serverResponseClass->Get(), *response, "headers");
+
+      if (responseHeadersArray) {
+        int itemsCount = env->GetArrayLength(responseHeadersArray) / 2;
+        for (int i=0; i<itemsCount; i++) {
+          // key
+          jstring jKey = (jstring)env->GetObjectArrayElement(responseHeadersArray, i * 2);
+          const char *cKey = env->GetStringUTFChars(jKey, 0);
+          std::string stdCKey(cKey);
+          env->ReleaseStringUTFChars(jKey, cKey);
+
+          // value
+          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);
+          sResponse.responseHeaders.push_back(keyValue);
+        }
+      }
     }
   }
 
   CheckAndLogJavaException(*env);
 
   return sResponse;
 }
 
 jobject JniWebRequest::NewTuple(JNIEnv* env, const std::string& a,
     const std::string& b) const
@@ skipping 10 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]));
 }