Merge pull request #300 from SamSmithNZ-dotcom/copilot/fix-exception-type-checks

Improve test assertions and exception types for null unit validation

Author: samsmithnz

src/MandMCounter.Core/Calculator.cs

@@ -124,7 +124,7 @@ private static float GetCubicCmForRectangle(string unit, float height, float wid
         {
             if (string.IsNullOrEmpty(unit))
             {
-                unit = "";
+                throw new ArgumentNullException(nameof(unit), "Unit cannot be null or empty.");
             }
 
             float baseCalculation = height * width * length;
@@ -152,7 +152,7 @@ private static float GetCubicCmForCylinder(string unit, float height, float radi
         {
             if (string.IsNullOrEmpty(unit))
             {
-                unit = "";
+                throw new ArgumentNullException(nameof(unit), "Unit cannot be null or empty.");
             }
 
             // radius ^ 2 * (pi) * height

src/MandMCounter.Tests/SkittleTests.cs

@@ -18,7 +18,6 @@ public void CountSkittlesInAUSGallonTest()
             float quantity = 1f;
 
             //Act
-            
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
@@ -33,7 +32,6 @@ public void CountSkittlesInAUSQuartTest()
             float quantity = 1f;
 
             //Act
-            
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
@@ -48,7 +46,6 @@ public void CountSkittlesInAUSCupTest()
             float quantity = 1f;
 
             //Act
-            
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
@@ -178,7 +175,7 @@ public void CountSkittlesInA1CubicNullUnitTest()
             //Act
 
             //Assert
-            Assert.Throws<Exception>(() => Calculator.CountSkittles(unit, height, width, length));
+            Assert.Throws<ArgumentNullException>(() => Calculator.CountSkittles(unit, height, width, length));
         }
 
         #endregion
@@ -226,7 +223,7 @@ public void CountSkittlesInACylinderWithNullUnitTest()
             float radius = 5;
 
             //Act & Assert
-            Assert.Throws<Exception>(() => Calculator.CountSkittles(unit, height, radius));
+            Assert.Throws<ArgumentNullException>(() => Calculator.CountSkittles(unit, height, radius));
         }
 
         #endregion

src/MandMCounter.Tests/UnitsTests.cs

@@ -7,7 +7,7 @@ namespace MandMCounter.Tests
 {
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
     [TestClass]
-    public class UnitsTests
+    public class UnitTests
     {
         [TestMethod]
         public void GetUnitsForVolumeTest()
@@ -18,9 +18,9 @@ public void GetUnitsForVolumeTest()
             List<string> results = Units.GetUnitsForVolume();
 
             //Assert
-            Assert.IsTrue(results != null);
+            Assert.IsNotNull(results);
             Assert.IsTrue(results.Count > 0);
-            Assert.IsTrue(string.IsNullOrEmpty(results[0]) == false);
+            Assert.IsFalse(string.IsNullOrEmpty(results[0]));
         }
 
         [TestMethod]
@@ -32,9 +32,9 @@ public void GetUnitsForContainerTest()
             List<string> results = Units.GetUnitsForContainer();
 
             //Assert
-            Assert.IsTrue(results != null);
+            Assert.IsNotNull(results);
             Assert.IsTrue(results.Count > 0);
-            Assert.IsTrue(string.IsNullOrEmpty(results[0]) == false);
+            Assert.IsFalse(string.IsNullOrEmpty(results[0]));
         }
 
         [TestMethod]