Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback

libadblockplus-android/jni/Utils.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 <string>
+#include <sstream>
+#include <iostream>
 
 #include "Utils.h"
 
 // precached in JNI_OnLoad and released in JNI_OnUnload
 JniGlobalReference<jclass>* arrayListClass;
 jmethodID  arrayListCtor;
 
 JniGlobalReference<jclass>* filterClass;
 jmethodID filterCtor;
 
@@ skipping 62 matching lines @@
     return std::string();
   }
 
   const char* cStr = env->GetStringUTFChars(str, 0);
   std::string ret(cStr);
   env->ReleaseStringUTFChars(str, cStr);
 
   return ret;
 }
 
+std::string JniStdStreamToStdString(std::istream *in)

[sergei, 2017/04/28 09:24:49]

I think it would be better to call the function from libadblockplus instead of
having own implementation.
https://github.com/adblockplus/libadblockplus/blob/53211850e1dba0d3ba6613dfe9...

So far, you can simply declare it in the header as
namespace Utils {
  std::string Slurp(std::istream& stream);
}
and call if you statically link with libadblockplus.

+{
+  std::string ret;
+  char buffer[1024];
+  while (in->read(buffer, sizeof(buffer)))
+    ret.append(buffer, sizeof(buffer));
+  ret.append(buffer, in->gcount());
+  return ret;
+}
+
 jstring JniStdStringToJava(JNIEnv* env, std::string str)
 {
   return env->NewStringUTF(str.c_str());
 }
 
 jobject NewJniArrayList(JNIEnv* env)
 {
   return env->NewObject(arrayListClass->Get(), arrayListCtor);
 }
 
@@ skipping 80 matching lines @@
     const AdblockPlus::SubscriptionPtr& subscription)
 {
   return NewJniObject(env, subscription, subscriptionClass->Get(), subscriptionCtor);
 }
 
 jobject NewJniNotification(JNIEnv* env,
     const AdblockPlus::NotificationPtr& notification)
 {
   return NewJniObject(env, notification, notificationClass->Get(), notificationCtor);
 }