Skip to content

Commit 222efa8

Browse files
committed
Updated calls and tests
1 parent f858af5 commit 222efa8

File tree

2 files changed

+35
-10
lines changed

2 files changed

+35
-10
lines changed

heos-lib/src/heos_reply.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ impl HeosReply {
7575
Self::parse_generic_payload(&json, "payload")
7676
)),
7777

78-
"player/set_volume" | "player/get_volume" | "group/set_volume" | "group/get_volume" => Ok(HeosReply::Volume(
78+
"player/set_volume" | "player/get_volume"
79+
| "group/set_volume" | "group/get_volume" => Ok(HeosReply::Volume(
7980
"success" == json.get("heos.result").str(),
8081
Self::parse_message(&json, "heos.message")
8182
)),
8283

83-
"player/set_mute" | "player/get_mute" | "player/toggle_mute" | "player/set_mute"
84-
| "player/get_mute" | "player/toggle_mute" => Ok(HeosReply::Mute(
84+
"player/set_mute" | "player/get_mute" | "player/toggle_mute"
85+
| "group/set_mute" | "group/get_mute" | "group/toggle_mute" => Ok(HeosReply::Mute(
8586
"success" == json.get("heos.result").str(),
8687
Self::parse_message(&json, "heos.message")
8788
)),

heos-lib/src/heos_reply_test.rs

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,43 +110,67 @@ mod heos_reply_test {
110110

111111
#[test]
112112
fn should_parse_set_volume_reply() {
113-
let reply = HeosReply::parse(test_asset!("set_volume.json"))
113+
let mut reply = HeosReply::parse(test_asset!("set_volume.json"))
114114
.expect("Failed to parse set_volume.json");
115115

116116
assert!(matches!(reply, HeosReply::Volume { .. }));
117+
118+
reply = HeosReply::parse(test_asset!("set_group_volume.json"))
119+
.expect("Failed to parse set_group_volume.json");
120+
121+
assert!(matches!(reply, HeosReply::Volume { .. }));
117122
}
118123

119124
#[test]
120125
fn should_parse_get_volume_reply() {
121-
let reply = HeosReply::parse(test_asset!("get_volume.json"))
126+
let mut reply = HeosReply::parse(test_asset!("get_volume.json"))
122127
.expect("Failed to parse get_volume.json");
123128

124129
assert!(matches!(reply, HeosReply::Volume { .. }));
125-
}
126130

131+
reply = HeosReply::parse(test_asset!("get_group_volume.json"))
132+
.expect("Failed to parse get_group_volume.json");
133+
134+
assert!(matches!(reply, HeosReply::Volume { .. }));
135+
}
127136

128137
#[test]
129-
fn should_parse_set_mute_reply() {
130-
let reply = HeosReply::parse(test_asset!("set_mute.json"))
138+
fn should_parse_set_group_mute_reply() {
139+
let mut reply = HeosReply::parse(test_asset!("set_mute.json"))
131140
.expect("Failed to parse set_mute.json");
132141

133142
assert!(matches!(reply, HeosReply::Mute{ .. }));
143+
144+
reply = HeosReply::parse(test_asset!("set_group_mute.json"))
145+
.expect("Failed to parse set_group_mute.json");
146+
147+
assert!(matches!(reply, HeosReply::Mute{ .. }));
134148
}
135149

136150
#[test]
137151
fn should_parse_get_mute_reply() {
138-
let reply = HeosReply::parse(test_asset!("get_mute.json"))
152+
let mut reply = HeosReply::parse(test_asset!("get_mute.json"))
139153
.expect("Failed to parse get_mute.json");
140154

141155
assert!(matches!(reply, HeosReply::Mute { .. }));
156+
157+
reply = HeosReply::parse(test_asset!("get_group_mute.json"))
158+
.expect("Failed to parse get_group_mute.json");
159+
160+
assert!(matches!(reply, HeosReply::Mute { .. }));
142161
}
143162

144163
#[test]
145164
fn should_parse_toggle_mute_reply() {
146-
let reply = HeosReply::parse(test_asset!("toggle_mute.json"))
165+
let mut reply = HeosReply::parse(test_asset!("toggle_mute.json"))
147166
.expect("Failed to parse toggle_mute.json");
148167

149168
assert!(matches!(reply, HeosReply::Mute { .. }));
169+
170+
reply = HeosReply::parse(test_asset!("toggle_group_mute.json"))
171+
.expect("Failed to parse toggle_group_mute.json");
172+
173+
assert!(matches!(reply, HeosReply::Mute { .. }));
150174
}
151175

152176
#[test]

0 commit comments

Comments
 (0)