Tests: Make the code of downloading maven artifacts thread safe. This does not impact parallelization or performance, as it will actually block the first time maven downloads artifacts.

Author: astonbitecode

rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "j4rs"
-version = "0.20.0"
+version = "0.21.0"
 authors = ["aston <[email protected]>"]
 description = "j4rs stands for 'Java for Rust' and allows effortless calls to Java code, from Rust"
 keywords = ["java", "jni"]

rust/jassets/j4rs-0.21.0-SNAPSHOT-jar-with-dependencies.jar

@@ -250,12 +250,7 @@ impl<'a> ChainableInstance<'a> {
 #[cfg(test)]
 mod instance_unit_tests {
     use crate::*;
-
-    fn create_tests_jvm() -> errors::Result<Jvm> {
-        let jvm: Jvm = JvmBuilder::new().build()?;
-        jvm.deploy_artifact(&MavenArtifact::from(format!("io.github.astonbitecode:j4rs-testing:{}", api::j4rs_version()).as_str()))?;
-        Ok(jvm)
-    }
+    use crate::lib_unit_tests::create_tests_jvm;
 
     #[test]
     fn is_null() -> errors::Result<()> {

rust/src/api/instance.rs

@@ -699,15 +699,9 @@ impl TryFrom<Result<InvocationArg, errors::J4RsError>> for InvocationArg {
 mod inv_arg_unit_tests {
     use serde::Deserialize;
 
-    use crate::{api, errors, JvmBuilder, MavenArtifact};
-
     use super::*;
-
-    fn create_tests_jvm() -> errors::Result<Jvm> {
-        let jvm: Jvm = JvmBuilder::new().build()?;
-        jvm.deploy_artifact(&MavenArtifact::from(format!("io.github.astonbitecode:j4rs-testing:{}", api::j4rs_version()).as_str()))?;
-        Ok(jvm)
-    }
+    use crate::lib_unit_tests::create_tests_jvm;
+    use crate::errors;
 
     #[test]
     fn new_invocation_arg() -> errors::Result<()> {

rust/src/api/invocation_arg.rs

@@ -2086,14 +2086,9 @@ impl<'a> ToString for JavaOpt<'a> {
 
 #[cfg(test)]
 mod api_unit_tests {
+    use crate::lib_unit_tests::create_tests_jvm;
     use super::*;
 
-    fn create_tests_jvm() -> errors::Result<Jvm> {
-        let jvm: Jvm = JvmBuilder::new().build()?;
-        jvm.deploy_artifact(&MavenArtifact::from(format!("io.github.astonbitecode:j4rs-testing:{}", j4rs_version()).as_str()))?;
-        Ok(jvm)
-    }
-
     #[test]
     fn jvm_builder() -> errors::Result<()> {
         let res = create_tests_jvm();

rust/src/api/mod.rs

@@ -147,16 +147,10 @@ impl Jvm {
 #[cfg(test)]
 mod api_unit_tests {
     use super::*;
-    use crate::{api, JvmBuilder, MavenArtifact};
+    use crate::lib_unit_tests::create_tests_jvm;
     use futures::Future;
     use tokio;
 
-    fn create_tests_jvm() -> errors::Result<Jvm> {
-        let jvm: Jvm = JvmBuilder::new().build()?;
-        jvm.deploy_artifact(&MavenArtifact::from(format!("io.github.astonbitecode:j4rs-testing:{}", api::j4rs_version()).as_str()))?;
-        Ok(jvm)
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
     async fn invoke_async_success_w_tokio() -> errors::Result<()> {
         let s_test = "j4rs_rust";

rust/src/async_api/mod.rs

@@ -571,15 +571,8 @@ fn fx_event_type_to_event_class_and_field(event_type: FxEventType) -> (String, S
 
 #[cfg(test)]
 mod api_unit_tests {
-    use crate::JvmBuilder;
-
     use super::*;
-
-    fn create_tests_jvm() -> errors::Result<Jvm> {
-        let jvm: Jvm = JvmBuilder::new().build()?;
-        jvm.deploy_artifact(&MavenArtifact::from(format!("io.github.astonbitecode:j4rs-testing:{}", api::j4rs_version()).as_str()))?;
-        Ok(jvm)
-    }
+    use crate::lib_unit_tests::create_tests_jvm;
 
     #[test]
     #[should_panic]

rust/src/jfx.rs

@@ -166,17 +166,23 @@ mod lib_unit_tests {
     use std::ptr::null_mut;
     use std::thread::JoinHandle;
     use std::{thread, time};
-
+    use std::sync::Mutex;
     use crate::api::{self, JavaClass};
     use crate::provisioning::JavaArtifact;
     use crate::{LocalJarArtifact, MavenArtifactRepo, MavenSettings, Null};
-
     use super::utils::jassets_path;
     use super::{errors, InvocationArg, Jvm, JvmBuilder, MavenArtifact};
 
-    fn create_tests_jvm() -> errors::Result<Jvm> {
+    lazy_static! {
+        static ref SYNC_GUARD: Mutex<()> = Mutex::new(());
+    }
+
+    pub(crate) fn create_tests_jvm() -> errors::Result<Jvm> {
         let jvm: Jvm = JvmBuilder::new().build()?;
-        jvm.deploy_artifact(&MavenArtifact::from(format!("io.github.astonbitecode:j4rs-testing:{}", api::j4rs_version()).as_str()))?;
+        {
+            let _guard = SYNC_GUARD.lock().unwrap();
+            jvm.deploy_artifact(&MavenArtifact::from(format!("io.github.astonbitecode:j4rs-testing:{}", api::j4rs_version()).as_str()))?;
+        }
         Ok(jvm)
     }
 

rust/src/lib.rs

@@ -181,15 +181,8 @@ pub(crate) fn get_class_name(inv_arg: &InvocationArg) -> &str {
 mod utils_unit_tests {
     use std::convert::TryFrom;
 
-    use crate::{api, Jvm, JvmBuilder, MavenArtifact};
-
     use super::*;
-
-    fn create_tests_jvm() -> errors::Result<Jvm> {
-        let jvm: Jvm = JvmBuilder::new().build()?;
-        jvm.deploy_artifact(&MavenArtifact::from(format!("io.github.astonbitecode:j4rs-testing:{}", api::j4rs_version()).as_str()))?;
-        Ok(jvm)
-    }
+    use crate::lib_unit_tests::create_tests_jvm;
 
     #[test]
     fn get_class_name_test() -> errors::Result<()> {