jasterv/test-context
1
0
Fork 0
mirror of https://codeberg.org/JasterV/test-context.git synced 2026-04-26 18:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Regression in version 0.5.0 (#55)

Browse source 
An attempt to fix the issue defined in https://github.com/JasterV/test-context/issues/53 & some refactors
This commit is contained in:
Víctor Martínez 2025-11-04 17:27:53 +01:00 committed by GitHub
parent 90f0f92b66
commit ef4bdb28a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 77 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -3,9 +3,9 @@ resolver = "2"
members = ["test-context", "test-context-macros"]
[workspace.package]
edition = "2021"
edition = "2024"
version = "0.5.0"
rust-version = "1.75.0"
rust-version = "1.91.0"
homepage = "https://github.com/JasterV/test-context"
repository = "https://github.com/JasterV/test-context"
authors = [

2
rust-toolchain.toml
View file

@ -1,3 +1,3 @@
[toolchain]
channel = "1.90"
channel = "1.91"
components = ["rustfmt", "clippy", "rust-src", "rust-analyzer"]

2
test-context-macros/src/args.rs
View file

@ -1,4 +1,4 @@
use syn::{parse::Parse, Token, Type};
use syn::{Token, Type, parse::Parse};
pub(crate) struct TestContextArgs {
pub(crate) context_type: Type,

125
test-context-macros/src/lib.rs
View file

@ -3,7 +3,7 @@ mod args;
use args::TestContextArgs;
use proc_macro::TokenStream;
use quote::{format_ident, quote};
use syn::{Block, Ident};
use syn::Ident;
/// Macro to use on tests to add the setup/teardown functionality of your context.
///
@ -28,101 +28,67 @@ use syn::{Block, Ident};
#[proc_macro_attribute]
pub fn test_context(attr: TokenStream, item: TokenStream) -> TokenStream {
let args = syn::parse_macro_input!(attr as TestContextArgs);
let input = syn::parse_macro_input!(item as syn::ItemFn);
let (input, context_arg_name) = remove_context_arg(input, args.context_type.clone());
let input = refactor_input_body(input, &args, context_arg_name);
quote! { #input }.into()
}
fn refactor_input_body(
mut input: syn::ItemFn,
args: &TestContextArgs,
context_arg_name: Option<Ident>,
) -> syn::ItemFn {
let context_type = &args.context_type;
let context_arg_name = context_arg_name.unwrap_or_else(|| format_ident!("test_ctx"));
let result_name = format_ident!("wrapped_result");
let body = &input.block;
let is_async = input.sig.asyncness.is_some();
let (new_input, context_arg_name) =
extract_and_remove_context_arg(input.clone(), args.context_type.clone());
let wrapper_body = if is_async {
async_wrapper_body(args, &context_arg_name, &input.block)
} else {
sync_wrapper_body(args, &context_arg_name, &input.block)
};
let mut result_input = new_input;
result_input.block = Box::new(syn::parse2(wrapper_body).unwrap());
quote! { #result_input }.into()
}
fn async_wrapper_body(
args: TestContextArgs,
context_arg_name: &Option<syn::Ident>,
body: &Block,
) -> proc_macro2::TokenStream {
let context_type = args.context_type;
let result_name = format_ident!("wrapped_result");
let binding = format_ident!("test_ctx");
let context_name = context_arg_name.as_ref().unwrap_or(&binding);
let body = if args.skip_teardown {
let body = match (is_async, args.skip_teardown) {
(true, true) => {
quote! {
let #context_name = <#context_type as test_context::AsyncTestContext>::setup().await;
let #result_name = std::panic::AssertUnwindSafe( async { #body } ).catch_unwind().await;
}
} else {
quote! {
let mut #context_name = <#context_type as test_context::AsyncTestContext>::setup().await;
let #result_name = std::panic::AssertUnwindSafe( async { #body } ).catch_unwind().await;
<#context_type as test_context::AsyncTestContext>::teardown(#context_name).await;
}
};
let handle_wrapped_result = handle_result(result_name);
quote! {
{
use test_context::futures::FutureExt;
#body
#handle_wrapped_result
let mut __context = <#context_type as test_context::AsyncTestContext>::setup().await;
let #context_arg_name = &mut __context;
let #result_name = std::panic::AssertUnwindSafe( async { #body } ).catch_unwind().await;
}
}
}
fn sync_wrapper_body(
args: TestContextArgs,
context_arg_name: &Option<syn::Ident>,
body: &Block,
) -> proc_macro2::TokenStream {
let context_type = args.context_type;
let result_name = format_ident!("wrapped_result");
let binding = format_ident!("test_ctx");
let context_name = context_arg_name.as_ref().unwrap_or(&binding);
let body = if args.skip_teardown {
(true, false) => {
quote! {
let mut #context_name = <#context_type as test_context::TestContext>::setup();
use test_context::futures::FutureExt;
let mut __context = <#context_type as test_context::AsyncTestContext>::setup().await;
let #context_arg_name = &mut __context;
let #result_name = std::panic::AssertUnwindSafe( async { #body } ).catch_unwind().await;
<#context_type as test_context::AsyncTestContext>::teardown(__context).await;
}
}
(false, true) => {
quote! {
let mut __context = <#context_type as test_context::TestContext>::setup();
let #result_name = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
let #context_name = &mut #context_name;
let #context_arg_name = &mut __context;
#body
}));
}
} else {
}
(false, false) => {
quote! {
let mut #context_name = <#context_type as test_context::TestContext>::setup();
let mut __context = <#context_type as test_context::TestContext>::setup();
let #result_name = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
let #context_arg_name = &mut __context;
#body
}));
<#context_type as test_context::TestContext>::teardown(#context_name);
<#context_type as test_context::TestContext>::teardown(__context);
}
}
};
let handle_wrapped_result = handle_result(result_name);
quote! {
let body = quote! {
{
#body
#handle_wrapped_result
}
}
}
fn handle_result(result_name: Ident) -> proc_macro2::TokenStream {
quote! {
match #result_name {
Ok(value) => value,
Err(err) => {
@ -130,9 +96,14 @@ fn handle_result(result_name: Ident) -> proc_macro2::TokenStream {
}
}
}
};
input.block = Box::new(syn::parse2(body).unwrap());
input
}
fn extract_and_remove_context_arg(
fn remove_context_arg(
mut input: syn::ItemFn,
expected_context_type: syn::Type,
) -> (syn::ItemFn, Option<syn::Ident>) {
@ -154,10 +125,12 @@ fn extract_and_remove_context_arg(
}
}
}
new_args.push(arg.clone());
}
input.sig.inputs = new_args;
(input, context_arg_name)
}

2
test-context/tests/test.rs
View file

@ -1,7 +1,7 @@
use std::marker::PhantomData;
use rstest::rstest;
use test_context::{test_context, AsyncTestContext, TestContext};
use test_context::{AsyncTestContext, TestContext, test_context};
struct Context {
n: u32,