diff options
author | zmiao <miao.zhao@mapbox.com> | 2019-11-19 20:45:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-19 20:45:30 +0200 |
commit | 1b58e87f154bf7d3d5f38ef32cc4b171362f73a2 (patch) | |
tree | cf692c1fbee906e2370ec0f6d684d5b5bb838e61 /platform | |
parent | abdd32d11fcd9cebe0631afbfd2aba9e78c7d790 (diff) | |
download | qtlocation-mapboxgl-1b58e87f154bf7d3d5f38ef32cc4b171362f73a2.tar.gz |
[render-test] Wrap test data inside RenderTestRunner App + Add a new test app (#15887)
* [render-test] Wrap test resources inside app
* [render-test] Add test app
* fix test app failure
* [render-test]add callback + add javaObjectWrapper
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/src/test/render_test_runner.cpp | 269 | ||||
-rw-r--r-- | platform/default/src/mbgl/render-test/main.cpp | 2 |
2 files changed, 252 insertions, 19 deletions
diff --git a/platform/android/src/test/render_test_runner.cpp b/platform/android/src/test/render_test_runner.cpp index d4554aa9de..98197ce1cc 100644 --- a/platform/android/src/test/render_test_runner.cpp +++ b/platform/android/src/test/render_test_runner.cpp @@ -1,15 +1,17 @@ #include <android_native_app_glue.h> #include <mbgl/render_test.hpp> +#include <mbgl/util/logging.hpp> + +#include <android/asset_manager.h> +#include <android/log.h> + #include "jni.hpp" -#include "logger.hpp" +#include <cstdio> +#include <functional> #include <string> #include <vector> -#include <mbgl/util/logging.hpp> - -#include <android/log.h> - namespace mbgl { namespace { @@ -18,16 +20,12 @@ int severityToPriority(EventSeverity severity) { switch (severity) { case EventSeverity::Debug: return ANDROID_LOG_DEBUG; - case EventSeverity::Info: return ANDROID_LOG_INFO; - case EventSeverity::Warning: return ANDROID_LOG_WARN; - case EventSeverity::Error: return ANDROID_LOG_ERROR; - default: return ANDROID_LOG_VERBOSE; } @@ -41,17 +39,252 @@ void Log::platformRecord(EventSeverity severity, const std::string& msg) { } // namespace mbgl +namespace { + +template <class T> +class JavaWrapper { +public: + JavaWrapper(JNIEnv* env_, T obj_) : env(env_), obj(obj_) {} + ~JavaWrapper() { + env->DeleteLocalRef(obj); + env = nullptr; + obj = NULL; + } + T& get() { return obj; } + +private: + JavaWrapper() = delete; + JNIEnv* env; + T obj; +}; + +std::string jstringToStdString(JNIEnv* env, jstring jStr) { + if (!jStr) { + return std::string(); + } + + JavaWrapper<jclass> stringClass(env, env->GetObjectClass(jStr)); + const jmethodID getBytes = env->GetMethodID(stringClass.get(), "getBytes", "(Ljava/lang/String;)[B"); + JavaWrapper<jbyteArray> stringJbytes( + env, + static_cast<jbyteArray>( + env->CallObjectMethod(jStr, getBytes, JavaWrapper<jstring>(env, env->NewStringUTF("UTF-8")).get()))); + + size_t length = static_cast<size_t>(env->GetArrayLength(stringJbytes.get())); + jbyte* pBytes = env->GetByteArrayElements(stringJbytes.get(), NULL); + + std::string ret = std::string(reinterpret_cast<char*>(pBytes), length); + env->ReleaseByteArrayElements(stringJbytes.get(), pBytes, JNI_ABORT); + + return ret; +} + +void changeState(JNIEnv* env, struct android_app* app) { + jobject nativeActivity = app->activity->clazz; + jclass acl = env->GetObjectClass(nativeActivity); + jmethodID getClassLoader = env->GetMethodID(acl, "getClassLoader", "()Ljava/lang/ClassLoader;"); + jobject cls = env->CallObjectMethod(nativeActivity, getClassLoader); + JavaWrapper<jclass> classLoader(env, env->FindClass("java/lang/ClassLoader")); + jmethodID findClass = env->GetMethodID(classLoader.get(), "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;"); + JavaWrapper<jstring> strClassName(env, env->NewStringUTF("android.app.TestState")); + jclass testStateClass = static_cast<jclass>(env->CallObjectMethod(cls, findClass, strClassName.get())); + if (testStateClass != NULL) { + jfieldID id = env->GetStaticFieldID(testStateClass, "running", "Z"); + env->SetStaticBooleanField(testStateClass, id, false); + } +} + +bool copyFile(JNIEnv* env, + AAssetManager* assetManager, + const std::string& filePath, + const std::string& destinationPath, + const std::string& fileName) { + JavaWrapper<jclass> fileClass(env, env->FindClass("java/io/File")); + jmethodID fileCtor = env->GetMethodID(fileClass.get(), "<init>", "(Ljava/lang/String;Ljava/lang/String;)V"); + jmethodID fileExists = env->GetMethodID(fileClass.get(), "exists", "()Z"); + + JavaWrapper<jstring> destination(env, env->NewStringUTF(destinationPath.c_str())); + JavaWrapper<jstring> file(env, env->NewStringUTF(fileName.c_str())); + JavaWrapper<jobject> fileToCopy(env, env->NewObject(fileClass.get(), fileCtor, destination.get(), file.get())); + + bool stateOk = true; + if (env->CallBooleanMethod(fileToCopy.get(), fileExists)) { + mbgl::Log::Warning(mbgl::Event::General, "File '%s' already exists", filePath.c_str()); + } else { + std::unique_ptr<AAsset, std::function<void(AAsset*)>> fileAsset( + AAssetManager_open(assetManager, fileName.c_str(), AASSET_MODE_BUFFER), + [](AAsset* asset) { AAsset_close(asset); }); + if (fileAsset == nullptr) { + mbgl::Log::Warning(mbgl::Event::General, "Failed to open asset file %s", fileName.c_str()); + return false; + } + const void* fileData = AAsset_getBuffer(fileAsset.get()); + const off_t fileLen = AAsset_getLength(fileAsset.get()); + + std::unique_ptr<FILE, std::function<void(FILE*)>> newFile(std::fopen(filePath.c_str(), "w+"), + [](FILE* file) { std::fclose(file); }); + stateOk = newFile != nullptr; + + if (!stateOk) { + mbgl::Log::Warning(mbgl::Event::General, "Failed to create new file entry %s", fileName.c_str()); + } else { + auto res = static_cast<off_t>(std::fwrite(fileData, sizeof(char), fileLen, newFile.get())); + if (fileLen != res) { + mbgl::Log::Warning( + mbgl::Event::General, "Failed to generate file entry %s from assets", fileName.c_str()); + } + } + } + return stateOk; +} + +void unZipFile(JNIEnv* env, const std::string& zipFilePath, const std::string& destinationPath) { + JavaWrapper<jclass> fileClassWrapper(env, env->FindClass("java/io/File")); + auto fileClass = fileClassWrapper.get(); + jmethodID fileCtor = env->GetMethodID(fileClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V"); + jmethodID fileExists = env->GetMethodID(fileClass, "exists", "()Z"); + jmethodID fileIsDirectory = env->GetMethodID(fileClass, "isDirectory", "()Z"); + jmethodID deleteFile = env->GetMethodID(fileClass, "delete", "()Z"); + jmethodID createNewFile = env->GetMethodID(fileClass, "createNewFile", "()Z"); + jmethodID fileGetName = env->GetMethodID(fileClass, "getName", "()Ljava/lang/String;"); + + JavaWrapper<jclass> fileInputStreamWrapper(env, env->FindClass("java/io/FileInputStream")); + auto fileInputStream = fileInputStreamWrapper.get(); + jmethodID finCtor = env->GetMethodID(fileInputStream, "<init>", "(Ljava/lang/String;)V"); + + JavaWrapper<jclass> fileOutputStreamWrapper(env, env->FindClass("java/io/FileOutputStream")); + auto fileOutputStream = fileOutputStreamWrapper.get(); + jmethodID foutCtor = env->GetMethodID(fileOutputStream, "<init>", "(Ljava/io/File;)V"); + jmethodID foutClose = env->GetMethodID(fileOutputStream, "close", "()V"); + jmethodID foutWrite = env->GetMethodID(fileOutputStream, "write", "([BII)V"); + + JavaWrapper<jclass> zipInputStreamWrapper(env, env->FindClass("java/util/zip/ZipInputStream")); + auto zipInputStream = zipInputStreamWrapper.get(); + jmethodID zinCtor = env->GetMethodID(zipInputStream, "<init>", "(Ljava/io/InputStream;)V"); + jmethodID zinGetNextEntry = env->GetMethodID(zipInputStream, "getNextEntry", "()Ljava/util/zip/ZipEntry;"); + jmethodID zinRead = env->GetMethodID(zipInputStream, "read", "([B)I"); + jmethodID zinCloseEntry = env->GetMethodID(zipInputStream, "closeEntry", "()V"); + + JavaWrapper<jclass> zipEntryWrapper(env, env->FindClass("java/util/zip/ZipEntry")); + auto zipEntry = zipEntryWrapper.get(); + jmethodID zipGetName = env->GetMethodID(zipEntry, "getName", "()Ljava/lang/String;"); + jmethodID zipIsDirectory = env->GetMethodID(zipEntry, "isDirectory", "()Z"); + + // Unzip the resource folder to destination path + JavaWrapper<jstring> destination(env, env->NewStringUTF(destinationPath.c_str())); + JavaWrapper<jstring> zipFile(env, env->NewStringUTF(zipFilePath.c_str())); + JavaWrapper<jobject> fileIn(env, env->NewObject(fileInputStream, finCtor, zipFile.get())); + JavaWrapper<jobject> zipIn(env, env->NewObject(zipInputStream, zinCtor, fileIn.get())); + + while (true) { + JavaWrapper<jobject> obj(env, env->CallObjectMethod(zipIn.get(), zinGetNextEntry)); + jobject zEntry = obj.get(); + if (zEntry == NULL) { + break; + } + jstring dir = static_cast<jstring>(env->CallObjectMethod(zEntry, zipGetName)); + std::string name = jstringToStdString(env, dir); + bool isDir = env->CallBooleanMethod(zEntry, zipIsDirectory); + + JavaWrapper<jobject> fileHandle(env, env->NewObject(fileClass, fileCtor, destination.get(), dir)); + jobject& f = fileHandle.get(); + std::string fileName = jstringToStdString(env, static_cast<jstring>(env->CallObjectMethod(f, fileGetName))); + + if (isDir) { + if (!(env->CallBooleanMethod(f, fileIsDirectory))) { + jmethodID mkdirs = env->GetMethodID(fileClass, "mkdirs", "()Z"); + bool success = (env->CallBooleanMethod(f, mkdirs)); + std::string fileName = + jstringToStdString(env, static_cast<jstring>(env->CallObjectMethod(f, fileGetName))); + + if (!success) { + mbgl::Log::Warning( + mbgl::Event::General, "Failed to create folder entry %s from zip", fileName.c_str()); + } + } + } else if (!(env->CallBooleanMethod(f, fileExists))) { + bool success = env->CallBooleanMethod(f, createNewFile); + std::string fileName = jstringToStdString(env, static_cast<jstring>(env->CallObjectMethod(f, fileGetName))); + + if (!success) { + mbgl::Log::Warning(mbgl::Event::General, "Failed to create folder entry %s from zip", fileName.c_str()); + continue; + } + + JavaWrapper<jobject> fout(env, env->NewObject(fileOutputStream, foutCtor, f)); + JavaWrapper<jbyteArray> jBuff(env, env->NewByteArray(2048)); + + int count; + while ((count = env->CallIntMethod(zipIn.get(), zinRead, jBuff.get())) != -1) { + env->CallVoidMethod(fout.get(), foutWrite, jBuff.get(), 0, count); + } + + env->CallVoidMethod(zipIn.get(), zinCloseEntry); + env->CallVoidMethod(fout.get(), foutClose); + } + } + + JavaWrapper<jobject> fileToDelete(env, env->NewObject(fileClass, fileCtor, destination.get(), zipFile.get())); + if (env->CallBooleanMethod(fileToDelete.get(), fileExists)) { + jboolean success = (env->CallBooleanMethod(fileToDelete.get(), deleteFile)); + if (!success) { + mbgl::Log::Warning(mbgl::Event::General, "Failed to delete file entry %s", zipFilePath.c_str()); + } + } +} + +} // namespace + void android_main(struct android_app* app) { mbgl::android::theJVM = app->activity->vm; - JNIEnv* env; + JNIEnv* env = nullptr; app->activity->vm->AttachCurrentThread(&env, NULL); - std::vector<std::string> arguments = {"mbgl-render-test-runner", "-p", "/sdcard/render-test/android-manifest.json"}; - std::vector<char*> argv; - for (const auto& arg : arguments) { - argv.push_back((char*)arg.data()); + const char* storage_chars = app->activity->internalDataPath; + std::string storagePath(storage_chars); + std::string zipFile = storagePath + "/data.zip"; + + int outFd, outEvents; + struct android_poll_source* source = nullptr; + if (!copyFile(env, app->activity->assetManager, zipFile, storagePath, "data.zip")) { + mbgl::Log::Error( + mbgl::Event::General, "Failed to copy zip File '%s' to external storage for upzipping", zipFile.c_str()); + } else { + unZipFile(env, zipFile, storagePath); + + std::string configFile = storagePath + "/android-manifest.json"; + std::vector<std::string> arguments = {"mbgl-render-test-runner", "-p", configFile}; + std::vector<char*> argv; + for (const auto& arg : arguments) { + argv.push_back((char*)arg.data()); + } + argv.push_back(nullptr); + + int finishedTestCount = 0; + std::function<void()> testStatus = [&]() { + ALooper_pollAll(0, &outFd, &outEvents, reinterpret_cast<void**>(&source)); + + if (source != nullptr) { + source->process(app, source); + } + + mbgl::Log::Info(mbgl::Event::General, "Current finished tests number is '%d' ", ++finishedTestCount); + }; + + mbgl::runRenderTests(argv.size() - 1, argv.data(), testStatus); + mbgl::Log::Info(mbgl::Event::General, "All tests are finished!"); + changeState(env, app); + } + while (true) { + ALooper_pollAll(0, &outFd, &outEvents, reinterpret_cast<void**>(&source)); + + if (source != nullptr) { + source->process(app, source); + } + if (app->destroyRequested != 0) { + app->activity->vm->DetachCurrentThread(); + mbgl::Log::Info(mbgl::Event::General, "Close the App!"); + return; + } } - argv.push_back(nullptr); - (void)mbgl::runRenderTests(argv.size() - 1, argv.data()); - app->activity->vm->DetachCurrentThread(); -}
\ No newline at end of file +} diff --git a/platform/default/src/mbgl/render-test/main.cpp b/platform/default/src/mbgl/render-test/main.cpp index 9b22b20e00..aed0e01d39 100644 --- a/platform/default/src/mbgl/render-test/main.cpp +++ b/platform/default/src/mbgl/render-test/main.cpp @@ -1,5 +1,5 @@ #include <mbgl/render_test.hpp> int main(int argc, char *argv[]) { - return mbgl::runRenderTests(argc, argv); + return mbgl::runRenderTests(argc, argv, []() {}); } |