Merge branch 'main' into finding-autofix-733fec3b

Author: samsmithnz

src/MandMCounter.Tests/Controllers/PeanutMandMControllerTests.cs

@@ -43,7 +43,7 @@ public void ControllerCountPeanutMandMsInA1CubicCMTest()
             float result = controller.GetDataForRectangle(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 764f);
+            Assert.IsTrue((int)System.Math.Round(result, 0) == (int)764f);
         }      
 
         #endregion

src/MandMCounter.Tests/Controllers/SkittleControllerTests.cs

@@ -22,7 +22,7 @@ public void ControllerCountSkittlesInAUSCupTest()
             float result = controller.GetDataForUnit(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 212f);
+            Assert.IsTrue(System.Math.Abs(System.Math.Round(result, 0) - 212f) < 0.0001f);
         }
 
         #endregion
@@ -43,7 +43,7 @@ public void ControllerCountSkittlesInA1CubicCMTest()
             float result = controller.GetDataForRectangle(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 896f);
+            Assert.IsTrue(System.Math.Abs(System.Math.Round(result, 0) - 896f) < 0.0001f);
         }
 
         #endregion
@@ -63,7 +63,7 @@ public void ControllerCountSkittlesInACylinderWithCMTest()
             float result = controller.GetDataForCylinder(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 704f);
+            Assert.IsTrue(System.Math.Abs(System.Math.Round(result, 0) - 704f) < 0.0001f);
         }
 
         #endregion

src/MandMCounter.Tests/PeanutMandMTests.cs

@@ -22,7 +22,7 @@ public void CountPeanutMandMsInAUSGallonTest()
             float result = Calculator.CountPeanutMandMs(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 2892f);
+            Assert.AreEqual(2892, (int)System.Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -37,7 +37,7 @@ public void CountPeanutMandMsInAUSQuartTest()
             float result = Calculator.CountPeanutMandMs(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 1446f);
+            Assert.AreEqual(1446, (int)System.Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -52,7 +52,7 @@ public void CountPeanutMandMsInAUSCupTest()
             float result = Calculator.CountPeanutMandMs(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 181f);
+            Assert.AreEqual(181, (int)System.Math.Round(result, 0));
         }