Skip to content
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

Jump to bottom

Refactor unnecessary try/catch #4057

Merged
merged 11 commits into from
Nov 19, 2024
Merged

Refactor unnecessary try/catch #4057

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0007764
Refactor unnecessary try/catch
Youssef1313 Nov 13, 2024
c3819e2
Remove one more unnecessary try/catch
Youssef1313 Nov 13, 2024
444a938
Fix formatting
Youssef1313 Nov 13, 2024
ce7848d
Fix test failures
Youssef1313 Nov 13, 2024
75db0fe
Refactor a bit more
Youssef1313 Nov 13, 2024
6ebcb5f
Merge branch 'main' into dev/ygerges/unnecessary-try-catch
Evangelink Nov 15, 2024
838302b
Adjust back again so that the exception is thrown by callers
Youssef1313 Nov 17, 2024
ac44c91
Adjust the logic and add test
Youssef1313 Nov 18, 2024
04db4fd
Assert the exception message
Youssef1313 Nov 18, 2024
3f45364
Address review comments
Youssef1313 Nov 19, 2024
bcddb36
Merge branch 'main' into dev/ygerges/unnecessary-try-catch
Evangelink Nov 19, 2024
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
26 changes: 12 additions & 14 deletions src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,24 +409,22 @@ private static bool ProcessTestDataSourceTests(UnitTestElement test, ReflectionT

// This code is to discover tests. To run the tests code is in TestMethodRunner.ExecuteDataSourceBasedTests.
// Any change made here should be reflected in TestMethodRunner.ExecuteDataSourceBasedTests as well.
try
{
data = dataSource.GetData(methodInfo);
data = dataSource.GetData(methodInfo);

if (!data.Any())
if (!data.Any())
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
{
if (MSTestSettings.CurrentSettings.ConsiderEmptyDataSourceAsInconclusive)
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
{
throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, FrameworkMessages.DynamicDataIEnumerableEmpty, "GetData", dataSource.GetType().Name));
UnitTestElement discoveredTest = test.Clone();
// Make the test not data driven, because it had no data.
discoveredTest.TestMethod.DataType = DynamicDataType.None;
discoveredTest.DisplayName = dataSource.GetDisplayName(methodInfo, null) ?? discoveredTest.DisplayName;

tests.Add(discoveredTest);
continue;
}
}
catch (ArgumentException) when (MSTestSettings.CurrentSettings.ConsiderEmptyDataSourceAsInconclusive)
{
UnitTestElement discoveredTest = test.Clone();
// Make the test not data driven, because it had no data.
discoveredTest.TestMethod.DataType = DynamicDataType.None;
discoveredTest.DisplayName = dataSource.GetDisplayName(methodInfo, null) ?? discoveredTest.DisplayName;

tests.Add(discoveredTest);
continue;
throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, FrameworkMessages.DynamicDataIEnumerableEmpty, "GetData", dataSource.GetType().Name));
}

var testDisplayNameFirstSeen = new Dictionary<string, int>();
Expand Down
31 changes: 15 additions & 16 deletions src/Adapter/MSTest.TestAdapter/Execution/TestMethodRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,25 +311,24 @@ private bool ExecuteDataSourceBasedTests(List<TestResult> results)
{
isDataDriven = true;
IEnumerable<object?[]>? dataSource;
try
{
// This code is to execute tests. To discover the tests code is in AssemblyEnumerator.ProcessTestDataSourceTests.
// Any change made here should be reflected in AssemblyEnumerator.ProcessTestDataSourceTests as well.
dataSource = testDataSource.GetData(_testMethodInfo.MethodInfo);

if (!dataSource.Any())
{
throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, FrameworkMessages.DynamicDataIEnumerableEmpty, "GetData", testDataSource.GetType().Name));
}
}
catch (Exception ex) when (ex is ArgumentException && MSTestSettings.CurrentSettings.ConsiderEmptyDataSourceAsInconclusive)
// This code is to execute tests. To discover the tests code is in AssemblyEnumerator.ProcessTestDataSourceTests.
// Any change made here should be reflected in AssemblyEnumerator.ProcessTestDataSourceTests as well.
dataSource = testDataSource.GetData(_testMethodInfo.MethodInfo);

if (!dataSource.Any())
{
var inconclusiveResult = new TestResult
if (MSTestSettings.CurrentSettings.ConsiderEmptyDataSourceAsInconclusive)
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
{
Outcome = UTF.UnitTestOutcome.Inconclusive,
};
results.Add(inconclusiveResult);
continue;
var inconclusiveResult = new TestResult
{
Outcome = UTF.UnitTestOutcome.Inconclusive,
};
results.Add(inconclusiveResult);
continue;
}

throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, FrameworkMessages.DynamicDataIEnumerableEmpty, "GetData", testDataSource.GetType().Name));
}

foreach (object?[] data in dataSource)
Expand Down
Loading