grimhilt/nextsync-rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(tests): use init_test and clean_test

Browse Source
This commit is contained in:
grimhilt 2024-05-07 18:20:32 +02:00
parent 980d2d9a5d
commit 4533b9a72d
4 changed files with 34 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/add.rs
View File

@ -99,10 +99,7 @@ mod add_tests {
#[test] #[test]
fn add_file_no_changes() { fn add_file_no_changes() {
// add a file push it and add it again // add a file push it and add it again
let id = get_random_test_id(); let (mut client, mut server) = init_test();
let mut server = ServerTest::new(id.clone());
server.init();
let mut client = ClientTest::new(id).init();
let _ = client.add_file("file1", "foo"); let _ = client.add_file("file1", "foo");
client.run_cmd_ok("add file1"); client.run_cmd_ok("add file1");
@ -113,8 +110,7 @@ mod add_tests {
client.run_cmd_ok("add file1"); client.run_cmd_ok("add file1");
status_should_be_empty(&mut client); status_should_be_empty(&mut client);
client.clean(); clean_test(client, &mut server)
server.clean();
} }
} }

18
tests/pull.rs
View File

@ -1,5 +1,5 @@
mod utils; mod utils;
use utils::{utils::*, server::ServerTest, client::ClientTest}; use utils::{utils::*};
#[cfg(test)] #[cfg(test)]
@ -8,10 +8,7 @@ mod pull_tests {
#[test] #[test]
fn simple_pull() { fn simple_pull() {
let id = get_random_test_id(); let (mut client, mut server) = init_test();
let mut server = ServerTest::new(id.clone());
server.init();
let mut client = ClientTest::new(id).init();
let _ = server.add_file("file1", "foo"); let _ = server.add_file("file1", "foo");
client.run_cmd_ok("pull"); client.run_cmd_ok("pull");
@ -19,16 +16,12 @@ mod pull_tests {
// tests // tests
assert!(client.has_file("file1", "foo")); assert!(client.has_file("file1", "foo"));
client.clean(); clean_test(client, &mut server);
server.clean();
} }
#[test] #[test]
fn simple_pull_directory() { fn simple_pull_directory() {
let id = get_random_test_id(); let (mut client, mut server) = init_test();
let mut server = ServerTest::new(id.clone());
server.init();
let mut client = ClientTest::new(id).init();
let _ = server.add_dir("dir"); let _ = server.add_dir("dir");
let _ = server.add_file("dir/file1", "foo"); let _ = server.add_file("dir/file1", "foo");
@ -38,7 +31,6 @@ mod pull_tests {
// tests // tests
assert!(client.has_file("dir/file1", "foo")); assert!(client.has_file("dir/file1", "foo"));
client.clean(); clean_test(client, &mut server);
server.clean();
} }
} }

33
tests/push.rs
View File

@ -1,14 +1,5 @@
mod utils; mod utils;
use utils::{utils::*, status_utils::*, server::ServerTest, client::ClientTest}; use utils::{utils::*, status_utils::*};
fn init_test() -> (ClientTest, ServerTest) {
let id = get_random_test_id();
let mut server = ServerTest::new(id.clone());
server.init();
let client = ClientTest::new(id).init();
(client, server)
}
#[cfg(test)] #[cfg(test)]
mod push_tests { mod push_tests {
@ -28,8 +19,7 @@ mod push_tests {
lines_should_not_contains(staged, "file1"); lines_should_not_contains(staged, "file1");
lines_should_not_contains(not_staged, "file1"); lines_should_not_contains(not_staged, "file1");
client.clean(); clean_test(client, &mut server);
server.clean();
} }
#[test] #[test]
@ -59,9 +49,7 @@ mod push_tests {
lines_should_not_contains(staged, "file1"); lines_should_not_contains(staged, "file1");
lines_should_not_contains(not_staged, "file1"); lines_should_not_contains(not_staged, "file1");
clean_test(client, &mut server);
client.clean();
server.clean();
} }
#[test] #[test]
@ -83,8 +71,7 @@ mod push_tests {
lines_should_not_contains(not_staged.clone(), "file2"); lines_should_not_contains(not_staged.clone(), "file2");
lines_should_not_contains(not_staged, "foo"); lines_should_not_contains(not_staged, "foo");
client.clean(); clean_test(client, &mut server);
server.clean();
} }
#[test] #[test]
@ -106,8 +93,7 @@ mod push_tests {
lines_should_not_contains(not_staged.clone(), "file2"); lines_should_not_contains(not_staged.clone(), "file2");
lines_should_not_contains(not_staged, "foo"); lines_should_not_contains(not_staged, "foo");
client.clean(); clean_test(client, &mut server);
server.clean();
} }
#[test] #[test]
@ -129,8 +115,7 @@ mod push_tests {
assert!(staged.len() == 0); assert!(staged.len() == 0);
assert!(not_staged.len() == 0); assert!(not_staged.len() == 0);
client.clean(); clean_test(client, &mut server);
server.clean();
} }
#[test] #[test]
@ -156,8 +141,7 @@ mod push_tests {
assert!(server.has_not_file("file1")); assert!(server.has_not_file("file1"));
status_should_be_empty(&mut client); status_should_be_empty(&mut client);
client.clean(); clean_test(client, &mut server);
server.clean();
} }
#[test] #[test]
@ -179,7 +163,6 @@ mod push_tests {
client.run_cmd_ok("push"); client.run_cmd_ok("push");
assert!(server.has_not_dir("dir")); assert!(server.has_not_dir("dir"));
client.clean(); clean_test(client, &mut server);
server.clean();
} }
} }

19
tests/utils/utils.rs
View File

@ -1,4 +1,6 @@
use rand::{distributions::Alphanumeric, Rng}; use rand::{distributions::Alphanumeric, Rng};
use super::client::ClientTest;
use super::server::ServerTest;
#[cfg(test)] #[cfg(test)]
pub fn get_random_test_id() -> String { pub fn get_random_test_id() -> String {
@ -10,3 +12,20 @@ pub fn get_random_test_id() -> String {
id.push_str("_nextsync"); id.push_str("_nextsync");
id.to_owned() id.to_owned()
} }
#[cfg(test)]
pub fn init_test() -> (ClientTest, ServerTest) {
let id = get_random_test_id();
let mut server = ServerTest::new(id.clone());
server.init();
let client = ClientTest::new(id).init();
(client, server)
}
#[cfg(test)]
pub fn clean_test(client: ClientTest, server: &mut ServerTest) {
client.clean();
server.clean();
}