Skip to content

Commit 1185045

Browse files
committed
refactor: use indoc for unit tests
1 parent 5687aae commit 1185045

3 files changed

Lines changed: 36 additions & 14 deletions

File tree

rust/operator-binary/src/controller/build/properties/hbase_site.rs

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ pub fn build(
137137

138138
#[cfg(test)]
139139
mod tests {
140+
use indoc::indoc;
141+
140142
use super::*;
141143
use crate::test_utils::{merged_config, validated_cluster};
142144

@@ -153,11 +155,15 @@ mod tests {
153155
KeyValueConfigOverrides::default(),
154156
);
155157
assert!(
156-
xml.contains("<name>hbase.cluster.distributed</name>\n <value>true</value>"),
158+
xml.contains(indoc! {"
159+
<name>hbase.cluster.distributed</name>
160+
<value>true</value>"}),
157161
"{xml}"
158162
);
159163
assert!(
160-
xml.contains("<name>hbase.master.ipc.address</name>\n <value>0.0.0.0</value>"),
164+
xml.contains(indoc! {"
165+
<name>hbase.master.ipc.address</name>
166+
<value>0.0.0.0</value>"}),
161167
"{xml}"
162168
);
163169
}
@@ -175,13 +181,15 @@ mod tests {
175181
KeyValueConfigOverrides::default(),
176182
);
177183
assert!(
178-
xml.contains("<name>hbase.regionserver.ipc.address</name>\n <value>0.0.0.0</value>"),
184+
xml.contains(indoc! {"
185+
<name>hbase.regionserver.ipc.address</name>
186+
<value>0.0.0.0</value>"}),
179187
"{xml}"
180188
);
181189
assert!(
182-
xml.contains(
183-
"<name>hbase.unsafe.regionserver.hostname</name>\n <value>${env:HBASE_SERVICE_HOST}</value>"
184-
),
190+
xml.contains(indoc! {"
191+
<name>hbase.unsafe.regionserver.hostname</name>
192+
<value>${env:HBASE_SERVICE_HOST}</value>"}),
185193
"{xml}"
186194
);
187195
}
@@ -199,9 +207,9 @@ mod tests {
199207
KeyValueConfigOverrides::default(),
200208
);
201209
assert!(
202-
xml.contains(
203-
"<name>hbase.rest.endpoint</name>\n <value>${env:HBASE_SERVICE_HOST}:${env:HBASE_SERVICE_PORT}</value>"
204-
),
210+
xml.contains(indoc! {"
211+
<name>hbase.rest.endpoint</name>
212+
<value>${env:HBASE_SERVICE_HOST}:${env:HBASE_SERVICE_PORT}</value>"}),
205213
"{xml}"
206214
);
207215
}
@@ -219,7 +227,9 @@ mod tests {
219227
[("hbase.cluster.distributed", "false")].into(),
220228
);
221229
assert!(
222-
xml.contains("<name>hbase.cluster.distributed</name>\n <value>false</value>"),
230+
xml.contains(indoc! {"
231+
<name>hbase.cluster.distributed</name>
232+
<value>false</value>"}),
223233
"{xml}"
224234
);
225235
}

rust/operator-binary/src/controller/build/properties/ssl_client.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ pub fn build(
1616

1717
#[cfg(test)]
1818
mod tests {
19+
use indoc::indoc;
20+
1921
use super::*;
2022

2123
#[test]
@@ -36,7 +38,9 @@ mod tests {
3638
)
3739
.expect("settings present, so ssl-client.xml is rendered");
3840
assert!(
39-
xml.contains("<name>ssl.client.truststore.type</name>\n <value>pkcs12</value>"),
41+
xml.contains(indoc! {"
42+
<name>ssl.client.truststore.type</name>
43+
<value>pkcs12</value>"}),
4044
"{xml}"
4145
);
4246
}
@@ -49,7 +53,9 @@ mod tests {
4953
)
5054
.expect("override present, so ssl-client.xml is rendered");
5155
assert!(
52-
xml.contains("<name>ssl.client.keystore.type</name>\n <value>jks</value>"),
56+
xml.contains(indoc! {"
57+
<name>ssl.client.keystore.type</name>
58+
<value>jks</value>"}),
5359
"{xml}"
5460
);
5561
}

rust/operator-binary/src/controller/build/properties/ssl_server.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ pub fn build(
1616

1717
#[cfg(test)]
1818
mod tests {
19+
use indoc::indoc;
20+
1921
use super::*;
2022

2123
#[test]
@@ -33,7 +35,9 @@ mod tests {
3335
)
3436
.expect("settings present, so ssl-server.xml is rendered");
3537
assert!(
36-
xml.contains("<name>ssl.server.keystore.type</name>\n <value>pkcs12</value>"),
38+
xml.contains(indoc! {"
39+
<name>ssl.server.keystore.type</name>
40+
<value>pkcs12</value>"}),
3741
"{xml}"
3842
);
3943
}
@@ -46,7 +50,9 @@ mod tests {
4650
)
4751
.expect("override present, so ssl-server.xml is rendered");
4852
assert!(
49-
xml.contains("<name>ssl.server.keystore.type</name>\n <value>jks</value>"),
53+
xml.contains(indoc! {"
54+
<name>ssl.server.keystore.type</name>
55+
<value>jks</value>"}),
5056
"{xml}"
5157
);
5258
}

0 commit comments

Comments
 (0)