test work

This commit is contained in:
John Smith
2022-12-01 14:32:02 -05:00
parent e1be2bac67
commit e2153a34e4
13 changed files with 55 additions and 40 deletions

View File

@@ -1,12 +1,9 @@
use super::native::*;
use crate::*;
use backtrace::Backtrace;
use jni::{
objects::GlobalRef, objects::JClass, objects::JObject, objects::JString, JNIEnv, JavaVM,
};
use lazy_static::*;
use jni::{objects::JClass, objects::JObject, JNIEnv};
use std::panic;
use tracing_subscriber::{filter, fmt, prelude::*};
use tracing_subscriber::prelude::*;
#[no_mangle]
#[allow(non_snake_case)]
@@ -15,7 +12,7 @@ pub extern "system" fn Java_com_veilid_veilid_1core_1android_1tests_MainActivity
_class: JClass,
ctx: JObject,
) {
crate::intf::utils::android::veilid_core_setup_android_tests(env, ctx);
veilid_core_setup_android_tests(env, ctx);
block_on(async {
run_all_tests().await;
})
@@ -24,10 +21,9 @@ pub extern "system" fn Java_com_veilid_veilid_1core_1android_1tests_MainActivity
pub fn veilid_core_setup_android_tests(env: JNIEnv, ctx: JObject) {
// Set up subscriber and layers
let filter = VeilidLayerFilter::new(VeilidConfigLogLevel::Trace, None);
let layer = tracing_android::layer("veilid-core").expect("failed to set up android logging");
let layer = paranoid_android::layer("veilid-core");
tracing_subscriber::registry()
.with(filter)
.with(layer)
.with(layer.with_filter(filter))
.init();
// Set up panic hook for backtraces

View File

@@ -22,6 +22,9 @@ public class MainActivity extends AppCompatActivity {
}
public void run() {
run_tests(this.context);
((MainActivity)this.context).finish();
System.exit(0);
}
}
@@ -30,6 +33,7 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
run_tests(this.context);
this.testThread = new TestThread(this);
this.testThread.start();
}
}