Skip to content

Handle possible null ref in error handler #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Apr 16, 2021
Merged

Handle possible null ref in error handler #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
127b214
Handle possible null ref in error handler
nohwnd Apr 15, 2021
fd11b4b
Remove unused method
nohwnd Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/Adapter/MSTest.CoreAdapter/Execution/TestMethodInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,11 +717,27 @@ private object CreateTestClassInstance(TestResult result)
}
catch (Exception ex)
{
if (ex == null)
{
// It seems that ex can be null in some rare cases when initialization fails in native code.
// Get our own exception with a stack trace to satisfy GetStackTraceInformation.
try
{
throw new InvalidOperationException(Resource.UTA_UserCodeThrewNullValueException);
}
catch (Exception exception)
{
ex = exception;
}
}

// In most cases, exception will be TargetInvocationException with real exception wrapped
// in the InnerException; or user code throws an exception
// in the InnerException; or user code throws an exception.
// It also seems that in rare cases the ex can be null.
var actualException = ex.InnerException ?? ex;
var exceptionMessage = StackTraceHelper.GetExceptionMessage(actualException);
var stackTraceInfo = StackTraceHelper.GetStackTraceInformation(actualException);

var errorMessage = string.Format(
CultureInfo.CurrentCulture,
Resource.UTA_InstanceCreationError,
Expand Down
6 changes: 3 additions & 3 deletions src/Adapter/MSTest.CoreAdapter/Execution/TestMethodRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ internal UnitTestResult[] RunTestMethod()
{
testResults = new[]
{
new UTF.TestResult() { TestFailureException = new Exception(string.Format(CultureInfo.CurrentCulture, Resource.UTA_ExecuteThrewException, ex.Message), ex) }
new UTF.TestResult() { TestFailureException = new Exception(string.Format(CultureInfo.CurrentCulture, Resource.UTA_ExecuteThrewException, ex?.Message, ex?.StackTrace), ex) }
};
}

Expand Down Expand Up @@ -324,7 +324,7 @@ internal UnitTestResult[] RunTestMethod()
{
testResults = new[]
{
new UTF.TestResult() { TestFailureException = new Exception(string.Format(CultureInfo.CurrentCulture, Resource.UTA_ExecuteThrewException, ex.Message), ex) }
new UTF.TestResult() { TestFailureException = new Exception(string.Format(CultureInfo.CurrentCulture, Resource.UTA_ExecuteThrewException, ex?.Message, ex?.StackTrace), ex) }
};
}

Expand All @@ -346,7 +346,7 @@ internal UnitTestResult[] RunTestMethod()
}
catch (Exception ex)
{
results.Add(new UTF.TestResult() { TestFailureException = new Exception(string.Format(CultureInfo.CurrentCulture, Resource.UTA_ExecuteThrewException, ex.Message), ex) });
results.Add(new UTF.TestResult() { TestFailureException = new Exception(string.Format(CultureInfo.CurrentCulture, Resource.UTA_ExecuteThrewException, ex?.Message, ex?.StackTrace), ex) });
}
}
}
Expand Down
13 changes: 11 additions & 2 deletions src/Adapter/MSTest.CoreAdapter/Resources/Resource.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion src/Adapter/MSTest.CoreAdapter/Resources/Resource.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ Error: {1}</value>
<value>Class Initialization method {0}.{1} threw exception. {2}: {3}.</value>
</data>
<data name="UTA_ExecuteThrewException" xml:space="preserve">
<value>Exception thrown while executing test. If using extension of TestMethodAttribute then please contact vendor. Error message: {0}</value>
<value>Exception thrown while executing test. If using extension of TestMethodAttribute then please contact vendor. Error message: {0}, Stack trace: {1}</value>
</data>
<data name="UTA_NoTestResult" xml:space="preserve">
<value>Error in executing test. No result returned by extension. If using extension of TestMethodAttribute then please contact vendor.</value>
Expand Down Expand Up @@ -320,4 +320,7 @@ Error: {1}</value>
<data name="Execution_Test_Cancelled" xml:space="preserve">
<value>Test '{0}' execution has been aborted.</value>
</data>
<data name="UTA_UserCodeThrewNullValueException" xml:space="preserve">
<value>The called code threw an exception that was caught, but the exception value was null</value>
</data>
</root>