Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortherzok <marius.ungureanu@xamarin.com>2018-07-20 15:45:07 +0300
committerMarius Ungureanu <teromario@yahoo.com>2018-08-01 17:07:37 +0300
commita07d1ac304d70d47e00595d6645383a70bd89cd9 (patch)
treed6bc6e3ea48d2751a4d563bbd981cd9ea6fc3ab0 /main/src/addins/MonoDevelop.UnitTesting
parent626e64b681ab1db836ca370592c5506806a7d279 (diff)
[UnitTests] Clean up equals check a bit
Diffstat (limited to 'main/src/addins/MonoDevelop.UnitTesting')
-rw-r--r--main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestGroup.cs4
-rw-r--r--main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResult.cs29
2 files changed, 13 insertions, 20 deletions
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestGroup.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestGroup.cs
index 006a9cb4ad..062329404d 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestGroup.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestGroup.cs
@@ -70,7 +70,7 @@ namespace MonoDevelop.UnitTesting
base.ResetLastResult ();
}
- static UnitTestResult GetLastResultDynamicaly (IEnumerable<UnitTest> tests)
+ static UnitTestResult GetLastResultDynamically (IEnumerable<UnitTest> tests)
{
int passed = 0;
int errors = 0;
@@ -115,7 +115,7 @@ namespace MonoDevelop.UnitTesting
{
if (this.Status == TestStatus.Running)
return;
- var calculatedResult = GetLastResultDynamicaly (Tests);
+ var calculatedResult = GetLastResultDynamically (Tests);
var storedResult = GetLastResult ();
if(!calculatedResult.Equals (storedResult)){
lastResult = calculatedResult;
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResult.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResult.cs
index a2d0eb9208..206602a19d 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResult.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestResult.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
namespace MonoDevelop.UnitTesting
{
[Serializable]
- public class UnitTestResult
+ public class UnitTestResult : IEquatable<UnitTestResult>
{
DateTime testDate;
ResultStatus status;
@@ -240,26 +240,19 @@ namespace MonoDevelop.UnitTesting
return unknowObject.GetHashCode ();
}
- public override bool Equals (object obj)
- {
- var unitTestResult = obj as UnitTestResult;
- if (unitTestResult == null)
- return false;
- return EqualsHelper (this, unitTestResult);
- }
+ public override bool Equals (object obj) => obj is UnitTestResult other && Equals (other);
- bool EqualsHelper (UnitTestResult firstResult, UnitTestResult secondResult)
+ public bool Equals (UnitTestResult other)
{
- return firstResult.Status == secondResult.Status &&
- firstResult.Passed == secondResult.Passed &&
- firstResult.Errors == secondResult.Errors &&
- firstResult.Failures == secondResult.Failures &&
- firstResult.Inconclusive == secondResult.Inconclusive &&
- firstResult.NotRunnable == secondResult.NotRunnable &&
- firstResult.Skipped == secondResult.Skipped &&
- firstResult.Ignored == secondResult.Ignored;
+ return Status == other.Status &&
+ Passed == other.Passed &&
+ Errors == other.Errors &&
+ Failures == other.Failures &&
+ Inconclusive == other.Inconclusive &&
+ NotRunnable == other.NotRunnable &&
+ Skipped == other.Skipped &&
+ Ignored == other.Ignored;
}
-
}
}