Skip to content

Commit 7fe86d5

Browse files
authored
chore: Rename test functions (#870)
1 parent a7e70f1 commit 7fe86d5

35 files changed

+157
-162
lines changed

crates/stackable-certs/src/ca/mod.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -467,19 +467,18 @@ fn format_leaf_certificate_subject(name: &str, scope: &str) -> Result<Name> {
467467
}
468468

469469
#[cfg(test)]
470-
mod test {
471-
470+
mod tests {
472471
use super::*;
473472

474473
#[tokio::test]
475-
async fn test_rsa_key_generation() {
474+
async fn rsa_key_generation() {
476475
let mut ca = CertificateAuthority::new_rsa().unwrap();
477476
ca.generate_rsa_leaf_certificate("Airflow", "pod", Duration::from_secs(3600))
478477
.unwrap();
479478
}
480479

481480
#[tokio::test]
482-
async fn test_ecdsa_key_generation() {
481+
async fn ecdsa_key_generation() {
483482
let mut ca = CertificateAuthority::new_ecdsa().unwrap();
484483
ca.generate_ecdsa_leaf_certificate("Airflow", "pod", Duration::from_secs(3600))
485484
.unwrap();

crates/stackable-operator/src/builder/configmap.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ mod tests {
6969
use std::collections::BTreeMap;
7070

7171
#[test]
72-
fn test_configmap_builder() {
72+
fn configmap_builder() {
7373
let mut data = BTreeMap::new();
7474
data.insert("foo".to_string(), "bar".to_string());
7575
let configmap = ConfigMapBuilder::new()

crates/stackable-operator/src/builder/event.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ mod tests {
130130
use crate::builder::pod::PodBuilder;
131131

132132
#[test]
133-
fn test_event_builder() {
133+
fn event_builder() {
134134
let pod = PodBuilder::new()
135135
.metadata_builder(|builder| builder.name("testpod"))
136136
.build()

crates/stackable-operator/src/builder/meta.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ mod tests {
316316
use k8s_openapi::api::core::v1::Pod;
317317

318318
#[test]
319-
fn test_objectmeta_builder() {
319+
fn objectmeta_builder() {
320320
let mut pod = Pod::default();
321321
pod.metadata.name = Some("pod".to_string());
322322
pod.metadata.uid = Some("uid".to_string());

crates/stackable-operator/src/builder/pdb.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl PodDisruptionBudgetBuilder<ObjectMeta, LabelSelector, PodDisruptionBudgetCo
198198
}
199199

200200
#[cfg(test)]
201-
mod test {
201+
mod tests {
202202
use std::collections::BTreeMap;
203203

204204
use k8s_openapi::{
@@ -214,7 +214,7 @@ mod test {
214214
use super::PodDisruptionBudgetBuilder;
215215

216216
#[test]
217-
pub fn test_normal_build() {
217+
pub fn normal_build() {
218218
#[allow(deprecated)]
219219
let pdb = PodDisruptionBudgetBuilder::new()
220220
.new_with_metadata(
@@ -255,7 +255,7 @@ mod test {
255255
}
256256

257257
#[test]
258-
pub fn test_build_from_role() {
258+
pub fn build_from_role() {
259259
#[derive(
260260
Clone, CustomResource, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize,
261261
)]
@@ -273,10 +273,12 @@ mod test {
273273
",
274274
)
275275
.unwrap();
276+
276277
let app_name = "trino";
277278
let role = "worker";
278279
let operator_name = "trino.stackable.tech";
279280
let controller_name = "trino-operator-trino-controller";
281+
280282
let pdb = PodDisruptionBudgetBuilder::new_with_role(
281283
&trino,
282284
app_name,

crates/stackable-operator/src/builder/pod/container.rs

+11-10
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ mod tests {
368368
};
369369

370370
#[test]
371-
fn test_container_builder() {
371+
fn builder() {
372372
let container_port: i32 = 10000;
373373
let container_port_name = "foo_port_name";
374374
let container_port_1: i32 = 20000;
@@ -428,7 +428,7 @@ mod tests {
428428
}
429429

430430
#[test]
431-
fn test_container_builder_lifecycle() {
431+
fn builder_lifecycle() {
432432
let post_start = LifecycleHandler {
433433
exec: Some(ExecAction {
434434
command: Some(vec!["hello".to_string(), "world".to_string()]),
@@ -456,7 +456,7 @@ mod tests {
456456
}
457457

458458
#[test]
459-
fn test_container_port_builder() {
459+
fn port_builder() {
460460
let port: i32 = 10000;
461461
let name = "FooBar";
462462
let protocol = "http";
@@ -477,15 +477,16 @@ mod tests {
477477
}
478478

479479
#[test]
480-
pub fn test_field_ref_env_var_serialization() {
480+
pub fn field_ref_env_var_serialization() {
481481
assert_eq!(
482482
"metadata.labels['some-label-name']",
483483
FieldPathEnvVar::Labels("some-label-name".to_string()).to_string()
484484
);
485485
}
486486

487+
// TODO (@Techassi): Use rstest for name validation below
487488
#[test]
488-
fn test_container_name_max_len() {
489+
fn name_max_len() {
489490
let long_container_name =
490491
"lengthexceededlengthexceededlengthexceededlengthexceededlengthex";
491492
assert_eq!(long_container_name.len(), 64); // 63 characters is the limit for container names
@@ -512,12 +513,12 @@ mod tests {
512513
}
513514

514515
#[test]
515-
fn test_container_name_alphabet_only() {
516+
fn name_alphabet_only() {
516517
ContainerBuilder::new("okname").unwrap();
517518
}
518519

519520
#[test]
520-
fn test_container_name_hyphen() {
521+
fn name_hyphen() {
521522
assert!(ContainerBuilder::new("name-with-hyphen").is_ok());
522523
assert_container_builder_err(
523524
ContainerBuilder::new("ends-with-hyphen-"),
@@ -530,12 +531,12 @@ mod tests {
530531
}
531532

532533
#[test]
533-
fn test_container_name_contains_number() {
534+
fn name_contains_number() {
534535
assert!(ContainerBuilder::new("1name-0-name1").is_ok());
535536
}
536537

537538
#[test]
538-
fn test_container_name_contains_underscore() {
539+
fn name_contains_underscore() {
539540
assert!(ContainerBuilder::new("name_name").is_err());
540541
assert_container_builder_err(
541542
ContainerBuilder::new("name_name"),
@@ -544,7 +545,7 @@ mod tests {
544545
}
545546

546547
#[test]
547-
fn test_container_cpu_and_memory_resource_requirements() {
548+
fn cpu_and_memory_resource_requirements() {
548549
let resources = ResourceRequirementsBuilder::new()
549550
.with_cpu_request("2000m")
550551
.with_cpu_limit("3000m")

crates/stackable-operator/src/builder/pod/mod.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ mod tests {
646646
}
647647

648648
#[rstest]
649-
fn test_pod_builder_pod_name() {
649+
fn builder_pod_name() {
650650
let pod = PodBuilder::new()
651651
.metadata_builder(|builder| builder.name("foo"))
652652
.build()
@@ -656,7 +656,7 @@ mod tests {
656656
}
657657

658658
#[rstest]
659-
fn test_pod_builder(pod_affinity: PodAffinity, dummy_container: Container) {
659+
fn builder(pod_affinity: PodAffinity, dummy_container: Container) {
660660
let init_container = ContainerBuilder::new("init-containername")
661661
.expect("ContainerBuilder not created")
662662
.image("stackable/zookeeper:2.4.14")
@@ -707,7 +707,7 @@ mod tests {
707707
}
708708

709709
#[rstest]
710-
fn test_pod_builder_image_pull_secrets(mut pod_builder_with_name_and_container: PodBuilder) {
710+
fn builder_image_pull_secrets(mut pod_builder_with_name_and_container: PodBuilder) {
711711
let pod = pod_builder_with_name_and_container
712712
.image_pull_secrets(vec!["company-registry-secret".to_string()].into_iter())
713713
.build()
@@ -722,7 +722,7 @@ mod tests {
722722
}
723723

724724
#[rstest]
725-
fn test_pod_builder_restart_policy(mut pod_builder_with_name_and_container: PodBuilder) {
725+
fn builder_restart_policy(mut pod_builder_with_name_and_container: PodBuilder) {
726726
let pod = pod_builder_with_name_and_container
727727
.restart_policy("Always")
728728
.build()
@@ -731,7 +731,7 @@ mod tests {
731731
}
732732

733733
#[test]
734-
fn test_pod_builder_too_long_termination_grace_period() {
734+
fn builder_too_long_termination_grace_period() {
735735
let too_long_duration = Duration::from_secs(i64::MAX as u64 + 1);
736736
let mut pod_builder = PodBuilder::new();
737737

crates/stackable-operator/src/builder/pod/resources.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,11 @@ impl ResourceRequirementsBuilder<Quantity, Quantity, Quantity, Quantity> {
252252
}
253253

254254
#[cfg(test)]
255-
mod test {
255+
mod tests {
256256
use super::*;
257257

258258
#[test]
259-
fn test_builder() {
259+
fn builder() {
260260
let resources = ResourceRequirements {
261261
limits: Some(
262262
[

crates/stackable-operator/src/builder/pod/security.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ mod tests {
339339
use k8s_openapi::api::core::v1::{PodSecurityContext, SELinuxOptions, SeccompProfile, Sysctl};
340340

341341
#[test]
342-
fn test_security_context_builder() {
342+
fn security_context_builder() {
343343
let mut builder = PodSecurityContextBuilder::new();
344344
let context = builder
345345
.fs_group(1000)

crates/stackable-operator/src/builder/pod/volume.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ mod tests {
558558
use std::collections::BTreeMap;
559559

560560
#[test]
561-
fn test_volume_builder() {
561+
fn builder() {
562562
let mut volume_builder = VolumeBuilder::new("name");
563563
volume_builder.with_config_map("configmap");
564564
let vol = volume_builder.build();
@@ -595,7 +595,7 @@ mod tests {
595595
}
596596

597597
#[test]
598-
fn test_volume_mount_builder() {
598+
fn mount_builder() {
599599
let mut volume_mount_builder = VolumeMountBuilder::new("name", "mount_path");
600600
volume_mount_builder
601601
.mount_propagation("mount_propagation")
@@ -614,7 +614,7 @@ mod tests {
614614
}
615615

616616
#[test]
617-
fn test_listener_operator_volume_source_builder() {
617+
fn listener_operator_volume_source_builder() {
618618
let labels: Labels = Labels::try_from(BTreeMap::<String, String>::new()).unwrap();
619619

620620
let builder = ListenerOperatorVolumeSourceBuilder::new(

crates/stackable-operator/src/cli.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ mod tests {
303303
DEPLOY_FILE_PATH
304304
)]
305305
#[case(None, vec!["bad", DEFAULT_FILE_PATH], DEFAULT_FILE_PATH, DEFAULT_FILE_PATH)]
306-
fn test_resolve_path_good(
306+
fn resolve_path_good(
307307
#[case] user_provided_path: Option<&str>,
308308
#[case] default_locations: Vec<&str>,
309309
#[case] path_to_create: &str,
@@ -343,12 +343,12 @@ mod tests {
343343

344344
#[test]
345345
#[should_panic]
346-
fn test_resolve_path_user_path_not_existing() {
346+
fn resolve_path_user_path_not_existing() {
347347
resolve_path(Some(USER_PROVIDED_PATH.as_ref()), &[DEPLOY_FILE_PATH]).unwrap();
348348
}
349349

350350
#[test]
351-
fn test_resolve_path_nothing_found_errors() {
351+
fn resolve_path_nothing_found_errors() {
352352
if let Err(Error::RequiredFileMissing { search_path }) =
353353
resolve_path(None, &[DEPLOY_FILE_PATH, DEFAULT_FILE_PATH])
354354
{
@@ -365,7 +365,7 @@ mod tests {
365365
}
366366

367367
#[test]
368-
fn test_product_operator_run_watch_namespace() {
368+
fn product_operator_run_watch_namespace() {
369369
// clean env var to not interfere if already set
370370
env::remove_var(WATCH_NAMESPACE);
371371

crates/stackable-operator/src/commons/affinity.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ mod tests {
143143
use super::*;
144144

145145
#[test]
146-
fn test_affinity_merge_new_attributes() {
146+
fn merge_new_attributes() {
147147
let default_affinity = StackableAffinityFragment {
148148
pod_affinity: None,
149149
pod_anti_affinity: Some(PodAntiAffinity {
@@ -254,7 +254,7 @@ mod tests {
254254
}
255255

256256
#[test]
257-
fn test_affinity_merge_overwrite_existing_attribute() {
257+
fn merge_overwrite_existing_attribute() {
258258
let default_affinity = StackableAffinityFragment {
259259
pod_affinity: None,
260260
pod_anti_affinity: Some(PodAntiAffinity {
@@ -319,7 +319,7 @@ mod tests {
319319
}
320320

321321
#[test]
322-
fn test_affinity_between_role_pods() {
322+
fn between_role_pods() {
323323
let app_name = "kafka";
324324
let cluster_name = "simple-kafka";
325325
let role = "broker";
@@ -352,7 +352,7 @@ mod tests {
352352
}
353353

354354
#[test]
355-
fn test_affinity_between_cluster_pods() {
355+
fn between_cluster_pods() {
356356
let app_name = "kafka";
357357
let cluster_name = "simple-kafka";
358358

crates/stackable-operator/src/commons/authentication/ldap.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,11 @@ impl Default for FieldNames {
213213
}
214214

215215
#[cfg(test)]
216-
mod test {
216+
mod tests {
217217
use super::*;
218218

219219
#[test]
220-
fn test_ldap_minimal() {
220+
fn minimal() {
221221
let ldap = serde_yaml::from_str::<AuthenticationProvider>(
222222
"
223223
hostname: my.ldap.server
@@ -231,7 +231,7 @@ mod test {
231231
}
232232

233233
#[test]
234-
fn test_ldap_with_bind_credentials() {
234+
fn with_bind_credentials() {
235235
let _ldap = serde_yaml::from_str::<AuthenticationProvider>(
236236
"
237237
hostname: my.ldap.server
@@ -245,7 +245,7 @@ mod test {
245245
}
246246

247247
#[test]
248-
fn test_ldap_full() {
248+
fn full() {
249249
let input = r#"
250250
hostname: my.ldap.server
251251
port: 42
@@ -272,6 +272,7 @@ mod test {
272272
ldap.tls.tls_ca_cert_mount_path(),
273273
Some("/stackable/secrets/ldap-ca-cert/ca.crt".to_string())
274274
);
275+
275276
let (tls_volumes, tls_mounts) = ldap.tls.volumes_and_mounts().unwrap();
276277
assert_eq!(
277278
tls_volumes,
@@ -299,6 +300,7 @@ mod test {
299300
"/stackable/secrets/openldap-bind-credentials/password".to_string()
300301
))
301302
);
303+
302304
let (ldap_volumes, ldap_mounts) = ldap.volumes_and_mounts().unwrap();
303305
assert_eq!(
304306
ldap_volumes,

0 commit comments

Comments
 (0)