refactor: unit test warnings reduced

BoBoBaSs84 · BoBoBaSs84 · commit db265f7a0439 · 2025-01-13T18:47:39.000+01:00
diff --git a/tests/LSDW.Domain.Tests/Extensions/IntegerExtensionsTests.cs b/tests/LSDW.Domain.Tests/Extensions/IntegerExtensionsTests.cs
@@ -20,7 +20,7 @@ public void GetListTest()
 	{
 		int i = 10;
 
-		IList<int> ints = i.GetList();
+		List<int> ints = i.GetList();
 
 		Assert.AreEqual(i + 1, ints.Count);
 	}
diff --git a/tests/LSDW.Domain.Tests/Factories/DomainFactoryTests.Models.cs b/tests/LSDW.Domain.Tests/Factories/DomainFactoryTests.Models.cs
@@ -66,7 +66,7 @@ public void CreateAllDrugsTest()
 		drugs = DomainFactory.CreateAllDrugs();
 
 		Assert.IsNotNull(drugs);
-		Assert.IsTrue(drugs.Any());
+		Assert.AreNotEqual(0, drugs.Count);
 	}
 
 	[TestMethod]
diff --git a/tests/LSDW.Domain.Tests/Models/Base/BindablePropertyTests.cs b/tests/LSDW.Domain.Tests/Models/Base/BindablePropertyTests.cs
@@ -52,11 +52,8 @@ public void BindablePropertySameValueTest()
 		Assert.AreEqual(oldValue, testClass.TestProperty.Value);
 	}
 
-	private sealed class TestClass
+	private sealed class TestClass(string testProperty)
 	{
-		public TestClass(string testProperty)
-			=> TestProperty = new BindableProperty<string>(testProperty);
-
-		public IBindableProperty<string> TestProperty { get; set; }
+		public IBindableProperty<string> TestProperty { get; set; } = new BindableProperty<string>(testProperty);
 	}
 }
diff --git a/tests/LSDW.Domain.Tests/Models/SettingsTests.DealerSettings.cs b/tests/LSDW.Domain.Tests/Models/SettingsTests.DealerSettings.cs
@@ -13,9 +13,9 @@ public void DealerSettingsInstanceTest()
 	[TestMethod]
 	public void GetDownTimeInHoursValuesTest()
 	{
-		int[] values = _settings.Dealer.GetDownTimeInHoursValues();
+		int[]? values = _settings.Dealer.GetDownTimeInHoursValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 }
diff --git a/tests/LSDW.Domain.Tests/Models/SettingsTests.MarketSettings.cs b/tests/LSDW.Domain.Tests/Models/SettingsTests.MarketSettings.cs
@@ -15,45 +15,45 @@ public void MarketSettingsInstanceTest()
 	[TestMethod]
 	public void GetSpecialOfferChanceValuesTest()
 	{
-		float[] values = _settings.Market.GetSpecialOfferChanceValues();
+		float[]? values = _settings.Market.GetSpecialOfferChanceValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 
 	[TestMethod]
 	public void GetInventoryChangeIntervalValuesTest()
 	{
-		int[] values = _settings.Market.GetInventoryChangeIntervalValues();
+		int[]? values = _settings.Market.GetInventoryChangeIntervalValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 
 	[TestMethod]
 	public void GetPriceChangeIntervalValuesTest()
 	{
-		int[] values = _settings.Market.GetPriceChangeIntervalValues();
+		int[]? values = _settings.Market.GetPriceChangeIntervalValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 
 	[TestMethod]
 	public void GetMaximumDrugPriceValuesTest()
 	{
-		float[] values = _settings.Market.GetMaximumDrugPriceValues();
+		float[]? values = _settings.Market.GetMaximumDrugPriceValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 
 	[TestMethod]
 	public void GetMinimumDrugPriceValuesTest()
 	{
-		float[] values = _settings.Market.GetMinimumDrugPriceValues();
+		float[]? values = _settings.Market.GetMinimumDrugPriceValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 }
diff --git a/tests/LSDW.Domain.Tests/Models/SettingsTests.PlayerSettings.cs b/tests/LSDW.Domain.Tests/Models/SettingsTests.PlayerSettings.cs
@@ -17,27 +17,27 @@ public void PlayerSettingsInstanceTest()
 	[TestMethod]
 	public void GetExperienceMultiplierValuesTest()
 	{
-		float[] values = _settings.Player.GetExperienceMultiplierValues();
+		float[]? values = _settings.Player.GetExperienceMultiplierValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 
 	[TestMethod]
 	public void GetInventoryExpansionPerLevelValuesTest()
 	{
-		int[] values = _settings.Player.GetInventoryExpansionPerLevelValues();
+		int[]? values = _settings.Player.GetInventoryExpansionPerLevelValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 
 	[TestMethod]
 	public void GetStartingInventoryValuesTest()
 	{
-		int[] values = _settings.Player.GetStartingInventoryValues();
+		int[]? values = _settings.Player.GetStartingInventoryValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 }
diff --git a/tests/LSDW.Domain.Tests/Models/SettingsTests.TraffickingSettings.cs b/tests/LSDW.Domain.Tests/Models/SettingsTests.TraffickingSettings.cs
@@ -13,18 +13,18 @@ public void TraffickingSettingsInstanceTest()
 	[TestMethod]
 	public void GetBustChanceValuesTest()
 	{
-		float[] values = _settings.Trafficking.GetBustChanceValues();
+		float[]? values = _settings.Trafficking.GetBustChanceValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 
 	[TestMethod]
 	public void GetWantedLevelValuesTest()
 	{
-		int[] values = _settings.Trafficking.GetWantedLevelValues();
+		int[]? values = _settings.Trafficking.GetWantedLevelValues();
 
 		Assert.IsNotNull(values);
-		Assert.IsTrue(values.Any());
+		Assert.AreNotEqual(0, values.Length);
 	}
 }
diff --git a/tests/LSDW.Infrastructure.Tests/Factories/InfrastructureFactoryTests.States.cs b/tests/LSDW.Infrastructure.Tests/Factories/InfrastructureFactoryTests.States.cs
@@ -20,7 +20,7 @@ public void CreateDrugFromStateTest()
 	{
 		DrugState state = GetDrugState();
 
-		IDrug drug = CreateDrug(state);
+		IDrug? drug = CreateDrug(state);
 
 		Assert.IsNotNull(drug);
 		Assert.AreEqual(state.Type, drug.Type);
@@ -31,9 +31,9 @@ public void CreateDrugFromStateTest()
 	[TestMethod]
 	public void CreateDrugsFromStatesTest()
 	{
-		List<DrugState> states = new() { GetDrugState(), GetDrugState() };
+		List<DrugState> states = [GetDrugState(), GetDrugState()];
 
-		ICollection<IDrug> drugs = CreateDrugs(states);
+		ICollection<IDrug>? drugs = CreateDrugs(states);
 
 		Assert.IsNotNull(drugs);
 		Assert.AreEqual(states.Count, drugs.Count);
@@ -44,7 +44,7 @@ public void CreateDrugStateTest()
 	{
 		IDrug drug = DomainFactory.CreateDrug();
 
-		DrugState state = CreateDrugState(drug);
+		DrugState? state = CreateDrugState(drug);
 
 		Assert.IsNotNull(state);
 		Assert.AreEqual(drug.Type, state.Type);
@@ -57,7 +57,7 @@ public void CreateDrugStatesTest()
 	{
 		ICollection<IDrug> drugs = DomainFactory.CreateAllDrugs();
 
-		List<DrugState> states = CreateDrugStates(drugs);
+		List<DrugState>? states = CreateDrugStates(drugs);
 
 		Assert.IsNotNull(states);
 		Assert.AreEqual(drugs.Count, states.Count);
@@ -69,7 +69,7 @@ public void CreateInventoryStateTest()
 		int money = 1000;
 		IInventory inventory = DomainFactory.CreateInventory(money);
 
-		InventoryState state = CreateInventoryState(inventory);
+		InventoryState? state = CreateInventoryState(inventory);
 
 		Assert.IsNotNull(state);
 		Assert.IsNotNull(state.Drugs);
@@ -101,11 +101,13 @@ public void CreatePlayerStateTest()
 	[TestMethod]
 	public void CreateDealerStatesTest()
 	{
-		ICollection<IDealer> dealers = new List<IDealer>()
-		{
+		ICollection<IDealer>? dealers;
+		
+		dealers =
+		[
 			DomainFactory.CreateDealer(_zeroVector, _pedHash),
 			DomainFactory.CreateDealer(_zeroVector, _pedHash),
-		};
+		];
 
 		List<DealerState> states = CreateDealerStates(dealers);
 
@@ -194,11 +196,13 @@ public void CreateTransactionStateTest()
 	[TestMethod]
 	public void CreateTransactionStatesTest()
 	{
-		ICollection<ITransaction> transactions = new List<ITransaction>()
-		{
+		ICollection<ITransaction>? transactions;
+
+		transactions =
+		[
 			DomainFactory.CreateTransaction(DateTime.MinValue, TransactionType.SELL, DrugType.COKE, 10, 100),
 			DomainFactory.CreateTransaction(DateTime.MinValue, TransactionType.SELL, DrugType.METH, 10, 125),
-		};
+		];
 
 		List<TransactionState> states = CreateTransactionStates(transactions);
 
@@ -211,11 +215,11 @@ public void CreateGameStateTest()
 	{
 		IPlayer player = DomainFactory.CreatePlayer(RandomHelper.GetInt(123456789, 987654321));
 		player.Inventory.Restock(player.Level);
-		List<IDealer> dealers = new()
-		{
+		List<IDealer> dealers =
+		[
 			DomainFactory.CreateDealer(_zeroVector),
 			DomainFactory.CreateDealer(_zeroVector),
-		};
+		];
 		foreach (IDealer dealer in dealers)
 			_ = dealer.Inventory.Restock(player.Level);
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public void GetListTest()`
`20`	`20`	`{`
`21`	`21`	`int i = 10;`
`22`	`22`
`23`		`- IList<int> ints = i.GetList();`
	`23`	`+ List<int> ints = i.GetList();`
`24`	`24`
`25`	`25`	`Assert.AreEqual(i + 1, ints.Count);`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void CreateAllDrugsTest()`
`66`	`66`	`drugs = DomainFactory.CreateAllDrugs();`
`67`	`67`
`68`	`68`	`Assert.IsNotNull(drugs);`
`69`		`- Assert.IsTrue(drugs.Any());`
	`69`	`+ Assert.AreNotEqual(0, drugs.Count);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`[TestMethod]`
Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,8 @@ public void BindablePropertySameValueTest()`
`52`	`52`	`Assert.AreEqual(oldValue, testClass.TestProperty.Value);`
`53`	`53`	`}`
`54`	`54`
`55`		`- private sealed class TestClass`
	`55`	`+ private sealed class TestClass(string testProperty)`
`56`	`56`	`{`
`57`		`- public TestClass(string testProperty)`
`58`		`- => TestProperty = new BindableProperty<string>(testProperty);`
`59`		`-`
`60`		`- public IBindableProperty<string> TestProperty { get; set; }`
	`57`	`+ public IBindableProperty<string> TestProperty { get; set; } = new BindableProperty<string>(testProperty);`
`61`	`58`	`}`
`62`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ public void DealerSettingsInstanceTest()`
`13`	`13`	`[TestMethod]`
`14`	`14`	`public void GetDownTimeInHoursValuesTest()`
`15`	`15`	`{`
`16`		`- int[] values = _settings.Dealer.GetDownTimeInHoursValues();`
	`16`	`+ int[]? values = _settings.Dealer.GetDownTimeInHoursValues();`
`17`	`17`
`18`	`18`	`Assert.IsNotNull(values);`
`19`		`- Assert.IsTrue(values.Any());`
	`19`	`+ Assert.AreNotEqual(0, values.Length);`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,45 +15,45 @@ public void MarketSettingsInstanceTest()`
`15`	`15`	`[TestMethod]`
`16`	`16`	`public void GetSpecialOfferChanceValuesTest()`
`17`	`17`	`{`
`18`		`- float[] values = _settings.Market.GetSpecialOfferChanceValues();`
	`18`	`+ float[]? values = _settings.Market.GetSpecialOfferChanceValues();`
`19`	`19`
`20`	`20`	`Assert.IsNotNull(values);`
`21`		`- Assert.IsTrue(values.Any());`
	`21`	`+ Assert.AreNotEqual(0, values.Length);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`[TestMethod]`
`25`	`25`	`public void GetInventoryChangeIntervalValuesTest()`
`26`	`26`	`{`
`27`		`- int[] values = _settings.Market.GetInventoryChangeIntervalValues();`
	`27`	`+ int[]? values = _settings.Market.GetInventoryChangeIntervalValues();`
`28`	`28`
`29`	`29`	`Assert.IsNotNull(values);`
`30`		`- Assert.IsTrue(values.Any());`
	`30`	`+ Assert.AreNotEqual(0, values.Length);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`[TestMethod]`
`34`	`34`	`public void GetPriceChangeIntervalValuesTest()`
`35`	`35`	`{`
`36`		`- int[] values = _settings.Market.GetPriceChangeIntervalValues();`
	`36`	`+ int[]? values = _settings.Market.GetPriceChangeIntervalValues();`
`37`	`37`
`38`	`38`	`Assert.IsNotNull(values);`
`39`		`- Assert.IsTrue(values.Any());`
	`39`	`+ Assert.AreNotEqual(0, values.Length);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`[TestMethod]`
`43`	`43`	`public void GetMaximumDrugPriceValuesTest()`
`44`	`44`	`{`
`45`		`- float[] values = _settings.Market.GetMaximumDrugPriceValues();`
	`45`	`+ float[]? values = _settings.Market.GetMaximumDrugPriceValues();`
`46`	`46`
`47`	`47`	`Assert.IsNotNull(values);`
`48`		`- Assert.IsTrue(values.Any());`
	`48`	`+ Assert.AreNotEqual(0, values.Length);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`[TestMethod]`
`52`	`52`	`public void GetMinimumDrugPriceValuesTest()`
`53`	`53`	`{`
`54`		`- float[] values = _settings.Market.GetMinimumDrugPriceValues();`
	`54`	`+ float[]? values = _settings.Market.GetMinimumDrugPriceValues();`
`55`	`55`
`56`	`56`	`Assert.IsNotNull(values);`
`57`		`- Assert.IsTrue(values.Any());`
	`57`	`+ Assert.AreNotEqual(0, values.Length);`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,27 +17,27 @@ public void PlayerSettingsInstanceTest()`
`17`	`17`	`[TestMethod]`
`18`	`18`	`public void GetExperienceMultiplierValuesTest()`
`19`	`19`	`{`
`20`		`- float[] values = _settings.Player.GetExperienceMultiplierValues();`
	`20`	`+ float[]? values = _settings.Player.GetExperienceMultiplierValues();`
`21`	`21`
`22`	`22`	`Assert.IsNotNull(values);`
`23`		`- Assert.IsTrue(values.Any());`
	`23`	`+ Assert.AreNotEqual(0, values.Length);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`[TestMethod]`
`27`	`27`	`public void GetInventoryExpansionPerLevelValuesTest()`
`28`	`28`	`{`
`29`		`- int[] values = _settings.Player.GetInventoryExpansionPerLevelValues();`
	`29`	`+ int[]? values = _settings.Player.GetInventoryExpansionPerLevelValues();`
`30`	`30`
`31`	`31`	`Assert.IsNotNull(values);`
`32`		`- Assert.IsTrue(values.Any());`
	`32`	`+ Assert.AreNotEqual(0, values.Length);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`[TestMethod]`
`36`	`36`	`public void GetStartingInventoryValuesTest()`
`37`	`37`	`{`
`38`		`- int[] values = _settings.Player.GetStartingInventoryValues();`
	`38`	`+ int[]? values = _settings.Player.GetStartingInventoryValues();`
`39`	`39`
`40`	`40`	`Assert.IsNotNull(values);`
`41`		`- Assert.IsTrue(values.Any());`
	`41`	`+ Assert.AreNotEqual(0, values.Length);`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,18 +13,18 @@ public void TraffickingSettingsInstanceTest()`
`13`	`13`	`[TestMethod]`
`14`	`14`	`public void GetBustChanceValuesTest()`
`15`	`15`	`{`
`16`		`- float[] values = _settings.Trafficking.GetBustChanceValues();`
	`16`	`+ float[]? values = _settings.Trafficking.GetBustChanceValues();`
`17`	`17`
`18`	`18`	`Assert.IsNotNull(values);`
`19`		`- Assert.IsTrue(values.Any());`
	`19`	`+ Assert.AreNotEqual(0, values.Length);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[TestMethod]`
`23`	`23`	`public void GetWantedLevelValuesTest()`
`24`	`24`	`{`
`25`		`- int[] values = _settings.Trafficking.GetWantedLevelValues();`
	`25`	`+ int[]? values = _settings.Trafficking.GetWantedLevelValues();`
`26`	`26`
`27`	`27`	`Assert.IsNotNull(values);`
`28`		`- Assert.IsTrue(values.Any());`
	`28`	`+ Assert.AreNotEqual(0, values.Length);`
`29`	`29`	`}`
`30`	`30`	`}`