add more doc, fix tests

AlexanderSchuetz97 · Nov 25, 2024 · 6fceaf6 · 6fceaf6
1 parent 4efec2a
commit 6fceaf6
Show file tree

Hide file tree

Showing 11 changed files with 339 additions and 21 deletions.
diff --git a/src/lib.rs b/src/lib.rs
diff --git a/tests/define_non_cl.rs b/tests/define_non_cl.rs
@@ -15,7 +15,7 @@ pub mod test {
             let class_blob = include_bytes!("../java_testcode/ThrowNewZa.class");
             panic::catch_unwind(|| {
                 //cl is not a classloader. This is UB in the JVM.
-                env.DefineClass("ThrowNewZa", cl, class_blob);
+                env.DefineClass_from_slice("ThrowNewZa", cl, class_blob);
             })
             .expect_err("Error expected");
             vm.DestroyJavaVM();

diff --git a/tests/fields.rs b/tests/fields.rs
@@ -46,7 +46,7 @@ pub mod test {
 
         env.ExceptionClear(); //Clear ClassNotFoundException
         let class_blob = include_bytes!("../java_testcode/FieldTests.class");
-        let class_loaded = env.DefineClass("FieldTests", null_mut(), class_blob);
+        let class_loaded = env.DefineClass_from_slice("FieldTests", null_mut(), class_blob);
         if class_loaded.is_null() {
             env.ExceptionDescribe();
             env.FatalError("failed to load class");

diff --git a/tests/method_calls.rs b/tests/method_calls.rs
@@ -46,7 +46,7 @@ pub mod test {
 
         env.ExceptionClear(); //Clear ClassNotFoundException
         let class_blob = include_bytes!("../java_testcode/MethodCalls.class");
-        let class_loaded = env.DefineClass("MethodCalls", null_mut(), class_blob);
+        let class_loaded = env.DefineClass_from_slice("MethodCalls", null_mut(), class_blob);
         if class_loaded.is_null() {
             env.ExceptionDescribe();
             env.FatalError("failed to load class");
@@ -70,7 +70,7 @@ pub mod test {
 
         env.ExceptionClear(); //Clear ClassNotFoundException
         let class_blob = include_bytes!("../java_testcode/MethodCalls$NvChild.class");
-        let class_loaded = env.DefineClass("MethodCalls$NvChild", null_mut(), class_blob);
+        let class_loaded = env.DefineClass_from_slice("MethodCalls$NvChild", null_mut(), class_blob);
         if class_loaded.is_null() {
             env.ExceptionDescribe();
             env.FatalError("failed to load class");

diff --git a/tests/register_natives.rs b/tests/register_natives.rs
@@ -23,7 +23,7 @@ pub mod test {
 
             let class_blob = include_bytes!("../java_testcode/RegisterTest.class");
 
-            let registered_class = env.DefineClass("RegisterTest", null_mut(), class_blob.as_slice());
+            let registered_class = env.DefineClass_from_slice("RegisterTest", null_mut(), class_blob.as_slice());
             let t1m = env.GetStaticMethodID(registered_class, "callTest", "(Ljava/lang/String;)V");
             let t2m = env.GetStaticMethodID(registered_class, "callTest", "(D)V");
             let test_string = env.NewStringUTF("test_string");

diff --git a/tests/string.rs b/tests/string.rs
@@ -75,8 +75,8 @@ pub mod test {
         unsafe {
             let env = get_env();
             let str = env.NewStringUTF("Test String");
-            let mut data = vec![0 as c_char; env.GetStringUTFLength(str) as usize];
-            env.GetStringUTFRegion(str, 0, data.len() as jsize, data.as_mut_ptr());
+            let mut data = vec![1 as c_char; (env.GetStringUTFLength(str) as usize) + 2];
+            env.GetStringUTFRegion(str, 0, (data.len() - 2) as jsize, data.as_mut_ptr());
             env.DeleteLocalRef(str);
             assert_eq!(
                 [
@@ -90,7 +90,9 @@ pub mod test {
                     'r' as c_char,
                     'i' as c_char,
                     'n' as c_char,
-                    'g' as c_char
+                    'g' as c_char,
+                    0 as c_char,
+                    1 as c_char,
                 ]
                 .as_slice(),
                 data.as_slice()

diff --git a/tests/throw_new.rs b/tests/throw_new.rs
@@ -10,7 +10,7 @@ pub mod test {
             let args: Vec<String> = vec!["-Xcheck:jni".to_string()];
             let (vm, env) = JNI_CreateJavaVM_with_string_args(JNI_VERSION_1_8, &args).expect("failed to create java VM");
             let class_blob = include_bytes!("../java_testcode/ThrowNew.class");
-            let class_loaded = env.DefineClass("ThrowNew", null_mut(), class_blob);
+            let class_loaded = env.DefineClass_from_slice("ThrowNew", null_mut(), class_blob);
             if class_loaded.is_null() {
                 env.ExceptionDescribe();
                 env.FatalError("failed to load class");

diff --git a/tests/throw_new_za.rs b/tests/throw_new_za.rs
@@ -10,7 +10,7 @@ pub mod test {
             let args: Vec<String> = vec!["-Xcheck:jni".to_string()];
             let (vm, env) = JNI_CreateJavaVM_with_string_args(JNI_VERSION_1_8, &args).expect("failed to create java VM");
             let class_blob = include_bytes!("../java_testcode/ThrowNewZa.class");
-            let class_loaded = env.DefineClass("ThrowNewZa", null_mut(), class_blob);
+            let class_loaded = env.DefineClass_from_slice("ThrowNewZa", null_mut(), class_blob);
             if class_loaded.is_null() {
                 env.ExceptionDescribe();
                 env.FatalError("failed to load class");

diff --git a/tests/throw_new_za2.rs b/tests/throw_new_za2.rs
@@ -10,7 +10,7 @@ pub mod test {
             let args: Vec<String> = vec!["-Xcheck:jni".to_string()];
             let (vm, env) = JNI_CreateJavaVM_with_string_args(JNI_VERSION_1_8, &args).expect("failed to create java VM");
             let class_blob = include_bytes!("../java_testcode/ThrowNewZa2.class");
-            let class_loaded = env.DefineClass("ThrowNewZa2", null_mut(), class_blob);
+            let class_loaded = env.DefineClass_from_slice("ThrowNewZa2", null_mut(), class_blob);
             if class_loaded.is_null() {
                 env.ExceptionDescribe();
                 env.FatalError("failed to load class");

diff --git a/tests/throw_new_za3.rs b/tests/throw_new_za3.rs
@@ -10,7 +10,7 @@ pub mod test {
             let args: Vec<String> = vec![];
             let (vm, env) = JNI_CreateJavaVM_with_string_args(JNI_VERSION_1_8, &args).expect("failed to create java VM");
             let class_blob = include_bytes!("../java_testcode/ThrowNewZa3.class");
-            let class_loaded = env.DefineClass("ThrowNewZa3", null_mut(), class_blob);
+            let class_loaded = env.DefineClass_from_slice("ThrowNewZa3", null_mut(), class_blob);
             if class_loaded.is_null() {
                 env.ExceptionDescribe();
                 env.FatalError("failed to load class");

diff --git a/tests/throw_new_za4.rs b/tests/throw_new_za4.rs
@@ -12,7 +12,7 @@ pub mod test {
             let args: Vec<String> = vec!["-Xcheck:jni".to_string()];
             let (vm, env) = JNI_CreateJavaVM_with_string_args(JNI_VERSION_1_8, &args).expect("failed to create java VM");
             let class_blob = include_bytes!("../java_testcode/ThrowNewZa4.class");
-            let class_loaded = env.DefineClass("ThrowNewZa4", null_mut(), class_blob);
+            let class_loaded = env.DefineClass_from_slice("ThrowNewZa4", null_mut(), class_blob);
             if class_loaded.is_null() {
                 env.ExceptionDescribe();
                 env.FatalError("failed to load class");