Simplify HasCorrectTimeout

src/Adapter/MSTest.TestAdapter/Execution/TypeCache.cs

@@ -418,7 +418,7 @@ private TestAssemblyInfo GetAssemblyInfo(Type type)
                     TimeoutAttribute? timeoutAttribute = _reflectionHelper.GetFirstNonDerivedAttributeOrDefault<TimeoutAttribute>(methodInfo, inherit: false);
                     if (timeoutAttribute != null)
                     {
-                        if (!methodInfo.HasCorrectTimeout(timeoutAttribute))
+                        if (!timeoutAttribute.HasCorrectTimeout)
                         {
                             string message = string.Format(CultureInfo.CurrentCulture, Resource.UTA_ErrorInvalidTimeout, methodInfo.DeclaringType!.FullName, methodInfo.Name);
                             throw new TypeInspectionException(message);
@@ -437,7 +437,7 @@ private TestAssemblyInfo GetAssemblyInfo(Type type)
                     TimeoutAttribute? timeoutAttribute = _reflectionHelper.GetFirstNonDerivedAttributeOrDefault<TimeoutAttribute>(methodInfo, inherit: false);
                     if (timeoutAttribute != null)
                     {
-                        if (!methodInfo.HasCorrectTimeout(timeoutAttribute))
+                        if (!timeoutAttribute.HasCorrectTimeout)
                         {
                             string message = string.Format(CultureInfo.CurrentCulture, Resource.UTA_ErrorInvalidTimeout, methodInfo.DeclaringType!.FullName, methodInfo.Name);
                             throw new TypeInspectionException(message);
@@ -578,7 +578,7 @@ private void UpdateInfoIfClassInitializeOrCleanupMethod(
             TimeoutAttribute? timeoutAttribute = _reflectionHelper.GetFirstNonDerivedAttributeOrDefault<TimeoutAttribute>(methodInfo, inherit: false);
             if (timeoutAttribute != null)
             {
-                if (!methodInfo.HasCorrectTimeout(timeoutAttribute))
+                if (!timeoutAttribute.HasCorrectTimeout)
                 {
                     string message = string.Format(CultureInfo.CurrentCulture, Resource.UTA_ErrorInvalidTimeout, methodInfo.DeclaringType!.FullName, methodInfo.Name);
                     throw new TypeInspectionException(message);
@@ -611,7 +611,7 @@ private void UpdateInfoIfClassInitializeOrCleanupMethod(
             TimeoutAttribute? timeoutAttribute = _reflectionHelper.GetFirstNonDerivedAttributeOrDefault<TimeoutAttribute>(methodInfo, inherit: false);
             if (timeoutAttribute != null)
             {
-                if (!methodInfo.HasCorrectTimeout(timeoutAttribute))
+                if (!timeoutAttribute.HasCorrectTimeout)
                 {
                     string message = string.Format(CultureInfo.CurrentCulture, Resource.UTA_ErrorInvalidTimeout, methodInfo.DeclaringType!.FullName, methodInfo.Name);
                     throw new TypeInspectionException(message);
@@ -677,7 +677,7 @@ private void UpdateInfoIfTestInitializeOrCleanupMethod(
             TimeoutAttribute? timeoutAttribute = _reflectionHelper.GetFirstNonDerivedAttributeOrDefault<TimeoutAttribute>(methodInfo, inherit: false);
             if (timeoutAttribute != null)
             {
-                if (!methodInfo.HasCorrectTimeout(timeoutAttribute))
+                if (!timeoutAttribute.HasCorrectTimeout)
                 {
                     string message = string.Format(CultureInfo.CurrentCulture, Resource.UTA_ErrorInvalidTimeout, methodInfo.DeclaringType!.FullName, methodInfo.Name);
                     throw new TypeInspectionException(message);
@@ -708,7 +708,7 @@ private void UpdateInfoIfTestInitializeOrCleanupMethod(
             TimeoutAttribute? timeoutAttribute = _reflectionHelper.GetFirstNonDerivedAttributeOrDefault<TimeoutAttribute>(methodInfo, inherit: false);
             if (timeoutAttribute != null)
             {
-                if (!methodInfo.HasCorrectTimeout(timeoutAttribute))
+                if (!timeoutAttribute.HasCorrectTimeout)
                 {
                     string message = string.Format(CultureInfo.CurrentCulture, Resource.UTA_ErrorInvalidTimeout, methodInfo.DeclaringType!.FullName, methodInfo.Name);
                     throw new TypeInspectionException(message);
@@ -875,7 +875,7 @@ private TimeoutInfo GetTestTimeout(MethodInfo methodInfo, TestMethod testMethod)
 
         if (timeoutAttribute != null)
         {
-            if (!methodInfo.HasCorrectTimeout(timeoutAttribute))
+            if (!timeoutAttribute.HasCorrectTimeout)
             {
                 string message = string.Format(CultureInfo.CurrentCulture, Resource.UTA_ErrorInvalidTimeout, testMethod.FullClassName, testMethod.Name);
                 throw new TypeInspectionException(message);

src/Adapter/MSTest.TestAdapter/Extensions/MethodInfoExtensions.cs

@@ -80,22 +80,6 @@ internal static bool HasCorrectTestMethodSignature(this MethodInfo method, bool
             method.IsValidReturnType(); // Match return type Task for async methods only. Else return type void.
     }
 
-    /// <summary>
-    /// Checks whether test method has correct Timeout attribute.
-    /// </summary>
-    /// <param name="method">The method to verify.</param>
-    /// <param name="timeoutAttribute">The timeout attribute when we already have it.</param>
-    /// <returns>True if the method has the right test timeout signature.</returns>
-    internal static bool HasCorrectTimeout(this MethodInfo method, TimeoutAttribute? timeoutAttribute = null)
-    {
-        DebugEx.Assert(method != null, "method should not be null.");
-
-        // TODO: redesign this, probably change this to GetTimeout? so we don't have to do this weird dance?
-        timeoutAttribute ??= ReflectHelper.Instance.GetFirstNonDerivedAttributeOrDefault<TimeoutAttribute>(method, inherit: false);
-
-        return timeoutAttribute?.Timeout > 0;
-    }
-
     /// <summary>
     /// Check is return type is void for non async and Task for async methods.
     /// </summary>

src/TestFramework/TestFramework/Attributes/TestMethod/TimeoutAttribute.cs

@@ -17,15 +17,22 @@
     /// <param name="timeout">
     /// The timeout in milliseconds.
     /// </param>
-    public TimeoutAttribute(int timeout) => Timeout = timeout;
+    public TimeoutAttribute(int timeout)
+    {
+        Timeout = timeout;
+        HasCorrectTimeout = Timeout > 0;
+    }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="TimeoutAttribute"/> class with a preset timeout.
     /// </summary>
     /// <param name="timeout">
     /// The timeout.
     /// </param>
-    public TimeoutAttribute(TestTimeout timeout) => Timeout = (int)timeout;
+    public TimeoutAttribute(TestTimeout timeout)
+        : this((int)timeout)
+    {
+    }
 
     /// <summary>
     /// Gets the timeout in milliseconds.
@@ -52,5 +59,10 @@
         }
     }
 
+    /// <summary>
+    /// Gets a value indicating whether the instance has the correct test timeout signature.
+    /// </summary>
+    internal bool HasCorrectTimeout => Timeout > 0;
+
     internal bool IsCooperativeCancellationSet { get; private set; }
 }

test/UnitTests/MSTestAdapter.UnitTests/Extensions/MethodInfoExtensionsTests.cs

@@ -244,28 +244,6 @@ public void HasCorrectTestMethodSignatureShouldReturnFalseForAsyncTestMethodsWit
 
     #endregion
 
-    #region HasCorrectTimeout tests
-
-    public void HasCorrectTimeoutShouldReturnFalseForMethodsWithoutTimeoutAttribute()
-    {
-        MethodInfo methodInfo = typeof(DummyTestClass).GetMethod("PublicMethod");
-        Verify(!methodInfo.HasCorrectTimeout());
-    }
-
-    public void HasCorrectTimeoutShouldReturnFalseForMethodsWithInvalidTimeoutAttribute()
-    {
-        MethodInfo methodInfo = typeof(DummyTestClass).GetMethod("PublicMethodWithInvalidTimeout");
-        Verify(!methodInfo.HasCorrectTimeout());
-    }
-
-    public void HasCorrectTimeoutShouldReturnTrueForMethodsWithTimeoutAttribute()
-    {
-        MethodInfo methodInfo = typeof(DummyTestClass).GetMethod("PublicMethodWithTimeout");
-        Verify(methodInfo.HasCorrectTimeout());
-    }
-
-    #endregion
-
     #region IsVoidOrTaskReturnType tests
 
     public void IsVoidOrTaskReturnTypeShouldReturnTrueForVoidMethods()