Merge pull request #2968 from gitbutlerapp/Virtual-branch-4

move from lib+bin to bin, refactor tests into crate

Author: Qix-

.cargo/config.toml

@@ -5,14 +5,6 @@ edition = "2021"
 rust-version = "1.57"
 authors = ["GitButler <[email protected]>"]
 
-[lib]
-name = "gblib"
-path = "src/lib.rs"
-
-[[bin]]
-name = "gitbutler-app"
-path = "src/bin.rs"
-
 [build-dependencies]
 tauri-build = { version = "1.5", features = [] }
 

gitbutler-app/Cargo.toml

@@ -148,13 +148,13 @@ impl App {
         Ok(head.name().unwrap().to_string())
     }
 
-    pub fn git_set_global_config(&self, key: &str, value: &str) -> Result<String> {
+    pub fn git_set_global_config(key: &str, value: &str) -> Result<String> {
         let mut config = git2::Config::open_default()?;
         config.set_str(key, value)?;
         Ok(value.to_string())
     }
 
-    pub fn git_get_global_config(&self, key: &str) -> Result<Option<String>> {
+    pub fn git_get_global_config(key: &str) -> Result<Option<String>> {
         let config = git2::Config::open_default()?;
         let value = config.get_string(key);
         match value {

gitbutler-app/src/app.rs

@@ -105,8 +105,7 @@ pub async fn git_set_global_config(
     key: &str,
     value: &str,
 ) -> Result<String, Error> {
-    let app = handle.state::<app::App>();
-    let result = app.git_set_global_config(key, value)?;
+    let result = app::App::git_set_global_config(key, value)?;
     Ok(result)
 }
 
@@ -116,8 +115,7 @@ pub async fn git_get_global_config(
     handle: tauri::AppHandle,
     key: &str,
 ) -> Result<Option<String>, Error> {
-    let app = handle.state::<app::App>();
-    let result = app.git_get_global_config(key)?;
+    let result = app::App::git_get_global_config(key)?;
     Ok(result)
 }
 

gitbutler-app/src/commands.rs

@@ -74,13 +74,13 @@ impl Database {
 
 #[cfg(test)]
 mod tests {
-    use crate::test_utils;
+    use crate::tests;
 
     use super::*;
 
     #[test]
     fn smoke() {
-        let data_dir = test_utils::temp_dir();
+        let data_dir = tests::temp_dir();
         let db = Database::try_from(&data_dir).unwrap();
         db.transaction(|tx| {
             tx.execute("CREATE TABLE test (id INTEGER PRIMARY KEY)", [])

gitbutler-app/src/database.rs

@@ -138,13 +138,13 @@ fn insert_stmt<'conn>(
 
 #[cfg(test)]
 mod tests {
-    use crate::test_utils;
+    use crate::tests;
 
     use super::*;
 
     #[test]
     fn insert_query() -> Result<()> {
-        let db = test_utils::test_database();
+        let db = tests::test_database();
         let database = Database::new(db);
 
         let project_id = ProjectId::generate();
@@ -170,7 +170,7 @@ mod tests {
 
     #[test]
     fn insert_update() -> Result<()> {
-        let db = test_utils::test_database();
+        let db = tests::test_database();
         let database = Database::new(db);
 
         let project_id = ProjectId::generate();
@@ -203,7 +203,7 @@ mod tests {
 
     #[test]
     fn aggregate_deltas_by_file() -> Result<()> {
-        let db = test_utils::test_database();
+        let db = tests::test_database();
         let database = Database::new(db);
 
         let project_id = ProjectId::generate();

gitbutler-app/src/deltas/database.rs

@@ -77,7 +77,7 @@ mod tests {
 
     use crate::{
         deltas, sessions,
-        test_utils::{Case, Suite},
+        tests::{Case, Suite},
     };
 
     use super::*;

gitbutler-app/src/deltas/writer.rs

@@ -67,8 +67,8 @@ pub mod gb {
             }
 
             #[inline]
-            pub fn context(&self) -> Option<&Context> {
-                Some(&self.context)
+            pub fn context(&self) -> &Context {
+                &self.context
             }
 
             pub(crate) fn into_owned(self) -> (ErrorKind, Context) {
@@ -175,10 +175,7 @@ pub mod gb {
                 let r = app_level_io();
                 assert!(r.is_err());
                 let e = r.unwrap_err();
-                assert_eq!(
-                    e.context().unwrap().vars.get("foo"),
-                    Some(&"bar".to_string())
-                );
+                assert_eq!(e.context().vars.get("foo"), Some(&"bar".to_string()));
                 assert!(e.source().is_none());
                 assert!(e.to_string().starts_with("io.other-error:"));
             }

gitbutler-app/src/error.rs

@@ -969,7 +969,7 @@ mod test {
     use anyhow::Result;
     use pretty_assertions::assert_eq;
 
-    use crate::test_utils::{Case, Suite};
+    use crate::tests::{Case, Suite};
 
     #[test]
     fn test_alternates_file_being_set() -> Result<()> {

gitbutler-app/src/gb_repository/repository.rs

@@ -8,7 +8,7 @@ use crate::{
     projects::{self, ProjectId},
     reader,
     sessions::{self, SessionId},
-    test_utils::{Case, Suite},
+    tests::{Case, Suite},
 };
 
 fn test_remote_repository() -> Result<git2::Repository> {

gitbutler-app/src/gb_repository/repository_tests.rs

@@ -50,11 +50,11 @@ impl Config {
 
 #[cfg(test)]
 mod tests {
-    use crate::test_utils;
+    use crate::tests;
 
     #[test]
     pub fn test_set_str() {
-        let repo = test_utils::test_repository();
+        let repo = tests::test_repository();
         let mut config = repo.config().unwrap();
         config.set_str("test.key", "test.value").unwrap();
         assert_eq!(
@@ -65,22 +65,22 @@ mod tests {
 
     #[test]
     pub fn test_set_bool() {
-        let repo = test_utils::test_repository();
+        let repo = tests::test_repository();
         let mut config = repo.config().unwrap();
         config.set_bool("test.key", true).unwrap();
         assert!(config.get_bool("test.key").unwrap().unwrap());
     }
 
     #[test]
     pub fn test_get_string_none() {
-        let repo = test_utils::test_repository();
+        let repo = tests::test_repository();
         let config = repo.config().unwrap();
         assert_eq!(config.get_string("test.key").unwrap(), None);
     }
 
     #[test]
     pub fn test_get_bool_none() {
-        let repo = test_utils::test_repository();
+        let repo = tests::test_repository();
         let config = repo.config().unwrap();
         assert_eq!(config.get_bool("test.key").unwrap(), None);
     }

gitbutler-app/src/git/config.rs

@@ -417,7 +417,7 @@ impl Helper {
 mod tests {
     use super::*;
 
-    use crate::test_utils::{self, test_repository};
+    use crate::tests::{self, test_repository};
 
     #[derive(Default)]
     struct TestCase<'a> {
@@ -429,7 +429,7 @@ mod tests {
 
     impl TestCase<'_> {
         fn run(&self) -> Vec<(String, Vec<Credential>)> {
-            let local_app_data = test_utils::temp_dir();
+            let local_app_data = tests::temp_dir();
 
             let users = users::Controller::try_from(&local_app_data).unwrap();
             let user = users::User {

gitbutler-app/src/git/credentials.rs

@@ -331,13 +331,13 @@ pub fn reverse_hunk(hunk: &Hunk) -> Option<Hunk> {
 
 #[cfg(test)]
 mod tests {
-    use crate::test_utils;
+    use crate::tests;
 
     use super::*;
 
     #[test]
     fn diff_simple_text() {
-        let repository = test_utils::test_repository();
+        let repository = tests::test_repository();
         std::fs::write(repository.workdir().unwrap().join("file"), "hello").unwrap();
 
         let head_commit_id = repository.head().unwrap().peel_to_commit().unwrap().id();
@@ -360,7 +360,7 @@ mod tests {
 
     #[test]
     fn diff_empty_file() {
-        let repository = test_utils::test_repository();
+        let repository = tests::test_repository();
         std::fs::write(repository.workdir().unwrap().join("first"), "").unwrap();
 
         let head_commit_id = repository.head().unwrap().peel_to_commit().unwrap().id();
@@ -383,7 +383,7 @@ mod tests {
 
     #[test]
     fn diff_multiple_empty_files() {
-        let repository = test_utils::test_repository();
+        let repository = tests::test_repository();
         std::fs::write(repository.workdir().unwrap().join("first"), "").unwrap();
         std::fs::write(repository.workdir().unwrap().join("second"), "").unwrap();
 
@@ -419,7 +419,7 @@ mod tests {
 
     #[test]
     fn diff_binary() {
-        let repository = test_utils::test_repository();
+        let repository = tests::test_repository();
         std::fs::write(
             repository.workdir().unwrap().join("image"),
             [
@@ -450,7 +450,7 @@ mod tests {
 
     #[test]
     fn diff_some_lines_are_binary() {
-        let repository = test_utils::test_repository();
+        let repository = tests::test_repository();
         std::fs::write(
             repository.workdir().unwrap().join("file"),
             [

gitbutler-app/src/git/diff.rs

@@ -25,10 +25,6 @@ impl<'repo> Remote<'repo> {
             .map_err(Into::into)
     }
 
-    pub fn url_as_str(&self) -> Result<Option<&str>> {
-        Ok(self.inner.url())
-    }
-
     pub fn push(
         &mut self,
         refspec: &[&str],

gitbutler-app/src/git/remote.rs

@@ -59,7 +59,7 @@ mod tests {
     #[cfg(target_family = "unix")]
     use std::os::unix::prelude::*;
 
-    use crate::test_utils::Suite;
+    use crate::tests::Suite;
 
     use super::*;
 

gitbutler-app/src/keys/controller.rs

@@ -4,7 +4,6 @@ use ssh_key::{HashAlg, LineEnding, SshSig};
 
 use rand::rngs::OsRng;
 use serde::{Deserialize, Serialize};
-use ssh_key;
 
 #[derive(Debug, Clone, Eq)]
 pub struct PrivateKey(ssh_key::PrivateKey);

gitbutler-app/src/keys/key.rs

@@ -54,7 +54,7 @@ impl Inner {
 mod tests {
     use super::*;
 
-    use crate::test_utils::temp_dir;
+    use crate::tests::temp_dir;
 
     #[tokio::test]
     async fn test_lock_same_instance() {