Formatted

KyGost · KyGost · commit 1b2eca7cadf7 · 2022-06-08T18:42:38.000+10:00
diff --git a/tests/api_main.rs b/tests/api_main.rs
@@ -3,12 +3,13 @@ mod util;
 
 use {
 	multisql::{Connection, Glue},
-	util::{run, Test},
+	util::*,
 };
 
 inventory::collect!(Test);
 
 fn main() {
+	announce_test_suite!();
 	for test in inventory::iter::<Test> {
 		run!(test, init_storage);
 	}
diff --git a/tests/databases_main.rs b/tests/databases_main.rs
@@ -2,10 +2,7 @@ mod ability;
 mod databases;
 mod util;
 
-use {
-	multisql::Glue,
-	util::{run, Test},
-};
+use {multisql::Glue, util::*};
 
 inventory::collect!(Test);
 inventory::collect!(TestDatabase);
@@ -16,15 +13,14 @@ struct TestDatabase {
 }
 
 fn main() {
+	announce_test_suite!();
 	for database in inventory::iter::<TestDatabase> {
-		println!(
-			"- - -\t- - -\t- - -\t- - -\t- - -\t- - -\t- - -\t- - -\t- - -
-			\nTesting database:\t {}
-			\n- - -\t- - -\t- - -\t- - -\t- - -\t- - -\t- - -\t- - -\t- - -",
-			database.name
-		);
+		announce!(format!("[Database]\t{}", database.name));
 		for test in inventory::iter::<Test> {
-			let name = test.name.strip_prefix(concat!(module_path!(), "::", "ability::")).unwrap();
+			let name = test
+				.name
+				.strip_prefix(concat!(module_path!(), "::", "ability::"))
+				.unwrap();
 			if !database
 				.exceptions
 				.iter()
diff --git a/tests/functionality_main.rs b/tests/functionality_main.rs
@@ -3,12 +3,13 @@ mod util;
 
 use {
 	multisql::{Connection, Glue},
-	util::{run, Test},
+	util::*,
 };
 
 inventory::collect!(Test);
 
 fn main() {
+	announce_test_suite!();
 	for test in inventory::iter::<Test> {
 		run!(test, init_storage);
 	}
diff --git a/tests/misc_main.rs b/tests/misc_main.rs
@@ -3,12 +3,13 @@ mod util;
 
 use {
 	multisql::{Connection, Glue},
-	util::{run, Test},
+	util::*,
 };
 
 inventory::collect!(Test);
 
 fn main() {
+	announce_test_suite!();
 	for test in inventory::iter::<Test> {
 		run!(test, init_storage);
 	}
diff --git a/tests/query_main.rs b/tests/query_main.rs
@@ -3,12 +3,13 @@ mod util;
 
 use {
 	multisql::{Connection, Glue},
-	util::{run, Test},
+	util::*,
 };
 
 inventory::collect!(Test);
 
 fn main() {
+	announce_test_suite!();
 	for test in inventory::iter::<Test> {
 		run!(test, init_storage);
 	}
diff --git a/tests/util/mod.rs b/tests/util/mod.rs
@@ -32,21 +32,21 @@ macro_rules! run {
 		);
 		progress.set_style(
 			ProgressStyle::default_spinner()
-				.template("[Running]\t {msg:50.yellow} {spinner}")
+				.template("\t[Running]\t{msg:.yellow} {spinner}")
 				.tick_chars("|/—\\*"),
 		);
 		progress.enable_steady_tick(100);
 		//		progress.tick(); // Aesthetic -- in case too fast
 		match catch_unwind(|| ($test.test)($storage($test.name))) {
 			Ok(_) => {
 				progress.set_style(
-					ProgressStyle::default_spinner().template("[Passed]\t {msg:50.green}"),
+					ProgressStyle::default_spinner().template("\t[Passed]\t{msg:.green}"),
 				);
 				progress.finish();
 			}
 			Err(err) => {
 				progress.set_style(
-					ProgressStyle::default_spinner().template("[Failed]\t {msg:50.red} {spinner}"),
+					ProgressStyle::default_spinner().template("\t[Failed]\t{msg:.red} {spinner}"),
 				);
 				progress.finish();
 				panic!("Test Failed; Error: {:?}", err);
@@ -56,6 +56,20 @@ macro_rules! run {
 }
 pub(crate) use run;
 
+macro_rules! announce {
+	($content: expr) => {
+		println!("\t{}", $content)
+	};
+}
+pub(crate) use announce;
+
+macro_rules! announce_test_suite {
+	() => {
+		announce!(format!("[Suite]\t\t{}", module_path!()))
+	};
+}
+pub(crate) use announce_test_suite;
+
 macro_rules! make_basic_table {
 	($glue: expr) => {
 		$glue
