5

Hotel_Course_Project/AdminPage.xaml.cs

@@ -10,7 +10,8 @@ namespace Hotel_Course_Project
     /// </summary>
     public partial class AdminPage : Page
     {
-        public List<Staff> staffSearchedlist;        
+        public List<Staff> staffSearchedlist;
+        public List<Client> clientSearchedList;
         public AdminPage(Staff admin)
         {
             InitializeComponent();
@@ -149,16 +150,23 @@ namespace Hotel_Course_Project
 
         private void ClientSrchBtn_Click(object sender, RoutedEventArgs e)
         {
-            var seacrhed = DataBase.db.Client.Where(item => (item.LName + " " + item.FName + " " + item.MName).Contains(ClientSeacrhTB.Text)).ToList();
+            string searchText = ClientSeacrhTB.Text;
+            //var seacrhed = DataBase.db.Client.Where(item => (item.LName + " " + item.FName + " " + item.MName).Contains(ClientSeacrhTB.Text)).ToList();
+            var searched = SearchClient(DataBase.db.Client.ToList(), searchText, clientSearchedList);
             if (SortClientCB.SelectedItem == activeC)
             {
-                ClientList.ItemsSource = seacrhed.Where(item => item.Id_PersStatus == 1).ToList();
+                ClientList.ItemsSource = searched.Where(item => item.Id_PersStatus == 1).ToList();
             }
             else
             {
-                ClientList.ItemsSource = seacrhed.Where(item => item.Id_PersStatus == 2).ToList();
+                ClientList.ItemsSource = searched.Where(item => item.Id_PersStatus == 2).ToList();
             }
         }
+        public List<Client> SearchClient(List<Client> listClient, string searchText, List<Client> clientSearchedList)
+        {
+            clientSearchedList = listClient.Where(item => (item.LName + " " + item.FName + " " + item.MName).Contains(searchText)).ToList();
+            return clientSearchedList;
+        }
 
         private void PaySrchBtn_Click(object sender, RoutedEventArgs e)
         {

UnitTestCourseProject/UnitTest.cs

@@ -75,6 +75,18 @@ namespace UnitTestCourseProject
             Fname = "Пётр";
             Mname = "";
             Assert.IsTrue(clientChangeOrAdd.TestAddClient(Lname, Fname, Mname));
+            Lname = "Фёдоров";
+            Fname = "Пётр";
+            Mname = "Иванович";
+            Assert.IsTrue(clientChangeOrAdd.TestAddClient(Lname, Fname, Mname));
+            Lname = "Петров";
+            Fname = "";
+            Mname = "Петрович";
+            Assert.IsFalse(clientChangeOrAdd.TestAddClient(Lname, Fname, Mname));
+            Lname = "";
+            Fname = "Пётр";
+            Mname = "Петрович";
+            Assert.IsFalse(clientChangeOrAdd.TestAddClient(Lname, Fname, Mname));
         }
 
         [TestMethod]
@@ -141,6 +153,62 @@ namespace UnitTestCourseProject
             searchText = "45";
             List<Staff> scrh = new List<Staff>();
             CollectionAssert.AreEqual(adminPage.SearchStaff(staffList, searchText, scrh), searchedStaffList);
+            searchedStaffList = new List<Staff>();
+            searchedStaffList.Add(staff4);
+            searchText = "Давид";
+            CollectionAssert.AreEqual(adminPage.SearchStaff(staffList, searchText, scrh), searchedStaffList);
+        }
+        [TestMethod]
+        public void TestSearchClient()
+        {
+            AdminPage adminPage = new AdminPage(null);
+            List<Client> clientList = new List<Client>();
+            List<Client> searchedClientList = new List<Client>();
+            string searchText;
+
+            //создаётся базовый лист клиентов из которого будет происходить поиск
+            Client Client1 = new Client()
+            {
+                Id = 1,
+                LName = "Иванов",
+                FName = "Иван",
+                MName = "Иванович"
+            };
+            Client Client2 = new Client()
+            {
+                Id = 2,
+                LName = "Петров",
+                FName = "Пётр",
+                MName = "Петрович"
+            };
+            Client Client3 = new Client()
+            {
+                Id = 3,
+                LName = "Фёдоров",
+                FName = "Фёдор",
+                MName = "Фёдорович"
+            };
+            Client Client4 = new Client()
+            {
+                Id = 4,
+                LName = "Давидов",
+                FName = "Давид",
+                MName = "Давидович"
+            };
+            clientList.Add(Client1);
+            clientList.Add(Client2);
+            clientList.Add(Client3);
+            clientList.Add(Client4);
+
+            //заполняем итоговый лист с тем, что должно найтись после поиска
+            searchText = "45";
+            List<Client> scrh = new List<Client>();
+            CollectionAssert.AreEqual(adminPage.SearchClient(clientList, searchText, scrh), searchedClientList);
+            searchedClientList = new List<Client>();
+            searchedClientList.Add(Client3);
+            searchText = "Фёдор";
+            CollectionAssert.AreEqual(adminPage.SearchClient(clientList, searchText, scrh), searchedClientList);
+
         }
     }
 }