-
Notifications
You must be signed in to change notification settings - Fork 259
Commit
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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()) | ||
{ | ||
if (MSTestSettings.CurrentSettings.ConsiderEmptyDataSourceAsInconclusive) | ||
{ | ||
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; | ||
|
||
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfx (Build Linux Debug)src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfx (Build Linux Debug)src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfx (Build Linux Debug)src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfx (Build Linux Debug)src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfx (Build Linux Debug)src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfx (Build Linux Release)src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfx (Build Linux Release)src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfx (Build Linux Release)src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfx (Build Linux Release)src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfx (Build Linux Release)src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfxsrc/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfxsrc/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfxsrc/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
Check failure on line 422 in src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs Azure Pipelines / microsoft.testfxsrc/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs#L422
|
||
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>(); | ||
|