Skip to content

Commit 6008c94

Browse files
samsmithnzsamsmithnz
authored
Merge pull request #313 from SamSmithNZ-dotcom/FixToJellyBeans
fixes to improve tests
2 parents 6e964be + 3d6773f commit 6008c94

File tree

5 files changed

+55
-55
lines changed

5 files changed

+55
-55
lines changed

‎src/MandMCounter.Core/Constants.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public class Constants
1111
//Reference: this one thinks it's 0.625f http://www.answers.com/Q/What_is_a_volume_of_one_skittle
1212
//Reference 2: this one thinks it's 0.7418629f https://community.babycenter.com/post/a37375396/guess_how_many_skittles?cpg=2
1313
public const float SkittlesVolumeCubicCm = 0.7418629f; //Going with the bigger number, as skittles are bigger than M&Ms
14-
//Reference: Volume of a jellybean is 3.5325, so the volume in one cubic CM is 1/3.5325 = 0.2831
15-
public const float JellyBeansVolumeCubicCm = 0.2831f;
14+
//Reference: Volume of a jellybean is 3.5325 cubic CM
15+
public const float JellyBeansVolumeCubicCm = 3.5325f;
1616

1717
//Reference: https://yenra.com/particle-packing/
1818
//Some people think this is 68.5%. https://cims.nyu.edu/~donev/Thesis.pdf

‎src/MandMCounter.Tests/JellyBeanTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void CountJellyBeansInAUSGallonTest()
1919
float result = Calculator.CountJellyBeans(unit, quantity);
2020

2121
//Assert
22-
Assert.AreEqual(8558f, System.Math.Round(result, 0), 1f);
22+
Assert.AreEqual(685.82, Math.Round(result, 2), 0.01);
2323
}
2424

2525
[TestMethod]
@@ -33,7 +33,7 @@ public void CountJellyBeansInAUSQuartTest()
3333
float result = Calculator.CountJellyBeans(unit, quantity);
3434

3535
//Assert
36-
Assert.AreEqual(2140f, System.Math.Round(result, 0), 1f);
36+
Assert.AreEqual(171.46, Math.Round(result, 2), 0.01);
3737
}
3838

3939
[TestMethod]
@@ -47,7 +47,7 @@ public void CountJellyBeansInAUSCupTest()
4747
float result = Calculator.CountJellyBeans(unit, quantity);
4848

4949
//Assert
50-
Assert.AreEqual(535f, System.Math.Round(result, 0), 1f);
50+
Assert.AreEqual(42.86, Math.Round(result, 2), 0.01);
5151
}
5252

5353

@@ -63,7 +63,7 @@ public void CountJellyBeansInAUSQuarterCupTest()
6363
float result = Calculator.CountJellyBeans(unit, quantity);
6464

6565
//Assert
66-
Assert.AreEqual(134f, System.Math.Round(result, 0), 1f);
66+
Assert.AreEqual(10.72, Math.Round(result, 2), 0.01);
6767
}
6868

6969
[TestMethod]
@@ -78,7 +78,7 @@ public void CountJellyBeansInAUSTableSpoonTest()
7878
float result = Calculator.CountJellyBeans(unit, quantity);
7979

8080
//Assert
81-
Assert.AreEqual(33f, System.Math.Round(result, 0), 1f);
81+
Assert.AreEqual(2.68, Math.Round(result, 2), 0.01);
8282
}
8383

8484
[TestMethod]
@@ -93,7 +93,7 @@ public void CountJellyBeansInAUSTeaSpoonTest()
9393
float result = Calculator.CountJellyBeans(unit, quantity);
9494

9595
//Assert
96-
Assert.AreEqual(11f, System.Math.Round(result, 0), 1f);
96+
Assert.AreEqual(0.89, Math.Round(result, 2), 0.01);
9797
}
9898

9999
[TestMethod]
@@ -119,7 +119,7 @@ public void CountJellyBeansInA1LitreTest()
119119
float result = Calculator.CountJellyBeans(unit, quantity);
120120

121121
//Assert
122-
Assert.AreEqual(2260f, System.Math.Round(result, 0), 1f);
122+
Assert.AreEqual(181.17, Math.Round(result, 2), 0.01);
123123
}
124124

125125
[TestMethod]
@@ -136,7 +136,7 @@ public void CountJellyBeansInA1CubicCMTest()
136136
float result = Calculator.CountJellyBeans(unit, height, width, length);
137137

138138
//Assert
139-
Assert.AreEqual(2260f, System.Math.Round(result, 0), 1f);
139+
Assert.AreEqual(181.17, Math.Round(result, 2), 0.01);
140140
}
141141

142142
[TestMethod]
@@ -153,7 +153,7 @@ public void CountJellyBeansInA1CubicInchTest()
153153
float result = Calculator.CountJellyBeans(unit, height, width, length);
154154

155155
//Assert
156-
Assert.AreEqual(37f, System.Math.Round(result, 0), 1f);
156+
Assert.AreEqual(2.97, Math.Round(result, 2), 0.01);
157157
}
158158

159159

@@ -183,7 +183,7 @@ public void CountJellyBeansInACylinderWithCMTest()
183183
float result = Calculator.CountJellyBeans(unit, height, radius);
184184

185185
//Assert
186-
Assert.AreEqual(1777f, System.Math.Round(result, 0), 1f);
186+
Assert.AreEqual(142.29, Math.Round(result, 2), 0.01);
187187
}
188188

189189
[TestMethod]
@@ -199,7 +199,7 @@ public void CountJellyBeansInACylinderWithInchTest()
199199
float result = Calculator.CountJellyBeans(unit, height, radius);
200200

201201
//Assert
202-
Assert.AreEqual(1862f, System.Math.Round(result, 0), 1f);
202+
Assert.AreEqual(149.23, Math.Round(result, 2), 0.01);
203203
}
204204

205205
[TestMethod]

‎src/MandMCounter.Tests/MandMTests.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void CountMandMsInAUSGallonTest()
1919
float result = Calculator.CountMandMs(unit, quantity);
2020

2121
//Assert
22-
Assert.AreEqual(4047f, (float)System.Math.Round(result, 0), 0.1f);
22+
Assert.AreEqual(4047.3, Math.Round(result, 2), 0.01);
2323
}
2424

2525
[TestMethod]
@@ -33,7 +33,7 @@ public void CountMandMsInAUSQuartTest()
3333
float result = Calculator.CountMandMs(unit, quantity);
3434

3535
//Assert
36-
Assert.AreEqual(1012f, (float)System.Math.Round(result, 0), 0.1f);
36+
Assert.AreEqual(1011.82, Math.Round(result, 2), 0.01);
3737
}
3838

3939
[TestMethod]
@@ -47,7 +47,7 @@ public void CountMandMsInAUSOunceTest()
4747
float result = Calculator.CountMandMs(unit, quantity);
4848

4949
//Assert
50-
Assert.AreEqual(32f, (float)System.Math.Round(result, 0), 0.1f);
50+
Assert.AreEqual(31.62, Math.Round(result, 2), 0.01);
5151
}
5252

5353
[TestMethod]
@@ -61,7 +61,7 @@ public void CountMandMsIn21PoundsTest()
6161
float result = Calculator.CountMandMs(unit, quantity);
6262

6363
//Assert
64-
Assert.AreEqual(339973f, (float)System.Math.Round(result, 0), 0.1f);
64+
Assert.AreEqual(339972.88, Math.Round(result, 2), 0.01);
6565
}
6666

6767

@@ -76,7 +76,7 @@ public void CountMandMsInAUSCupTest()
7676
float result = Calculator.CountMandMs(unit, quantity);
7777

7878
//Assert
79-
Assert.AreEqual(253f, (float)System.Math.Round(result, 0), 0.1f);
79+
Assert.AreEqual(252.96, Math.Round(result, 2), 0.01);
8080
}
8181

8282

@@ -91,7 +91,7 @@ public void CountMandMsInAUSQuarterCupTest()
9191
float result = Calculator.CountMandMs(unit, quantity);
9292

9393
//Assert
94-
Assert.AreEqual(63, (int)Math.Round(result, 0));
94+
Assert.AreEqual(63.24, Math.Round(result, 2), 0.01);
9595
}
9696

9797
[TestMethod]
@@ -105,7 +105,7 @@ public void CountMandMsInAUSTableSpoonTest()
105105
float result = Calculator.CountMandMs(unit, quantity);
106106

107107
//Assert
108-
Assert.AreEqual(16, (int)Math.Round(result, 0));
108+
Assert.AreEqual(15.81, Math.Round(result, 2), 0.01);
109109
}
110110

111111
[TestMethod]
@@ -119,7 +119,7 @@ public void CountMandMsInAUSTeaSpoonTest()
119119
float result = Calculator.CountMandMs(unit, quantity);
120120

121121
//Assert
122-
Assert.AreEqual(5, (int)Math.Round(result, 0));
122+
Assert.AreEqual(5.27, Math.Round(result, 2), 0.01);
123123
}
124124

125125
[TestMethod]
@@ -144,7 +144,7 @@ public void CountMandMsInA1LitreTest()
144144
float result = Calculator.CountMandMs(unit, quantity);
145145

146146
//Assert
147-
Assert.AreEqual(1069, (int)Math.Round(result, 0));
147+
Assert.AreEqual(1069.18, Math.Round(result, 2), 0.01);
148148
}
149149

150150
[TestMethod]
@@ -160,7 +160,7 @@ public void CountMandMsInA1CubicCMTest()
160160
float result = Calculator.CountMandMs(unit, height, width, length);
161161

162162
//Assert
163-
Assert.AreEqual(1069, (int)Math.Round(result, 0));
163+
Assert.AreEqual(1069.18, Math.Round(result, 2), 0.01);
164164
}
165165

166166
[TestMethod]
@@ -176,7 +176,7 @@ public void CountMandMsInA1CubicMTest()
176176
float result = Calculator.CountMandMs(unit, height, width, length);
177177

178178
//Assert
179-
Assert.AreEqual(1069, (int)Math.Round(result, 0));
179+
Assert.AreEqual(1069.18, Math.Round(result, 2), 0.01);
180180
}
181181

182182
[TestMethod]
@@ -192,7 +192,7 @@ public void CountMandMsInA1CubicInchTest()
192192
float result = Calculator.CountMandMs(unit, height, width, length);
193193

194194
//Assert
195-
Assert.AreEqual(18, (int)Math.Round(result, 0));
195+
Assert.AreEqual(17.52, Math.Round(result, 2), 0.01);
196196
}
197197

198198
[TestMethod]
@@ -208,7 +208,7 @@ public void CountMandMsInA1CubicFeetTest()
208208
float result = Calculator.CountMandMs(unit, height, width, length);
209209

210210
//Assert
211-
Assert.AreEqual(30276, (int)Math.Round(result, 0));
211+
Assert.AreEqual(30275.94, Math.Round(result, 2), 0.01);
212212
}
213213

214214

@@ -229,7 +229,7 @@ public void CountMandMsInA1CubicNullUnitTest()
229229
catch (Exception ex)
230230
{
231231
//Assert
232-
Assert.IsTrue(ex != null);
232+
Assert.IsNotNull(ex);
233233
}
234234
}
235235

@@ -245,7 +245,7 @@ public void CountMandMsInACylinderWithCMTest()
245245
float result = Calculator.CountMandMs(unit, height, radius);
246246

247247
//Assert
248-
Assert.AreEqual(840, (int)Math.Round(result, 0));
248+
Assert.AreEqual(839.73, Math.Round(result, 2), 0.01);
249249
}
250250

251251
[TestMethod]
@@ -260,7 +260,7 @@ public void CountMandMsInACylinderWithMTest()
260260
float result = Calculator.CountMandMs(unit, height, radius);
261261

262262
//Assert
263-
Assert.AreEqual(3359, (int)Math.Round(result, 0));
263+
Assert.AreEqual(3358.94, Math.Round(result, 2), 0.01);
264264
}
265265

266266
[TestMethod]
@@ -275,7 +275,7 @@ public void CountMandMsInACylinderWithMeterTest()
275275
float result = Calculator.CountMandMs(unit, height, radius);
276276

277277
//Assert
278-
Assert.AreEqual(3359, (int)Math.Round(result, 0));
278+
Assert.AreEqual(3358.94, Math.Round(result, 2), 0.01);
279279
}
280280

281281
[TestMethod]
@@ -290,7 +290,7 @@ public void CountMandMsInACylinderWithInchTest()
290290
float result = Calculator.CountMandMs(unit, height, radius);
291291

292292
//Assert
293-
Assert.AreEqual(881, (int)Math.Round(result, 0));
293+
Assert.AreEqual(880.69, Math.Round(result, 2), 0.01);
294294
}
295295

296296
[TestMethod]
@@ -305,7 +305,7 @@ public void CountMandMsInACylinderWithFeetTest()
305305
float result = Calculator.CountMandMs(unit, height, radius);
306306

307307
//Assert
308-
Assert.AreEqual(95115, (int)Math.Round(result, 0));
308+
Assert.AreEqual(95114.68, Math.Round(result, 2), 0.01);
309309
}
310310

311311
[TestMethod]
@@ -324,7 +324,7 @@ public void CountMandMsInACylinderWithNullUnitTest()
324324
catch (Exception ex)
325325
{
326326
//Assert
327-
Assert.IsTrue(ex != null);
327+
Assert.IsNotNull(ex);
328328
}
329329
}
330330

‎src/MandMCounter.Tests/PeanutMandMTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void CountPeanutMandMsInAUSGallonTest()
2020
float result = Calculator.CountPeanutMandMs(unit, quantity);
2121

2222
//Assert
23-
Assert.AreEqual(2892, (int)System.Math.Round(result, 0));
23+
Assert.AreEqual(2891.83, Math.Round(result, 2), 0.01);
2424
}
2525

2626
[TestMethod]
@@ -35,7 +35,7 @@ public void CountPeanutMandMsInAUSQuartTest()
3535
float result = Calculator.CountPeanutMandMs(unit, quantity);
3636

3737
//Assert
38-
Assert.AreEqual(1446, (int)System.Math.Round(result, 0));
38+
Assert.AreEqual(1445.92, Math.Round(result, 2), 0.01);
3939
}
4040

4141
[TestMethod]
@@ -50,7 +50,7 @@ public void CountPeanutMandMsInAUSCupTest()
5050
float result = Calculator.CountPeanutMandMs(unit, quantity);
5151

5252
//Assert
53-
Assert.AreEqual(181, (int)System.Math.Round(result, 0));
53+
Assert.AreEqual(180.74, Math.Round(result, 2), 0.01);
5454
}
5555

5656

@@ -66,7 +66,7 @@ public void CountPeanutMandMsInAUSQuarterCupTest()
6666
float result = Calculator.CountPeanutMandMs(unit, quantity);
6767

6868
//Assert
69-
Assert.AreEqual(45, (int)Math.Round(result, 0));
69+
Assert.AreEqual(45.18, Math.Round(result, 2), 0.01);
7070
}
7171

7272
[TestMethod]
@@ -81,7 +81,7 @@ public void CountPeanutMandMsInAUSTableSpoonTest()
8181
float result = Calculator.CountPeanutMandMs(unit, quantity);
8282

8383
//Assert
84-
Assert.AreEqual(11, (int)Math.Round(result, 0));
84+
Assert.AreEqual(11.3, Math.Round(result, 2), 0.01);
8585
}
8686

8787
[TestMethod]
@@ -96,7 +96,7 @@ public void CountPeanutMandMsInAUSTeaSpoonTest()
9696
float result = Calculator.CountPeanutMandMs(unit, quantity);
9797

9898
//Assert
99-
Assert.AreEqual(4, (int)Math.Round(result, 0));
99+
Assert.AreEqual(3.77, Math.Round(result, 2), 0.01);
100100
}
101101

102102
[TestMethod]
@@ -122,7 +122,7 @@ public void CountPeanutMandMsInA1LitreTest()
122122
float result = Calculator.CountPeanutMandMs(unit, quantity);
123123

124124
//Assert
125-
Assert.AreEqual(764, (int)Math.Round(result, 0));
125+
Assert.AreEqual(763.94, Math.Round(result, 2), 0.01);
126126
}
127127

128128
[TestMethod]
@@ -139,7 +139,7 @@ public void CountPeanutMandMsInA1CubicCMTest()
139139
float result = Calculator.CountPeanutMandMs(unit, height, width, length);
140140

141141
//Assert
142-
Assert.AreEqual(764, (int)Math.Round(result, 0));
142+
Assert.AreEqual(763.94, Math.Round(result, 2), 0.01);
143143
}
144144

145145
[TestMethod]
@@ -156,7 +156,7 @@ public void CountPeanutMandMsInA1CubicInchTest()
156156
float result = Calculator.CountPeanutMandMs(unit, height, width, length);
157157

158158
//Assert
159-
Assert.AreEqual(13, (int)Math.Round(result, 0));
159+
Assert.AreEqual(12.52, Math.Round(result, 2), 0.01);
160160
}
161161

162162

@@ -189,7 +189,7 @@ public void CountPeanutMandMsInACylinderWithCMTest()
189189
float result = Calculator.CountPeanutMandMs(unit, height, radius);
190190

191191
//Assert
192-
Assert.AreEqual(600, (int)Math.Round(result, 0));
192+
Assert.AreEqual(600, Math.Round(result, 2), 0.01);
193193
}
194194

195195
[TestMethod]
@@ -205,7 +205,7 @@ public void CountPeanutMandMsInACylinderWithInchTest()
205205
float result = Calculator.CountPeanutMandMs(unit, height, radius);
206206

207207
//Assert
208-
Assert.AreEqual(629, (int)Math.Round(result, 0));
208+
Assert.AreEqual(629.26, Math.Round(result, 2), 0.01);
209209
}
210210

211211
[TestMethod]

0 commit comments

Comments
 (0)