LAB/rust-otus
0
0
Fork 0
Code Pull Requests Activity

homework: add name to thermometer

Browse Source
This commit is contained in:
Баранов Александр Сергеевич
2026-01-21 17:05:43 +03:00
parent db6833ebe0
commit b2d3b2e635
5 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
smart-house/src/house.rs
View File

@@ -47,14 +47,17 @@ mod tests {
Room::new(
"main",
Box::new([
Device::Thermometer(Thermometer::new(20.0)),
Device::Thermometer(Thermometer::new("ThermA", 20.0)),
Device::PowerSocket(PowerSocket::new(12.34, false)),
Device::PowerSocket(PowerSocket::new(10.01, true)),
]),
),
Room::new(
"bedroom",
Box::new([Device::PowerSocket(PowerSocket::new(11.11, true)), Device::Thermometer(Thermometer::new(17.99))]),
Box::new([
Device::PowerSocket(PowerSocket::new(11.11, true)),
Device::Thermometer(Thermometer::new("ThermB", 17.99)),
]),
),
]),
)
@@ -66,10 +69,7 @@ mod tests {
house.print_status();
assert_eq!(house.address, "Best street, 777");
assert_eq!(
format!("{}", house.get_room(0).unwrap().get_device(0).unwrap().display()),
"DEV:Thermometer[ 20.0 ]"
);
assert_eq!(format!("{}", house.get_room(0).unwrap().get_device(0).unwrap().display()), "DEV:ThermA[ 20.0 ]");
assert_eq!(
format!("{}", house.get_room(0).unwrap().get_device(1).unwrap().display()),
"DEV:PowerSocket[ OFF : 0.0 ]"