Merge pull request #296 from SamSmithNZ-dotcom/finding-autofix-ff32f6d5

samsmithnz · web-flow · commit 5ce56d54dad0 · 2025-12-04T13:29:35.000-05:00
Fix for Equality check on floating point values
diff --git a/src/MandMCounter.Tests/MandMTests.cs b/src/MandMCounter.Tests/MandMTests.cs
@@ -93,7 +93,7 @@ public void CountMandMsInAUSQuarterCupTest()
             float result = Calculator.CountMandMs(unit, quantity);
 
             //Assert
-            Assert.AreEqual(63f, (float)System.Math.Round(result, 0), 0.1f);
+            Assert.AreEqual(63, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -107,7 +107,7 @@ public void CountMandMsInAUSTableSpoonTest()
             float result = Calculator.CountMandMs(unit, quantity);
 
             //Assert
-            Assert.AreEqual(16f, (float)System.Math.Round(result, 0), 0.1f);
+            Assert.AreEqual(16, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -121,7 +121,7 @@ public void CountMandMsInAUSTeaSpoonTest()
             float result = Calculator.CountMandMs(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 5f);
+            Assert.AreEqual(5, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -146,7 +146,7 @@ public void CountMandMsInA1LitreTest()
             float result = Calculator.CountMandMs(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 1069f);
+            Assert.AreEqual(1069, (int)Math.Round(result, 0));
         }
 
         #endregion
@@ -166,7 +166,7 @@ public void CountMandMsInA1CubicCMTest()
             float result = Calculator.CountMandMs(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 1069f);
+            Assert.AreEqual(1069, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -182,7 +182,7 @@ public void CountMandMsInA1CubicMTest()
             float result = Calculator.CountMandMs(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 1069f);
+            Assert.AreEqual(1069, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -198,7 +198,7 @@ public void CountMandMsInA1CubicInchTest()
             float result = Calculator.CountMandMs(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 18f);
+            Assert.AreEqual(18, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -214,7 +214,7 @@ public void CountMandMsInA1CubicFeetTest()
             float result = Calculator.CountMandMs(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 30276f);
+            Assert.AreEqual(30276, (int)Math.Round(result, 0));
         }
 
 
@@ -255,7 +255,7 @@ public void CountMandMsInACylinderWithCMTest()
             float result = Calculator.CountMandMs(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 840f);
+            Assert.AreEqual(840, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -270,7 +270,7 @@ public void CountMandMsInACylinderWithMTest()
             float result = Calculator.CountMandMs(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 3359f);
+            Assert.AreEqual(3359, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -285,7 +285,7 @@ public void CountMandMsInACylinderWithMeterTest()
             float result = Calculator.CountMandMs(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 3359f);
+            Assert.AreEqual(3359, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -300,7 +300,7 @@ public void CountMandMsInACylinderWithInchTest()
             float result = Calculator.CountMandMs(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 881f);
+            Assert.AreEqual(881, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -315,7 +315,7 @@ public void CountMandMsInACylinderWithFeetTest()
             float result = Calculator.CountMandMs(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 95115f);
+            Assert.AreEqual(95115, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
diff --git a/src/MandMCounter.Tests/PeanutMandMTests.cs b/src/MandMCounter.Tests/PeanutMandMTests.cs
@@ -68,7 +68,7 @@ public void CountPeanutMandMsInAUSQuarterCupTest()
             float result = Calculator.CountPeanutMandMs(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 45f);
+            Assert.AreEqual(45, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -83,7 +83,7 @@ public void CountPeanutMandMsInAUSTableSpoonTest()
             float result = Calculator.CountPeanutMandMs(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 11f);
+            Assert.AreEqual(11, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -98,7 +98,7 @@ public void CountPeanutMandMsInAUSTeaSpoonTest()
             float result = Calculator.CountPeanutMandMs(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 4f);
+            Assert.AreEqual(4, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -124,7 +124,7 @@ public void CountPeanutMandMsInA1LitreTest()
             float result = Calculator.CountPeanutMandMs(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 764f);
+            Assert.AreEqual(764, (int)Math.Round(result, 0));
         }
 
         #endregion
@@ -145,7 +145,7 @@ public void CountPeanutMandMsInA1CubicCMTest()
             float result = Calculator.CountPeanutMandMs(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 764f);
+            Assert.AreEqual(764, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -162,7 +162,7 @@ public void CountPeanutMandMsInA1CubicInchTest()
             float result = Calculator.CountPeanutMandMs(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 13f);
+            Assert.AreEqual(13, (int)Math.Round(result, 0));
         }
 
 
@@ -199,7 +199,7 @@ public void CountPeanutMandMsInACylinderWithCMTest()
             float result = Calculator.CountPeanutMandMs(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 600f);
+            Assert.AreEqual(600, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -215,7 +215,7 @@ public void CountPeanutMandMsInACylinderWithInchTest()
             float result = Calculator.CountPeanutMandMs(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 629f);
+            Assert.AreEqual(629, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
diff --git a/src/MandMCounter.Tests/SkittleTests.cs b/src/MandMCounter.Tests/SkittleTests.cs
@@ -22,7 +22,7 @@ public void CountSkittlesInAUSGallonTest()
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 3393f);
+            Assert.AreEqual(3393, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -37,7 +37,7 @@ public void CountSkittlesInAUSQuartTest()
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 848f);
+            Assert.AreEqual(848, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -52,7 +52,7 @@ public void CountSkittlesInAUSCupTest()
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 212f);
+            Assert.AreEqual(212, (int)Math.Round(result, 0));
         }
 
 
@@ -68,7 +68,7 @@ public void CountSkittlesInAUSQuarterCupTest()
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 53f);
+            Assert.AreEqual(53, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -83,7 +83,7 @@ public void CountSkittlesInAUSTableSpoonTest()
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 13f);
+            Assert.AreEqual(13, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -98,7 +98,7 @@ public void CountSkittlesInAUSTeaSpoonTest()
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 4f);
+            Assert.AreEqual(4, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -124,7 +124,7 @@ public void CountSkittlesInA1LitreTest()
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 896f);
+            Assert.AreEqual(896, (int)Math.Round(result, 0));
         }
 
         #endregion
@@ -145,7 +145,7 @@ public void CountSkittlesInA1CubicCMTest()
             float result = Calculator.CountSkittles(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 896f);
+            Assert.AreEqual(896, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -162,7 +162,7 @@ public void CountSkittlesInA1CubicInchTest()
             float result = Calculator.CountSkittles(unit, height, width, length);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 15f);
+            Assert.AreEqual(15, (int)Math.Round(result, 0));
         }
 
 
@@ -198,7 +198,7 @@ public void CountSkittlesInACylinderWithCMTest()
             float result = Calculator.CountSkittles(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 704f);
+            Assert.AreEqual(704, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
@@ -214,7 +214,7 @@ public void CountSkittlesInACylinderWithInchTest()
             float result = Calculator.CountSkittles(unit, height, radius);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 738f);
+            Assert.AreEqual(738, (int)Math.Round(result, 0));
         }
 
         [TestMethod]
diff --git a/src/MandMCounter.Tests/UnitsTests.cs b/src/MandMCounter.Tests/UnitsTests.cs
@@ -48,7 +48,7 @@ public void CountSkittlesInAUSCupTest()
             float result = Calculator.CountSkittles(unit, quantity);
 
             //Assert
-            Assert.IsTrue(System.Math.Round(result, 0) == 212f);
+            Assert.AreEqual(212, (int)Math.Round(result, 0));
         }
 
     }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public void CountSkittlesInAUSCupTest()`
`48`	`48`	`float result = Calculator.CountSkittles(unit, quantity);`
`49`	`49`
`50`	`50`	`//Assert`
`51`		`- Assert.IsTrue(System.Math.Round(result, 0) == 212f);`
	`51`	`+ Assert.AreEqual(212, (int)Math.Round(result, 0));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`}`