Skip to content

Commit b4f98e0

Browse files
committed
Use indoc for tests
1 parent 956d523 commit b4f98e0

File tree

4 files changed

+223
-248
lines changed

4 files changed

+223
-248
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/stackable-operator/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,6 @@ tracing-subscriber.workspace = true
5555
url.workspace = true
5656

5757
[dev-dependencies]
58+
indoc.workspace = true
5859
rstest.workspace = true
5960
tempfile.workspace = true

crates/stackable-operator/src/crd/listener/listeners/v1alpha1_impl.rs

Lines changed: 42 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -90,60 +90,55 @@ impl DeepMerge for ListenerPort {
9090

9191
#[cfg(test)]
9292
mod tests {
93+
use indoc::indoc;
94+
9395
use super::*;
9496

9597
#[test]
9698
fn deep_merge_listener() {
97-
let mut base: ListenerSpec = serde_yaml::from_str(
98-
"
99-
className: my-listener-class
100-
extraPodSelectorLabels:
101-
foo: bar
102-
ports:
103-
- name: http
104-
port: 8080
105-
protocol: http
106-
- name: https
107-
port: 8080
108-
protocol: https
109-
# publishNotReadyAddresses defaults to true
110-
",
111-
)
112-
.unwrap();
99+
let mut base: ListenerSpec = serde_yaml::from_str(indoc! {"
100+
className: my-listener-class
101+
extraPodSelectorLabels:
102+
foo: bar
103+
ports:
104+
- name: http
105+
port: 8080
106+
protocol: http
107+
- name: https
108+
port: 8080
109+
protocol: https
110+
# publishNotReadyAddresses defaults to true
111+
"})
112+
.expect("test YAML is valid");
113113

114-
let merge: ListenerSpec = serde_yaml::from_str(
115-
"
116-
className: custom-listener-class
117-
extraPodSelectorLabels:
118-
foo: overridden
119-
extra: label
120-
ports:
121-
- name: https
122-
port: 8443
123-
publishNotReadyAddresses: false
124-
",
125-
)
126-
.unwrap();
114+
let merge: ListenerSpec = serde_yaml::from_str(indoc! {"
115+
className: custom-listener-class
116+
extraPodSelectorLabels:
117+
foo: overridden
118+
extra: label
119+
ports:
120+
- name: https
121+
port: 8443
122+
publishNotReadyAddresses: false
123+
"})
124+
.expect("test YAML is valid");
127125

128126
base.merge_from(merge);
129-
130-
let expected: ListenerSpec = serde_yaml::from_str(
131-
"
132-
className: custom-listener-class
133-
extraPodSelectorLabels:
134-
foo: overridden
135-
extra: label
136-
ports:
137-
- name: http
138-
port: 8080
139-
protocol: http
140-
- name: https
141-
port: 8443 # overridden
142-
protocol: https
143-
publishNotReadyAddresses: false
144-
",
145-
)
146-
.unwrap();
127+
let expected: ListenerSpec = serde_yaml::from_str(indoc! {"
128+
className: custom-listener-class
129+
extraPodSelectorLabels:
130+
foo: overridden
131+
extra: label
132+
ports:
133+
- name: http
134+
port: 8080
135+
protocol: http
136+
- name: https
137+
port: 8443 # overridden
138+
protocol: https
139+
publishNotReadyAddresses: false
140+
"})
141+
.expect("test YAML is valid");
147142

148143
assert_eq!(base, expected);
149144
}

0 commit comments

Comments
 (0)