#1167 Переводит проверки к *.Should().NotBeNull()

- Assert.NotNull(result); к settings.Should().NotBeNull(); - Assert.IsNotNull(callMethod); к callMethod.Should().NotBeNull();
vknet · Oct 3, 2021 · 0273bb8 · 0273bb8
1 parent 3ceaaef
commit 0273bb8
Show file tree

Hide file tree

Showing 77 changed files with 242 additions and 166 deletions.
diff --git a/VkNet.Tests/Categories/Account/AccountCategoryTest.cs b/VkNet.Tests/Categories/Account/AccountCategoryTest.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Categories;
 using VkNet.Enums;
@@ -193,7 +194,7 @@ public void GetPrivacySettings()
 			var settings = Api.Account.GetPrivacySettings();
 
 			// Assert
-			Assert.NotNull(settings);
+			settings.Should().NotBeNull();
 			Assert.IsNotEmpty(settings.Sections);
 			Assert.IsNotEmpty(settings.Settings);
 			Assert.IsNotEmpty(settings.SupportedCategories);

diff --git a/VkNet.Tests/Categories/Ads/AdsCheckLinkTests.cs b/VkNet.Tests/Categories/Ads/AdsCheckLinkTests.cs
@@ -1,4 +1,5 @@
 using System;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Enums.SafetyEnums;
 using VkNet.Model.RequestParams.Ads;
@@ -26,7 +27,7 @@ public void CheckLink()
 				LinkUrl = new Uri(Url)
 			});
 
-			Assert.NotNull(link);
+			link.Should().NotBeNull();
 
 			Assert.IsNotEmpty(link.Description);
 			Assert.That(link.Status, Is.EqualTo(LinkStatusType.Disallowed));

diff --git a/VkNet.Tests/Categories/AppWidgets/GetAppImageUploadServerTest.cs b/VkNet.Tests/Categories/AppWidgets/GetAppImageUploadServerTest.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using FluentAssertions;
+using NUnit.Framework;
 using VkNet.Enums.SafetyEnums;
 using VkNet.Tests.Infrastructure;
 
@@ -19,7 +20,7 @@ public void GetAppImageUploadServer()
 
 			var result = Api.AppWidgets.GetAppImageUploadServer(AppWidgetImageType.FiftyOnFifty);
 
-			Assert.IsNotNull(result.UploadUrl);
+			result.UploadUrl.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/AppWidgets/GetAppImagesTest.cs b/VkNet.Tests/Categories/AppWidgets/GetAppImagesTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Enums.SafetyEnums;
 using VkNet.Tests.Infrastructure;
@@ -20,7 +21,7 @@ public void GetAppImages()
 
 			var result = Api.AppWidgets.GetAppImages(0, 10, AppWidgetImageType.FiftyOnFifty);
 
-			Assert.IsNotNull(result.Items.First().Images.First().Url);
+			result.Items.First().Images.First().Url.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/AppWidgets/GetGroupImageUploadServerTest.cs b/VkNet.Tests/Categories/AppWidgets/GetGroupImageUploadServerTest.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using FluentAssertions;
+using NUnit.Framework;
 using VkNet.Enums.SafetyEnums;
 using VkNet.Tests.Infrastructure;
 
@@ -19,7 +20,7 @@ public void GetGroupImageUploadServer()
 
 			var result = Api.AppWidgets.GetGroupImageUploadServer(AppWidgetImageType.FiftyOnFifty);
 
-			Assert.IsNotNull(result.UploadUrl);
+			result.UploadUrl.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/AppWidgets/GetGroupImagesTest.cs b/VkNet.Tests/Categories/AppWidgets/GetGroupImagesTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Enums.SafetyEnums;
 using VkNet.Tests.Infrastructure;
@@ -20,7 +21,7 @@ public void GetGroupImages()
 
 			var result = Api.AppWidgets.GetGroupImages(0, 10, AppWidgetImageType.FiftyOnFifty);
 
-			Assert.IsNotNull(result.Items.First().Images.First().Url);
+			result.Items.First().Images.First().Url.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/AppWidgets/GetImagesByIdTest.cs b/VkNet.Tests/Categories/AppWidgets/GetImagesByIdTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Tests.Infrastructure;
 
@@ -19,7 +20,7 @@ public void GetAppImages()
 
 			var result = Api.AppWidgets.GetImagesById("7309583_1192027");
 
-			Assert.IsNotNull(result);
+			result.Should().NotBeNull();
 			Assert.AreEqual("7309583_1192027", result.First().Id);
 		}
 	}

diff --git a/VkNet.Tests/Categories/AppWidgets/SaveAppImageTest.cs b/VkNet.Tests/Categories/AppWidgets/SaveAppImageTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Tests.Infrastructure;
 
@@ -21,7 +22,7 @@ public void SaveAppImage()
 				"0f009dbdd6154c88b8",
 				"eyJvaWQiOjczMDk1ODMsInR5cGUiOjUsInBob3RvIjp7InBob3RvIjoiMjRkNmQwOWU1ZXgiLCJzaXplcyI6W1siYSIsMjA2NzIwNTg5LCI1YmYxOCIsInJ2a3JxRWRsR0tVIiw1MCw1MF0sWyJiIiwyMDY3MjA1ODksIjViZjE5IiwiYnE2VXhhakJaUFEiLDEwMCwxMDBdLFsiYyIsMjA2NzIwNTg5LCI1YmYxYSIsImI5eTlEalUtTVR3IiwxNTAsMTUwXV0sImtpZCI6IjhlMDkzZjYxOGQyY2M5MzJiMDU5YmRlYTViNjVhYmNhIiwiZGVidWciOiJ4Y2MiLCJ1cmxzIjpbInYyMDY3MjA1ODlcLzViZjE4XC9ydmtycUVkbEdLVS5qcGciLCJ2MjA2NzIwNTg5XC81YmYxOVwvYnE2VXhhakJaUFEuanBnIiwidjIwNjcyMDU4OVwvNWJmMWFcL2I5eTlEalUtTVR3LmpwZyJdfSwiYndhY3QiOiJhcHBfd2lkZ2V0X2ltYWdlIiwic2VydmVyIjoyMDY3MjAsIm1pZCI6MCwiX3NpZyI6ImNhMjI3ZWZlY2MxMjhjMzgxNTYzZjBjOGQ4YTM4ZTJlIn0");
 
-			Assert.IsNotNull(result.Images.First().Url);
+			result.Images.First().Url.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/AppWidgets/SaveGroupImageTest.cs b/VkNet.Tests/Categories/AppWidgets/SaveGroupImageTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Tests.Infrastructure;
 
@@ -21,7 +22,7 @@ public void SaveGroupImage()
 				"0f009dbdd6154c88b8",
 				"eyJvaWQiOjczMDk1ODMsInR5cGUiOjUsInBob3RvIjp7InBob3RvIjoiMjRkNmQwOWU1ZXgiLCJzaXplcyI6W1siYSIsMjA2NzIwNTg5LCI1YmYxOCIsInJ2a3JxRWRsR0tVIiw1MCw1MF0sWyJiIiwyMDY3MjA1ODksIjViZjE5IiwiYnE2VXhhakJaUFEiLDEwMCwxMDBdLFsiYyIsMjA2NzIwNTg5LCI1YmYxYSIsImI5eTlEalUtTVR3IiwxNTAsMTUwXV0sImtpZCI6IjhlMDkzZjYxOGQyY2M5MzJiMDU5YmRlYTViNjVhYmNhIiwiZGVidWciOiJ4Y2MiLCJ1cmxzIjpbInYyMDY3MjA1ODlcLzViZjE4XC9ydmtycUVkbEdLVS5qcGciLCJ2MjA2NzIwNTg5XC81YmYxOVwvYnE2VXhhakJaUFEuanBnIiwidjIwNjcyMDU4OVwvNWJmMWFcL2I5eTlEalUtTVR3LmpwZyJdfSwiYndhY3QiOiJhcHBfd2lkZ2V0X2ltYWdlIiwic2VydmVyIjoyMDY3MjAsIm1pZCI6MCwiX3NpZyI6ImNhMjI3ZWZlY2MxMjhjMzgxNTYzZjBjOGQ4YTM4ZTJlIn0");
 
-			Assert.IsNotNull(result.Images.First().Url);
+			result.Images.First().Url.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/Apps/AppsTest.cs b/VkNet.Tests/Categories/Apps/AppsTest.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Enums.Filters;
 using VkNet.Enums.SafetyEnums;
@@ -84,7 +85,7 @@ public void GetLeaderboard_Extended()
 
 			var app = Api.Apps.GetLeaderboard(AppRatingType.Points, null, true);
 
-			Assert.IsNotNull(app);
+			app.Should().NotBeNull();
 			Assert.That(app.Count, Is.EqualTo(130));
 			Assert.That(app.Items, Is.Not.Empty);
 			Assert.That(app.Items[0].Score, Is.EqualTo(221634238));
@@ -101,7 +102,7 @@ public void GetLeaderboard_Level()
 
 			var app = Api.Apps.GetLeaderboard(AppRatingType.Level);
 
-			Assert.IsNotNull(app);
+			app.Should().NotBeNull();
 			Assert.That(app.Count, Is.EqualTo(130));
 			Assert.That(app.Items, Is.Not.Empty);
 			Assert.That(app.Items[0].Score, Is.EqualTo(221634238));
@@ -117,7 +118,7 @@ public void GetLeaderboard_Points()
 
 			var app = Api.Apps.GetLeaderboard(AppRatingType.Points);
 
-			Assert.IsNotNull(app);
+			app.Should().NotBeNull();
 			Assert.That(app.Count, Is.EqualTo(130));
 			Assert.That(app.Items, Is.Not.Empty);
 			Assert.That(app.Items[0].Score, Is.EqualTo(221634238));

diff --git a/VkNet.Tests/Categories/Audio/AudioCreatePlaylistTest.cs b/VkNet.Tests/Categories/Audio/AudioCreatePlaylistTest.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Tests.Infrastructure;
 
@@ -19,7 +20,7 @@ public void CreatePlaylistTest()
 
 			var result = Api.Audio.CreatePlaylist(123456789, "test title", "test description", new List<string> { "123456789_123456789" });
 
-			Assert.NotNull(result);
+			result.Should().NotBeNull();
 			Assert.That(result.Id, Is.EqualTo(11));
 			Assert.That(result.OwnerId, Is.EqualTo(123456789));
 			Assert.That(result.Title, Is.EqualTo("test title"));

diff --git a/VkNet.Tests/Categories/Audio/AudioGetBroadcastListTest.cs b/VkNet.Tests/Categories/Audio/AudioGetBroadcastListTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Tests.Infrastructure;
 
@@ -21,7 +22,7 @@ public void GetBroadcastListTest()
 			var firstOrDefault = result.FirstOrDefault();
 
 			Assert.IsNotEmpty(result);
-			Assert.NotNull(firstOrDefault);
+			firstOrDefault.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/Audio/AudioGetByIdTest.cs b/VkNet.Tests/Categories/Audio/AudioGetByIdTest.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Tests.Infrastructure;
 
@@ -22,7 +23,7 @@ public void GetByIdTest()
 			var audio = result.FirstOrDefault();
 
 			Assert.IsNotEmpty(result);
-			Assert.NotNull(audio);
+			audio.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/Audio/AudioGetCatalogTest.cs b/VkNet.Tests/Categories/Audio/AudioGetCatalogTest.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using FluentAssertions;
+using NUnit.Framework;
 using VkNet.Enums.Filters;
 using VkNet.Enums.SafetyEnums;
 using VkNet.Tests.Infrastructure;
@@ -20,7 +21,7 @@ public void GetCatalog()
 
 			var result = Api.Audio.GetCatalog(20, true, UsersFields.FirstNameGen| UsersFields.Photo100);
 
-			Assert.NotNull(result);
+			result.Should().NotBeNull();
 			Assert.AreEqual(result.Items[0].Type, AudioCatalogType.AudiosSpecial);
 			Assert.AreEqual(result.Items[0].Source, AudioCatalogSourceType.RecomsRecoms);
 			Assert.AreEqual(result.Items[0].Thumbs[0].Width, 300);

diff --git a/VkNet.Tests/Categories/Audio/AudioGetPlaylistsTest.cs b/VkNet.Tests/Categories/Audio/AudioGetPlaylistsTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Tests.Infrastructure;
 
@@ -22,7 +23,7 @@ public void GetPlaylistsTest()
 
 			Assert.That(result.TotalCount, Is.EqualTo(3));
 			Assert.IsNotEmpty(result);
-			Assert.NotNull(playlist);
+			playlist.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/Audio/AudioGetRecommendationsTest.cs b/VkNet.Tests/Categories/Audio/AudioGetRecommendationsTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Tests.Infrastructure;
 
@@ -21,7 +22,7 @@ public void GetRecommendationsTest()
 			var audio = result.FirstOrDefault();
 
 			Assert.IsNotEmpty(result);
-			Assert.NotNull(audio);
+			audio.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/Audio/AudioGetTest.cs b/VkNet.Tests/Categories/Audio/AudioGetTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Model.RequestParams;
 using VkNet.Tests.Infrastructure;
@@ -27,7 +28,7 @@ public void GetTest()
 
 			Assert.IsNotEmpty(result);
 			Assert.That(result.Count, Is.EqualTo(1));
-			Assert.NotNull(audio);
+			audio.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/Audio/AudiogGetPopularTest.cs b/VkNet.Tests/Categories/Audio/AudiogGetPopularTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Tests.Infrastructure;
 
@@ -21,7 +22,7 @@ public void GetGetPopularTest()
 			var audio = response.FirstOrDefault();
 
 			Assert.IsNotEmpty(response);
-			Assert.NotNull(audio);
+			audio.Should().NotBeNull();
 			Assert.That(audio.Id, Is.EqualTo(456240861));
 		}
 	}

diff --git a/VkNet.Tests/Categories/Audio/GetPlaylistByIdTest.cs b/VkNet.Tests/Categories/Audio/GetPlaylistByIdTest.cs
@@ -1,3 +1,4 @@
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Tests.Infrastructure;
 
@@ -16,7 +17,7 @@ public void GetPlaylistByIdTestTest()
 
 			var result = Api.Audio.GetPlaylistById(-77288583, 84820009);
 
-			Assert.NotNull(result);
+			result.Should().NotBeNull();
 		}
 	}
 }
diff --git a/VkNet.Tests/Categories/BotsLongPoll/BotsLongPollMessageTest.cs b/VkNet.Tests/Categories/BotsLongPoll/BotsLongPollMessageTest.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Enums;
 using VkNet.Model.RequestParams;
@@ -29,9 +30,9 @@ public void GetBotsLongPollHistory_MessageNewTest()
 
 			var clientInfo = messageNew?.ClientInfo;
 
-			Assert.NotNull(messageNew);
-			Assert.NotNull(message);
-			Assert.NotNull(clientInfo);
+			messageNew.Should().NotBeNull();
+			message.Should().NotBeNull();
+			clientInfo.Should().NotBeNull();
 
 			Assert.IsNotEmpty(clientInfo.ButtonActions);
 			Assert.True(clientInfo.Keyboard);
@@ -154,7 +155,7 @@ public void GetBotsLongPollHistory_MessageEventTest()
 
 			var messageEvent = update.MessageEvent;
 
-			Assert.NotNull(messageEvent);
+			messageEvent.Should().NotBeNull();
 			Assert.AreEqual("feleyinek", messageEvent.EventId);
 			Assert.AreEqual(123456789, messageEvent.UserId);
 			Assert.AreEqual(123456789, messageEvent.PeerId);

diff --git a/VkNet.Tests/Categories/Docs/DocsSaveTests.cs b/VkNet.Tests/Categories/Docs/DocsSaveTests.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Enums;
 using VkNet.Model.Attachments;
@@ -62,9 +63,9 @@ public void Save_Type()
 
 			Assert.IsNotEmpty(result);
 			var item = result.FirstOrDefault();
-			Assert.NotNull(item);
+			item.Should().NotBeNull();
 			var doc = item.Instance as Document;
-			Assert.NotNull(doc);
+			doc.Should().NotBeNull();
 			Assert.AreEqual(DocumentTypeEnum.Text, doc.Type);
 		}
 	}

diff --git a/VkNet.Tests/Categories/Donut/DonutTests.cs b/VkNet.Tests/Categories/Donut/DonutTests.cs
@@ -1,3 +1,4 @@
+using FluentAssertions;
 using NUnit.Framework;
 using VkNet.Enums.Filters;
 using VkNet.Exception;
@@ -24,7 +25,7 @@ public void GetFriends()
 			Url = "https://api.vk.com/method/donut.getFriends";
 			ReadJsonFile(JsonPaths.EmptyArray);
 			var result = Api.Donut.GetFriends(-173151748, 0, 3, new UsersFields());
-			Assert.NotNull(result);
+			result.Should().NotBeNull();
 		}
 
 		[Test]
@@ -40,7 +41,7 @@ public void GetSubscriptions()
 		{
 			Url = "https://api.vk.com/method/donut.getSubscriptions";
 			ReadCategoryJsonPath(nameof(GetSubscriptions));
-			Assert.NotNull(Api.Donut.GetSubscriptions(new UsersFields(), 1, 1));
+			Api.Donut.GetSubscriptions(new UsersFields(), 1, 1).Should().NotBeNull();
 		}
 	}
 }