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

homework: remove names

Browse Source
This commit is contained in:
Баранов Александр Сергеевич
2026-01-24 10:23:13 +03:00
parent f8258ee6d4
commit 3f083fd9fd
6 changed files with 133 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
smart-house/src/device.rs
View File

@@ -21,13 +21,6 @@ impl Device {
pub fn print_status(&self) {
println!("{}", self.display());
}
pub fn get_name(&self) -> &str {
match self {
Device::Thermometer(thermometer) => thermometer.get_name(),
Device::PowerSocket(power_socket) => power_socket.get_name(),
}
}
}
impl From<super::Thermometer> for Device {
@@ -49,8 +42,8 @@ mod tests {
#[test]
fn smoke_test() {
let dev_thermometer = Device::Thermometer(Thermometer::new("Therm", 20.1));
let dev_power_socket = Device::PowerSocket(PowerSocket::new("PSoc", 11.2, false));
let dev_thermometer = Device::Thermometer(Thermometer::new(20.1));
let dev_power_socket = Device::PowerSocket(PowerSocket::new(11.2, false));
dev_thermometer.print_status();
dev_power_socket.print_status();
@@ -60,16 +53,16 @@ mod tests {
unreachable!()
};
assert_eq!(format!("{}", thermometer.display()), "Therm[ 20.1 ]");
assert_eq!(format!("{}", power_socket.display()), "PSoc[ OFF : 0.0 ]");
assert_eq!(format!("{}", thermometer.display()), "Thermometer[ 20.1 ]");
assert_eq!(format!("{}", power_socket.display()), "PowerSocket[ OFF : 0.0 ]");
}
#[test]
fn display_test() {
let dev_thermometer = Device::Thermometer(Thermometer::new("Therm", 20.1));
let dev_power_socket = Device::PowerSocket(PowerSocket::new("PSoc", 11.2, false));
let dev_thermometer = Device::Thermometer(Thermometer::new(20.1));
let dev_power_socket = Device::PowerSocket(PowerSocket::new(11.2, false));
assert_eq!(format!("{}", dev_thermometer.display()), "DEV:Therm[ 20.1 ]");
assert_eq!(format!("{}", dev_power_socket.display()), "DEV:PSoc[ OFF : 0.0 ]");
assert_eq!(format!("{}", dev_thermometer.display()), "DEV:Thermometer[ 20.1 ]");
assert_eq!(format!("{}", dev_power_socket.display()), "DEV:PowerSocket[ OFF : 0.0 ]");
}
}