@@ -1536,9 +1536,9 @@ mod tests {
15361536 }
15371537
15381538 #[ rstest]
1539- #[ case:: early_decommission_within_lifetime ( 2024 , 2024 ) ]
1540- #[ case:: decommission_at_maximum_year ( 2026 , 2025 ) ]
1541- fn test_asset_decommission_with_process_lifetime (
1539+ #[ case:: commission_during_process_lifetime ( 2024 , 2024 ) ]
1540+ #[ case:: decommission_after_process_lifetime_ends ( 2026 , 2025 ) ]
1541+ fn test_asset_decommission (
15421542 #[ case] requested_decommission_year : u32 ,
15431543 #[ case] expected_decommission_year : u32 ,
15441544 process : Process ,
@@ -1564,11 +1564,14 @@ mod tests {
15641564 }
15651565
15661566 #[ rstest]
1567- #[ case:: early_decommission_within_lifetime( 2024 , 2024 ) ]
1568- #[ case:: decommission_at_maximum_year( 2026 , 2025 ) ]
1569- fn test_asset_decommission_with_predefined_decommission_year (
1567+ #[ case:: decommission_after_predefined_max_year( 2026 , 2025 , Some ( 2025 ) ) ]
1568+ #[ case:: decommission_before_predefined_max_year( 2024 , 2024 , Some ( 2025 ) ) ]
1569+ #[ case:: decommission_during_process_lifetime_end_no_max_year( 2024 , 2024 , None ) ]
1570+ #[ case:: decommission_after_process_lifetime_end_no_max_year( 2026 , 2025 , None ) ]
1571+ fn test_asset_decommission_with_max_decommission_year_predefined (
15701572 #[ case] requested_decommission_year : u32 ,
15711573 #[ case] expected_decommission_year : u32 ,
1574+ #[ case] max_decommission_year : Option < u32 > ,
15721575 process : Process ,
15731576 ) {
15741577 // Test successful commissioning of Future asset
@@ -1579,7 +1582,7 @@ mod tests {
15791582 "GBR" . into ( ) ,
15801583 Capacity ( 1.0 ) ,
15811584 2020 ,
1582- Some ( 2025 ) ,
1585+ max_decommission_year ,
15831586 )
15841587 . unwrap ( ) ;
15851588 asset. commission ( AssetID ( 1 ) , "" ) ;
0 commit comments