diff --git a/AndDietCokeContracts/AndDietCokeContracts/DataModels/BuyerDataModel.cs b/AndDietCokeContracts/AndDietCokeContracts/DataModels/BuyerDataModel.cs index 0fe72a7..152d6d0 100644 --- a/AndDietCokeContracts/AndDietCokeContracts/DataModels/BuyerDataModel.cs +++ b/AndDietCokeContracts/AndDietCokeContracts/DataModels/BuyerDataModel.cs @@ -31,6 +31,6 @@ public class BuyerDataModel(string id, string fio, string phoneNumber) : IValida if (!Regex.IsMatch(PhoneNumber, @"^((8|\+7)[\- ]?)?(\(?\d{3}\)?[\- ]?)?[\d\- ]{7,10}$")) throw new ValidationException("Field PhoneNumber is not a phone number"); if (!Regex.IsMatch(FIO, @"^[А-ЯЁA-Z][а-яёa-z]+(?:-[А-ЯЁA-Z][а-яёa-z]+)?\s[А-ЯЁA-Z][а-яёa-z]+(?:\s[А-ЯЁA-Z][а-яёa-z]+)?$")) - throw new ValidationException("Not Correct FIO"); + throw new ValidationException("Incorrect FIO input"); } } diff --git a/AndDietCokeContracts/AndDietCokeTests/DataModelsTests/BuyerDataModelTests.cs b/AndDietCokeContracts/AndDietCokeTests/DataModelsTests/BuyerDataModelTests.cs index aa93bb5..93f2e09 100644 --- a/AndDietCokeContracts/AndDietCokeTests/DataModelsTests/BuyerDataModelTests.cs +++ b/AndDietCokeContracts/AndDietCokeTests/DataModelsTests/BuyerDataModelTests.cs @@ -15,15 +15,15 @@ internal class BuyerDataModelTests [Test] public void IdIsNullOrEmptyTest() { - var buyer = CreateDataModel(null, "fio", "number"); + var buyer = CreateDataModel(null, "Ivanov Ivan", "number"); Assert.That(() => buyer.Validate(), Throws.TypeOf()); - buyer = CreateDataModel(string.Empty, "fio", "number"); + buyer = CreateDataModel(string.Empty, "Ivanov Ivan", "number"); Assert.That(() => buyer.Validate(), Throws.TypeOf()); } [Test] public void IdIsNotGuidTest() { - var buyer = CreateDataModel("id", "fio", "number"); + var buyer = CreateDataModel("id", "Ivanov Ivan", "number"); Assert.That(() => buyer.Validate(), Throws.TypeOf()); } [Test] @@ -37,23 +37,23 @@ internal class BuyerDataModelTests [Test] public void PhoneNumberIsNullOrEmptyTest() { - var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", null); + var buyer = CreateDataModel(Guid.NewGuid().ToString(), "Ivanov Ivan", null); Assert.That(() => buyer.Validate(), Throws.TypeOf()); - buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", string.Empty); + buyer = CreateDataModel(Guid.NewGuid().ToString(), "Ivanov Ivan", string.Empty); Assert.That(() => buyer.Validate(),Throws.TypeOf()); } [Test] public void PhoneNumberIsIncorrectTest() { - var buyer = CreateDataModel(Guid.NewGuid().ToString(), "fio", "777"); + var buyer = CreateDataModel(Guid.NewGuid().ToString(), "Ivanov Ivan", "777"); Assert.That(() => buyer.Validate(),Throws.TypeOf()); } [Test] public void AllFieldsIsCorrectTest() { var buyerId = Guid.NewGuid().ToString(); - var fio = "Fio"; + var fio = "Ivanov Ivan"; var phoneNumber = "+7-777-777-77-77"; var buyer = CreateDataModel(buyerId, fio, phoneNumber); Assert.That(() => buyer.Validate(), Throws.Nothing);