Revert "Test each benchmark case in own #[test] (#9860)"

This reverts commit 3d0a917.

bin/node-template/pallets/template/src/benchmarking.rs

@@ -4,7 +4,7 @@ use super::*;
 
 #[allow(unused)]
 use crate::Pallet as Template;
-use frame_benchmarking::{benchmarks, whitelisted_caller};
+use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_system::RawOrigin;
 
 benchmarks! {
@@ -15,6 +15,6 @@ benchmarks! {
 	verify {
 		assert_eq!(Something::<T>::get(), Some(s));
 	}
-
-	impl_benchmark_test_suite!(Template, crate::mock::new_test_ext(), crate::mock::Test);
 }
+
+impl_benchmark_test_suite!(Template, crate::mock::new_test_ext(), crate::mock::Test);

frame/babe/src/benchmarking.rs

@@ -63,19 +63,19 @@ benchmarks! {
 	} verify {
 		assert!(sp_consensus_babe::check_equivocation_proof::<Header>(equivocation_proof2));
 	}
-
-	impl_benchmark_test_suite!(
-		Pallet,
-		crate::mock::new_test_ext(3),
-		crate::mock::Test,
-	)
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
 	use crate::mock::*;
 
+	frame_benchmarking::impl_benchmark_test_suite!(
+		Pallet,
+		crate::mock::new_test_ext(3),
+		crate::mock::Test,
+	);
+
 	#[test]
 	fn test_generate_equivocation_report_blob() {
 		let (pairs, mut ext) = new_test_ext_with_pairs(3);

frame/bags-list/src/benchmarks.rs

@@ -134,10 +134,11 @@ frame_benchmarking::benchmarks! {
 			]
 		);
 	}
-
-	impl_benchmark_test_suite!(
-		Pallet,
-		crate::mock::ExtBuilder::default().build(),
-		crate::mock::Runtime,
-	)
 }
+
+use frame_benchmarking::impl_benchmark_test_suite;
+impl_benchmark_test_suite!(
+	Pallet,
+	crate::mock::ExtBuilder::default().build(),
+	crate::mock::Runtime,
+);

frame/balances/src/benchmarking.rs

@@ -21,7 +21,9 @@
 
 use super::*;
 
-use frame_benchmarking::{account, benchmarks_instance_pallet, whitelisted_caller};
+use frame_benchmarking::{
+	account, benchmarks_instance_pallet, impl_benchmark_test_suite, whitelisted_caller,
+};
 use frame_system::RawOrigin;
 use sp_runtime::traits::Bounded;
 
@@ -213,10 +215,10 @@ benchmarks_instance_pallet! {
 		assert!(Balances::<T, I>::reserved_balance(&user).is_zero());
 		assert_eq!(Balances::<T, I>::free_balance(&user), balance);
 	}
-
-	impl_benchmark_test_suite!(
-		Balances,
-		crate::tests_composite::ExtBuilder::default().build(),
-		crate::tests_composite::Test,
-	)
 }
+
+impl_benchmark_test_suite!(
+	Balances,
+	crate::tests_composite::ExtBuilder::default().build(),
+	crate::tests_composite::Test,
+);