Support #[itest(skip)]

Author: Bromeon

godot-macros/src/itest.rs

@@ -4,12 +4,13 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-use crate::util::bail;
+use crate::util::{bail, KvParser};
+use crate::ParseResult;
 use proc_macro2::TokenStream;
 use quote::quote;
-use venial::{Declaration, Error};
+use venial::Declaration;
 
-pub fn transform(input_decl: Declaration) -> Result<TokenStream, Error> {
+pub fn transform(input_decl: Declaration) -> ParseResult<TokenStream> {
     let func = match input_decl {
         Declaration::Function(f) => f,
         _ => return bail("#[itest] can only be applied to functions", &input_decl),
@@ -27,10 +28,21 @@ pub fn transform(input_decl: Declaration) -> Result<TokenStream, Error> {
         );
     }
 
+    let mut attr = KvParser::parse_required(&func.attributes, "itest", &func.name)?;
+    let skipped = attr.handle_alone("skip")?;
+    let focused = attr.handle_alone("focus")?;
+    attr.finish()?;
+
+    if skipped && focused {
+        return bail(
+            "#[itest]: keys `skip` and `focus` are mutually exclusive",
+            func.name,
+        );
+    }
+
     let test_name = &func.name;
     let test_name_str = func.name.to_string();
     let body = &func.body;
-    let skipped = false;
 
     Ok(quote! {
         pub fn #test_name() {

godot-macros/src/util.rs

@@ -170,9 +170,10 @@ impl KvParser {
             // Useless allocation, but there seems to be no join() on map iterators. Anyway, this is slow/error path.
             let keys = self.map.keys().cloned().collect::<Vec<_>>().join(", ");
 
+            let s = if self.map.len() > 1 { "s" } else { "" }; // plural
             return bail(
                 format!(
-                    "#[{attr}]: unrecognized keys: {keys}",
+                    "#[{attr}]: unrecognized key{s}: {keys}",
                     attr = self.attr_name
                 ),
                 self.span,

itest/rust/src/runner.rs

@@ -94,7 +94,13 @@ impl IntegrationTests {
         let gdscript_time = gdscript_time.as_secs_f32();
         let total_time = rust_time + gdscript_time;
 
-        println!("\nTest result: {outcome}. {passed} passed; {failed} failed.");
+        let extra = if skipped > 0 {
+            format!(", {skipped} skipped")
+        } else {
+            "".to_string()
+        };
+
+        println!("\nTest result: {outcome}. {passed} passed; {failed} failed{extra}.");
         println!("  Time: {total_time:.2}s.  (Rust {rust_time:.2}s, GDScript {gdscript_time:.2}s)");
         all_passed
     }
@@ -191,7 +197,7 @@ impl std::fmt::Display for TestOutcome {
         let (col, outcome) = match self {
             TestOutcome::Passed => (FMT_GREEN, "ok"),
             TestOutcome::Failed => (FMT_RED, "FAILED"),
-            TestOutcome::Skipped => (FMT_YELLOW, "ignored"),
+            TestOutcome::Skipped => (FMT_YELLOW, "skipped"),
         };
 
         write!(f, "{col}{outcome}{end}")