From b509ca724f2ce1766225fa1303c4e26f1faa0c1e Mon Sep 17 00:00:00 2001 From: dervoeti Date: Fri, 10 Jan 2025 13:11:04 +0100 Subject: [PATCH] chore: adjust tests --- .../src/commons/authentication/oidc.rs | 24 +++++++++---------- .../src/commons/networking.rs | 16 +++++++------ .../src/commons/s3/helpers.rs | 6 ++--- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/crates/stackable-operator/src/commons/authentication/oidc.rs b/crates/stackable-operator/src/commons/authentication/oidc.rs index ed19eebdb..45804cb7b 100644 --- a/crates/stackable-operator/src/commons/authentication/oidc.rs +++ b/crates/stackable-operator/src/commons/authentication/oidc.rs @@ -323,7 +323,7 @@ mod test { assert_eq!( oidc.endpoint_url().unwrap().as_str(), - "http://my.keycloak.server:12345/my-root-path" + "http://my.keycloak.server.:12345/my-root-path" ); } @@ -345,7 +345,7 @@ mod test { assert_eq!( oidc.endpoint_url().unwrap().as_str(), - "https://my.keycloak.server/" + "https://my.keycloak.server./" ); } @@ -369,13 +369,13 @@ mod test { } #[rstest] - #[case("/", "http://my.keycloak.server:1234/")] - #[case("/realms/sdp", "http://my.keycloak.server:1234/realms/sdp")] - #[case("/realms/sdp/", "http://my.keycloak.server:1234/realms/sdp")] - #[case("/realms/sdp//////", "http://my.keycloak.server:1234/realms/sdp")] + #[case("/", "http://my.keycloak.server.:1234/")] + #[case("/realms/sdp", "http://my.keycloak.server.:1234/realms/sdp")] + #[case("/realms/sdp/", "http://my.keycloak.server.:1234/realms/sdp")] + #[case("/realms/sdp//////", "http://my.keycloak.server.:1234/realms/sdp")] #[case( "/realms/my/realm/with/slashes//////", - "http://my.keycloak.server:1234/realms/my/realm/with/slashes" + "http://my.keycloak.server.:1234/realms/my/realm/with/slashes" )] fn root_path_endpoint_url(#[case] root_path: String, #[case] expected_endpoint_url: &str) { let oidc = serde_yaml::from_str::(&format!( @@ -393,22 +393,22 @@ mod test { } #[rstest] - #[case("/", "https://my.keycloak.server/.well-known/openid-configuration")] + #[case("/", "https://my.keycloak.server./.well-known/openid-configuration")] #[case( "/realms/sdp", - "https://my.keycloak.server/realms/sdp/.well-known/openid-configuration" + "https://my.keycloak.server./realms/sdp/.well-known/openid-configuration" )] #[case( "/realms/sdp/", - "https://my.keycloak.server/realms/sdp/.well-known/openid-configuration" + "https://my.keycloak.server./realms/sdp/.well-known/openid-configuration" )] #[case( "/realms/sdp//////", - "https://my.keycloak.server/realms/sdp/.well-known/openid-configuration" + "https://my.keycloak.server./realms/sdp/.well-known/openid-configuration" )] #[case( "/realms/my/realm/with/slashes//////", - "https://my.keycloak.server/realms/my/realm/with/slashes/.well-known/openid-configuration" + "https://my.keycloak.server./realms/my/realm/with/slashes/.well-known/openid-configuration" )] fn root_path_well_known_url(#[case] root_path: String, #[case] expected_well_known_url: &str) { let oidc = serde_yaml::from_str::(&format!( diff --git a/crates/stackable-operator/src/commons/networking.rs b/crates/stackable-operator/src/commons/networking.rs index d1d552bcd..95a20c6a6 100644 --- a/crates/stackable-operator/src/commons/networking.rs +++ b/crates/stackable-operator/src/commons/networking.rs @@ -185,17 +185,19 @@ mod tests { use rstest::rstest; #[rstest] - #[case("foo")] - #[case("foo.bar")] - fn test_domain_name_and_host_name_parsing_success(#[case] domain_name: String) { + #[case("foo", "foo.")] + #[case("foo.", "foo.")] + #[case("foo.bar", "foo.bar.")] + #[case("foo.bar.", "foo.bar.")] + fn test_domain_name_and_host_name_parsing_success(#[case] domain_name: String, #[case] expected_domain_name: &str) { let parsed_domain_name: DomainName = domain_name.parse().expect("domain name can not be parsed"); // Every domain name is also a valid host name let parsed_host_name: HostName = domain_name.parse().expect("host name can not be parsed"); // Also test the round-trip - assert_eq!(parsed_domain_name.to_string(), domain_name); - assert_eq!(parsed_host_name.to_string(), domain_name); + assert_eq!(parsed_domain_name.to_string(), expected_domain_name); + assert_eq!(parsed_host_name.to_string(), expected_domain_name); } #[rstest] @@ -209,8 +211,8 @@ mod tests { } #[rstest] - #[case("foo", "foo")] - #[case("foo.bar", "foo.bar")] + #[case("foo.", "foo.")] + #[case("foo.bar.", "foo.bar.")] #[case("1.2.3.4", "1.2.3.4")] #[case("fe80::1", "[fe80::1]")] fn test_host_name_parsing_success(#[case] host: &str, #[case] expected_url_host: &str) { diff --git a/crates/stackable-operator/src/commons/s3/helpers.rs b/crates/stackable-operator/src/commons/s3/helpers.rs index c43068734..e3debfa32 100644 --- a/crates/stackable-operator/src/commons/s3/helpers.rs +++ b/crates/stackable-operator/src/commons/s3/helpers.rs @@ -204,7 +204,7 @@ mod tests { }; let (volumes, mounts) = s3.volumes_and_mounts().unwrap(); - assert_eq!(s3.endpoint().unwrap(), Url::parse("http://minio").unwrap()); + assert_eq!(s3.endpoint().unwrap(), Url::parse("http://minio.").unwrap()); assert_eq!(volumes, vec![]); assert_eq!(mounts, vec![]); } @@ -231,7 +231,7 @@ mod tests { assert_eq!( s3.endpoint().unwrap(), - Url::parse("https://s3-eu-central-2.ionoscloud.com").unwrap() + Url::parse("https://s3-eu-central-2.ionoscloud.com.").unwrap() ); assert_eq!(volumes.len(), 1); let volume = volumes.remove(0); @@ -283,7 +283,7 @@ mod tests { assert_eq!( s3.endpoint().unwrap(), - Url::parse("https://minio:1234").unwrap() + Url::parse("https://minio.:1234").unwrap() ); assert_eq!(volumes, vec![]); assert_eq!(mounts, vec![]);