From 62cc38f429618e3c186dedb090badc0061ccd330 Mon Sep 17 00:00:00 2001 From: anperederi Date: Sat, 16 Mar 2024 14:38:27 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20Update=20and=20pass=20all=20the=20t?= =?UTF-8?q?ests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnitTestsEntities/AthleteEntityTests.cs | 14 +++++++--- .../FriendshipEntityTests.cs | 27 ++++++++++++------- .../UnitTestsEntities/HeartRateEntityTests.cs | 22 ++++++++++----- .../NotificationEntityTests.cs | 12 ++++++--- .../UnitTestsEntities/StatisticEntityTests.cs | 12 ++++++--- .../UnitTestsEntities/TrainingEntityTests.cs | 24 +++++++++++------ 6 files changed, 76 insertions(+), 35 deletions(-) diff --git a/src/Tests/UnitTestsEntities/AthleteEntityTests.cs b/src/Tests/UnitTestsEntities/AthleteEntityTests.cs index 701f27b..1f67d03 100644 --- a/src/Tests/UnitTestsEntities/AthleteEntityTests.cs +++ b/src/Tests/UnitTestsEntities/AthleteEntityTests.cs @@ -21,7 +21,9 @@ public class AthleteEntityTests (DatabaseFixture fixture) : IClassFixture)follower + DataSourceId = 2 }; var friendship = new FriendshipEntity @@ -45,23 +46,31 @@ public class FriendshipEntityTests (DatabaseFixture fixture) : IClassFixture a.Username == "following_user1"); - follow.Followings = (ICollection)following; context.SaveChanges(); } using (var context = new TrainingStubbedContext(fixture._options)) { - var savedAth1 = context.AthletesSet.FirstOrDefault(a => a.Username == "following_user1"); - var savedAth2 = context.AthletesSet.FirstOrDefault(a => a.Username == "follower_user1"); - Assert.Equal(savedAth2, friendship.Follower); - Assert.Equal(savedAth1, friendship.Following); + context.Attach(friendship); // Attachez l'amitiƩ au contexte + context.SaveChanges(); + } + + using (var context = new TrainingStubbedContext(fixture._options)) + { + var savedFriendship = context.AthletesSet.Include(a => a.Followers).Include(a => a.Followings).FirstOrDefault(a => a.Username == "follower_user1").Followers.FirstOrDefault(f => f.FollowerId == follower.IdAthlete && f.FollowingId == following.IdAthlete); + + Assert.NotNull(savedFriendship); + if (savedFriendship != null) + { + Assert.Equal(follower.IdAthlete, savedFriendship.FollowerId); + Assert.Equal(following.IdAthlete, savedFriendship.FollowingId); + } } } diff --git a/src/Tests/UnitTestsEntities/HeartRateEntityTests.cs b/src/Tests/UnitTestsEntities/HeartRateEntityTests.cs index baeabc1..ceaa4ff 100644 --- a/src/Tests/UnitTestsEntities/HeartRateEntityTests.cs +++ b/src/Tests/UnitTestsEntities/HeartRateEntityTests.cs @@ -122,7 +122,7 @@ public class HeartRateEntityTests (DatabaseFixture fixture) : IClassFixture h.Altitude == 105.0); - var savedActivity = context.ActivitiesSet.FirstOrDefault(a => a.Type == "Run" && a.EffortFelt == 7 && a.Average == 0.4f); - context.HeartRatesSet.Remove(savedHeartRate); - context.ActivitiesSet.Remove(savedActivity); + var savedHeartRate = context.HeartRatesSet.First(h => h.Altitude == 105.0); + var savedActivity = context.ActivitiesSet.First(a => a.Type == "Run"); + + Assert.NotNull(savedHeartRate); + if (savedHeartRate != null) + { + context.HeartRatesSet.Remove(savedHeartRate); + } + Assert.NotNull(savedActivity); + if (savedActivity != null) + { + context.ActivitiesSet.Remove(savedActivity); + } + context.SaveChanges(); } diff --git a/src/Tests/UnitTestsEntities/NotificationEntityTests.cs b/src/Tests/UnitTestsEntities/NotificationEntityTests.cs index 9858911..f44774d 100644 --- a/src/Tests/UnitTestsEntities/NotificationEntityTests.cs +++ b/src/Tests/UnitTestsEntities/NotificationEntityTests.cs @@ -21,7 +21,8 @@ public class NotificationEntityTests (DatabaseFixture fixture) : IClassFixture