From e2dcb86b02efcb343b87d4d118f416fe3ba24850 Mon Sep 17 00:00:00 2001 From: mar-va Date: Thu, 13 Mar 2025 13:40:15 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=20=D0=B4=D0=BE=D0=BB=D0=B6=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PostBuisnessLogicContract.cs | 2 +- .../DataModels/PostDataModel.cs | 2 +- .../AndDietCokeTests/AndDietCokeTests.csproj | 1 + .../DataModelsTests/PostDataModelTests.cs | 26 +++++++++---------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/AndDietCokeProject/AndDietCokeBuisnessLogic/Implementations/PostBuisnessLogicContract.cs b/AndDietCokeProject/AndDietCokeBuisnessLogic/Implementations/PostBuisnessLogicContract.cs index c0190ac..5b60e8a 100644 --- a/AndDietCokeProject/AndDietCokeBuisnessLogic/Implementations/PostBuisnessLogicContract.cs +++ b/AndDietCokeProject/AndDietCokeBuisnessLogic/Implementations/PostBuisnessLogicContract.cs @@ -26,7 +26,7 @@ internal class PostBuisnessLogicContract(IPostStorageContract postStorageContrac } public PostDataModel GetPostByData(string data) { - return new("", "", "", PostType.None, 0, true, DateTime.UtcNow); + return new("", "", PostType.None, 0, true, DateTime.UtcNow); } public void InsertPost(PostDataModel postDataModel) { diff --git a/AndDietCokeProject/AndDietCokeProject/DataModels/PostDataModel.cs b/AndDietCokeProject/AndDietCokeProject/DataModels/PostDataModel.cs index c1892f9..c313dc7 100644 --- a/AndDietCokeProject/AndDietCokeProject/DataModels/PostDataModel.cs +++ b/AndDietCokeProject/AndDietCokeProject/DataModels/PostDataModel.cs @@ -11,7 +11,7 @@ using System.Xml; namespace AndDietCokeContracts.DataModels; -public class PostDataModel(string id, string postId, string postName, PostType +public class PostDataModel(string id, string postName, PostType postType, double salary, bool isActual, DateTime changeDate) : IValidation { public string Id { get; private set; } = id; diff --git a/AndDietCokeProject/AndDietCokeTests/AndDietCokeTests.csproj b/AndDietCokeProject/AndDietCokeTests/AndDietCokeTests.csproj index 739072c..4558492 100644 --- a/AndDietCokeProject/AndDietCokeTests/AndDietCokeTests.csproj +++ b/AndDietCokeProject/AndDietCokeTests/AndDietCokeTests.csproj @@ -7,6 +7,7 @@ false true + preview diff --git a/AndDietCokeProject/AndDietCokeTests/DataModelsTests/PostDataModelTests.cs b/AndDietCokeProject/AndDietCokeTests/DataModelsTests/PostDataModelTests.cs index 7b094dd..58e746e 100644 --- a/AndDietCokeProject/AndDietCokeTests/DataModelsTests/PostDataModelTests.cs +++ b/AndDietCokeProject/AndDietCokeTests/DataModelsTests/PostDataModelTests.cs @@ -16,51 +16,51 @@ internal class PostDataModelTests [Test] public void IdIsNullOrEmptyTest() { - var post = CreateDataModel("0", Guid.NewGuid().ToString(), "name", PostType.Waiter, 10, true, DateTime.UtcNow); + var post = CreateDataModel("0", "name", PostType.Waiter, 10, true, DateTime.UtcNow); Assert.That(() => post.Validate(), Throws.TypeOf()); - post = CreateDataModel(string.Empty, Guid.NewGuid().ToString(), "name", PostType.Waiter, 10, true, DateTime.UtcNow); + post = CreateDataModel(string.Empty, "name", PostType.Waiter, 10, true, DateTime.UtcNow); Assert.That(() => post.Validate(), Throws.TypeOf()); } [Test] public void IdIsNotGuidTest() { - var post = CreateDataModel("id", Guid.NewGuid().ToString(), "name", PostType.Waiter, 10, true, DateTime.UtcNow); + var post = CreateDataModel("id", "name", PostType.Waiter, 10, true, DateTime.UtcNow); Assert.That(() => post.Validate(), Throws.TypeOf()); } [Test] public void PostIdIsNullEmptyTest() { - var post = CreateDataModel(Guid.NewGuid().ToString(), null, "name", PostType.Waiter, 10, true, DateTime.UtcNow); + var post = CreateDataModel("0", "name", PostType.Waiter, 10, true, DateTime.UtcNow); Assert.That(() => post.Validate(), Throws.TypeOf()); - post = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, "name", PostType.Waiter, 10, true, DateTime.UtcNow); + post = CreateDataModel("0", "name", PostType.Waiter, 10, true, DateTime.UtcNow); Assert.That(() => post.Validate(), Throws.TypeOf()); } [Test] public void PostIdIsNotGuidTest() { - var post = CreateDataModel(Guid.NewGuid().ToString(), "postId", "name", PostType.Waiter, 10, true, DateTime.UtcNow); + var post = CreateDataModel("0", "name", PostType.Waiter, 10, true, DateTime.UtcNow); Assert.That(() => post.Validate(), Throws.TypeOf()); } [Test] public void PostNameIsEmptyTest() { - var manufacturer = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), null, PostType.Waiter, 10, true, DateTime.UtcNow); + var manufacturer = CreateDataModel(Guid.NewGuid().ToString(), null, PostType.Waiter, 10, true, DateTime.UtcNow); Assert.That(() => manufacturer.Validate(), Throws.TypeOf()); - manufacturer = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), string.Empty, PostType.Waiter, 10, true, DateTime.UtcNow); + manufacturer = CreateDataModel(Guid.NewGuid().ToString(), string.Empty, PostType.Waiter, 10, true, DateTime.UtcNow); Assert.That(() => manufacturer.Validate(), Throws.TypeOf()); } [Test] public void PostTypeIsNoneTest() { - var post = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "name", PostType.None, 10, true, DateTime.UtcNow); + var post = CreateDataModel(Guid.NewGuid().ToString(), "name", PostType.None, 10, true, DateTime.UtcNow); Assert.That(() => post.Validate(), Throws.TypeOf()); } [Test] public void SalaryIsLessOrZeroTest() { - var post = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "name", PostType.Waiter, 0, true, DateTime.UtcNow); + var post = CreateDataModel(Guid.NewGuid().ToString(), "name", PostType.Waiter, 0, true, DateTime.UtcNow); Assert.That(() => post.Validate(), Throws.TypeOf()); - post = CreateDataModel(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "name", PostType.Waiter, -10, true, DateTime.UtcNow); + post = CreateDataModel(Guid.NewGuid().ToString(), "name", PostType.Waiter, -10, true, DateTime.UtcNow); Assert.That(() => post.Validate(), Throws.TypeOf()); } [Test] @@ -73,7 +73,7 @@ internal class PostDataModelTests var salary = 10; var isActual = false; var changeDate = DateTime.UtcNow.AddDays(-1); - var post = CreateDataModel(postId, postPostId, postName, postType, salary, isActual, changeDate); + var post = CreateDataModel(postId, postName, postType, salary, isActual, changeDate); Assert.That(() => post.Validate(), Throws.Nothing); Assert.Multiple(() => { @@ -83,7 +83,7 @@ internal class PostDataModelTests Assert.That(post.Salary, Is.EqualTo(salary)); }); } - private static PostDataModel CreateDataModel(string? id, string? postId, string? postName, PostType postType, double salary, bool isActual, DateTime changeDate) => new(id, postId, postName, postType, salary, isActual, changeDate); + private static PostDataModel CreateDataModel(string? id, string? postName, PostType postType, double salary, bool isActual, DateTime changeDate) => new(id, postName, postType, salary, isActual, changeDate); }