From 1604fece2fc380bc907161c0701a1e953997f339 Mon Sep 17 00:00:00 2001 From: Alexis DRAI Date: Thu, 6 Oct 2022 20:40:03 +0200 Subject: [PATCH] :refactor: Use Guid.NewGuid() instead of hardcoding them obviously ^^' --- Sources/Data/EF/DiceAppDbContextWithStub.cs | 8 ++-- .../Data_UTs/Players/PlayerEntityTest.cs | 38 +++++++++++++------ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/Sources/Data/EF/DiceAppDbContextWithStub.cs b/Sources/Data/EF/DiceAppDbContextWithStub.cs index c857085..2b7484a 100644 --- a/Sources/Data/EF/DiceAppDbContextWithStub.cs +++ b/Sources/Data/EF/DiceAppDbContextWithStub.cs @@ -17,10 +17,10 @@ namespace Data.EF base.OnModelCreating(modelBuilder); modelBuilder.Entity().HasData( - new PlayerEntity { ID = Guid.Parse("e3b42372-0186-484c-9b1c-01618fbfac44"), Name = "Alice" }, - new PlayerEntity { ID = Guid.Parse("73265e15-3c43-45f8-8f5d-d02feaaf7620"), Name = "Bob" }, - new PlayerEntity { ID = Guid.Parse("5198ba9d-44d6-4660-85f9-1843828c6f0d"), Name = "Clyde" }, - new PlayerEntity { ID = Guid.Parse("386cec27-fd9d-4475-8093-93c8b569bf2e"), Name = "Dahlia" } + new PlayerEntity { ID = Guid.NewGuid(), Name = "Alice" }, + new PlayerEntity { ID = Guid.NewGuid(), Name = "Bob" }, + new PlayerEntity { ID = Guid.NewGuid(), Name = "Clyde" }, + new PlayerEntity { ID = Guid.NewGuid(), Name = "Dahlia" } ); } } diff --git a/Sources/Tests/Data_UTs/Players/PlayerEntityTest.cs b/Sources/Tests/Data_UTs/Players/PlayerEntityTest.cs index b9d41a9..db482cc 100644 --- a/Sources/Tests/Data_UTs/Players/PlayerEntityTest.cs +++ b/Sources/Tests/Data_UTs/Players/PlayerEntityTest.cs @@ -27,7 +27,7 @@ namespace Tests.Data_UTs.Players { // Arrange PlayerEntity player = new(); - Guid expected = new("c8f60957-dd36-4e47-a7ce-1281f4f8bea4"); + Guid expected = Guid.NewGuid(); // Act player.ID = expected; @@ -107,10 +107,16 @@ namespace Tests.Data_UTs.Players PlayerEntity p2; PlayerEntity p3; + Guid id1 = Guid.NewGuid(); + Guid id2 = Guid.NewGuid(); + + string name1 = "Panama"; + string name2 = "Clyde"; + // Act - p1 = new() { ID = new Guid("ae04ef10-bd25-4f4e-b4c1-4860fe3daaa0"), Name = "Panama" }; - p2 = new() { ID = new Guid("ae04ef10-bd25-4f4e-b4c1-4860fe3daaa0"), Name = "Clyde" }; - p3 = new() { ID = new Guid("846d332f-56ca-44fc-8170-6cfd28dab88b"), Name = "Clyde" }; + p1 = new() { ID = id1, Name = name1 }; + p2 = new() { ID = id1, Name = name2 }; + p3 = new() { ID = id2, Name = name2 }; // Assert Assert.False(p1.Equals(p2)); @@ -127,10 +133,12 @@ namespace Tests.Data_UTs.Players // Arrange PlayerEntity p1; PlayerEntity p2; + Guid id = Guid.NewGuid(); + string name = "Marley"; // Act - p1 = new() { ID = new Guid("ae04ef10-bd25-4f4e-b4c1-4860fe3daaa0"), Name = "Marley" }; - p2 = new() { ID = new Guid("ae04ef10-bd25-4f4e-b4c1-4860fe3daaa0"), Name = "Marley" }; + p1 = new() { ID = id, Name = name }; + p2 = new() { ID = id, Name = name }; // Assert Assert.True(p1.Equals(p2)); @@ -145,10 +153,16 @@ namespace Tests.Data_UTs.Players PlayerEntity p2; PlayerEntity p3; + Guid id1 = Guid.NewGuid(); + Guid id2 = Guid.NewGuid(); + + string name1 = "Panama"; + string name2 = "Clyde"; + // Act - p1 = new() { ID = new Guid("ae04ef10-bd25-4f4e-b4c1-4860fe3daaa0"), Name = "Panama" }; - p2 = new() { ID = new Guid("ae04ef10-bd25-4f4e-b4c1-4860fe3daaa0"), Name = "Clyde" }; - p3 = new() { ID = new Guid("846d332f-56ca-44fc-8170-6cfd28dab88b"), Name = "Clyde" }; + p1 = new() { ID = id1, Name = name1 }; + p2 = new() { ID = id1, Name = name2 }; + p3 = new() { ID = id2, Name = name2 }; // Assert Assert.False(p1.GetHashCode().Equals(p2.GetHashCode())); @@ -165,10 +179,12 @@ namespace Tests.Data_UTs.Players // Arrange PlayerEntity p1; PlayerEntity p2; + Guid id = Guid.NewGuid(); + string name = "Marley"; // Act - p1 = new() { ID = new Guid("ae04ef10-bd25-4f4e-b4c1-4860fe3daaa0"), Name = "Marley" }; - p2 = new() { ID = new Guid("ae04ef10-bd25-4f4e-b4c1-4860fe3daaa0"), Name = "Marley" }; + p1 = new() { ID = id, Name = name }; + p2 = new() { ID = id, Name = name }; // Assert Assert.True(p1.GetHashCode().Equals(p2.GetHashCode()));