diff --git a/Cargo.lock b/Cargo.lock index ec8da89ee..8474b64a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1002,19 +1002,6 @@ name = "log" version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" -dependencies = [ - "value-bag", -] - -[[package]] -name = "logtest" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3e43a8657c1d64516dcc9db8ca03826a4aceaf89d5ce1b37b59f6ff0e43026" -dependencies = [ - "lazy_static", - "log", -] [[package]] name = "map-macro" @@ -1070,7 +1057,6 @@ dependencies = [ "indexmap", "itertools 0.15.0", "log", - "logtest", "map-macro", "ordered-float", "petgraph", @@ -1823,12 +1809,6 @@ dependencies = [ "getrandom 0.4.3", ] -[[package]] -name = "value-bag" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2799ffb329a792ecfd902b71306c8a815a6ef1c0470fa9953a6aa4d4cecbe511" - [[package]] name = "vcpkg" version = "0.2.15" diff --git a/Cargo.toml b/Cargo.toml index 102234b25..a4e352806 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,6 @@ rayon = "1.12.0" assert_cmd = "2.2.2" colored = "3.0.0" criterion = "0.8.2" -logtest = "2.0.0" ordered-float = "5.1.0" rstest = {version = "0.26.1", default-features = false, features = ["crate-name"]} similar = "3.1.0" diff --git a/src/input/process/investment_constraints.rs b/src/input/process/investment_constraints.rs index f8054addd..7118ac9de 100644 --- a/src/input/process/investment_constraints.rs +++ b/src/input/process/investment_constraints.rs @@ -216,7 +216,6 @@ mod tests { use crate::fixture::{assert_error, processes}; use crate::region::RegionID; use crate::units::Capacity; - use logtest::Logger; use rstest::rstest; fn validate_raw_constraint( @@ -445,24 +444,33 @@ mod tests { } #[rstest] - #[case(Some(CapacityPerYear(10.0)), None, None, None)] - #[case(Some(CapacityPerYear(0.0)), None, None, None)] - #[case(Some(CapacityPerYear(10.0)), Some(Dimensionless(0.5)), None, None)] - #[case(Some(CapacityPerYear(10.0)), Some(Dimensionless(0.0)), None, None)] - #[case(Some(CapacityPerYear(10.0)), None, None, Some(Capacity(100.0)))] - #[case(Some(CapacityPerYear(10.0)), None, None, Some(Capacity(0.0)))] + #[case(Some(CapacityPerYear(10.0)), None, None)] // only addition limits + #[case(Some(CapacityPerYear(0.0)), None, None)] // zero addition limit + #[case(None, Some(Dimensionless(0.5)), None)] // only growth limit + #[case(None, Some(Dimensionless(0.0)), None)] // zero growth limit + #[case(None, Some(Dimensionless(1.0)), None)] // growth limit exactly 1 + #[case(None, Some(Dimensionless(5.0)), None)] // growth limit > 1 (TODO: test that this raises a warning) + #[case(None, None, Some(Capacity(100.0)))] // only total limit + #[case(None, None, Some(Capacity(0.0)))] // zero total limit + #[case( + Some(CapacityPerYear(1.0)), + Some(Dimensionless(0.1)), + Some(Capacity(100.0)) + )] // all limits, all positive + #[case( + Some(CapacityPerYear(0.0)), + Some(Dimensionless(0.0)), + Some(Capacity(0.0)) + )] // all limits, all zero fn validate_constraints_valid( #[case] addition_limit: Option, #[case] capacity_growth_limit: Option, - #[case] growth_seed: Option, #[case] total_capacity_limit: Option, ) { - // Valid: capacity constraints with values >= 0, and capacity_growth_limit and - // total_capacity_limit as None let valid = validate_raw_constraint( addition_limit, capacity_growth_limit, - growth_seed, + None, total_capacity_limit, ); valid.unwrap(); @@ -585,22 +593,6 @@ mod tests { assert_error!(invalid, error_msg); } - #[test] - fn validate_capacity_growth_limit_warning() { - // Check warning raised if value above 1 provided - let mut logger = Logger::start(); - let _ = validate_raw_constraint( - Some(CapacityPerYear(10.0)), - Some(Dimensionless(5.0)), - None, - None, - ); - assert_eq!( - logger.pop().unwrap().args(), - "Interpreting capacity growth constraint '5' as 500%" - ); - } - #[rstest] #[case(Some(CapacityPerYear(10.0)), None, None, None)] #[case(Some(CapacityPerYear(10.0)), None, Some(Dimensionless(1.0)), None)]