move tests

server/src/infra/ldap_handler.rs

@@ -1217,6 +1217,7 @@ mod tests {
             .with(eq(Some(GroupRequestFilter::And(vec![
                 GroupRequestFilter::DisplayName("group_1".to_string()),
                 GroupRequestFilter::Member(UserId::new("bob")),
+                GroupRequestFilter::DisplayName("rockstars".to_string()),
                 GroupRequestFilter::And(vec![]),
                 GroupRequestFilter::And(vec![]),
                 GroupRequestFilter::And(vec![]),
@@ -1245,6 +1246,10 @@ mod tests {
                     "uniqueMember".to_string(),
                     "uid=bob,ou=peopLe,Dc=eXample,dc=com".to_string(),
                 ),
+                LdapFilter::Equality(
+                    "dn".to_string(),
+                    "uid=rockstars,ou=groups,dc=example,dc=com".to_string(),
+                ),
                 LdapFilter::Equality("obJEctclass".to_string(), "groupofUniqueNames".to_string()),
                 LdapFilter::Equality("objectclass".to_string(), "groupOfNames".to_string()),
                 LdapFilter::Present("objectclass".to_string()),
@@ -1403,6 +1408,7 @@ mod tests {
                         UserRequestFilter::Not(Box::new(UserRequestFilter::UserId(UserId::new(
                             "bob",
                         )))),
+                        UserRequestFilter::UserId("bob_1".to_string().into()),
                         UserRequestFilter::And(vec![]),
                         UserRequestFilter::Not(Box::new(UserRequestFilter::And(vec![]))),
                         UserRequestFilter::And(vec![]),
@@ -1422,6 +1428,10 @@ mod tests {
                     "uid".to_string(),
                     "bob".to_string(),
                 ))),
+                LdapFilter::Equality(
+                    "dn".to_string(),
+                    "uid=bob_1,ou=people,dc=example,dc=com".to_string(),
+                ),
                 LdapFilter::Equality("objectclass".to_string(), "persOn".to_string()),
                 LdapFilter::Equality("objectclass".to_string(), "other".to_string()),
                 LdapFilter::Present("objectClass".to_string()),
@@ -1535,94 +1545,6 @@ mod tests {
         );
     }
 
-    #[tokio::test]
-    async fn test_search_filter_dn_user() {
-        let mut mock = MockTestBackendHandler::new();
-        mock.expect_list_users()
-            .with(
-                eq(Some(UserRequestFilter::UserId("bob_1".to_string().into()))),
-                eq(false),
-            )
-            .times(1)
-            .return_once(|_, _| {
-                Ok(vec![UserAndGroups {
-                    user: User {
-                        user_id: UserId::new("bob_1"),
-                        ..Default::default()
-                    },
-                    groups: None,
-                }])
-            });
-        let mut ldap_handler = setup_bound_admin_handler(mock).await;
-        let request = make_user_search_request(
-            LdapFilter::Equality(
-                "dn".to_string(),
-                "uid=bob_1,ou=people,dc=example,dc=com".to_string(),
-            ),
-            vec!["objectclass"],
-        );
-        assert_eq!(
-            ldap_handler.do_search_or_dse(&request).await,
-            Ok(vec![
-                LdapOp::SearchResultEntry(LdapSearchResultEntry {
-                    dn: "uid=bob_1,ou=people,dc=example,dc=com".to_string(),
-                    attributes: vec![LdapPartialAttribute {
-                        atype: "objectclass".to_string(),
-                        vals: vec![
-                            b"inetOrgPerson".to_vec(),
-                            b"posixAccount".to_vec(),
-                            b"mailAccount".to_vec(),
-                            b"person".to_vec()
-                        ]
-                    },]
-                }),
-                make_search_success()
-            ])
-        );
-    }
-
-    #[tokio::test]
-    async fn test_search_filter_dn_group() {
-        let mut mock = MockTestBackendHandler::new();
-        mock.expect_list_groups()
-            .with(eq(Some(GroupRequestFilter::DisplayName(
-                "rockstars".to_string().into(),
-            ))))
-            .times(1)
-            .return_once(|_| {
-                let epoch = chrono::Utc.timestamp_opt(0, 0).unwrap();
-                Ok(vec![Group {
-                    id: GroupId(0),
-                    display_name: "rockstars".to_string(),
-                    creation_date: epoch,
-                    uuid: Uuid::from_name_and_date("", &epoch),
-                    users: vec![],
-                }])
-            });
-        let mut ldap_handler = setup_bound_admin_handler(mock).await;
-        let request = make_search_request(
-            "ou=groups,Dc=example,dc=com",
-            LdapFilter::Equality(
-                "dn".to_string(),
-                "uid=rockstars,ou=groups,dc=example,dc=com".to_string(),
-            ),
-            vec!["objectclass"],
-        );
-        assert_eq!(
-            ldap_handler.do_search_or_dse(&request).await,
-            Ok(vec![
-                LdapOp::SearchResultEntry(LdapSearchResultEntry {
-                    dn: "cn=rockstars,ou=groups,dc=example,dc=com".to_string(),
-                    attributes: vec![LdapPartialAttribute {
-                        atype: "objectclass".to_string(),
-                        vals: vec![b"groupOfUniqueNames".to_vec(),]
-                    },]
-                }),
-                make_search_success()
-            ])
-        );
-    }
-
     #[tokio::test]
     async fn test_search_both() {
         let mut mock = MockTestBackendHandler::new();