add test_call_https_java

Author: damlayildiz

src/call_java.c

@@ -1,8 +1,11 @@
 #include <jni.h>
 #include <sqlite3ext.h>
 #include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
 
-JavaVM* gJvm = NULL;  // Stored from JNI_OnLoad
+JavaVM* gJvm = NULL;
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
     gJvm = vm;
@@ -12,7 +15,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
 JNIEnv* getEnv() {
     JNIEnv* env;
     if ((*gJvm)->GetEnv(gJvm, (void**)&env, JNI_VERSION_1_6) != JNI_OK) {
-        if ((*gJvm)->AttachCurrentThread(gJvm, &env, NULL) != 0) {
+        if ((*gJvm)->AttachCurrentThread(gJvm, (void**)&env, NULL) != 0) {
             return NULL;
         }
     }
@@ -21,19 +24,34 @@ JNIEnv* getEnv() {
 
 const char* call_https_java(JNIEnv* env) {
     jclass cls = (*env)->FindClass(env, "HttpsCaller");
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionDescribe(env);
+        (*env)->ExceptionClear(env);
+        return "Class not found (exception)";
+    }
     if (!cls) return "Class not found";
 
     jmethodID mid = (*env)->GetStaticMethodID(env, cls, "callHttps", "()Ljava/lang/String;");
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionDescribe(env);
+        (*env)->ExceptionClear(env);
+        return "Method not found (exception)";
+    }
     if (!mid) return "Method not found";
 
     jstring result = (jstring)(*env)->CallStaticObjectMethod(env, cls, mid);
+    if ((*env)->ExceptionCheck(env)) {
+        (*env)->ExceptionDescribe(env);
+        (*env)->ExceptionClear(env);
+        return "Java method threw exception";
+    }
     if (!result) return "Java method returned null";
 
     const char* str = (*env)->GetStringUTFChars(env, result, 0);
+    if (!str) return "Failed to get UTF chars";
 
     char* copied = strdup(str);
-
     (*env)->ReleaseStringUTFChars(env, result, str);
 
-    return copied; 
+    return copied ? copied : "Memory allocation failed";
 }

src/network.c

@@ -13,11 +13,6 @@
 #include "utils.h"
 #include "curl/curl.h"
 #include "cloudsync_private.h"
-#include <stdio.h>
-#include <android/log.h>
-#include <jni.h>
-#include <stdlib.h>
-#include "call_java.h"
 
 #define CLOUDSYNC_ENDPOINT_PREFIX               "v1/cloudsync"
 #define CLOUDSYNC_ENDPOINT_UPLOAD               "upload"
@@ -459,18 +454,6 @@ void cloudsync_network_init (sqlite3_context *context, int argc, sqlite3_value *
     // save site_id string representation: 01957493c6c07e14803727e969f1d2cc
     cloudsync_uuid_v7_stringify(site_id, data->site_id, false);
 
-    JNIEnv* env = getEnv();
-    if (!env) {
-        sqlite3_result_error(context, "Could not get JNIEnv", -1);
-        return;
-    }
-
-    const char* javaResult = call_https_java(env);
-    if (javaResult) {
-        printf("Got from Java: %s\n", javaResult);
-        __android_log_print(ANDROID_LOG_INFO, "MyNativeCode", "Got from Java: %s", javaResult);
-        free((void*)javaResult); 
-    }
     // connection string is something like:
     // https://UUID.g5.sqlite.cloud:443/chinook.sqlite?apikey=hWDanFolRT9WDK0p54lufNrIyfgLZgtMw6tb6fbPmpo
     // or https://UUID.g5.sqlite.cloud:443/chinook.sqlite

test/unit.c

@@ -23,6 +23,8 @@
 #include "dbutils.h"
 #include "cloudsync.h"
 #include "cloudsync_private.h"
+#include <jni.h>
+#include "call_java.h"
 
 // declared only if macro CLOUDSYNC_UNITTEST is defined 
 extern char *OUT_OF_MEMORY_BUFFER;
@@ -3273,6 +3275,29 @@ bool do_test_alter(int nclients, int alter_version, bool print_result, bool clea
     return result;
 }
 
+bool test_call_https_java(void) {
+    JNIEnv* env = getEnv();
+    if (!env) {
+        printf("Could not get JNIEnv\n");
+        return false;
+    }
+
+    const char* javaResult = call_https_java(env);
+    if (javaResult) {
+        printf("Got from Java: %s\n", javaResult);
+        if (strcmp(javaResult, "Memory allocation failed") != 0 &&
+            strcmp(javaResult, "Class not found") != 0 &&
+            strcmp(javaResult, "Method not found") != 0 &&
+            strstr(javaResult, "exception") == NULL) {
+            free((void*)javaResult);
+        }
+        return true;
+    } else {
+        printf("call_https_java returned NULL\n");
+        return false;
+    }
+}
+
 // MARK: -
 
 int test_report(const char *description, bool result){
@@ -3341,7 +3366,8 @@ int main(int argc, const char * argv[]) {
     result += test_report("Test Alter Table 1:", do_test_alter(3, 1, print_result, cleanup_databases));
     result += test_report("Test Alter Table 2:", do_test_alter(3, 2, print_result, cleanup_databases));
     result += test_report("Test Alter Table 3:", do_test_alter(3, 3, print_result, cleanup_databases));
-    
+    result += test_report("JNI call_https_java Test:", test_call_https_java());
+
 finalize:
     printf("\n");
     if (rc != SQLITE_OK) printf("%s (%d)\n", (db) ? sqlite3_errmsg(db) : "N/A", rc);