Skip to content

Commit e9f0d90

Browse files
maltesandermaltesander
committed
chore: use more indoc for unit tests
1 parent 00b3a6c commit e9f0d90

4 files changed

Lines changed: 47 additions & 23 deletions

File tree

‎rust/operator-binary/src/controller/build/properties/core_site.rs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ impl CoreSiteConfigBuilder {
108108

109109
#[cfg(test)]
110110
mod tests {
111+
use indoc::indoc;
112+
111113
use super::*;
112114
use crate::controller::build::properties::test_support::{cluster_info, validated_cluster};
113115

@@ -120,17 +122,21 @@ mod tests {
120122
KeyValueConfigOverrides::default(),
121123
);
122124
assert!(
123-
xml.contains("<name>fs.defaultFS</name>\n <value>hdfs://hdfs/</value>"),
125+
xml.contains(indoc! {"
126+
<name>fs.defaultFS</name>
127+
<value>hdfs://hdfs/</value>"}),
124128
"{xml}"
125129
);
126130
assert!(
127-
xml.contains(
128-
"<name>hadoop.prometheus.endpoint.enabled</name>\n <value>true</value>"
129-
),
131+
xml.contains(indoc! {"
132+
<name>hadoop.prometheus.endpoint.enabled</name>
133+
<value>true</value>"}),
130134
"{xml}"
131135
);
132136
assert!(
133-
xml.contains("<name>io.file.buffer.size</name>\n <value>131072</value>"),
137+
xml.contains(indoc! {"
138+
<name>io.file.buffer.size</name>
139+
<value>131072</value>"}),
134140
"{xml}"
135141
);
136142
}
@@ -144,7 +150,9 @@ mod tests {
144150
[("io.file.buffer.size", "65536")].into(),
145151
);
146152
assert!(
147-
xml.contains("<name>io.file.buffer.size</name>\n <value>65536</value>"),
153+
xml.contains(indoc! {"
154+
<name>io.file.buffer.size</name>
155+
<value>65536</value>"}),
148156
"{xml}"
149157
);
150158
}

‎rust/operator-binary/src/controller/build/properties/hdfs_site.rs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,8 @@ impl HdfsSiteConfigBuilder {
332332

333333
#[cfg(test)]
334334
mod tests {
335+
use indoc::indoc;
336+
335337
use super::*;
336338
use crate::{
337339
controller::build::properties::test_support::{cluster_info, validated_cluster},
@@ -358,11 +360,15 @@ mod tests {
358360
KeyValueConfigOverrides::default(),
359361
);
360362
assert!(
361-
xml.contains("<name>dfs.replication</name>\n <value>3</value>"),
363+
xml.contains(indoc! {"
364+
<name>dfs.replication</name>
365+
<value>3</value>"}),
362366
"{xml}"
363367
);
364368
assert!(
365-
xml.contains("<name>dfs.datanode.max.transfer.threads</name>\n <value>8192</value>"),
369+
xml.contains(indoc! {"
370+
<name>dfs.datanode.max.transfer.threads</name>
371+
<value>8192</value>"}),
366372
"{xml}"
367373
);
368374
}
@@ -378,7 +384,9 @@ mod tests {
378384
[("dfs.replication", "5")].into(),
379385
);
380386
assert!(
381-
xml.contains("<name>dfs.replication</name>\n <value>5</value>"),
387+
xml.contains(indoc! {"
388+
<name>dfs.replication</name>
389+
<value>5</value>"}),
382390
"{xml}"
383391
);
384392
}

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ pub fn build(https_enabled: bool, overrides: KeyValueConfigOverrides) -> String
2424

2525
#[cfg(test)]
2626
mod tests {
27+
use indoc::{formatdoc, indoc};
28+
2729
use super::*;
2830
use crate::controller::build::{
2931
container::{TLS_STORE_DIR, TLS_STORE_PASSWORD},
@@ -42,15 +44,15 @@ mod tests {
4244
fn enabled_https_injects_truststore() {
4345
let xml = build(true, KeyValueConfigOverrides::default());
4446
assert!(
45-
xml.contains(&format!(
46-
"<name>ssl.client.truststore.location</name>\n <value>{TLS_STORE_DIR}/truststore.p12</value>"
47-
)),
47+
xml.contains(&formatdoc! {"
48+
<name>ssl.client.truststore.location</name>
49+
<value>{TLS_STORE_DIR}/truststore.p12</value>"}),
4850
"{xml}"
4951
);
5052
assert!(
51-
xml.contains(&format!(
52-
"<name>ssl.client.truststore.password</name>\n <value>{TLS_STORE_PASSWORD}</value>"
53-
)),
53+
xml.contains(&formatdoc! {"
54+
<name>ssl.client.truststore.password</name>
55+
<value>{TLS_STORE_PASSWORD}</value>"}),
5456
"{xml}"
5557
);
5658
}
@@ -59,7 +61,9 @@ mod tests {
5961
fn user_overrides_win_over_injected_defaults() {
6062
let xml = build(true, [("ssl.client.truststore.type", "jks")].into());
6163
assert!(
62-
xml.contains("<name>ssl.client.truststore.type</name>\n <value>jks</value>"),
64+
xml.contains(indoc! {"
65+
<name>ssl.client.truststore.type</name>
66+
<value>jks</value>"}),
6367
"{xml}"
6468
);
6569
}

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ pub fn build(https_enabled: bool, overrides: KeyValueConfigOverrides) -> String
4141

4242
#[cfg(test)]
4343
mod tests {
44+
use indoc::{formatdoc, indoc};
45+
4446
use super::*;
4547
use crate::controller::build::properties::test_support::EMPTY_HADOOP_XML;
4648

@@ -56,15 +58,15 @@ mod tests {
5658
fn enabled_https_injects_keystore_and_truststore() {
5759
let xml = build(true, KeyValueConfigOverrides::default());
5860
assert!(
59-
xml.contains(&format!(
60-
"<name>ssl.server.keystore.location</name>\n <value>{TLS_STORE_DIR}/keystore.p12</value>"
61-
)),
61+
xml.contains(&formatdoc! {"
62+
<name>ssl.server.keystore.location</name>
63+
<value>{TLS_STORE_DIR}/keystore.p12</value>"}),
6264
"{xml}"
6365
);
6466
assert!(
65-
xml.contains(&format!(
66-
"<name>ssl.server.truststore.password</name>\n <value>{TLS_STORE_PASSWORD}</value>"
67-
)),
67+
xml.contains(&formatdoc! {"
68+
<name>ssl.server.truststore.password</name>
69+
<value>{TLS_STORE_PASSWORD}</value>"}),
6870
"{xml}"
6971
);
7072
}
@@ -73,7 +75,9 @@ mod tests {
7375
fn user_overrides_win_over_injected_defaults() {
7476
let xml = build(true, [("ssl.server.keystore.type", "jks")].into());
7577
assert!(
76-
xml.contains("<name>ssl.server.keystore.type</name>\n <value>jks</value>"),
78+
xml.contains(indoc! {"
79+
<name>ssl.server.keystore.type</name>
80+
<value>jks</value>"}),
7781
"{xml}"
7882
);
7983
}

0 commit comments

Comments
 (0)