From 1a183fe255131571ccb8d80c1ef611534a14e0c3 Mon Sep 17 00:00:00 2001 From: Zachary Van Gorkom <69218730+Apoktieno@users.noreply.github.com> Date: Tue, 15 Aug 2023 10:37:05 -0700 Subject: [PATCH] [Backend.Tests] Use Constraint Model in Helper, Models, and Services tests (#2466) --- .../Helper/LevenshteinDistanceTests.cs | 8 +- Backend.Tests/Helper/PasswordHashTests.cs | 8 +- Backend.Tests/Helper/TimeTests.cs | 4 +- Backend.Tests/Models/BannerTests.cs | 20 ++--- Backend.Tests/Models/EmailInviteTests.cs | 36 ++++---- .../Models/MergeBlacklistEntryTests.cs | 16 ++-- Backend.Tests/Models/MergeWordsTests.cs | 24 ++--- Backend.Tests/Models/ProjectTests.cs | 68 +++++++------- Backend.Tests/Models/SemanticDomainTest.cs | 36 ++++---- Backend.Tests/Models/SenseTests.cs | 54 ++++++------ Backend.Tests/Models/UserEditTests.cs | 44 +++++----- Backend.Tests/Models/UserRoleTests.cs | 38 ++++---- Backend.Tests/Models/UserTests.cs | 16 ++-- Backend.Tests/Models/WordTests.cs | 88 +++++++++---------- Backend.Tests/Services/MergeServiceTests.cs | 56 ++++++------ .../Services/PasswordResetServiceTests.cs | 12 +-- .../Services/PermissionServiceTests.cs | 2 +- .../Services/StatisticsServiceTests.cs | 26 +++--- 18 files changed, 277 insertions(+), 279 deletions(-) diff --git a/Backend.Tests/Helper/LevenshteinDistanceTests.cs b/Backend.Tests/Helper/LevenshteinDistanceTests.cs index 2b54b775da..50b649e025 100644 --- a/Backend.Tests/Helper/LevenshteinDistanceTests.cs +++ b/Backend.Tests/Helper/LevenshteinDistanceTests.cs @@ -62,19 +62,19 @@ public void GetDistanceDifferentWordTest() [Test] public void TestConstructorNegativeInputs() { - Assert.Throws(() => + Assert.That(() => { var _ = new LevenshteinDistance(-1); - }); + }, Throws.TypeOf()); } [Test] public void TestConstructorSmallSubstitute() { - Assert.Throws(() => + Assert.That(() => { var _ = new LevenshteinDistance(1, 1, 99); - }); + }, Throws.TypeOf()); } } } diff --git a/Backend.Tests/Helper/PasswordHashTests.cs b/Backend.Tests/Helper/PasswordHashTests.cs index 6c7cf2cbfe..a9fb54a53f 100644 --- a/Backend.Tests/Helper/PasswordHashTests.cs +++ b/Backend.Tests/Helper/PasswordHashTests.cs @@ -11,8 +11,8 @@ public class PasswordHashTests public void HashPasswordValidRoundtrip() { var hash = HashPassword(Password); - Assert.AreNotEqual(Password, hash); - Assert.That(ValidatePassword(hash, Password)); + Assert.That(hash, Is.Not.EqualTo(Password)); + Assert.That(ValidatePassword(hash, Password), Is.True); } [Test] @@ -21,7 +21,7 @@ public void HashPasswordInvalidHashByteRoundtrip() var hash = HashPassword(Password); // Change a single byte of the hash and validate that the hash fails. hash[0] ^= 0xff; - Assert.IsFalse(ValidatePassword(hash, Password)); + Assert.That(ValidatePassword(hash, Password), Is.False); } [Test] @@ -29,7 +29,7 @@ public void HashPasswordInvalidPasswordCharacterRoundtrip() { var hash = HashPassword(Password); var mutatedPassword = $"Z{Password}"; - Assert.IsFalse(ValidatePassword(hash, mutatedPassword)); + Assert.That(ValidatePassword(hash, mutatedPassword), Is.False); } } } diff --git a/Backend.Tests/Helper/TimeTests.cs b/Backend.Tests/Helper/TimeTests.cs index 6d69a62e25..856648ebb9 100644 --- a/Backend.Tests/Helper/TimeTests.cs +++ b/Backend.Tests/Helper/TimeTests.cs @@ -16,8 +16,8 @@ public void TestToUtcIso8601() public void TestUtcNowIso8601() { var time = UtcNowIso8601(); - Assert.That(time.Contains('T')); - Assert.That(time.EndsWith('Z')); + Assert.That(time.Contains('T'), Is.True); + Assert.That(time.EndsWith('Z'), Is.True); Assert.That(DateTime.Now, Is.EqualTo(DateTime.Parse(time)).Within(TimeSpan.FromSeconds(10))); } } diff --git a/Backend.Tests/Models/BannerTests.cs b/Backend.Tests/Models/BannerTests.cs index 720ca09fc7..d108b2eb53 100644 --- a/Backend.Tests/Models/BannerTests.cs +++ b/Backend.Tests/Models/BannerTests.cs @@ -12,33 +12,33 @@ public class SiteBannerTests [Test] public void TestEquals() { - Assert.That(_siteBanner.Equals(new SiteBanner { Type = Type, Text = Text })); + Assert.That(_siteBanner.Equals(new SiteBanner { Type = Type, Text = Text }), Is.True); } [Test] public void TestNotEquals() { - Assert.IsFalse(_siteBanner.Equals( - new SiteBanner { Type = BannerType.Announcement, Text = Text })); - Assert.IsFalse(_siteBanner.Equals( - new SiteBanner { Type = Type, Text = "Different Text" })); + Assert.That(_siteBanner.Equals( + new SiteBanner { Type = BannerType.Announcement, Text = Text }), Is.False); + Assert.That(_siteBanner.Equals( + new SiteBanner { Type = Type, Text = "Different Text" }), Is.False); } [Test] public void TestEqualsNull() { - Assert.IsFalse(_siteBanner.Equals(null)); + Assert.That(_siteBanner.Equals(null), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( _siteBanner.GetHashCode(), - new SiteBanner { Type = BannerType.Announcement, Text = Text }.GetHashCode()); - Assert.AreNotEqual( + Is.Not.EqualTo(new SiteBanner { Type = BannerType.Announcement, Text = Text }.GetHashCode())); + Assert.That( _siteBanner.GetHashCode(), - new SiteBanner { Type = Type, Text = "Different Text" }.GetHashCode()); + Is.Not.EqualTo(new SiteBanner { Type = Type, Text = "Different Text" }.GetHashCode())); } } } diff --git a/Backend.Tests/Models/EmailInviteTests.cs b/Backend.Tests/Models/EmailInviteTests.cs index 34145a7f47..f36dfd2f4c 100644 --- a/Backend.Tests/Models/EmailInviteTests.cs +++ b/Backend.Tests/Models/EmailInviteTests.cs @@ -20,27 +20,27 @@ public class EmailInviteTests public void TestCloneEquals() { var field = new EmailInvite { Email = Email1, Token = Token1, Role = Role1, ExpireTime = _expireTime1 }; - Assert.AreEqual(field, field.Clone()); + Assert.That(field, Is.EqualTo(field.Clone())); } [Test] public void TestEqualsNull() { - Assert.AreNotEqual(new EmailInvite(), null); + Assert.That(new EmailInvite().Equals(null), Is.False); } [Test] public void TestNotEquals() { var invite = new EmailInvite { Email = Email1, Token = Token1, Role = Role1, ExpireTime = _expireTime1 }; - Assert.AreNotEqual(invite, - new EmailInvite { Email = Email2, Token = Token1, Role = Role1, ExpireTime = _expireTime1 }); - Assert.AreNotEqual(invite, - new EmailInvite { Email = Email1, Token = Token2, Role = Role1, ExpireTime = _expireTime1 }); - Assert.AreNotEqual(invite, - new EmailInvite { Email = Email1, Token = Token1, Role = Role2, ExpireTime = _expireTime1 }); - Assert.AreNotEqual(invite, - new EmailInvite { Email = Email1, Token = Token1, Role = Role1, ExpireTime = _expireTime2 }); + Assert.That(invite, + Is.Not.EqualTo(new EmailInvite { Email = Email2, Token = Token1, Role = Role1, ExpireTime = _expireTime1 })); + Assert.That(invite, + Is.Not.EqualTo(new EmailInvite { Email = Email1, Token = Token2, Role = Role1, ExpireTime = _expireTime1 })); + Assert.That(invite, + Is.Not.EqualTo(new EmailInvite { Email = Email1, Token = Token1, Role = Role2, ExpireTime = _expireTime1 })); + Assert.That(invite, + Is.Not.EqualTo(new EmailInvite { Email = Email1, Token = Token1, Role = Role1, ExpireTime = _expireTime2 })); } [Test] @@ -56,21 +56,21 @@ public void TestToken() [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new EmailInvite { Email = Email1 }.GetHashCode(), - new EmailInvite { Email = Email2 }.GetHashCode() + Is.Not.EqualTo(new EmailInvite { Email = Email2 }.GetHashCode()) ); - Assert.AreNotEqual( + Assert.That( new EmailInvite { Token = Token1 }.GetHashCode(), - new EmailInvite { Token = Token2 }.GetHashCode() + Is.Not.EqualTo(new EmailInvite { Token = Token2 }.GetHashCode()) ); - Assert.AreNotEqual( + Assert.That( new EmailInvite { Role = Role1 }.GetHashCode(), - new EmailInvite { Role = Role2 }.GetHashCode() + Is.Not.EqualTo(new EmailInvite { Role = Role2 }.GetHashCode()) ); - Assert.AreNotEqual( + Assert.That( new EmailInvite { ExpireTime = _expireTime1 }.GetHashCode(), - new EmailInvite { ExpireTime = _expireTime2 }.GetHashCode() + Is.Not.EqualTo(new EmailInvite { ExpireTime = _expireTime2 }.GetHashCode()) ); } } diff --git a/Backend.Tests/Models/MergeBlacklistEntryTests.cs b/Backend.Tests/Models/MergeBlacklistEntryTests.cs index 72a7ee3858..df040bf520 100644 --- a/Backend.Tests/Models/MergeBlacklistEntryTests.cs +++ b/Backend.Tests/Models/MergeBlacklistEntryTests.cs @@ -23,7 +23,7 @@ public void TestClone() WordIds = _wordIds }; var entryB = entryA.Clone(); - Assert.That(entryA.Equals(entryB)); + Assert.That(entryA.Equals(entryB), Is.True); } [Test] @@ -43,7 +43,7 @@ public void TestEquals() UserId = UserId, WordIds = _wordIdsReversed }; - Assert.That(entryA.Equals(entryB)); + Assert.That(entryA.Equals(entryB), Is.True); } [Test] @@ -52,26 +52,26 @@ public void TestEqualsFalse() var entryA = new MergeBlacklistEntry(); var entryB = new MergeBlacklistEntry(); entryA.Id = EntryId; - Assert.IsFalse(entryA.Equals(entryB)); + Assert.That(entryA.Equals(entryB), Is.False); entryB = entryA.Clone(); entryA.ProjectId = ProjId; - Assert.IsFalse(entryA.Equals(entryB)); + Assert.That(entryA.Equals(entryB), Is.False); entryB = entryA.Clone(); entryA.UserId = UserId; - Assert.IsFalse(entryA.Equals(entryB)); + Assert.That(entryA.Equals(entryB), Is.False); entryB = entryA.Clone(); entryA.WordIds = _wordIds; - Assert.IsFalse(entryA.Equals(entryB)); + Assert.That(entryA.Equals(entryB), Is.False); } [Test] public void TestEqualsNull() { var edit = new MergeBlacklistEntry { ProjectId = ProjId }; - Assert.IsFalse(edit.Equals(null)); + Assert.That(edit.Equals(null), Is.False); } [Test] @@ -91,7 +91,7 @@ public void TestHashCode() UserId = UserId, WordIds = _wordIdsReversed }; - Assert.AreNotEqual(entryA.GetHashCode(), entryB.GetHashCode()); + Assert.That(entryA.GetHashCode(), Is.Not.EqualTo(entryB.GetHashCode())); } } } diff --git a/Backend.Tests/Models/MergeWordsTests.cs b/Backend.Tests/Models/MergeWordsTests.cs index 6b560b2c1e..f985787950 100644 --- a/Backend.Tests/Models/MergeWordsTests.cs +++ b/Backend.Tests/Models/MergeWordsTests.cs @@ -19,15 +19,15 @@ public void TestEquals() var mergeEmpty = new MergeUndoIds(); var mergeNonEmpty = new MergeUndoIds { ParentIds = _parentIds1, ChildIds = _childIds1 }; - Assert.That(mergeEmpty.Equals(new MergeUndoIds())); - Assert.That(mergeNonEmpty.Equals(new MergeUndoIds { ParentIds = _parentIds1, ChildIds = _childIds1 })); + Assert.That(mergeEmpty.Equals(new MergeUndoIds()), Is.True); + Assert.That(mergeNonEmpty.Equals(new MergeUndoIds { ParentIds = _parentIds1, ChildIds = _childIds1 }), Is.True); } [Test] public void TestCloneEquals() { var merge = new MergeUndoIds { ParentIds = _parentIds1, ChildIds = _childIds1 }; - Assert.That(merge.Equals(merge.Clone())); + Assert.That(merge.Equals(merge.Clone()), Is.True); } [Test] @@ -40,15 +40,15 @@ public void TestNotEquals() var mergeNonEmpty4 = new MergeUndoIds { ParentIds = _parentIds1, ChildIds = _childIds3 }; var mergeNonEmpty5 = new MergeUndoIds { ParentIds = _parentIds3, ChildIds = _childIds1 }; - Assert.IsFalse(mergeEmpty.Equals(mergeNonEmpty1)); + Assert.That(mergeEmpty.Equals(mergeNonEmpty1), Is.False); // Test one added child. - Assert.IsFalse(mergeNonEmpty1.Equals(mergeNonEmpty2)); + Assert.That(mergeNonEmpty1.Equals(mergeNonEmpty2), Is.False); // Test one added parent. - Assert.IsFalse(mergeNonEmpty1.Equals(mergeNonEmpty3)); + Assert.That(mergeNonEmpty1.Equals(mergeNonEmpty3), Is.False); // Test one different child. - Assert.IsFalse(mergeNonEmpty1.Equals(mergeNonEmpty4)); + Assert.That(mergeNonEmpty1.Equals(mergeNonEmpty4), Is.False); // Test one different parent. - Assert.IsFalse(mergeNonEmpty1.Equals(mergeNonEmpty5)); + Assert.That(mergeNonEmpty1.Equals(mergeNonEmpty5), Is.False); } [Test] @@ -57,16 +57,16 @@ public void TestEqualsNull() var mergeEmpty = new MergeUndoIds(); var mergeNonEmpty = new MergeUndoIds { ParentIds = _parentIds1, ChildIds = _childIds1 }; - Assert.IsFalse(mergeEmpty.Equals(null)); - Assert.IsFalse(mergeNonEmpty.Equals(null)); + Assert.That(mergeEmpty.Equals(null), Is.False); + Assert.That(mergeNonEmpty.Equals(null), Is.False); } [Test] public void TestHashCode() { - Assert.AreEqual( + Assert.That( new MergeUndoIds { ParentIds = _parentIds1, ChildIds = _childIds1 }.GetHashCode(), - new MergeUndoIds { ParentIds = _parentIds1, ChildIds = _childIds1 }.GetHashCode()); + Is.EqualTo(new MergeUndoIds { ParentIds = _parentIds1, ChildIds = _childIds1 }.GetHashCode())); } } } diff --git a/Backend.Tests/Models/ProjectTests.cs b/Backend.Tests/Models/ProjectTests.cs index c6c504be02..3ab58b4593 100644 --- a/Backend.Tests/Models/ProjectTests.cs +++ b/Backend.Tests/Models/ProjectTests.cs @@ -12,14 +12,14 @@ public class ProjectTests public void TestEquals() { var project = new Project { Name = Name }; - Assert.That(project.Equals(new Project { Name = Name })); + Assert.That(project.Equals(new Project { Name = Name }), Is.True); } [Test] public void TestEqualsNull() { var project = new Project { Name = Name }; - Assert.IsFalse(project.Equals(null)); + Assert.That(project.Equals(null), Is.False); } [Test] @@ -29,71 +29,71 @@ public void TestNotEquals() var project2 = project.Clone(); project2.IsActive = !project.IsActive; - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.LiftImported = !project.LiftImported; - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.DefinitionsEnabled = !project.DefinitionsEnabled; - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.GrammaticalInfoEnabled = !project.GrammaticalInfoEnabled; - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.AutocompleteSetting = 1 - project.AutocompleteSetting; - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.SemDomWritingSystem.Bcp47 = "diff"; - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.VernacularWritingSystem.Name = "different"; - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.AnalysisWritingSystems.Add(new WritingSystem()); - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.SemanticDomains.Add(new SemanticDomain()); - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project.ValidCharacters.Add("a"); project2.ValidCharacters.Add("b"); - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project.RejectedCharacters.Add("a"); project2.RejectedCharacters.Add("b"); - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.CustomFields.Add(new CustomField()); - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project.WordFields.Add("a"); project2.WordFields.Add("b"); - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project.PartsOfSpeech.Add("a"); project2.PartsOfSpeech.Add("b"); - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.InviteTokens.Add(new EmailInvite()); - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); project2 = project.Clone(); project2.WorkshopSchedule.Add(DateTime.Now); - Assert.IsFalse(project.Equals(project2)); + Assert.That(project.Equals(project2), Is.False); } [Test] @@ -111,15 +111,15 @@ public void TestClone() project.InviteTokens.Add(emailInvite); var project2 = project.Clone(); - Assert.AreEqual(project, project2); + Assert.That(project, Is.EqualTo(project2)); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new Project { Name = Name }.GetHashCode(), - new Project { Name = "Different Name" }.GetHashCode() + Is.Not.EqualTo(new Project { Name = "Different Name" }.GetHashCode()) ); } } @@ -133,37 +133,37 @@ public class CustomFieldTests public void TestEquals() { var field = new CustomField { Name = Name, Type = Type }; - Assert.That(field.Equals(new CustomField { Name = Name, Type = Type })); + Assert.That(field.Equals(new CustomField { Name = Name, Type = Type }), Is.True); } [Test] public void TestEqualsNull() { var field = new CustomField { Name = Name }; - Assert.IsFalse(field.Equals(null)); + Assert.That(field.Equals(null), Is.False); } [Test] public void TestNotEquals() { var field = new CustomField { Name = Name, Type = Type }; - Assert.IsFalse(field.Equals(new CustomField { Name = Name, Type = "Other Type" })); - Assert.IsFalse(field.Equals(new CustomField { Name = "Other Name", Type = Type })); + Assert.That(field.Equals(new CustomField { Name = Name, Type = "Other Type" }), Is.False); + Assert.That(field.Equals(new CustomField { Name = "Other Name", Type = Type }), Is.False); } [Test] public void TestClone() { var field = new CustomField { Name = Name, Type = Type }; - Assert.AreEqual(field, field.Clone()); + Assert.That(field, Is.EqualTo(field.Clone())); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new CustomField { Name = Name }.GetHashCode(), - new CustomField { Name = "Different Name" }.GetHashCode() + Is.Not.EqualTo(new CustomField { Name = "Different Name" }.GetHashCode()) ); } } @@ -178,24 +178,24 @@ public class WritingSystemTests public void TestEquals() { var system = new WritingSystem(Bcp47, Name); - Assert.That(system.Equals(new WritingSystem(Bcp47, Name))); + Assert.That(system.Equals(new WritingSystem(Bcp47, Name)), Is.True); } [Test] public void TestEqualsNull() { var system = new WritingSystem(Bcp47, Name); - Assert.IsFalse(system.Equals(null)); + Assert.That(system.Equals(null), Is.False); } [Test] public void TestNotEquals() { var system = new WritingSystem(Bcp47, Name); - Assert.IsFalse(system.Equals(new WritingSystem(Bcp47))); + Assert.That(system.Equals(new WritingSystem(Bcp47)), Is.False); system = new WritingSystem(Bcp47, Name, Font); - Assert.IsFalse(system.Equals(new WritingSystem(Bcp47, Name))); + Assert.That(system.Equals(new WritingSystem(Bcp47, Name)), Is.False); } [Test] @@ -203,7 +203,7 @@ public void TestToString() { var system = new WritingSystem(Bcp47, Name); var sysString = system.ToString(); - Assert.IsTrue(sysString.Contains(Name) && sysString.Contains(Bcp47)); + Assert.That(sysString.Contains(Name) && sysString.Contains(Bcp47), Is.True); } [Test] @@ -211,7 +211,7 @@ public void TestClone() { var system = new WritingSystem(Bcp47, Name, Font); var clonedSystem = system.Clone(); - Assert.AreEqual(system, clonedSystem); + Assert.That(system, Is.EqualTo(clonedSystem)); } } } diff --git a/Backend.Tests/Models/SemanticDomainTest.cs b/Backend.Tests/Models/SemanticDomainTest.cs index 9129b3f8a4..ad1c2d9a3c 100644 --- a/Backend.Tests/Models/SemanticDomainTest.cs +++ b/Backend.Tests/Models/SemanticDomainTest.cs @@ -13,32 +13,32 @@ public class SemanticDomainTests public void TestEquals() { var domain = new SemanticDomain { Name = Name }; - Assert.That(domain.Equals(new SemanticDomain { Name = Name })); + Assert.That(domain.Equals(new SemanticDomain { Name = Name }), Is.True); } [Test] public void TestEqualsNull() { var domain = new SemanticDomain { Name = Name }; - Assert.IsFalse(domain.Equals(null)); + Assert.That(domain.Equals(null), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new SemanticDomain { Id = "1" }.GetHashCode(), - new SemanticDomain { Id = "2" }.GetHashCode() + Is.Not.EqualTo(new SemanticDomain { Id = "2" }.GetHashCode()) ); - Assert.AreNotEqual( + Assert.That( new SemanticDomain { Name = "1" }.GetHashCode(), - new SemanticDomain { Name = "2" }.GetHashCode() + Is.Not.EqualTo(new SemanticDomain { Name = "2" }.GetHashCode()) ); - Assert.AreNotEqual( + Assert.That( new SemanticDomain { Guid = Guid.NewGuid().ToString() }.GetHashCode(), - new SemanticDomain { Name = Guid.NewGuid().ToString() }.GetHashCode() + Is.Not.EqualTo(new SemanticDomain { Name = Guid.NewGuid().ToString() }.GetHashCode()) ); } } @@ -51,37 +51,37 @@ public class SemanticDomainFullTests public void TestEquals() { var domain = new SemanticDomainFull { Name = Name }; - Assert.That(domain.Equals(new SemanticDomainFull { Name = Name })); + Assert.That(domain.Equals(new SemanticDomainFull { Name = Name }), Is.True); } [Test] public void TestEqualsNull() { var domain = new SemanticDomainFull { Name = Name }; - Assert.IsFalse(domain.Equals(null)); + Assert.That(domain.Equals(null), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new SemanticDomainFull { Id = "1" }.GetHashCode(), - new SemanticDomainFull { Id = "2" }.GetHashCode() + Is.Not.EqualTo(new SemanticDomainFull { Id = "2" }.GetHashCode()) ); - Assert.AreNotEqual( + Assert.That( new SemanticDomainFull { Name = "1" }.GetHashCode(), - new SemanticDomainFull { Name = "2" }.GetHashCode() + Is.Not.EqualTo(new SemanticDomainFull { Name = "2" }.GetHashCode()) ); - Assert.AreNotEqual( + Assert.That( new SemanticDomainFull { Description = "1" }.GetHashCode(), - new SemanticDomainFull { Description = "2" }.GetHashCode() + Is.Not.EqualTo(new SemanticDomainFull { Description = "2" }.GetHashCode()) ); - Assert.AreNotEqual( + Assert.That( new SemanticDomainFull { Questions = new List { "1" } }.GetHashCode(), - new SemanticDomainFull { Questions = new List { "2" } }.GetHashCode() + Is.Not.EqualTo(new SemanticDomainFull { Questions = new List { "2" } }.GetHashCode()) ); } } diff --git a/Backend.Tests/Models/SenseTests.cs b/Backend.Tests/Models/SenseTests.cs index de643a11d1..c4274a091d 100644 --- a/Backend.Tests/Models/SenseTests.cs +++ b/Backend.Tests/Models/SenseTests.cs @@ -16,29 +16,29 @@ public class SenseTests public void TestEquals() { var sense = new Sense { Guid = _commonGuid, Accessibility = Accessibility }; - Assert.That(sense.Equals(new Sense { Guid = _commonGuid, Accessibility = Accessibility })); + Assert.That(sense.Equals(new Sense { Guid = _commonGuid, Accessibility = Accessibility }), Is.True); } [Test] public void TestEqualsNull() { var sense = new Sense { Accessibility = Accessibility }; - Assert.IsFalse(sense.Equals(null)); + Assert.That(sense.Equals(null), Is.False); } [Test] public void TestClone() { var sense = new Sense { Accessibility = Status.Deleted }; - Assert.AreEqual(sense, sense.Clone()); + Assert.That(sense, Is.EqualTo(sense.Clone())); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new Sense { Guid = _commonGuid, Accessibility = Status.Active }.GetHashCode(), - new Sense { Guid = _commonGuid, Accessibility = Status.Deleted }.GetHashCode()); + Is.Not.EqualTo(new Sense { Guid = _commonGuid, Accessibility = Status.Deleted }.GetHashCode())); } [Test] @@ -48,13 +48,13 @@ public void TestIsEmpty() var fullDef = new Definition { Language = "l2", Text = "something" }; var emptyGloss = new Gloss { Language = "l3" }; var fullGloss = new Gloss { Language = "l4", Def = "anything" }; - Assert.IsFalse(new Sense { Glosses = new List { emptyGloss, fullGloss } }.IsEmpty()); - Assert.IsFalse(new Sense { Definitions = new List { fullDef, emptyDef } }.IsEmpty()); - Assert.IsTrue(new Sense + Assert.That(new Sense { Glosses = new List { emptyGloss, fullGloss } }.IsEmpty(), Is.False); + Assert.That(new Sense { Definitions = new List { fullDef, emptyDef } }.IsEmpty(), Is.False); + Assert.That(new Sense { Definitions = new List { emptyDef }, Glosses = new List { emptyGloss } - }.IsEmpty()); + }.IsEmpty(), Is.True); } [Test] @@ -67,11 +67,11 @@ public void TestIsContainedIn() var domGlossSense = new Sense { Glosses = glossList, SemanticDomains = domList }; var defGlossSense = new Sense { Definitions = defList, Glosses = glossList }; // For empty senses, semantic domains are checked. - Assert.IsTrue((new Sense()).IsContainedIn(domSense)); - Assert.IsFalse(domSense.IsContainedIn(new Sense())); + Assert.That((new Sense()).IsContainedIn(domSense), Is.True); + Assert.That(domSense.IsContainedIn(new Sense()), Is.False); // For non-empty senses, semantic domains aren't checked. - Assert.IsTrue(domGlossSense.IsContainedIn(defGlossSense)); - Assert.IsFalse(defGlossSense.IsContainedIn(domGlossSense)); + Assert.That(domGlossSense.IsContainedIn(defGlossSense), Is.True); + Assert.That(defGlossSense.IsContainedIn(domGlossSense), Is.False); } } @@ -84,30 +84,30 @@ public class DefinitionTests public void TestEquals() { var definition = new Definition { Language = Language, Text = Text }; - Assert.That(definition.Equals(new Definition { Language = Language, Text = Text })); + Assert.That(definition.Equals(new Definition { Language = Language, Text = Text }), Is.True); } [Test] public void TestNotEquals() { var definition = new Definition { Language = Language, Text = Text }; - Assert.IsFalse(definition.Equals(new Definition { Language = Language, Text = "Different text" })); - Assert.IsFalse(definition.Equals(new Definition { Language = "Different language", Text = Text })); + Assert.That(definition.Equals(new Definition { Language = Language, Text = "Different text" }), Is.False); + Assert.That(definition.Equals(new Definition { Language = "Different language", Text = Text }), Is.False); } [Test] public void TestEqualsNull() { var definition = new Definition { Language = Language, Text = Text }; - Assert.IsFalse(definition.Equals(null)); + Assert.That(definition.Equals(null), Is.False); } [Test] public void TestHashCode() { var defHash = new Definition { Language = Language, Text = Text }.GetHashCode(); - Assert.AreNotEqual(defHash, new Definition { Language = "DifferentLang", Text = Text }.GetHashCode()); - Assert.AreNotEqual(defHash, new Definition { Language = Language, Text = "DifferentText" }.GetHashCode()); + Assert.That(defHash, Is.Not.EqualTo(new Definition { Language = "DifferentLang", Text = Text }.GetHashCode())); + Assert.That(defHash, Is.Not.EqualTo(new Definition { Language = Language, Text = "DifferentText" }.GetHashCode())); } } @@ -120,22 +120,22 @@ public class GlossTests public void TestEquals() { var gloss = new Gloss { Language = Language, Def = Def }; - Assert.That(gloss.Equals(new Gloss { Language = Language, Def = Def })); + Assert.That(gloss.Equals(new Gloss { Language = Language, Def = Def }), Is.True); } [Test] public void TestEqualsNull() { var gloss = new Gloss { Language = Language, Def = Def }; - Assert.IsFalse(gloss.Equals(null)); + Assert.That(gloss.Equals(null), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new Gloss { Language = "1" }.GetHashCode(), - new Gloss { Language = "2" }.GetHashCode() + Is.Not.EqualTo(new Gloss { Language = "2" }.GetHashCode()) ); } } @@ -150,7 +150,7 @@ public void TestEquals() { var gramInfo1 = new GrammaticalInfo { CatGroup = CatGroup, GrammaticalCategory = GrammaticalCategory }; var gramInfo2 = new GrammaticalInfo { CatGroup = CatGroup, GrammaticalCategory = GrammaticalCategory }; - Assert.That(gramInfo1.Equals(gramInfo2)); + Assert.That(gramInfo1.Equals(gramInfo2), Is.True); } [Test] @@ -163,10 +163,10 @@ public void TestEqualsNull() [Test] public void TestHashCode() { - Assert.AreNotEqual(new GrammaticalInfo("1").GetHashCode(), new GrammaticalInfo("2").GetHashCode()); - Assert.AreNotEqual( + Assert.That(new GrammaticalInfo("1").GetHashCode(), Is.Not.EqualTo(new GrammaticalInfo("2").GetHashCode())); + Assert.That( new GrammaticalInfo { CatGroup = GramCatGroup.Prenoun }.GetHashCode(), - new GrammaticalInfo { CatGroup = GramCatGroup.Preverb }.GetHashCode() + Is.Not.EqualTo(new GrammaticalInfo { CatGroup = GramCatGroup.Preverb }.GetHashCode()) ); } } diff --git a/Backend.Tests/Models/UserEditTests.cs b/Backend.Tests/Models/UserEditTests.cs index 0692816cdd..bff69252bc 100644 --- a/Backend.Tests/Models/UserEditTests.cs +++ b/Backend.Tests/Models/UserEditTests.cs @@ -13,29 +13,29 @@ public class UserEditTests public void TestEquals() { var edit = new UserEdit { ProjectId = ProjectId }; - Assert.That(edit.Equals(new UserEdit { ProjectId = ProjectId })); + Assert.That(edit.Equals(new UserEdit { ProjectId = ProjectId }), Is.True); } [Test] public void TestNotEquals() { var edit = new UserEdit { ProjectId = ProjectId }; - Assert.IsFalse(edit.Equals(new UserEdit { ProjectId = "Different Id" })); + Assert.That(edit.Equals(new UserEdit { ProjectId = "Different Id" }), Is.False); } [Test] public void TestEqualsNull() { var edit = new UserEdit { ProjectId = ProjectId }; - Assert.IsFalse(edit.Equals(null)); + Assert.That(edit.Equals(null), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new UserEdit { ProjectId = ProjectId }.GetHashCode(), - new UserEdit { ProjectId = "Different Id" }.GetHashCode()); + Is.Not.EqualTo(new UserEdit { ProjectId = "Different Id" }.GetHashCode())); } } @@ -49,18 +49,18 @@ public class UserEditStepWrapperTests public void TestEquals() { var wrapper = new UserEditStepWrapper(GoalIndex, StepString, StepIndex); - Assert.That(wrapper.Equals(new UserEditStepWrapper(GoalIndex, StepString, StepIndex))); - Assert.IsFalse(wrapper.Equals(new UserEditStepWrapper(99, StepString, StepIndex))); - Assert.IsFalse(wrapper.Equals(new UserEditStepWrapper(GoalIndex, "Different step", StepIndex))); - Assert.IsFalse(wrapper.Equals(new UserEditStepWrapper(GoalIndex, StepString, 99))); - Assert.IsFalse(wrapper.Equals(null)); + Assert.That(wrapper.Equals(new UserEditStepWrapper(GoalIndex, StepString, StepIndex)), Is.True); + Assert.That(wrapper.Equals(new UserEditStepWrapper(99, StepString, StepIndex)), Is.False); + Assert.That(wrapper.Equals(new UserEditStepWrapper(GoalIndex, "Different step", StepIndex)), Is.False); + Assert.That(wrapper.Equals(new UserEditStepWrapper(GoalIndex, StepString, 99)), Is.False); + Assert.That(wrapper.Equals(null), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual(new UserEditStepWrapper(GoalIndex, StepString, StepIndex).GetHashCode(), - new UserEditStepWrapper(99, StepString, StepIndex).GetHashCode()); + Assert.That(new UserEditStepWrapper(GoalIndex, StepString, StepIndex).GetHashCode(), + Is.Not.EqualTo(new UserEditStepWrapper(99, StepString, StepIndex).GetHashCode())); } } @@ -75,15 +75,15 @@ public class EditTests public void TestEquals() { var edit = new Edit { Guid = _guid }; - Assert.That(edit.Equals(new Edit { Guid = _guid })); + Assert.That(edit.Equals(new Edit { Guid = _guid }), Is.True); edit.GoalType = GoalType; - Assert.That(edit.Equals(new Edit { Guid = _guid, GoalType = GoalType })); + Assert.That(edit.Equals(new Edit { Guid = _guid, GoalType = GoalType }), Is.True); edit.StepData = _stepData; Assert.That(edit.Equals( - new Edit { GoalType = GoalType, Guid = _guid, StepData = _stepData })); + new Edit { GoalType = GoalType, Guid = _guid, StepData = _stepData }), Is.True); edit.Changes = Changes; Assert.That(edit.Equals( - new Edit { GoalType = GoalType, Guid = _guid, StepData = _stepData, Changes = Changes })); + new Edit { GoalType = GoalType, Guid = _guid, StepData = _stepData, Changes = Changes }), Is.True); } @@ -91,21 +91,21 @@ public void TestEquals() public void TestEqualsNull() { var edit = new Edit(); - Assert.IsFalse(edit.Equals(null)); + Assert.That(edit.Equals(null), Is.False); edit = new Edit { GoalType = GoalType }; - Assert.IsFalse(edit.Equals(null)); + Assert.That(edit.Equals(null), Is.False); edit = new Edit { StepData = _stepData }; - Assert.IsFalse(edit.Equals(null)); + Assert.That(edit.Equals(null), Is.False); edit = new Edit { Changes = Changes }; - Assert.IsFalse(edit.Equals(null)); + Assert.That(edit.Equals(null), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new Edit { Guid = _guid, GoalType = GoalType }.GetHashCode(), - new Edit { Guid = _guid, GoalType = 5 }.GetHashCode()); + Is.Not.EqualTo(new Edit { Guid = _guid, GoalType = 5 }.GetHashCode())); } } } diff --git a/Backend.Tests/Models/UserRoleTests.cs b/Backend.Tests/Models/UserRoleTests.cs index 782b9b0ba1..97ff2e7e29 100644 --- a/Backend.Tests/Models/UserRoleTests.cs +++ b/Backend.Tests/Models/UserRoleTests.cs @@ -16,36 +16,36 @@ public class UserRoleTests public void TestCloneEquals() { var userRole = new UserRole { Id = Id1, ProjectId = ProjectId1, Role = Role1 }; - Assert.AreEqual(userRole, userRole.Clone()); + Assert.That(userRole, Is.EqualTo(userRole.Clone())); } [Test] public void TestNotEquals() { var userRole = new UserRole { Id = Id1, ProjectId = ProjectId1, Role = Role1 }; - Assert.AreNotEqual(userRole, new UserRole { Id = Id2, ProjectId = ProjectId1, Role = Role1 }); - Assert.AreNotEqual(userRole, new UserRole { Id = Id1, ProjectId = ProjectId2, Role = Role1 }); - Assert.AreNotEqual(userRole, new UserRole { Id = Id1, ProjectId = ProjectId1, Role = Role2 }); + Assert.That(userRole, Is.Not.EqualTo(new UserRole { Id = Id2, ProjectId = ProjectId1, Role = Role1 })); + Assert.That(userRole, Is.Not.EqualTo(new UserRole { Id = Id1, ProjectId = ProjectId2, Role = Role1 })); + Assert.That(userRole, Is.Not.EqualTo(new UserRole { Id = Id1, ProjectId = ProjectId1, Role = Role2 })); } [Test] public void TestEqualsNull() { - Assert.AreNotEqual(new UserRole(), null); + Assert.That(new UserRole().Equals(null), Is.False); } [Test] public void TestGetHashCode() { - Assert.AreNotEqual( + Assert.That( new UserRole { Id = Id1 }.GetHashCode(), - new UserRole { Id = Id2 }.GetHashCode()); - Assert.AreNotEqual( + Is.Not.EqualTo(new UserRole { Id = Id2 }.GetHashCode())); + Assert.That( new UserRole { ProjectId = ProjectId1 }.GetHashCode(), - new UserRole { ProjectId = ProjectId2 }.GetHashCode()); - Assert.AreNotEqual( + Is.Not.EqualTo(new UserRole { ProjectId = ProjectId2 }.GetHashCode())); + Assert.That( new UserRole { Role = Role1 }.GetHashCode(), - new UserRole { Role = Role2 }.GetHashCode()); + Is.Not.EqualTo(new UserRole { Role = Role2 }.GetHashCode())); } } public class ProjectRoleTests @@ -59,32 +59,32 @@ public class ProjectRoleTests public void TestCloneEquals() { var projectRole = new ProjectRole { ProjectId = ProjectId1, Role = Role1 }; - Assert.AreEqual(projectRole, projectRole.Clone()); + Assert.That(projectRole, Is.EqualTo(projectRole.Clone())); } [Test] public void TestNotEquals() { var projectRole = new ProjectRole { ProjectId = ProjectId1, Role = Role1 }; - Assert.AreNotEqual(projectRole, new ProjectRole { ProjectId = ProjectId2, Role = Role1 }); - Assert.AreNotEqual(projectRole, new ProjectRole { ProjectId = ProjectId1, Role = Role2 }); + Assert.That(projectRole, Is.Not.EqualTo(new ProjectRole { ProjectId = ProjectId2, Role = Role1 })); + Assert.That(projectRole, Is.Not.EqualTo(new ProjectRole { ProjectId = ProjectId1, Role = Role2 })); } [Test] public void TestEqualsNull() { - Assert.AreNotEqual(new ProjectRole(), null); + Assert.That(new ProjectRole().Equals(null), Is.False); } [Test] public void TestGetHashCode() { - Assert.AreNotEqual( + Assert.That( new ProjectRole { ProjectId = ProjectId1 }.GetHashCode(), - new ProjectRole { ProjectId = ProjectId2 }.GetHashCode()); - Assert.AreNotEqual( + Is.Not.EqualTo(new ProjectRole { ProjectId = ProjectId2 }.GetHashCode())); + Assert.That( new ProjectRole { Role = Role1 }.GetHashCode(), - new ProjectRole { Role = Role2 }.GetHashCode()); + Is.Not.EqualTo(new ProjectRole { Role = Role2 }.GetHashCode())); } } } diff --git a/Backend.Tests/Models/UserTests.cs b/Backend.Tests/Models/UserTests.cs index f89228138a..5458766ef9 100644 --- a/Backend.Tests/Models/UserTests.cs +++ b/Backend.Tests/Models/UserTests.cs @@ -11,22 +11,22 @@ public class UserTests public void TestEquals() { var user = new User { Name = Name }; - Assert.That(user.Equals(new User { Name = Name })); + Assert.That(user.Equals(new User { Name = Name }), Is.True); } [Test] public void TestEqualsNull() { var user = new User { Name = Name }; - Assert.IsFalse(user.Equals(null)); + Assert.That(user.Equals(null), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new User { Name = Name }.GetHashCode(), - new User { Name = "Different Name" }.GetHashCode() + Is.Not.EqualTo(new User { Name = "Different Name" }.GetHashCode()) ); } @@ -34,9 +34,9 @@ public void TestHashCode() public void TestSanitize() { var user = new User { Avatar = "ava", Password = "pas", Token = "tok" }; - Assert.IsFalse(user.Equals(new User())); + Assert.That(user.Equals(new User()), Is.False); user.Sanitize(); - Assert.IsTrue(user.Equals(new User())); + Assert.That(user.Equals(new User()), Is.True); } } @@ -46,8 +46,8 @@ public class CredentialsTest public void TestConstructor() { var credentials = new Credentials(); - Assert.AreEqual(credentials.Username, ""); - Assert.AreEqual(credentials.Password, ""); + Assert.That(credentials.Username, Is.EqualTo("")); + Assert.That(credentials.Password, Is.EqualTo("")); } } } diff --git a/Backend.Tests/Models/WordTests.cs b/Backend.Tests/Models/WordTests.cs index 57382f9ec2..d0af74eb7c 100644 --- a/Backend.Tests/Models/WordTests.cs +++ b/Backend.Tests/Models/WordTests.cs @@ -18,14 +18,14 @@ public class WordTests public void TestEquals() { var word = new Word { Guid = _commonGuid, Vernacular = Vernacular }; - Assert.That(word.Equals(new Word { Guid = _commonGuid, Vernacular = Vernacular })); + Assert.That(word.Equals(new Word { Guid = _commonGuid, Vernacular = Vernacular }), Is.True); } [Test] public void TestEqualsNull() { var word = new Word { Vernacular = Vernacular }; - Assert.IsFalse(word.Equals(null)); + Assert.That(word.Equals(null), Is.False); } [Test] @@ -33,23 +33,23 @@ public void TestEqualsNote() { var word = new Word { Guid = _commonGuid, Note = new Note { Language = Vernacular, Text = Text } }; Assert.That(word.Equals( - new Word { Guid = _commonGuid, Note = new Note { Language = Vernacular, Text = Text } })); + new Word { Guid = _commonGuid, Note = new Note { Language = Vernacular, Text = Text } }), Is.True); } [Test] public void TestNotEqualsNote() { var word = new Word { Guid = _commonGuid, Note = new Note { Language = Vernacular, Text = "Bad Text" } }; - Assert.IsFalse(word.Equals( - new Word { Guid = _commonGuid, Note = new Note { Language = Vernacular, Text = Text } })); + Assert.That(word.Equals( + new Word { Guid = _commonGuid, Note = new Note { Language = Vernacular, Text = Text } }), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new Word { Guid = _commonGuid, Vernacular = "1" }.GetHashCode(), - new Word { Guid = _commonGuid, Vernacular = "2" }.GetHashCode()); + Is.Not.EqualTo(new Word { Guid = _commonGuid, Vernacular = "2" }.GetHashCode())); } [Test] @@ -58,9 +58,9 @@ public void TestContains() var word = Util.RandomWord(); var diffWord = word.Clone(); diffWord.Senses.RemoveAt(1); - Assert.IsTrue(word.Contains(diffWord)); + Assert.That(word.Contains(diffWord), Is.True); diffWord.Vernacular = "different"; - Assert.IsFalse(word.Contains(diffWord)); + Assert.That(word.Contains(diffWord), Is.False); } [Test] @@ -92,17 +92,17 @@ public void TestAppendContainedWordContents() // create a userId var userId = Util.RandString(); - Assert.That(oldWord.AppendContainedWordContents(newWord, userId)); + Assert.That(oldWord.AppendContainedWordContents(newWord, userId), Is.True); var updatedSense = oldWord.Senses.Find(s => s.Guid == newSense.Guid); Assert.That(updatedSense, Is.Not.Null); var updatedDom = updatedSense!.SemanticDomains.Find(dom => dom.Id == newSemDom.Id); Assert.That(updatedDom, Is.Not.Null); - Assert.That(oldWord.Flag.Equals(newFlag)); - Assert.That(oldWord.Note.Equals(newNote)); - Assert.That(oldWord.Audio.Contains(Text)); - Assert.That(oldWord.EditedBy.Contains(Text)); - Assert.That(oldWord.History.Contains(Text)); + Assert.That(oldWord.Flag.Equals(newFlag), Is.True); + Assert.That(oldWord.Note.Equals(newNote), Is.True); + Assert.That(oldWord.Audio.Contains(Text), Is.True); + Assert.That(oldWord.EditedBy.Contains(Text), Is.True); + Assert.That(oldWord.History.Contains(Text), Is.True); // if userId append successfully Assert.That(updatedDom?.UserId, Is.EqualTo(userId)); @@ -120,7 +120,7 @@ public void TestAppendContainedWordContents() newWord2.Senses = new List { newSense2 }; // 3. AppendContainedWordContents with a empty userId - Assert.That(oldWord.AppendContainedWordContents(newWord2, "")); + Assert.That(oldWord.AppendContainedWordContents(newWord2, ""), Is.True); var updatedSense2 = oldWord.Senses.Find(s => s.Guid == newSense2.Guid); Assert.That(updatedSense2, Is.Not.Null); var updatedDom2 = updatedSense2!.SemanticDomains.Find(dom => dom.Id == newSemDom2.Id); @@ -148,7 +148,7 @@ public void TestAppendContainedWordContents() // create a userId2 var userId2 = Util.RandString(); - Assert.That(oldWord.AppendContainedWordContents(newWord3, userId2)); + Assert.That(oldWord.AppendContainedWordContents(newWord3, userId2), Is.True); var updatedSense3 = oldWord.Senses.Find(s => s.Guid == newSense3.Guid); Assert.That(updatedSense3, Is.Not.Null); @@ -174,37 +174,37 @@ public class NoteTests public void TestEquals() { var note = new Note { Language = Language }; - Assert.That(note.Equals(new Note { Language = Language })); + Assert.That(note.Equals(new Note { Language = Language }), Is.True); } [Test] public void TestEqualsNull() { var note = new Note { Language = Language }; - Assert.IsFalse(note.Equals(null)); + Assert.That(note.Equals(null), Is.False); } [Test] public void TestNotEquals() { var note = new Note { Language = Language, Text = Text }; - Assert.IsFalse(note.Equals(new Note { Language = "Different language", Text = Text })); + Assert.That(note.Equals(new Note { Language = "Different language", Text = Text }), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new Note { Text = "1" }.GetHashCode(), - new Note { Text = "2" }.GetHashCode()); + Is.Not.EqualTo(new Note { Text = "2" }.GetHashCode())); } [Test] public void TestIsBlank() { - Assert.That(new Note { Text = " " }.IsBlank()); - Assert.That(new Note { Language = Language }.IsBlank()); - Assert.IsFalse(new Note { Text = Text }.IsBlank()); + Assert.That(new Note { Text = " " }.IsBlank(), Is.True); + Assert.That(new Note { Language = Language }.IsBlank(), Is.True); + Assert.That(new Note { Text = Text }.IsBlank(), Is.False); } [Test] @@ -215,12 +215,12 @@ public void TestAppendBlank() var blankNote = new Note(); var newNote = note.Clone(); blankNote.Append(newNote); - Assert.That(blankNote.Equals(note)); + Assert.That(blankNote.Equals(note), Is.True); blankNote = new Note(); var oldNote = note.Clone(); oldNote.Append(blankNote); - Assert.That(oldNote.Equals(note)); + Assert.That(oldNote.Equals(note), Is.True); } [Test] @@ -230,7 +230,7 @@ public void TestAppendIdentical() var oldNote = note.Clone(); var newNote = note.Clone(); oldNote.Append(newNote); - Assert.That(oldNote.Equals(note)); + Assert.That(oldNote.Equals(note), Is.True); } [Test] @@ -244,7 +244,7 @@ public void TestAppendSameLanguage() oldNote.Append(newNote); var expectedNote = note.Clone(); expectedNote.Text += $"; {newText}"; - Assert.That(oldNote.Equals(expectedNote)); + Assert.That(oldNote.Equals(expectedNote), Is.True); } [Test] @@ -258,7 +258,7 @@ public void TestAppendDiffLanguage() oldNote.Append(newNote); var expectedNote = note.Clone(); expectedNote.Text += $"; [{newLanguage}] {newNote.Text}"; - Assert.That(oldNote.Equals(expectedNote)); + Assert.That(oldNote.Equals(expectedNote), Is.True); } } @@ -271,33 +271,33 @@ public class FlagTests public void TestEquals() { var flag = new Flag { Active = true, Text = Text }; - Assert.That(flag.Equals(new Flag { Active = true, Text = Text })); + Assert.That(flag.Equals(new Flag { Active = true, Text = Text }), Is.True); } [Test] public void TestEqualsNull() { var flag = new Flag { Active = true }; - Assert.IsFalse(flag.Equals(null)); + Assert.That(flag.Equals(null), Is.False); } [Test] public void TestNotEquals() { var flag = new Flag { Active = true, Text = Text }; - Assert.IsFalse(flag.Equals(new Flag { Active = false, Text = Text })); - Assert.IsFalse(flag.Equals(new Flag { Active = true, Text = Text2 })); + Assert.That(flag.Equals(new Flag { Active = false, Text = Text }), Is.False); + Assert.That(flag.Equals(new Flag { Active = true, Text = Text2 }), Is.False); } [Test] public void TestHashCode() { - Assert.AreNotEqual( + Assert.That( new Flag { Text = Text }.GetHashCode(), - new Flag { Text = Text2 }.GetHashCode()); - Assert.AreNotEqual( + Is.Not.EqualTo(new Flag { Text = Text2 }.GetHashCode())); + Assert.That( new Flag { Active = true }.GetHashCode(), - new Flag { Active = false }.GetHashCode()); + Is.Not.EqualTo(new Flag { Active = false }.GetHashCode())); } [Test] @@ -309,12 +309,12 @@ public void TestAppendBlank() var oldFlag = flag.Clone(); var newFlag = blankFlag.Clone(); oldFlag.Append(newFlag); - Assert.That(oldFlag.Equals(flag)); + Assert.That(oldFlag.Equals(flag), Is.True); oldFlag = blankFlag.Clone(); newFlag = flag.Clone(); oldFlag.Append(newFlag); - Assert.That(oldFlag.Equals(flag)); + Assert.That(oldFlag.Equals(flag), Is.True); } [Test] @@ -326,12 +326,12 @@ public void TestAppendNotActive() var oldFlag = activeFlag.Clone(); var newFlag = inactiveFlag.Clone(); oldFlag.Append(newFlag); - Assert.That(oldFlag.Equals(activeFlag)); + Assert.That(oldFlag.Equals(activeFlag), Is.True); oldFlag = inactiveFlag.Clone(); newFlag = activeFlag.Clone(); oldFlag.Append(newFlag); - Assert.That(oldFlag.Equals(activeFlag)); + Assert.That(oldFlag.Equals(activeFlag), Is.True); } [Test] @@ -341,7 +341,7 @@ public void TestAppendIdentical() var oldFlag = flag.Clone(); var newFlag = flag.Clone(); oldFlag.Append(newFlag); - Assert.That(oldFlag.Equals(flag)); + Assert.That(oldFlag.Equals(flag), Is.True); } [Test] @@ -353,7 +353,7 @@ public void TestAppendNewText() oldFlag.Append(newFlag); var expectedFlag = flag.Clone(); expectedFlag.Text += $"; {Text2}"; - Assert.That(oldFlag.Equals(expectedFlag)); + Assert.That(oldFlag.Equals(expectedFlag), Is.True); } } } diff --git a/Backend.Tests/Services/MergeServiceTests.cs b/Backend.Tests/Services/MergeServiceTests.cs index ea6ae7b314..a4fd1bb8d8 100644 --- a/Backend.Tests/Services/MergeServiceTests.cs +++ b/Backend.Tests/Services/MergeServiceTests.cs @@ -46,7 +46,7 @@ public void MergeWordsOneChildTest() // There should only be 1 word added and it should be identical to what we passed in Assert.That(newWords, Has.Count.EqualTo(1)); - Assert.That(newWords.First().ContentEquals(thisWord)); + Assert.That(newWords.First().ContentEquals(thisWord), Is.True); // Check that the only word in the frontier is the new word var frontier = _wordRepo.GetFrontier(ProjId).Result; @@ -77,9 +77,9 @@ public void MergeWordsDeleteTest() var newWords = _mergeService.Merge(ProjId, new List { mergeObject }).Result; // There should be no word added and no words left in the frontier. - Assert.That(newWords, Has.Count.EqualTo(0)); + Assert.That(newWords, Is.Empty); var frontier = _wordRepo.GetFrontier(ProjId).Result; - Assert.That(frontier, Has.Count.EqualTo(0)); + Assert.That(frontier, Is.Empty); } [Test] @@ -92,7 +92,7 @@ public void MergeWordsMultiChildTest() { var child = Util.RandomWord(ProjId); var id = _wordRepo.Create(child).Result.Id; - Assert.IsNotNull(_wordRepo.GetWord(ProjId, id).Result); + Assert.That(_wordRepo.GetWord(ProjId, id).Result, Is.Not.Null); mergeWords.Children.Add(new MergeSourceWord { SrcWordId = id }); } Assert.That(_wordRepo.GetFrontier(ProjId).Result, Has.Count.EqualTo(numberOfChildren)); @@ -105,7 +105,7 @@ public void MergeWordsMultiChildTest() Assert.That(dbParent.History, Has.Count.EqualTo(numberOfChildren)); // Confirm that parent added to repo and children not in frontier. - Assert.IsNotNull(_wordRepo.GetWord(ProjId, dbParent.Id).Result); + Assert.That(_wordRepo.GetWord(ProjId, dbParent.Id).Result, Is.Not.Null); Assert.That(_wordRepo.GetFrontier(ProjId).Result, Has.Count.EqualTo(1)); } @@ -118,13 +118,13 @@ public void MergeWordsMultipleTest() var newWords = _mergeService.Merge(ProjId, mergeWordsList).Result; Assert.That(newWords, Has.Count.EqualTo(wordCount)); - Assert.AreNotEqual(newWords.First().Id, newWords.Last().Id); + Assert.That(newWords.First().Id, Is.Not.EqualTo(newWords.Last().Id)); var frontier = _wordRepo.GetFrontier(ProjId).Result; Assert.That(frontier, Has.Count.EqualTo(wordCount)); - Assert.AreNotEqual(frontier.First().Id, frontier.Last().Id); - Assert.Contains(frontier.First(), newWords); - Assert.Contains(frontier.Last(), newWords); + Assert.That(frontier.First().Id, Is.Not.EqualTo(frontier.Last().Id)); + Assert.That(newWords, Does.Contain(frontier.First())); + Assert.That(newWords, Does.Contain(frontier.Last())); } [Test] @@ -146,19 +146,19 @@ public void UndoMergeOneChildTest() // There should only be 1 word added and it should be identical to what we passed in Assert.That(newWords, Has.Count.EqualTo(1)); - Assert.That(newWords.First().ContentEquals(thisWord)); + Assert.That(newWords.First().ContentEquals(thisWord), Is.True); var childIds = mergeObject.Children.Select(word => word.SrcWordId).ToList(); var parentIds = new List { newWords[0].Id }; var mergedWord = new MergeUndoIds(parentIds, childIds); var undo = _mergeService.UndoMerge(ProjId, mergedWord).Result; - Assert.IsTrue(undo); + Assert.That(undo, Is.True); var frontierWords = _wordRepo.GetFrontier(ProjId).Result; var frontierWordIds = frontierWords.Select(word => word.Id).ToList(); Assert.That(frontierWords, Has.Count.EqualTo(1)); - Assert.Contains(childIds[0], frontierWordIds); + Assert.That(frontierWordIds, Does.Contain(childIds[0])); } [Test] @@ -171,7 +171,7 @@ public void UndoMergeMultiChildTest() { var child = Util.RandomWord(ProjId); var id = _wordRepo.Create(child).Result.Id; - Assert.IsNotNull(_wordRepo.GetWord(ProjId, id).Result); + Assert.That(_wordRepo.GetWord(ProjId, id).Result, Is.Not.Null); mergeWords.Children.Add(new MergeSourceWord { SrcWordId = id }); } Assert.That(_wordRepo.GetFrontier(ProjId).Result, Has.Count.EqualTo(numberOfChildren)); @@ -185,15 +185,13 @@ public void UndoMergeMultiChildTest() var parentIds = new List { newWords[0].Id }; var mergedWord = new MergeUndoIds(parentIds, childIds); var undo = _mergeService.UndoMerge(ProjId, mergedWord).Result; - Assert.IsTrue(undo); + Assert.That(undo, Is.True); var frontierWords = _wordRepo.GetFrontier(ProjId).Result; var frontierWordIds = frontierWords.Select(word => word.Id).ToList(); Assert.That(frontierWords, Has.Count.EqualTo(numberOfChildren)); - Assert.Contains(childIds[0], frontierWordIds); - Assert.Contains(childIds[1], frontierWordIds); - Assert.Contains(childIds[2], frontierWordIds); + childIds.ForEach(id => Assert.That(frontierWordIds, Does.Contain(id))); } [Test] @@ -205,7 +203,7 @@ public void AddMergeToBlacklistTest() var blacklist = _mergeBlacklistRepo.GetAllEntries(ProjId).Result; Assert.That(blacklist, Has.Count.EqualTo(1)); var expectedEntry = new MergeBlacklistEntry { ProjectId = ProjId, UserId = UserId, WordIds = wordIds }; - Assert.That(expectedEntry.ContentEquals(blacklist.First())); + Assert.That(expectedEntry.ContentEquals(blacklist.First()), Is.True); } [Test] @@ -214,10 +212,10 @@ public void AddMergeToBlacklistErrorTest() _ = _mergeBlacklistRepo.DeleteAllEntries(ProjId).Result; var wordIds0 = new List(); var wordIds1 = new List { "1" }; - Assert.ThrowsAsync( - async () => { await _mergeService.AddToMergeBlacklist(ProjId, UserId, wordIds0); }); - Assert.ThrowsAsync( - async () => { await _mergeService.AddToMergeBlacklist(ProjId, UserId, wordIds1); }); + Assert.That( + async () => { await _mergeService.AddToMergeBlacklist(ProjId, UserId, wordIds0); }, Throws.TypeOf()); + Assert.That( + async () => { await _mergeService.AddToMergeBlacklist(ProjId, UserId, wordIds1); }, Throws.TypeOf()); } [Test] @@ -227,9 +225,9 @@ public void IsInMergeBlacklistTest() var wordIds = new List { "1", "2", "3" }; var subWordIds = new List { "3", "2" }; - Assert.IsFalse(_mergeService.IsInMergeBlacklist(ProjId, subWordIds).Result); + Assert.That(_mergeService.IsInMergeBlacklist(ProjId, subWordIds).Result, Is.False); _ = _mergeService.AddToMergeBlacklist(ProjId, UserId, wordIds).Result; - Assert.IsTrue(_mergeService.IsInMergeBlacklist(ProjId, subWordIds).Result); + Assert.That(_mergeService.IsInMergeBlacklist(ProjId, subWordIds).Result, Is.True); } [Test] @@ -238,10 +236,10 @@ public void IsInMergeBlacklistErrorTest() _ = _mergeBlacklistRepo.DeleteAllEntries(ProjId).Result; var wordIds0 = new List(); var wordIds1 = new List { "1" }; - Assert.ThrowsAsync( - async () => { await _mergeService.IsInMergeBlacklist(ProjId, wordIds0); }); - Assert.ThrowsAsync( - async () => { await _mergeService.IsInMergeBlacklist(ProjId, wordIds1); }); + Assert.That( + async () => { await _mergeService.IsInMergeBlacklist(ProjId, wordIds0); }, Throws.TypeOf()); + Assert.That( + async () => { await _mergeService.IsInMergeBlacklist(ProjId, wordIds1); }, Throws.TypeOf()); } [Test] @@ -284,7 +282,7 @@ public void UpdateMergeBlacklistTest() // The only blacklistEntry with at least two ids in the frontier is A. var newBlacklist = _mergeBlacklistRepo.GetAllEntries(ProjId).Result; Assert.That(newBlacklist, Has.Count.EqualTo(1)); - Assert.AreEqual(newBlacklist.First().WordIds, new List { "2", "3" }); + Assert.That(newBlacklist.First().WordIds, Is.EqualTo(new List { "2", "3" })); } } } diff --git a/Backend.Tests/Services/PasswordResetServiceTests.cs b/Backend.Tests/Services/PasswordResetServiceTests.cs index bca681c936..6eaf411767 100644 --- a/Backend.Tests/Services/PasswordResetServiceTests.cs +++ b/Backend.Tests/Services/PasswordResetServiceTests.cs @@ -31,7 +31,7 @@ public void CreateRequest() _userRepo.Create(user); var res = _passwordResetService.CreatePasswordReset(Email).Result; - Assert.Contains(res, _passwordResets.GetResets()); + Assert.That(_passwordResets.GetResets(), Does.Contain(res)); } [Test] @@ -41,8 +41,8 @@ public void ResetSuccess() _userRepo.Create(user); var request = _passwordResetService.CreatePasswordReset(Email).Result; - Assert.IsTrue(_passwordResetService.ResetPassword(request.Token, Password).Result); - Assert.IsEmpty(_passwordResets.GetResets()); + Assert.That(_passwordResetService.ResetPassword(request.Token, Password).Result, Is.True); + Assert.That(_passwordResets.GetResets(), Is.Empty); } [Test] @@ -54,7 +54,7 @@ public void ResetExpired() var request = _passwordResetService.CreatePasswordReset(Email).Result; request.ExpireTime = DateTime.Now.AddMinutes(-1); - Assert.IsFalse(_passwordResetService.ResetPassword(request.Token, Password).Result); + Assert.That(_passwordResetService.ResetPassword(request.Token, Password).Result, Is.False); } [Test] @@ -64,9 +64,9 @@ public void ResetBadToken() _userRepo.Create(user); var request = _passwordResetService.CreatePasswordReset(Email).Result; - Assert.That(request.Email == Email); + Assert.That(request.Email == Email, Is.True); var task = _passwordResetService.ResetPassword("NotARealToken", Password); - Assert.IsFalse(task.Result); + Assert.That(task.Result, Is.False); } } } diff --git a/Backend.Tests/Services/PermissionServiceTests.cs b/Backend.Tests/Services/PermissionServiceTests.cs index 218dc1f095..28a96af724 100644 --- a/Backend.Tests/Services/PermissionServiceTests.cs +++ b/Backend.Tests/Services/PermissionServiceTests.cs @@ -40,7 +40,7 @@ public void MakeJwtTestReturnsUser() { var user = _userRepo.Create(new User()).Result!; var result = _permService.MakeJwt(user).Result; - Assert.IsInstanceOf(result); + Assert.That(result, Is.InstanceOf()); } [Test] diff --git a/Backend.Tests/Services/StatisticsServiceTests.cs b/Backend.Tests/Services/StatisticsServiceTests.cs index fd3d613e00..e2277473ff 100644 --- a/Backend.Tests/Services/StatisticsServiceTests.cs +++ b/Backend.Tests/Services/StatisticsServiceTests.cs @@ -62,7 +62,7 @@ public void GetSemanticDomainCountsTestNullDomainList() _wordRepo.AddFrontier(getWordWithDomain()); var result = _statsService.GetSemanticDomainCounts(ProjId, "").Result; - Assert.That(result, Has.Count.EqualTo(0)); + Assert.That(result, Is.Empty); } [Test] @@ -73,7 +73,7 @@ public void GetSemanticDomainCountsTestEmptyDomainList() _wordRepo.AddFrontier(getWordWithDomain()); var result = _statsService.GetSemanticDomainCounts(ProjId, "").Result; - Assert.That(result, Has.Count.EqualTo(0)); + Assert.That(result, Is.Empty); } [Test] @@ -83,7 +83,7 @@ public void GetSemanticDomainCountsTestEmptyFrontier() ((SemanticDomainRepositoryMock)_domainRepo).SetNextResponse(TreeNodes); var result = _statsService.GetSemanticDomainCounts(ProjId, "").Result; - Assert.That(result, Has.Count.EqualTo(0)); + Assert.That(result, Is.Empty); } [Test] @@ -95,7 +95,7 @@ public void GetSemanticDomainCountsTestIdMismatch() var result = _statsService.GetSemanticDomainCounts(ProjId, "").Result; Assert.That(result, Has.Count.EqualTo(1)); - Assert.That(result.First().Count, Is.EqualTo(0)); + Assert.That(result.First(), Is.Empty); } [Test] @@ -114,7 +114,7 @@ public void GetSemanticDomainCountsTestIdMatch() public void GetWordsPerDayPerUserCountsTestEmptyFrontier() { var result = _statsService.GetWordsPerDayPerUserCounts(ProjId).Result; - Assert.That(result, Has.Count.EqualTo(0)); + Assert.That(result, Is.Empty); } [Test] @@ -123,8 +123,8 @@ public void GetProgressEstimationLineChartRootTestEmptyFrontier() var nonEmptySchedule = new List { DateTime.Now }; var result = _statsService.GetProgressEstimationLineChartRoot(ProjId, nonEmptySchedule).Result; - Assert.That(result.Dates, Has.Count.EqualTo(0)); - Assert.That(result.Datasets, Has.Count.EqualTo(0)); + Assert.That(result.Dates, Is.Empty); + Assert.That(result.Datasets, Is.Empty); } [Test] @@ -133,8 +133,8 @@ public void GetProgressEstimationLineChartRootTestEmptySchedule() _wordRepo.AddFrontier(getWordWithDomain()); var result = _statsService.GetProgressEstimationLineChartRoot(ProjId, new List()).Result; - Assert.That(result.Dates, Has.Count.EqualTo(0)); - Assert.That(result.Datasets, Has.Count.EqualTo(0)); + Assert.That(result.Dates, Is.Empty); + Assert.That(result.Datasets, Is.Empty); } [Test] @@ -144,8 +144,8 @@ public void GetProgressEstimationLineChartRootTestNoSemanticDomainDates() var nonEmptySchedule = new List { DateTime.Now }; var result = _statsService.GetProgressEstimationLineChartRoot(ProjId, nonEmptySchedule).Result; - Assert.That(result.Dates, Has.Count.EqualTo(0)); - Assert.That(result.Datasets, Has.Count.EqualTo(0)); + Assert.That(result.Dates, Is.Empty); + Assert.That(result.Datasets, Is.Empty); } [Test] @@ -164,8 +164,8 @@ public void GetProgressEstimationLineChartRootTestSchedule() public void GetLineChartRootDataTestNoData() { var result = _statsService.GetLineChartRootData(ProjId).Result; - Assert.That(result.Dates, Has.Count.EqualTo(0)); - Assert.That(result.Datasets, Has.Count.EqualTo(0)); + Assert.That(result.Dates, Is.Empty); + Assert.That(result.Datasets, Is.Empty); } [Test]