test: Use yaml_from_str_singleton_map helper instead of defining own

Author: sbernauer

rust/operator-binary/src/crd/mod.rs

@@ -1733,17 +1733,6 @@ mod tests {
 
     use crate::crd::v1alpha1;
 
-    pub fn deserialize_yaml_str<'a, T: serde::de::Deserialize<'a>>(value: &'a str) -> T {
-        let deserializer = serde_yaml::Deserializer::from_str(value);
-        serde_yaml::with::singleton_map_recursive::deserialize(deserializer).unwrap()
-    }
-
-    pub fn deserialize_yaml_file<'a, T: serde::de::Deserialize<'a>>(path: &'a str) -> T {
-        let file = std::fs::File::open(path).unwrap();
-        let deserializer = serde_yaml::Deserializer::from_reader(file);
-        serde_yaml::with::singleton_map_recursive::deserialize(deserializer).unwrap()
-    }
-
     impl RoundtripTestData for v1alpha1::DruidClusterSpec {
         fn roundtrip_test_data() -> Vec<Self> {
             vec![]

rust/operator-binary/src/crd/resource.rs

@@ -252,13 +252,13 @@ mod test {
         },
         k8s_openapi::apimachinery::pkg::api::resource::Quantity,
         role_utils::{CommonConfiguration, RoleGroup},
+        utils::yaml_from_str_singleton_map,
     };
 
     use super::*;
     use crate::crd::{
         MiddleManagerConfig,
         storage::{HistoricalStorage, default_free_percentage_empty_dir},
-        tests::deserialize_yaml_file,
         v1alpha1,
     };
 
@@ -406,9 +406,10 @@ mod test {
 
     #[test]
     fn test_resources() -> Result<(), Error> {
-        let cluster = deserialize_yaml_file::<v1alpha1::DruidCluster>(
-            "test/resources/crd/resource_merge/druid_cluster.yaml",
-        );
+        let cluster: v1alpha1::DruidCluster = yaml_from_str_singleton_map(include_str!(
+            "../../test/resources/crd/resource_merge/druid_cluster.yaml"
+        ))
+        .expect("failed to parse YAML");
 
         let config = cluster.merged_config().unwrap();
         if let Some(RoleGroup {
@@ -482,9 +483,10 @@ mod test {
 
     #[test]
     fn test_segment_cache() -> Result<(), Error> {
-        let cluster = deserialize_yaml_file::<v1alpha1::DruidCluster>(
-            "test/resources/crd/resource_merge/segment_cache.yaml",
-        );
+        let cluster: v1alpha1::DruidCluster = yaml_from_str_singleton_map(include_str!(
+            "../../test/resources/crd/resource_merge/segment_cache.yaml"
+        ))
+        .expect("failed to parse YAML");
 
         // ---------- default role group
         let config = cluster.merged_config().unwrap();

rust/operator-binary/src/crd/tls.rs

@@ -32,8 +32,9 @@ pub fn tls_default() -> Option<String> {
 #[cfg(test)]
 mod tests {
     use indoc::formatdoc;
+    use stackable_operator::utils::yaml_from_str_singleton_map;
 
-    use crate::crd::{tests::deserialize_yaml_str, tls::DruidTls, v1alpha1::DruidClusterConfig};
+    use crate::crd::{tls::DruidTls, v1alpha1::DruidClusterConfig};
 
     const BASE_DRUID_CONFIGURATION: &str = r#"
 deepStorage:
@@ -50,8 +51,8 @@ zookeeperConfigMapName: zk-config-map
 
     #[test]
     fn test_tls_default() {
-        let druid_cluster_config =
-            deserialize_yaml_str::<DruidClusterConfig>(BASE_DRUID_CONFIGURATION);
+        let druid_cluster_config: DruidClusterConfig =
+            yaml_from_str_singleton_map(BASE_DRUID_CONFIGURATION).expect("failed to parse YAML");
 
         assert_eq!(
             druid_cluster_config.tls,
@@ -69,8 +70,8 @@ zookeeperConfigMapName: zk-config-map
         tls:
           serverAndInternalSecretClass: druid-secret-class
         "};
-        dbg!(&input);
-        let druid_cluster_config = deserialize_yaml_str::<DruidClusterConfig>(&input);
+        let druid_cluster_config: DruidClusterConfig =
+            yaml_from_str_singleton_map(&input).expect("failed to parse YAML");
 
         assert_eq!(
             druid_cluster_config.tls,
@@ -87,8 +88,8 @@ zookeeperConfigMapName: zk-config-map
         {BASE_DRUID_CONFIGURATION}
         tls: null
         "};
-        dbg!(&input);
-        let druid_cluster_config = deserialize_yaml_str::<DruidClusterConfig>(&input);
+        let druid_cluster_config: DruidClusterConfig =
+            yaml_from_str_singleton_map(&input).expect("failed to parse YAML");
 
         assert_eq!(druid_cluster_config.tls, None,);
         assert_eq!(druid_cluster_config.authentication, vec![]);
@@ -101,8 +102,8 @@ zookeeperConfigMapName: zk-config-map
         tls:
           serverAndInternalSecretClass: null
         "};
-        dbg!(&input);
-        let druid_cluster_config = deserialize_yaml_str::<DruidClusterConfig>(&input);
+        let druid_cluster_config: DruidClusterConfig =
+            yaml_from_str_singleton_map(&input).expect("failed to parse YAML");
 
         assert_eq!(
             druid_cluster_config.tls,
@@ -122,8 +123,8 @@ zookeeperConfigMapName: zk-config-map
         authentication:
           - authenticationClass: druid-user-authentication-class
         "};
-        dbg!(&input);
-        let druid_cluster_config = deserialize_yaml_str::<DruidClusterConfig>(&input);
+        let druid_cluster_config: DruidClusterConfig =
+            yaml_from_str_singleton_map(&input).expect("failed to parse YAML");
 
         assert_eq!(
             druid_cluster_config.tls,