Add tests

Author: rmn-boiko

src/adapter/http/tests/tests/test_routing.rs

@@ -209,6 +209,32 @@ async fn test_routing_dataset_name() {
     await_client_server_flow!(server, client);
 }
 
+#[test_log::test(tokio::test)]
+async fn test_routing_dataset_name_case_insensetive() {
+    let repo = setup_repo().await;
+
+    let server = setup_server(
+        repo.catalog,
+        "/:dataset_name",
+        |Path(p): Path<DatasetByName>| DatasetAlias::new(None, p.dataset_name).into_local_ref(),
+    );
+
+    let dataset_url = url::Url::parse(&format!(
+        "http://{}/{}/",
+        server.local_addr(),
+        repo.created_dataset
+            .dataset_handle
+            .alias
+            .dataset_name
+            .to_ascii_uppercase()
+    ))
+    .unwrap();
+
+    let client = setup_client(dataset_url, repo.created_dataset.head);
+
+    await_client_server_flow!(server, client);
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////
 
 #[allow(dead_code)]

src/app/cli/src/services/accounts/account_service.rs

@@ -120,11 +120,9 @@ impl AccountService {
         RelatedAccountIndication::new(target_account)
     }
 
-    fn find_account_info_impl(&self, account_name: &String) -> Option<AccountInfo> {
+    fn find_account_info_impl(&self, account_name: &AccountName) -> Option<AccountInfo> {
         // The account might be predefined in the configuration
-        self.predefined_accounts
-            .get(&account_name.to_ascii_lowercase())
-            .cloned()
+        self.predefined_accounts.get(account_name.as_str()).cloned()
     }
 
     fn get_account_info_impl(
@@ -231,7 +229,7 @@ impl auth::AuthenticationProvider for AccountService {
         &'a self,
         account_name: &'a AccountName,
     ) -> Result<Option<AccountInfo>, InternalError> {
-        Ok(self.find_account_info_impl(&account_name.into()))
+        Ok(self.find_account_info_impl(account_name))
     }
 }
 

src/domain/opendatafabric/src/identity/dataset_identity.rs

@@ -112,7 +112,7 @@ use like::ILike;
 
 macro_rules! newtype_istr {
     ($typ:ident, $parse:expr, $visitor:ident) => {
-        #[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Ord, Hash)]
+        #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
         pub struct $typ(Arc<str>);
 
         impl $typ {
@@ -132,7 +132,7 @@ macro_rules! newtype_istr {
                 Self(s)
             }
 
-            pub fn into_lowercase<'a>(s: &'a str) -> Cow<'a, str> {
+            pub fn into_lowercase(s: &str) -> Cow<'_, str> {
                 let bytes = s.as_bytes();
                 if !bytes.iter().any(u8::is_ascii_uppercase) {
                     Cow::Borrowed(s)
@@ -268,20 +268,10 @@ impl DatasetAliasPattern {
     }
 
     pub fn matches(&self, dataset_handle: &DatasetHandle) -> bool {
-        if self.account_name.is_some() && dataset_handle.alias.account_name.is_none()
-            || self.account_name.is_none() && dataset_handle.alias.account_name.is_some()
-        {
-            return false;
-        }
-        if self.account_name.as_ref().unwrap()
-            == dataset_handle.alias.account_name.as_ref().unwrap()
+        self.account_name == dataset_handle.alias.account_name
             && self
                 .dataset_name_pattern
                 .matches(&dataset_handle.alias.dataset_name)
-        {
-            return true;
-        }
-        false
     }
 }
 
@@ -332,7 +322,7 @@ newtype_istr!(RepoName, Grammar::match_repo_name, RepoNameSerdeVisitor);
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct DatasetAlias {
     pub account_name: Option<AccountName>,
     pub dataset_name: DatasetName,
@@ -409,7 +399,7 @@ impl_serde!(DatasetAlias, DatasetAliasSerdeVisitor);
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct DatasetAliasRemote {
     pub repo_name: RepoName,
     pub account_name: Option<AccountName>,

src/domain/opendatafabric/tests/tests/test_dataset_identity.rs

@@ -276,7 +276,7 @@ fn test_dataset_remote_alias_eq() {
         DatasetAliasRemote::from_str("repository/account/net.example.com").unwrap(),
         DatasetAliasRemote::from_str("repository/AccOuNt/net.ExaMplE.coM").unwrap(),
     );
-    assert_ne!(
+    assert_eq!(
         DatasetAliasRemote::from_str("repository/net.example.com").unwrap(),
         DatasetAliasRemote::from_str("rEpoSitOry/net.ExaMplE.coM").unwrap(),
     );

src/domain/opendatafabric/tests/tests/test_dataset_refs.rs

@@ -169,6 +169,18 @@ fn test_dataset_ref_pattern_match() {
         },
     };
     assert!(pattern.matches(&dataset_handle));
+
+    let expression = "nEt.eXample%";
+    let dataset_name = "net.example.com";
+    let pattern = DatasetRefPattern::from_str(expression).unwrap();
+    let dataset_handle = DatasetHandle {
+        id: default_dataset_id.clone(),
+        alias: DatasetAlias {
+            account_name: None,
+            dataset_name: DatasetName::from_str(dataset_name).unwrap(),
+        },
+    };
+    assert!(pattern.matches(&dataset_handle));
 }
 
 #[test]

src/infra/core/tests/tests/repos/test_dataset_repository_s3.rs

@@ -311,3 +311,19 @@ async fn test_create_and_get_case_insensetive_dataset() {
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
+
+#[test_group::group(containerized)]
+#[tokio::test]
+async fn test_create_and_get_case_insensetive_dataset_multi_tenant() {
+    let s3 = LocalS3Server::new().await;
+    let harness =
+        S3RepoHarness::create(&s3, auth::AlwaysHappyDatasetActionAuthorizer::new(), true).await;
+
+    test_dataset_repository_shared::test_create_and_get_case_insensetive_dataset(
+        harness.dataset_repo.as_ref(),
+        Some(AccountName::new_unchecked(auth::DEFAULT_ACCOUNT_NAME)),
+    )
+    .await;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////

src/infra/core/tests/tests/repos/test_dataset_repository_shared.rs

@@ -87,13 +87,9 @@ pub async fn test_create_and_get_case_insensetive_dataset(
 
     assert_eq!(create_result.dataset_handle.alias, dataset_alias_to_create);
 
-    let account_name_uppercase = if account_name.is_some() {
-        Some(AccountName::new_unchecked(
-            &account_name.unwrap().to_ascii_uppercase(),
-        ))
-    } else {
-        None
-    };
+    let account_name_uppercase = account_name.map(|account_name_value| {
+        AccountName::new_unchecked(&account_name_value.to_ascii_uppercase())
+    });
 
     let dataset_alias_in_another_registry =
         DatasetAlias::new(account_name_uppercase, DatasetName::new_unchecked("foO"));