Skip to content

Append generated test macro so next test macros are aware of it #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Append generated test macro so next test macros are aware of it #561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions googletest_macro/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@

use quote::quote;
use syn::{
parse_macro_input, punctuated::Punctuated, spanned::Spanned, Attribute, DeriveInput, Expr,
ExprLit, FnArg, ItemFn, Lit, MetaNameValue, PatType, ReturnType, Signature, Type,
parse_macro_input, parse_quote, punctuated::Punctuated, spanned::Spanned, Attribute,
DeriveInput, Expr, ExprLit, FnArg, ItemFn, Lit, MetaNameValue, PatType, ReturnType, Signature,
Type,
};

/// Marks a test to be run by the Google Rust test runner.
Expand Down Expand Up @@ -75,7 +76,7 @@ pub fn gtest(
_args: proc_macro::TokenStream,
input: proc_macro::TokenStream,
) -> proc_macro::TokenStream {
let ItemFn { attrs, sig, block, .. } = parse_macro_input!(input as ItemFn);
let ItemFn { mut attrs, sig, block, .. } = parse_macro_input!(input as ItemFn);
let test_case_hash: u64 = {
use std::collections::hash_map::DefaultHasher;
use std::hash::{Hash, Hasher};
Expand Down Expand Up @@ -185,6 +186,13 @@ pub fn gtest(
)
}
};

if !attrs.iter().any(is_test_attribute) && !is_rstest_enabled {
let test_attr: Attribute = parse_quote! {
#[::core::prelude::v1::test]
};
attrs.push(test_attr);
};
let function = quote! {
#(#attrs)*
#outer_sig -> #outer_return_type {
Expand All @@ -200,17 +208,7 @@ pub fn gtest(
#trailer
}
};

let output = if attrs.iter().any(is_test_attribute) || is_rstest_enabled {
function
} else {
quote! {
#[::core::prelude::v1::test]
#function
}
};

output.into()
function.into()
}

/// Extract the optional "expected" string literal from a `should_panic`
Expand Down
Loading