TMP: Try adding a unit test that fails

Author: pinkisemils

mullvad-api/Cargo.toml

@@ -33,6 +33,7 @@ tokio = { workspace = true, features = ["macros", "time", "rt-multi-thread", "ne
 tokio-rustls = { version = "0.26.0", features = ["logging", "tls12", "ring"], default-features = false}
 tokio-socks = "0.5.1"
 rustls-pemfile = "2.1.3"
+uuid = { version = "1.4.1", features = ["v4"] }
 
 mullvad-encrypted-dns-proxy = { path = "../mullvad-encrypted-dns-proxy" }
 mullvad-fs = { path = "../mullvad-fs" }
@@ -49,9 +50,6 @@ tokio = { workspace = true, features = ["test-util", "time"] }
 [build-dependencies]
 cbindgen = { version = "0.24.3", default-features = false }
 
-[target.'cfg(target_os = "ios")'.dependencies]
-uuid = { version = "1.4.1", features = ["v4"] }
-
 [lib]
 crate-type = [ "rlib", "staticlib" ]
 bench = false

mullvad-api/src/address_cache.rs

@@ -52,6 +52,11 @@ impl AddressCache {
         Self::new_inner(address, None)
     }
 
+    // #[cfg(target_os = "ios")]
+    // pub fn with_static_hostname_addr(address: SocketAddr, hostname: &str) -> {
+
+    // }
+
     /// Initialize cache using `read_path`, and write changes to `write_path`.
     pub async fn from_file(read_path: &Path, write_path: Option<Box<Path>>) -> Result<Self, Error> {
         log::debug!("Loading API addresses from {}", read_path.display());

mullvad-api/src/ffi/error.rs

@@ -13,6 +13,7 @@ pub enum MullvadApiErrorKind {
 
 /// MullvadApiErrorKind contains a description and an error kind. If the error kind is
 /// `MullvadApiErrorKind` is NoError, the pointer will be nil.
+#[derive(Debug)]
 #[repr(C)]
 pub struct MullvadApiError {
     description: *mut libc::c_char,
@@ -47,6 +48,14 @@ impl MullvadApiError {
         }
     }
 
+    #[cfg(test)]
+    pub fn unwrap(&self) {
+        if ! matches!(self.kind, MullvadApiErrorKind::NoError) {
+            let desc = unsafe { std::ffi::CStr::from_ptr(self.description) };
+            panic!("API ERROR - {:?} - {}", self.kind, desc.to_str().unwrap());
+        }
+    }
+
     pub fn drop(self) {
         if self.description.is_null() {
             return;

mullvad-api/src/ffi/mod.rs

@@ -443,3 +443,43 @@ unsafe fn string_from_raw_ptr(ptr: *const libc::c_char) -> Result<String, Mullva
         })?
         .to_owned())
 }
+
+#[cfg(test)]
+mod test {
+    use std::mem::MaybeUninit;
+
+    use super::*;
+    const STAGING_SOCK_ADDR: &[u8] = b"185.217.116.129:443\0";
+    const STAGING_HOSTNAME: &[u8] = b"api-app.stagemole.eu\0";
+
+    #[test]
+    fn test_initialization() {
+        let _ = create_client();
+
+    }
+
+    fn create_client() -> MullvadApiClient {
+        let mut client = MaybeUninit::<MullvadApiClient>::uninit();
+        let _client = unsafe {
+            mullvad_api_client_initialize(
+                client.as_mut_ptr(),
+                STAGING_SOCK_ADDR.as_ptr().cast(),
+                STAGING_HOSTNAME.as_ptr().cast(),
+            )
+            .unwrap();
+        };
+        unsafe {
+            client.assume_init()
+        }
+    }
+
+    #[test]
+    fn test_create_delete_account() {
+        let client = create_client();
+
+        let mut account_buf_ptr = ptr::null_mut();
+
+
+        unsafe { mullvad_api_create_account(client, account_buf_ptr).unwrap() };
+    }
+}

mullvad-api/src/lib.rs

@@ -37,7 +37,6 @@ mod address_cache;
 pub mod device;
 mod relay_list;
 
-#[cfg(target_os = "ios")]
 pub mod ffi;
 
 pub use address_cache::AddressCache;
@@ -371,7 +370,6 @@ impl Runtime {
         )
     }
 
-    #[cfg(target_os = "ios")]
     pub fn with_static_addr(handle: tokio::runtime::Handle, address: SocketAddr) -> Self {
         Runtime {
             handle,
@@ -582,7 +580,6 @@ impl AccountsProxy {
         }
     }
 
-    #[cfg(target_os = "ios")]
     pub fn delete_account(
         &self,
         account: AccountNumber,