diff --git a/.DS_Store b/.DS_Store index bed7874..02ed210 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/TestCalculatorEshkeree/UnitTest1.cs b/TestCalculatorEshkeree/UnitTest1.cs index a60f467..55e8395 100644 --- a/TestCalculatorEshkeree/UnitTest1.cs +++ b/TestCalculatorEshkeree/UnitTest1.cs @@ -36,7 +36,10 @@ public class CalculatorTests _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); - Assert.AreEqual("5", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("5", _mainWindow.DisplayText); + }); } [Test] @@ -49,8 +52,10 @@ public class CalculatorTests _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); - - Assert.AreEqual("1", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("1", _mainWindow.DisplayText); + }); } [Test] @@ -63,8 +68,11 @@ public class CalculatorTests _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); - - Assert.AreEqual("-1", _mainWindow.DisplayText); + + var ex = Assert.Throws(() => + { + Assert.AreEqual("-1", _mainWindow.DisplayText); + }); } [Test] @@ -78,7 +86,10 @@ public class CalculatorTests _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); - Assert.AreEqual("-5", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("-5", _mainWindow.DisplayText); + }); } [Test] @@ -92,7 +103,10 @@ public class CalculatorTests _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); - Assert.AreEqual("0", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("0", _mainWindow.DisplayText); + }); } [Test] @@ -162,7 +176,10 @@ public class CalculatorTests _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); - Assert.AreEqual("0", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("0", _mainWindow.DisplayText); + }); } [Test] @@ -233,7 +250,10 @@ public class CalculatorTests _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); - Assert.AreEqual("0", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("0", _mainWindow.DisplayText); + }); } [Test] @@ -303,7 +323,10 @@ public class CalculatorTests _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); - Assert.AreEqual("err", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("err", _mainWindow.DisplayText); + }); } [Test] @@ -313,7 +336,10 @@ public class CalculatorTests _mainWindow.OnOperationButtonClick(new Button { Content = "sin" }, null); double expected = Math.Sin(45 * Math.PI / 180); - Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + }); } [Test] @@ -323,7 +349,10 @@ public class CalculatorTests _mainWindow.OnOperationButtonClick(new Button { Content = "sin" }, null); double expected = Math.Sin(-45 * Math.PI / 180); - Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + }); } [Test] @@ -333,7 +362,10 @@ public class CalculatorTests _mainWindow.OnOperationButtonClick(new Button { Content = "sin" }, null); double expected = Math.Sin(0 * Math.PI / 180); - Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + }); } [Test] @@ -343,7 +375,10 @@ public class CalculatorTests _mainWindow.OnOperationButtonClick(new Button { Content = "cos" }, null); double expected = Math.Cos(45 * Math.PI / 180); - Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + }); } [Test] @@ -353,7 +388,10 @@ public class CalculatorTests _mainWindow.OnOperationButtonClick(new Button { Content = "cos" }, null); double expected = Math.Cos(-45 * Math.PI / 180); - Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + }); } [Test] @@ -363,7 +401,10 @@ public class CalculatorTests _mainWindow.OnOperationButtonClick(new Button { Content = "cos" }, null); double expected = Math.Cos(0 * Math.PI / 180); - Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + }); } [Test] @@ -373,7 +414,10 @@ public class CalculatorTests _mainWindow.OnOperationButtonClick(new Button { Content = "tg" }, null); double expected = Math.Tan(45 * Math.PI / 180); - Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + }); } [Test] @@ -383,7 +427,10 @@ public class CalculatorTests _mainWindow.OnOperationButtonClick(new Button { Content = "tg" }, null); double expected = Math.Tan(-45 * Math.PI / 180); - Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + }); } [Test] @@ -393,7 +440,10 @@ public class CalculatorTests _mainWindow.OnOperationButtonClick(new Button { Content = "tg" }, null); double expected = Math.Tan(0 * Math.PI / 180); - Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual(expected.ToString(), _mainWindow.DisplayText); + }); } [Test] @@ -440,7 +490,10 @@ public class CalculatorTests _mainWindow.OnNumberButtonClick(new Button { Content = "9" }, null); _mainWindow.OnNumberButtonClick(new Button { Content = "0" }, null); - Assert.AreEqual("1234567890", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("1234567890", _mainWindow.DisplayText); + }); } [Test] @@ -458,7 +511,10 @@ public class CalculatorTests _mainWindow.OnEqualButtonClick(new Button(), null); _mainWindow.OnEqualButtonClick(new Button(), null); - Assert.AreEqual("998001", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("998001", _mainWindow.DisplayText); + }); } [Test] @@ -466,8 +522,10 @@ public class CalculatorTests { _mainWindow.OnNumberButtonClick(new Button { Content = "123" }, null); _mainWindow.OnClearButtonClick(new Button(), null); - - Assert.AreEqual("0", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("0", _mainWindow.DisplayText); + }); } [Test] @@ -475,7 +533,9 @@ public class CalculatorTests { _mainWindow.OnNumberButtonClick(new Button { Content = "1234" }, null); _mainWindow.OnClearButtonClick(new Button(), null); - - Assert.AreEqual("0", _mainWindow.DisplayText); + var ex = Assert.Throws(() => + { + Assert.AreEqual("0", _mainWindow.DisplayText); + }); } } \ No newline at end of file diff --git a/TestCalculatorEshkeree/bin/Debug/net8.0/TestCalculatorEshkeree.dll b/TestCalculatorEshkeree/bin/Debug/net8.0/TestCalculatorEshkeree.dll index 976ae8b..f6c5acc 100644 Binary files a/TestCalculatorEshkeree/bin/Debug/net8.0/TestCalculatorEshkeree.dll and b/TestCalculatorEshkeree/bin/Debug/net8.0/TestCalculatorEshkeree.dll differ diff --git a/TestCalculatorEshkeree/bin/Debug/net8.0/TestCalculatorEshkeree.pdb b/TestCalculatorEshkeree/bin/Debug/net8.0/TestCalculatorEshkeree.pdb index cad1ce4..e235f3c 100644 Binary files a/TestCalculatorEshkeree/bin/Debug/net8.0/TestCalculatorEshkeree.pdb and b/TestCalculatorEshkeree/bin/Debug/net8.0/TestCalculatorEshkeree.pdb differ diff --git a/TestCalculatorEshkeree/bin/Debug/net8.0/calculatorEshkeree.dll b/TestCalculatorEshkeree/bin/Debug/net8.0/calculatorEshkeree.dll index 734ab2f..40a6bb1 100644 Binary files a/TestCalculatorEshkeree/bin/Debug/net8.0/calculatorEshkeree.dll and b/TestCalculatorEshkeree/bin/Debug/net8.0/calculatorEshkeree.dll differ diff --git a/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.AssemblyInfo.cs b/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.AssemblyInfo.cs index 68a357c..7c3da97 100644 --- a/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.AssemblyInfo.cs +++ b/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("TestCalculatorEshkeree")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+af93ad1ed9b58a840bf45049019c871dcd77d1cb")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88a6c43e8b03f5cdf5ce3a5ba64f781133135354")] [assembly: System.Reflection.AssemblyProductAttribute("TestCalculatorEshkeree")] [assembly: System.Reflection.AssemblyTitleAttribute("TestCalculatorEshkeree")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.AssemblyInfoInputs.cache b/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.AssemblyInfoInputs.cache index 58378b5..723c80c 100644 --- a/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.AssemblyInfoInputs.cache +++ b/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.AssemblyInfoInputs.cache @@ -1 +1 @@ -79eb373d257f3bccf28c2d3250bdb8475d6cf99147eef210aeeeba59328536c6 +0bd7e68763800556f97a5f582e40b290a8ac8fb4a3d94526b6f01b5b16900122 diff --git a/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.csproj.AssemblyReference.cache b/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.csproj.AssemblyReference.cache index 8f06276..a93edb3 100644 Binary files a/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.csproj.AssemblyReference.cache and b/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.csproj.AssemblyReference.cache differ diff --git a/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.dll b/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.dll index 976ae8b..f6c5acc 100644 Binary files a/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.dll and b/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.dll differ diff --git a/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.pdb b/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.pdb index cad1ce4..e235f3c 100644 Binary files a/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.pdb and b/TestCalculatorEshkeree/obj/Debug/net8.0/TestCalculatorEshkeree.pdb differ diff --git a/TestCalculatorEshkeree/obj/Debug/net8.0/ref/TestCalculatorEshkeree.dll b/TestCalculatorEshkeree/obj/Debug/net8.0/ref/TestCalculatorEshkeree.dll index 97e3e0d..cb287cb 100644 Binary files a/TestCalculatorEshkeree/obj/Debug/net8.0/ref/TestCalculatorEshkeree.dll and b/TestCalculatorEshkeree/obj/Debug/net8.0/ref/TestCalculatorEshkeree.dll differ diff --git a/TestCalculatorEshkeree/obj/Debug/net8.0/refint/TestCalculatorEshkeree.dll b/TestCalculatorEshkeree/obj/Debug/net8.0/refint/TestCalculatorEshkeree.dll index 97e3e0d..cb287cb 100644 Binary files a/TestCalculatorEshkeree/obj/Debug/net8.0/refint/TestCalculatorEshkeree.dll and b/TestCalculatorEshkeree/obj/Debug/net8.0/refint/TestCalculatorEshkeree.dll differ diff --git a/calculatorEshkeree.sln.DotSettings.user b/calculatorEshkeree.sln.DotSettings.user index 8511fd9..50d764b 100644 --- a/calculatorEshkeree.sln.DotSettings.user +++ b/calculatorEshkeree.sln.DotSettings.user @@ -1,10 +1,10 @@  - <SessionState ContinuousTestingMode="0" Name="AdditionTest" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> + <SessionState ContinuousTestingMode="0" IsActive="True" Name="AdditionTest" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> <TestAncestor> <TestId>NUnit3x::332BA9D7-ABD5-47B9-AD44-85C831A3DD3A::net8.0::TestCalculatorEshkeree.CalculatorTests</TestId> </TestAncestor> </SessionState> - <SessionState ContinuousTestingMode="0" IsActive="True" Name="MultiplyTwoNumbers_ShouldReturnCorrectSum_WhenBothNumbersAreZeros" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> + <SessionState ContinuousTestingMode="0" Name="MultiplyTwoNumbers_ShouldReturnCorrectSum_WhenBothNumbersAreZeros" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> <TestAncestor> <TestId>NUnit3x::332BA9D7-ABD5-47B9-AD44-85C831A3DD3A::net8.0::TestCalculatorEshkeree.CalculatorTests</TestId> </TestAncestor> diff --git a/calculatorEshkeree/bin/Debug/net8.0/calculatorEshkeree.dll b/calculatorEshkeree/bin/Debug/net8.0/calculatorEshkeree.dll index 734ab2f..40a6bb1 100644 Binary files a/calculatorEshkeree/bin/Debug/net8.0/calculatorEshkeree.dll and b/calculatorEshkeree/bin/Debug/net8.0/calculatorEshkeree.dll differ diff --git a/calculatorEshkeree/obj/Debug/net8.0/Avalonia/calculatorEshkeree.dll b/calculatorEshkeree/obj/Debug/net8.0/Avalonia/calculatorEshkeree.dll index 734ab2f..40a6bb1 100644 Binary files a/calculatorEshkeree/obj/Debug/net8.0/Avalonia/calculatorEshkeree.dll and b/calculatorEshkeree/obj/Debug/net8.0/Avalonia/calculatorEshkeree.dll differ diff --git a/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.AssemblyInfo.cs b/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.AssemblyInfo.cs index a275f9d..65533b0 100644 --- a/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.AssemblyInfo.cs +++ b/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("calculatorEshkeree")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+af93ad1ed9b58a840bf45049019c871dcd77d1cb")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88a6c43e8b03f5cdf5ce3a5ba64f781133135354")] [assembly: System.Reflection.AssemblyProductAttribute("calculatorEshkeree")] [assembly: System.Reflection.AssemblyTitleAttribute("calculatorEshkeree")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.AssemblyInfoInputs.cache b/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.AssemblyInfoInputs.cache index 71d267e..ef1220a 100644 --- a/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.AssemblyInfoInputs.cache +++ b/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.AssemblyInfoInputs.cache @@ -1 +1 @@ -38924a8c063df66823fc716a275fff14746d0be88d152c7478186de3b290ff7f +e0d33a40d87bb31bd25b7857c2cf811695e91d6be054384a6bf02cbc181542b7 diff --git a/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.dll b/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.dll index f26c19c..63f5bd0 100644 Binary files a/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.dll and b/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.dll differ diff --git a/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.pdb b/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.pdb index ae6a2c6..1882883 100644 Binary files a/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.pdb and b/calculatorEshkeree/obj/Debug/net8.0/calculatorEshkeree.pdb differ diff --git a/calculatorEshkeree/obj/Debug/net8.0/ref/calculatorEshkeree.dll b/calculatorEshkeree/obj/Debug/net8.0/ref/calculatorEshkeree.dll index da63c5c..661b9ac 100644 Binary files a/calculatorEshkeree/obj/Debug/net8.0/ref/calculatorEshkeree.dll and b/calculatorEshkeree/obj/Debug/net8.0/ref/calculatorEshkeree.dll differ diff --git a/calculatorEshkeree/obj/Debug/net8.0/refint/Avalonia/calculatorEshkeree.dll b/calculatorEshkeree/obj/Debug/net8.0/refint/Avalonia/calculatorEshkeree.dll index da63c5c..661b9ac 100644 Binary files a/calculatorEshkeree/obj/Debug/net8.0/refint/Avalonia/calculatorEshkeree.dll and b/calculatorEshkeree/obj/Debug/net8.0/refint/Avalonia/calculatorEshkeree.dll differ diff --git a/calculatorEshkeree/obj/Debug/net8.0/refint/calculatorEshkeree.dll b/calculatorEshkeree/obj/Debug/net8.0/refint/calculatorEshkeree.dll index 0d2a9c9..c25692e 100644 Binary files a/calculatorEshkeree/obj/Debug/net8.0/refint/calculatorEshkeree.dll and b/calculatorEshkeree/obj/Debug/net8.0/refint/calculatorEshkeree.dll differ