Prechádzať zdrojové kódy

Сделаны три теста

Oleg Kireev 3 rokov pred
rodič
commit
a64f350722

+ 1 - 1
Hotel_Course_Project/ClientChangeOrAddPage.xaml

@@ -6,7 +6,7 @@
       xmlns:local="clr-namespace:Hotel_Course_Project"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="ClientChangeOrAddPage">
+      Title="ClientChangeOrAddPage" Loaded="Page_Loaded">
 
     <Grid>
 

+ 55 - 18
Hotel_Course_Project/ClientChangeOrAddPage.xaml.cs

@@ -14,6 +14,7 @@ namespace Hotel_Course_Project
     public partial class ClientChangeOrAddPage : Page
     {
         public Client _client;
+        public Client addClient;
         public int idClient;
         public byte[] PassportImage;
         public string FilePath;
@@ -22,6 +23,7 @@ namespace Hotel_Course_Project
             InitializeComponent();
             DataContext = client;
             _client = client;
+            addClient = client;
             if (DataContext != null)
             {
 
@@ -43,12 +45,7 @@ namespace Hotel_Course_Project
                 ClientChangeOrAddBtn.Content = "Добавить клиента";
                 this.Title = "Окно добавления клиента";
                 ClientDeleteOrRestoreBtn.Visibility = Visibility.Collapsed;
-            }
-            if (client == null || client.Passport == null)
-            {
-                CPassportPhoto.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/PersDefaultPhoto.png"));
-            }
-
+            }            
         }
 
         private void ClientChangeOrAddBtn_Click(object sender, RoutedEventArgs e)
@@ -69,19 +66,31 @@ namespace Hotel_Course_Project
             else
             {
                 if (DataContext == null)
-                {
-                    Client client = new Client()
+                {                    
+                    if (TestAddClient(CLName.Text, CFName.Text, CMName.Text) == true)
                     {
-                        LName = CLName.Text,
-                        FName = CFName.Text,
-                        MName = CMName.Text,
-                        Passport = PassportImage,
-                        Id_PersStatus = 1
-                    };
-                    DataBase.db.Client.Add(client);
-                    var lastId = DataBase.db.Client.OrderByDescending(item => item.Id).FirstOrDefault().Id;
-                    DataBase.db.SaveChanges();
-                    MessageBox.Show("Клиент добавлен в базу.");
+                        DataBase.db.Client.Add(addClient);
+                        var lastId = DataBase.db.Client.OrderByDescending(item => item.Id).FirstOrDefault().Id;
+                        DataBase.db.Client.SingleOrDefault(item => item.Id == lastId).Passport = PassportImage;
+                        DataBase.db.SaveChanges();
+                        MessageBox.Show("Клиент добавлен в базу.");
+                    }
+                    else
+                    {
+                        MessageBox.Show("Ключевые поля не были заполнены!");
+                    }
+                    //Client client = new Client()
+                    //{
+                    //    LName = CLName.Text,
+                    //    FName = CFName.Text,
+                    //    MName = CMName.Text,
+                    //    Passport = PassportImage,
+                    //    Id_PersStatus = 1
+                    //};
+                    //DataBase.db.Client.Add(client);
+                    //var lastId = DataBase.db.Client.OrderByDescending(item => item.Id).FirstOrDefault().Id;
+                    //DataBase.db.SaveChanges();
+                    //MessageBox.Show("Клиент добавлен в базу.");
                 }
                 else
                 {
@@ -93,6 +102,26 @@ namespace Hotel_Course_Project
             }
         }
 
+        public bool TestAddClient(string LName, string FName, string MName)
+        {
+            if (LName == null || LName == "" || FName == null || FName == "")
+            {
+                return false;
+            }
+            else
+            {
+                Client client = new Client()
+                {
+                    LName = LName,
+                    FName = FName,
+                    MName = MName,
+                    Id_PersStatus = 1
+                };
+                addClient = client;
+                return true;
+            }
+        }
+
         private void ClientDeleteOrRestoreBtn_Click(object sender, RoutedEventArgs e)
         {
             if (_client.Id_PersStatus == 1)
@@ -125,5 +154,13 @@ namespace Hotel_Course_Project
                 FilePath = string.Empty;
             }
         }
+
+        private void Page_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (_client == null || _client.Passport == null)
+            {
+                CPassportPhoto.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/PersDefaultPhoto.png"));
+            }
+        }
     }
 }

+ 17 - 20
Hotel_Course_Project/StaffChangeOrAddPage.xaml.cs

@@ -52,16 +52,6 @@ namespace Hotel_Course_Project
 
         private void StaffChangeOrAddBtn_Click(object sender, RoutedEventArgs e)
         {
-
-            //if (DataContext == null)
-            //{
-            //    var existUser = DataBase.db.Staff.SingleOrDefault(item => item.Login == SLogin.Text);
-            //    if (existUser != null && DataContext == null)
-            //    {
-            //        MessageBox.Show("Такой логин уже имеется в базе данных!");
-            //        return;
-            //    }
-            //}
             if (DataContext == null)
             {
                 if (SStaffRole.Text == null || SStaffRole.Text == "")
@@ -78,6 +68,18 @@ namespace Hotel_Course_Project
                         var lastId = DataBase.db.Staff.OrderByDescending(item => item.Id).FirstOrDefault().Id;
                         DataBase.db.Staff.SingleOrDefault(item => item.Id == lastId).PhotoContract = contractImage;
                         DataBase.db.SaveChanges();
+                        MessageBox.Show("Сотрудник добавлен в базу.");
+                    }
+                    else
+                    {
+                        if (SLName.Text == null || SLName.Text == "" || SFName.Text == null || SFName.Text == "" || SMName.Text == null || SMName.Text == "" || SLogin.Text == null || SLogin.Text == "" || SPassword.Text == null || SPassword.Text == "")
+                        {
+                            MessageBox.Show("Ключевые поля не были заполнены!");
+                        }
+                        else
+                        {
+                            MessageBox.Show("Такой логин уже имеется в базе данных у другого сотрудника!");
+                        }
                     }
                 }
             }
@@ -106,9 +108,8 @@ namespace Hotel_Course_Project
 
         public bool TestAddStaff(string LName, string FName, string MName, string Login, string Password, int numRole)
         {
-            if (LName == null || LName == "" || FName == null || FName == "" || MName == null || MName == "" || Login == null || Login == "" || Password == null || Password == "") 
+            if (LName == null || LName == "" || FName == null || FName == "" || Login == null || Login == "" || Password == null || Password == "")
             {
-                MessageBox.Show("Ключевые поля не были заполнены!");
                 return false;
             }
             else
@@ -116,7 +117,6 @@ namespace Hotel_Course_Project
                 var existUserS = DataBase.db.Staff.SingleOrDefault(item => item.Login == Login);
                 if (existUserS != null)
                 {
-                    MessageBox.Show("Такой логин уже имеется в базе данных у другого сотрудника!");
                     return false;
                 }
                 else
@@ -132,9 +132,6 @@ namespace Hotel_Course_Project
                         Id_PersStatus = 1
                     };
                     addStaff = staff;
-                    
-
-                    MessageBox.Show("Сотрудник добавлен в базу.");
                     return true;
                 }
             }
@@ -164,10 +161,10 @@ namespace Hotel_Course_Project
                 FilePath = openFileDialog.FileName;
                 string uriString = $"{FilePath}";
                 BitmapImage bitimage = new BitmapImage(new Uri(@uriString));
-                if(TestReceiveImage(uriString) == true)
+                if (TestReceiveImage(uriString) == true)
                 {
-                SContractPhoto.Source = bitimage;
-                contractImage = SomeMethods.ConvertBitmapImageToByte(bitimage);
+                    SContractPhoto.Source = bitimage;
+                    contractImage = SomeMethods.ConvertBitmapImageToByte(bitimage);
                 }
                 else
                 {
@@ -179,7 +176,7 @@ namespace Hotel_Course_Project
                 FilePath = string.Empty;
             }
         }
-        public  bool TestReceiveImage(string uriString)
+        public bool TestReceiveImage(string uriString)
         {
             try
             {

+ 0 - 1
UnitTestCourseProject/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("UnitTestCourseProject")]

+ 13 - 42
UnitTestCourseProject/UnitTest.cs

@@ -1,8 +1,5 @@
 using Hotel_Course_Project;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Microsoft.Win32;
-using System;
-using System.Windows.Media.Imaging;
 
 namespace UnitTestCourseProject
 {
@@ -10,45 +7,6 @@ namespace UnitTestCourseProject
     public class UnitTest
     {
         [TestMethod]
-        public void TestReceiveImage()
-        {
-            //StaffChangeOrAddPage staffChangeOrAdd = new StaffChangeOrAddPage(null);
-            //string FilePath;
-            //string uriString;
-            //OpenFileDialog openFileDialog = new OpenFileDialog();
-            //if (openFileDialog.ShowDialog() == true)
-            //{
-            //    FilePath = openFileDialog.FileName;
-            //    uriString = $"{FilePath}";                
-            //}
-            //else
-            //{
-            //    FilePath = string.Empty;
-            //    uriString  = string.Empty;
-            //}
-            //Assert.IsFalse(staffChangeOrAdd.TestReceiveImage(uriString));
-
-            //Assert.IsTrue(SomeMethods.TestconvertBitToImage(array));
-
-            //array = new byte[25234];
-            //Assert.IsTrue(SomeMethods.TestconvertBitToImage(array));
-
-            //array = new byte[5523334];
-            //Assert.IsTrue(SomeMethods.TestconvertBitToImage(array));
-            //byte[] sol ;
-            //array = sol;
-            //Assert.IsTrue(SomeMethods.TestconvertBitToImage(array));
-
-
-        }
-
-        [TestMethod]
-        public void TestDeCoddingByteToImage()
-        {
-
-        }
-
-        [TestMethod]
         public void TestAuthorization()
         {
             AuthorizationWindow authorization = new AuthorizationWindow();
@@ -60,9 +18,11 @@ namespace UnitTestCourseProject
             Assert.IsFalse(authorization.Auth("12334", "541231"));
             Assert.IsFalse(authorization.Auth("Login", "Parol"));
         }
+
         [TestMethod]
         public void TestAddStaff()
         {
+            //Некорректные данные о персонале
             StaffChangeOrAddPage staffChangeOrAdd = new StaffChangeOrAddPage(null);
             string LName = "";
             string Fname = "";
@@ -87,6 +47,7 @@ namespace UnitTestCourseProject
             Password = "dsa";
             Assert.IsFalse(staffChangeOrAdd.TestAddStaff(LName, Fname, Mname, Login, Password, 2));
 
+            //Корректные данные о персонале
             staffChangeOrAdd = new StaffChangeOrAddPage(null);
             LName = "Иванов";
             Fname = "Иван";
@@ -103,6 +64,16 @@ namespace UnitTestCourseProject
             Password = "Admin";
             Assert.IsTrue(staffChangeOrAdd.TestAddStaff(LName, Fname, Mname, Login, Password, 1));
         }
+        [TestMethod]
+        public void TestAddClient()
+        {
+            string Lname, Fname, Mname;
+            ClientChangeOrAddPage clientChangeOrAdd = new ClientChangeOrAddPage(null);
+            Lname = "Фёдоров";
+            Fname = "Пётр";
+            Mname = "";
+            Assert.IsTrue(clientChangeOrAdd.TestAddClient(Lname, Fname, Mname));
+        }
 
     }
 }