Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"#7

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
Jayarani garg (jayaranigarg) merged 7 commits into from
Sep 6, 2016
Merged

Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)" #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
255a16b
Bug Fix #258333 with UT
jayaranigarg Aug 31, 2016
86f8d13
Correcting UT
jayaranigarg Aug 31, 2016
6ce370b
Editing UT
jayaranigarg Aug 31, 2016
9cd135f
Bug Fix #233637 with UT
jayaranigarg Sep 2, 2016
d3471e7
Resolving merge conflicts
jayaranigarg Sep 6, 2016
39a0423
Resolving merge conflicts
jayaranigarg Sep 6, 2016
97d3eb9
Addressing PR comments
jayaranigarg Sep 6, 2016
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
2 changes: 2 additions & 0 deletions src/Adapter/MSTestAdapter.PlatformServices.Desktop/Services/DesktopTestDataSource.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,8 @@ public UTF.TestResult[] RunDataDrivenTest(UTF.TestContext testContext, UTF.ITest

}

currentResult[0].DatarowIndex = rowIndex;

watch.Stop();
currentResult[0].Duration = watch.Elapsed;

Expand Down
9 changes: 8 additions & 1 deletion src/Adapter/MSTestAdapter/Execution/TestExecutionManager.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;

Expand DownExpand Up@@ -41,6 +42,7 @@ public TestExecutionManager()
{
this.TestMethodFilter = new TestMethodFilter();
this.sessionParameters = new Dictionary<string, object>();
this.adapterSettings = new MSTestSettings();
}

/// <summary>
Expand DownExpand Up@@ -326,7 +328,7 @@ private void LogWarnings(ITestExecutionRecorder testExecutionRecorder, IEnumerab
}
}

private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
internal void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
{
if (!(unitTestResults?.Length > 0))
{
Expand All@@ -342,6 +344,11 @@ private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, Da
}

var testResult = unitTestResult.ToTestResult(test, startTime, endTime, adapterSettings.MapInconclusiveToFailed);

if (unitTestResult.DatarowIndex >= 0)
{
testResult.DisplayName = string.Format(CultureInfo.CurrentCulture, Resource.DataDrivenResultDisplayName, test.DisplayName, unitTestResult.DatarowIndex);
}
testExecutionRecorder.RecordEnd(test, testResult.Outcome);

if (testResult.Outcome == TestOutcome.Failed)
Expand Down
1 change: 1 addition & 0 deletions src/Adapter/MSTestAdapter/Execution/TestMethodRunner.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ internal UnitTestResult[] ConvertTestResultToUnitTestResult(UTF.TestResult[] res
unitTestResult.DebugTrace = results[i].DebugTrace;
unitTestResult.Duration = results[i].Duration;
unitTestResult.DisplayName = results[i].DisplayName;
unitTestResult.DatarowIndex = results[i].DatarowIndex;
unitTestResult.ResultFiles = testContext.GetResultFiles();
unitTestResults[i] = unitTestResult;
}
Expand Down
15 changes: 11 additions & 4 deletions src/Adapter/MSTestAdapter/ObjectModel/UnitTestResult.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,14 @@ public class UnitTestResult
/// </summary>
internal UnitTestResult()
{
DatarowIndex = -1;
}

/// <summary>
/// Initializes a new instance of the <see cref="UnitTestResult"/> class.
/// </summary>
/// <param name="testFailedException"> The test failed exception. </param>
internal UnitTestResult(TestFailedException testFailedException)
internal UnitTestResult(TestFailedException testFailedException):this()
{
this.Outcome = testFailedException.Outcome;
this.ErrorMessage = testFailedException.Message;
Expand All@@ -52,7 +53,7 @@ internal UnitTestResult(TestFailedException testFailedException)
/// </summary>
/// <param name="outcome"> The outcome. </param>
/// <param name="errorMessage"> The error message. </param>
internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
internal UnitTestResult(UnitTestOutcome outcome, string errorMessage):this()
{
this.Outcome = outcome;
this.ErrorMessage = errorMessage;
Expand DownExpand Up@@ -113,6 +114,12 @@ internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
/// </summary>
public int ErrorColumnNumber { get; private set; }

/// <summary>
/// Data row index in data source. Set only for results of individual
/// run of data row of a data driven test.
/// </summary>
public int DatarowIndex { get; internal set; }

/// <summary>
/// Gets the result files attached by the test.
/// </summary>
Expand All@@ -137,8 +144,8 @@ internal TestResult ToTestResult(TestCase testCase, DateTimeOffset startTime, Da
ErrorStackTrace = this.ErrorStackTrace,
Outcome = UnitTestOutcomeHelper.ToTestOutcome(this.Outcome, mapInconclusiveToFailed),
StartTime = startTime,
EndTime = endTime
};
EndTime = endTime
};

if (!string.IsNullOrEmpty(this.StandardOut))
{
Expand Down
9 changes: 9 additions & 0 deletions src/Adapter/MSTestAdapter/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.

3 changes: 3 additions & 0 deletions src/Adapter/MSTestAdapter/Resource.resx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -274,4 +274,7 @@
<data name="InvalidSettingsXmlElement" xml:space="preserve">
<value>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</value>
</data>
<data name="DataDrivenResultDisplayName" xml:space="preserve">
<value>{0} (Data Row {1})</value>
</data>
</root>
15 changes: 15 additions & 0 deletions src/TestFramework/vnext/VSTestAttributes.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -313,6 +313,15 @@ public TimeoutAttribute(TestTimeout timeout)
/// </summary>
public class TestResult
{

/// <summary>
/// Initializes a new instance of the <see cref="TestResult"/> class.
/// </summary>
public TestResult()
{
DatarowIndex = -1;
}

/// <summary>
/// Gets or sets the display name of the result. Useful when returning multiple results.
/// If null then Method name is used as DisplayName.
Expand DownExpand Up@@ -349,6 +358,12 @@ public class TestResult
/// </summary>
public TimeSpan Duration { get; set; }

/// <summary>
/// Data row index in data source. Set only for results of individual
/// run of data row of a data driven test.
/// </summary>
public int DatarowIndex { get; set; }

/// <summary>
/// Gets or sets the return value of the test method. (Currently null always).
/// </summary>
Expand Down
45 changes: 44 additions & 1 deletion ...Tests/MSTestAdapter.PlatformServices.Desktop.Tests/Services/DesktopTestDataSourceTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,51 @@ public void RunDataDrivenTestsGivesTestResultAsFailedWhenTestMethodFails()
Assert.AreEqual(result[0].Outcome, TestFrameworkV2.UnitTestOutcome.Failed);
}

[TestMethod]
public void RunDataDrivenTestsShouldSetDataRowIndex()
{
this.testContextImplementation = new TestContextImplementation(this.testMethod.Object, new System.IO.StringWriter(), this.properties);

TestFrameworkV2.DataSourceAttribute dataSourceAttribute = new TestFrameworkV2.DataSourceAttribute(
"Microsoft.VisualStudio.TestTools.DataSource.XML", "DataTestSourceFile.xml", "settings", TestFrameworkV2.DataAccessMethod.Sequential);

this.mockTestMethodInfo.Setup(ds => ds.GetAttributes<TestFrameworkV2.DataSourceAttribute>(false))
.Returns(new TestFrameworkV2.DataSourceAttribute[] { dataSourceAttribute });

TestFrameworkV2.TestResult testResult = new TestFrameworkV2.TestResult();
DummyTestClass testClassInstance = new DummyTestClass();
var methodInfo = typeof(DummyTestClass).GetMethod("PassingTest");

this.mockTestMethodInfo.Setup(ds => ds.Invoke(null)).
Callback(() =>
{
try
{
testClassInstance.TestContext = this.testContextImplementation;

var task = methodInfo.Invoke(testClassInstance, null) as Task;
task?.GetAwaiter().GetResult();

testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Passed;
}
catch (Exception ex)
{
testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Failed;
testResult.TestFailureException = ex;
}
}
).Returns(testResult);
this.mockTestMethodInfo.Setup(ds => ds.MethodInfo).Returns(methodInfo);

TestFrameworkV2.TestMethodAttribute testMethodAttribute = new TestFrameworkV2.TestMethodAttribute();
TestDataSource testDataSource = new TestDataSource();

TestFrameworkV2.TestResult[] result = testDataSource.RunDataDrivenTest(this.testContextImplementation, this.mockTestMethodInfo.Object, null, testMethodAttribute);
Assert.AreEqual(result[0].DatarowIndex, 0);
}

#region Dummy implementation

public class DummyTestClass
{
private DesktopTestFrameworkV2.TestContext testContextInstance;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"#7

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

Jayarani garg (jayaranigarg)
merged 7 commits into

from

Sep 6, 2016
 Merged


Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
255a16b

Bug Fix #258333 with UT


jayaranigarg Aug 31, 2016
86f8d13

Correcting UT


jayaranigarg Aug 31, 2016
6ce370b

Editing UT


jayaranigarg Aug 31, 2016
9cd135f

Bug Fix #233637 with UT


jayaranigarg Sep 2, 2016
d3471e7

Resolving merge conflicts


jayaranigarg Sep 6, 2016
39a0423

Resolving merge conflicts


jayaranigarg Sep 6, 2016
97d3eb9

Addressing PR comments


jayaranigarg Sep 6, 2016

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


2 changes: 2 additions & 0 deletions
src/Adapter/MSTestAdapter.PlatformServices.Desktop/Services/DesktopTestDataSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,8 @@ public UTF.TestResult[] RunDataDrivenTest(UTF.TestContext testContext, UTF.ITest

 }

 currentResult[0].DatarowIndex = rowIndex;

 watch.Stop();
 currentResult[0].Duration = watch.Elapsed;

Expand Down

9 changes: 8 additions & 1 deletion
src/Adapter/MSTestAdapter/Execution/TestExecutionManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;

Expand DownExpand Up@@ -41,6 +42,7 @@ public TestExecutionManager()
 {
 this.TestMethodFilter = new TestMethodFilter();
 this.sessionParameters = new Dictionary<string, object>();
 this.adapterSettings = new MSTestSettings();
 }

 /// <summary>
Expand DownExpand Up@@ -326,7 +328,7 @@ private void LogWarnings(ITestExecutionRecorder testExecutionRecorder, IEnumerab
 }
 }

private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
internal void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
 {
 if (!(unitTestResults?.Length > 0))
 {
Expand All@@ -342,6 +344,11 @@ private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, Da
 }

 var testResult = unitTestResult.ToTestResult(test, startTime, endTime, adapterSettings.MapInconclusiveToFailed);

 if (unitTestResult.DatarowIndex >= 0)
 {
 testResult.DisplayName = string.Format(CultureInfo.CurrentCulture, Resource.DataDrivenResultDisplayName, test.DisplayName, unitTestResult.DatarowIndex);
 }
 testExecutionRecorder.RecordEnd(test, testResult.Outcome);

 if (testResult.Outcome == TestOutcome.Failed)
Expand Down

1 change: 1 addition & 0 deletions
src/Adapter/MSTestAdapter/Execution/TestMethodRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ internal UnitTestResult[] ConvertTestResultToUnitTestResult(UTF.TestResult[] res
 unitTestResult.DebugTrace = results[i].DebugTrace;
 unitTestResult.Duration = results[i].Duration;
 unitTestResult.DisplayName = results[i].DisplayName;
 unitTestResult.DatarowIndex = results[i].DatarowIndex;
 unitTestResult.ResultFiles = testContext.GetResultFiles();
 unitTestResults[i] = unitTestResult;
 }
Expand Down

15 changes: 11 additions & 4 deletions
src/Adapter/MSTestAdapter/ObjectModel/UnitTestResult.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,14 @@ public class UnitTestResult
 /// </summary>
 internal UnitTestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Initializes a new instance of the <see cref="UnitTestResult"/> class.
 /// </summary>
 /// <param name="testFailedException"> The test failed exception. </param>
 internal UnitTestResult(TestFailedException testFailedException)
 internal UnitTestResult(TestFailedException testFailedException):this()
 {
 this.Outcome = testFailedException.Outcome;
 this.ErrorMessage = testFailedException.Message;
Expand All@@ -52,7 +53,7 @@ internal UnitTestResult(TestFailedException testFailedException)
 /// </summary>
 /// <param name="outcome"> The outcome. </param>
 /// <param name="errorMessage"> The error message. </param>
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage):this()
 {
 this.Outcome = outcome;
 this.ErrorMessage = errorMessage;
Expand DownExpand Up@@ -113,6 +114,12 @@ internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 /// </summary>
 public int ErrorColumnNumber { get; private set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; internal set; }

 /// <summary>
 /// Gets the result files attached by the test. 
 /// </summary>
Expand All@@ -137,8 +144,8 @@ internal TestResult ToTestResult(TestCase testCase, DateTimeOffset startTime, Da
 ErrorStackTrace = this.ErrorStackTrace,
 Outcome = UnitTestOutcomeHelper.ToTestOutcome(this.Outcome, mapInconclusiveToFailed),
 StartTime = startTime,
 EndTime = endTime
};
 EndTime = endTime
 };

 if (!string.IsNullOrEmpty(this.StandardOut))
 {
Expand Down

9 changes: 9 additions & 0 deletions
src/Adapter/MSTestAdapter/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.


3 changes: 3 additions & 0 deletions
src/Adapter/MSTestAdapter/Resource.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,4 +274,7 @@
 <data name="InvalidSettingsXmlElement" xml:space="preserve">
 <value>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</value>
 </data>
 <data name="DataDrivenResultDisplayName" xml:space="preserve">
 <value>{0} (Data Row {1})</value>
 </data>
</root>

15 changes: 15 additions & 0 deletions
src/TestFramework/vnext/VSTestAttributes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -313,6 +313,15 @@ public TimeoutAttribute(TestTimeout timeout)
 /// </summary>
 public class TestResult
 {

 /// <summary>
 /// Initializes a new instance of the <see cref="TestResult"/> class.
 /// </summary>
 public TestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Gets or sets the display name of the result. Useful when returning multiple results.
 /// If null then Method name is used as DisplayName.
Expand DownExpand Up@@ -349,6 +358,12 @@ public class TestResult
 /// </summary>
 public TimeSpan Duration { get; set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; set; }

 /// <summary>
 /// Gets or sets the return value of the test method. (Currently null always).
 /// </summary>
Expand Down

45 changes: 44 additions & 1 deletion
...Tests/MSTestAdapter.PlatformServices.Desktop.Tests/Services/DesktopTestDataSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,51 @@ public void RunDataDrivenTestsGivesTestResultAsFailedWhenTestMethodFails()
 Assert.AreEqual(result[0].Outcome, TestFrameworkV2.UnitTestOutcome.Failed);
 }

 [TestMethod]
 public void RunDataDrivenTestsShouldSetDataRowIndex()
 {
 this.testContextImplementation = new TestContextImplementation(this.testMethod.Object, new System.IO.StringWriter(), this.properties);

 TestFrameworkV2.DataSourceAttribute dataSourceAttribute = new TestFrameworkV2.DataSourceAttribute(
 "Microsoft.VisualStudio.TestTools.DataSource.XML", "DataTestSourceFile.xml", "settings", TestFrameworkV2.DataAccessMethod.Sequential);

 this.mockTestMethodInfo.Setup(ds => ds.GetAttributes<TestFrameworkV2.DataSourceAttribute>(false))
 .Returns(new TestFrameworkV2.DataSourceAttribute[] { dataSourceAttribute });

 TestFrameworkV2.TestResult testResult = new TestFrameworkV2.TestResult();
 DummyTestClass testClassInstance = new DummyTestClass();
 var methodInfo = typeof(DummyTestClass).GetMethod("PassingTest");

 this.mockTestMethodInfo.Setup(ds => ds.Invoke(null)).
 Callback(() =>
 {
 try
 {
 testClassInstance.TestContext = this.testContextImplementation;

 var task = methodInfo.Invoke(testClassInstance, null) as Task;
 task?.GetAwaiter().GetResult();

 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Passed;
 }
 catch (Exception ex)
 {
 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Failed;
 testResult.TestFailureException = ex;
 }
 }
 ).Returns(testResult);
 this.mockTestMethodInfo.Setup(ds => ds.MethodInfo).Returns(methodInfo);

 TestFrameworkV2.TestMethodAttribute testMethodAttribute = new TestFrameworkV2.TestMethodAttribute();
 TestDataSource testDataSource = new TestDataSource();

 TestFrameworkV2.TestResult[] result = testDataSource.RunDataDrivenTest(this.testContextImplementation, this.mockTestMethodInfo.Object, null, testMethodAttribute);
 Assert.AreEqual(result[0].DatarowIndex, 0);
 }

 #region Dummy implementation

 public class DummyTestClass
 {
 private DesktopTestFrameworkV2.TestContext testContextInstance;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"#7

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

Jayarani garg (jayaranigarg)
merged 7 commits into

from

Sep 6, 2016
 Merged


Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
255a16b

Bug Fix #258333 with UT


jayaranigarg Aug 31, 2016
86f8d13

Correcting UT


jayaranigarg Aug 31, 2016
6ce370b

Editing UT


jayaranigarg Aug 31, 2016
9cd135f

Bug Fix #233637 with UT


jayaranigarg Sep 2, 2016
d3471e7

Resolving merge conflicts


jayaranigarg Sep 6, 2016
39a0423

Resolving merge conflicts


jayaranigarg Sep 6, 2016
97d3eb9

Addressing PR comments


jayaranigarg Sep 6, 2016

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


2 changes: 2 additions & 0 deletions
src/Adapter/MSTestAdapter.PlatformServices.Desktop/Services/DesktopTestDataSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,8 @@ public UTF.TestResult[] RunDataDrivenTest(UTF.TestContext testContext, UTF.ITest

 }

 currentResult[0].DatarowIndex = rowIndex;

 watch.Stop();
 currentResult[0].Duration = watch.Elapsed;

Expand Down

9 changes: 8 additions & 1 deletion
src/Adapter/MSTestAdapter/Execution/TestExecutionManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;

Expand DownExpand Up@@ -41,6 +42,7 @@ public TestExecutionManager()
 {
 this.TestMethodFilter = new TestMethodFilter();
 this.sessionParameters = new Dictionary<string, object>();
 this.adapterSettings = new MSTestSettings();
 }

 /// <summary>
Expand DownExpand Up@@ -326,7 +328,7 @@ private void LogWarnings(ITestExecutionRecorder testExecutionRecorder, IEnumerab
 }
 }

private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
internal void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
 {
 if (!(unitTestResults?.Length > 0))
 {
Expand All@@ -342,6 +344,11 @@ private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, Da
 }

 var testResult = unitTestResult.ToTestResult(test, startTime, endTime, adapterSettings.MapInconclusiveToFailed);

 if (unitTestResult.DatarowIndex >= 0)
 {
 testResult.DisplayName = string.Format(CultureInfo.CurrentCulture, Resource.DataDrivenResultDisplayName, test.DisplayName, unitTestResult.DatarowIndex);
 }
 testExecutionRecorder.RecordEnd(test, testResult.Outcome);

 if (testResult.Outcome == TestOutcome.Failed)
Expand Down

1 change: 1 addition & 0 deletions
src/Adapter/MSTestAdapter/Execution/TestMethodRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ internal UnitTestResult[] ConvertTestResultToUnitTestResult(UTF.TestResult[] res
 unitTestResult.DebugTrace = results[i].DebugTrace;
 unitTestResult.Duration = results[i].Duration;
 unitTestResult.DisplayName = results[i].DisplayName;
 unitTestResult.DatarowIndex = results[i].DatarowIndex;
 unitTestResult.ResultFiles = testContext.GetResultFiles();
 unitTestResults[i] = unitTestResult;
 }
Expand Down

15 changes: 11 additions & 4 deletions
src/Adapter/MSTestAdapter/ObjectModel/UnitTestResult.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,14 @@ public class UnitTestResult
 /// </summary>
 internal UnitTestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Initializes a new instance of the <see cref="UnitTestResult"/> class.
 /// </summary>
 /// <param name="testFailedException"> The test failed exception. </param>
 internal UnitTestResult(TestFailedException testFailedException)
 internal UnitTestResult(TestFailedException testFailedException):this()
 {
 this.Outcome = testFailedException.Outcome;
 this.ErrorMessage = testFailedException.Message;
Expand All@@ -52,7 +53,7 @@ internal UnitTestResult(TestFailedException testFailedException)
 /// </summary>
 /// <param name="outcome"> The outcome. </param>
 /// <param name="errorMessage"> The error message. </param>
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage):this()
 {
 this.Outcome = outcome;
 this.ErrorMessage = errorMessage;
Expand DownExpand Up@@ -113,6 +114,12 @@ internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 /// </summary>
 public int ErrorColumnNumber { get; private set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; internal set; }

 /// <summary>
 /// Gets the result files attached by the test. 
 /// </summary>
Expand All@@ -137,8 +144,8 @@ internal TestResult ToTestResult(TestCase testCase, DateTimeOffset startTime, Da
 ErrorStackTrace = this.ErrorStackTrace,
 Outcome = UnitTestOutcomeHelper.ToTestOutcome(this.Outcome, mapInconclusiveToFailed),
 StartTime = startTime,
 EndTime = endTime
};
 EndTime = endTime
 };

 if (!string.IsNullOrEmpty(this.StandardOut))
 {
Expand Down

9 changes: 9 additions & 0 deletions
src/Adapter/MSTestAdapter/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.


3 changes: 3 additions & 0 deletions
src/Adapter/MSTestAdapter/Resource.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,4 +274,7 @@
 <data name="InvalidSettingsXmlElement" xml:space="preserve">
 <value>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</value>
 </data>
 <data name="DataDrivenResultDisplayName" xml:space="preserve">
 <value>{0} (Data Row {1})</value>
 </data>
</root>

15 changes: 15 additions & 0 deletions
src/TestFramework/vnext/VSTestAttributes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -313,6 +313,15 @@ public TimeoutAttribute(TestTimeout timeout)
 /// </summary>
 public class TestResult
 {

 /// <summary>
 /// Initializes a new instance of the <see cref="TestResult"/> class.
 /// </summary>
 public TestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Gets or sets the display name of the result. Useful when returning multiple results.
 /// If null then Method name is used as DisplayName.
Expand DownExpand Up@@ -349,6 +358,12 @@ public class TestResult
 /// </summary>
 public TimeSpan Duration { get; set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; set; }

 /// <summary>
 /// Gets or sets the return value of the test method. (Currently null always).
 /// </summary>
Expand Down

45 changes: 44 additions & 1 deletion
...Tests/MSTestAdapter.PlatformServices.Desktop.Tests/Services/DesktopTestDataSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,51 @@ public void RunDataDrivenTestsGivesTestResultAsFailedWhenTestMethodFails()
 Assert.AreEqual(result[0].Outcome, TestFrameworkV2.UnitTestOutcome.Failed);
 }

 [TestMethod]
 public void RunDataDrivenTestsShouldSetDataRowIndex()
 {
 this.testContextImplementation = new TestContextImplementation(this.testMethod.Object, new System.IO.StringWriter(), this.properties);

 TestFrameworkV2.DataSourceAttribute dataSourceAttribute = new TestFrameworkV2.DataSourceAttribute(
 "Microsoft.VisualStudio.TestTools.DataSource.XML", "DataTestSourceFile.xml", "settings", TestFrameworkV2.DataAccessMethod.Sequential);

 this.mockTestMethodInfo.Setup(ds => ds.GetAttributes<TestFrameworkV2.DataSourceAttribute>(false))
 .Returns(new TestFrameworkV2.DataSourceAttribute[] { dataSourceAttribute });

 TestFrameworkV2.TestResult testResult = new TestFrameworkV2.TestResult();
 DummyTestClass testClassInstance = new DummyTestClass();
 var methodInfo = typeof(DummyTestClass).GetMethod("PassingTest");

 this.mockTestMethodInfo.Setup(ds => ds.Invoke(null)).
 Callback(() =>
 {
 try
 {
 testClassInstance.TestContext = this.testContextImplementation;

 var task = methodInfo.Invoke(testClassInstance, null) as Task;
 task?.GetAwaiter().GetResult();

 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Passed;
 }
 catch (Exception ex)
 {
 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Failed;
 testResult.TestFailureException = ex;
 }
 }
 ).Returns(testResult);
 this.mockTestMethodInfo.Setup(ds => ds.MethodInfo).Returns(methodInfo);

 TestFrameworkV2.TestMethodAttribute testMethodAttribute = new TestFrameworkV2.TestMethodAttribute();
 TestDataSource testDataSource = new TestDataSource();

 TestFrameworkV2.TestResult[] result = testDataSource.RunDataDrivenTest(this.testContextImplementation, this.mockTestMethodInfo.Object, null, testMethodAttribute);
 Assert.AreEqual(result[0].DatarowIndex, 0);
 }

 #region Dummy implementation

 public class DummyTestClass
 {
 private DesktopTestFrameworkV2.TestContext testContextInstance;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"#7

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

Jayarani garg (jayaranigarg)
merged 7 commits into

from

Sep 6, 2016
 Merged


Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
255a16b

Bug Fix #258333 with UT


jayaranigarg Aug 31, 2016
86f8d13

Correcting UT


jayaranigarg Aug 31, 2016
6ce370b

Editing UT


jayaranigarg Aug 31, 2016
9cd135f

Bug Fix #233637 with UT


jayaranigarg Sep 2, 2016
d3471e7

Resolving merge conflicts


jayaranigarg Sep 6, 2016
39a0423

Resolving merge conflicts


jayaranigarg Sep 6, 2016
97d3eb9

Addressing PR comments


jayaranigarg Sep 6, 2016

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


2 changes: 2 additions & 0 deletions
src/Adapter/MSTestAdapter.PlatformServices.Desktop/Services/DesktopTestDataSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,8 @@ public UTF.TestResult[] RunDataDrivenTest(UTF.TestContext testContext, UTF.ITest

 }

 currentResult[0].DatarowIndex = rowIndex;

 watch.Stop();
 currentResult[0].Duration = watch.Elapsed;

Expand Down

9 changes: 8 additions & 1 deletion
src/Adapter/MSTestAdapter/Execution/TestExecutionManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;

Expand DownExpand Up@@ -41,6 +42,7 @@ public TestExecutionManager()
 {
 this.TestMethodFilter = new TestMethodFilter();
 this.sessionParameters = new Dictionary<string, object>();
 this.adapterSettings = new MSTestSettings();
 }

 /// <summary>
Expand DownExpand Up@@ -326,7 +328,7 @@ private void LogWarnings(ITestExecutionRecorder testExecutionRecorder, IEnumerab
 }
 }

private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
internal void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
 {
 if (!(unitTestResults?.Length > 0))
 {
Expand All@@ -342,6 +344,11 @@ private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, Da
 }

 var testResult = unitTestResult.ToTestResult(test, startTime, endTime, adapterSettings.MapInconclusiveToFailed);

 if (unitTestResult.DatarowIndex >= 0)
 {
 testResult.DisplayName = string.Format(CultureInfo.CurrentCulture, Resource.DataDrivenResultDisplayName, test.DisplayName, unitTestResult.DatarowIndex);
 }
 testExecutionRecorder.RecordEnd(test, testResult.Outcome);

 if (testResult.Outcome == TestOutcome.Failed)
Expand Down

1 change: 1 addition & 0 deletions
src/Adapter/MSTestAdapter/Execution/TestMethodRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ internal UnitTestResult[] ConvertTestResultToUnitTestResult(UTF.TestResult[] res
 unitTestResult.DebugTrace = results[i].DebugTrace;
 unitTestResult.Duration = results[i].Duration;
 unitTestResult.DisplayName = results[i].DisplayName;
 unitTestResult.DatarowIndex = results[i].DatarowIndex;
 unitTestResult.ResultFiles = testContext.GetResultFiles();
 unitTestResults[i] = unitTestResult;
 }
Expand Down

15 changes: 11 additions & 4 deletions
src/Adapter/MSTestAdapter/ObjectModel/UnitTestResult.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,14 @@ public class UnitTestResult
 /// </summary>
 internal UnitTestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Initializes a new instance of the <see cref="UnitTestResult"/> class.
 /// </summary>
 /// <param name="testFailedException"> The test failed exception. </param>
 internal UnitTestResult(TestFailedException testFailedException)
 internal UnitTestResult(TestFailedException testFailedException):this()
 {
 this.Outcome = testFailedException.Outcome;
 this.ErrorMessage = testFailedException.Message;
Expand All@@ -52,7 +53,7 @@ internal UnitTestResult(TestFailedException testFailedException)
 /// </summary>
 /// <param name="outcome"> The outcome. </param>
 /// <param name="errorMessage"> The error message. </param>
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage):this()
 {
 this.Outcome = outcome;
 this.ErrorMessage = errorMessage;
Expand DownExpand Up@@ -113,6 +114,12 @@ internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 /// </summary>
 public int ErrorColumnNumber { get; private set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; internal set; }

 /// <summary>
 /// Gets the result files attached by the test. 
 /// </summary>
Expand All@@ -137,8 +144,8 @@ internal TestResult ToTestResult(TestCase testCase, DateTimeOffset startTime, Da
 ErrorStackTrace = this.ErrorStackTrace,
 Outcome = UnitTestOutcomeHelper.ToTestOutcome(this.Outcome, mapInconclusiveToFailed),
 StartTime = startTime,
 EndTime = endTime
};
 EndTime = endTime
 };

 if (!string.IsNullOrEmpty(this.StandardOut))
 {
Expand Down

9 changes: 9 additions & 0 deletions
src/Adapter/MSTestAdapter/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.


3 changes: 3 additions & 0 deletions
src/Adapter/MSTestAdapter/Resource.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,4 +274,7 @@
 <data name="InvalidSettingsXmlElement" xml:space="preserve">
 <value>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</value>
 </data>
 <data name="DataDrivenResultDisplayName" xml:space="preserve">
 <value>{0} (Data Row {1})</value>
 </data>
</root>

15 changes: 15 additions & 0 deletions
src/TestFramework/vnext/VSTestAttributes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -313,6 +313,15 @@ public TimeoutAttribute(TestTimeout timeout)
 /// </summary>
 public class TestResult
 {

 /// <summary>
 /// Initializes a new instance of the <see cref="TestResult"/> class.
 /// </summary>
 public TestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Gets or sets the display name of the result. Useful when returning multiple results.
 /// If null then Method name is used as DisplayName.
Expand DownExpand Up@@ -349,6 +358,12 @@ public class TestResult
 /// </summary>
 public TimeSpan Duration { get; set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; set; }

 /// <summary>
 /// Gets or sets the return value of the test method. (Currently null always).
 /// </summary>
Expand Down

45 changes: 44 additions & 1 deletion
...Tests/MSTestAdapter.PlatformServices.Desktop.Tests/Services/DesktopTestDataSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,51 @@ public void RunDataDrivenTestsGivesTestResultAsFailedWhenTestMethodFails()
 Assert.AreEqual(result[0].Outcome, TestFrameworkV2.UnitTestOutcome.Failed);
 }

 [TestMethod]
 public void RunDataDrivenTestsShouldSetDataRowIndex()
 {
 this.testContextImplementation = new TestContextImplementation(this.testMethod.Object, new System.IO.StringWriter(), this.properties);

 TestFrameworkV2.DataSourceAttribute dataSourceAttribute = new TestFrameworkV2.DataSourceAttribute(
 "Microsoft.VisualStudio.TestTools.DataSource.XML", "DataTestSourceFile.xml", "settings", TestFrameworkV2.DataAccessMethod.Sequential);

 this.mockTestMethodInfo.Setup(ds => ds.GetAttributes<TestFrameworkV2.DataSourceAttribute>(false))
 .Returns(new TestFrameworkV2.DataSourceAttribute[] { dataSourceAttribute });

 TestFrameworkV2.TestResult testResult = new TestFrameworkV2.TestResult();
 DummyTestClass testClassInstance = new DummyTestClass();
 var methodInfo = typeof(DummyTestClass).GetMethod("PassingTest");

 this.mockTestMethodInfo.Setup(ds => ds.Invoke(null)).
 Callback(() =>
 {
 try
 {
 testClassInstance.TestContext = this.testContextImplementation;

 var task = methodInfo.Invoke(testClassInstance, null) as Task;
 task?.GetAwaiter().GetResult();

 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Passed;
 }
 catch (Exception ex)
 {
 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Failed;
 testResult.TestFailureException = ex;
 }
 }
 ).Returns(testResult);
 this.mockTestMethodInfo.Setup(ds => ds.MethodInfo).Returns(methodInfo);

 TestFrameworkV2.TestMethodAttribute testMethodAttribute = new TestFrameworkV2.TestMethodAttribute();
 TestDataSource testDataSource = new TestDataSource();

 TestFrameworkV2.TestResult[] result = testDataSource.RunDataDrivenTest(this.testContextImplementation, this.mockTestMethodInfo.Object, null, testMethodAttribute);
 Assert.AreEqual(result[0].DatarowIndex, 0);
 }

 #region Dummy implementation

 public class DummyTestClass
 {
 private DesktopTestFrameworkV2.TestContext testContextInstance;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"#7

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

Jayarani garg (jayaranigarg)
merged 7 commits into

from

Sep 6, 2016
 Merged


Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
255a16b

Bug Fix #258333 with UT


jayaranigarg Aug 31, 2016
86f8d13

Correcting UT


jayaranigarg Aug 31, 2016
6ce370b

Editing UT


jayaranigarg Aug 31, 2016
9cd135f

Bug Fix #233637 with UT


jayaranigarg Sep 2, 2016
d3471e7

Resolving merge conflicts


jayaranigarg Sep 6, 2016
39a0423

Resolving merge conflicts


jayaranigarg Sep 6, 2016
97d3eb9

Addressing PR comments


jayaranigarg Sep 6, 2016

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


2 changes: 2 additions & 0 deletions
src/Adapter/MSTestAdapter.PlatformServices.Desktop/Services/DesktopTestDataSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,8 @@ public UTF.TestResult[] RunDataDrivenTest(UTF.TestContext testContext, UTF.ITest

 }

 currentResult[0].DatarowIndex = rowIndex;

 watch.Stop();
 currentResult[0].Duration = watch.Elapsed;

Expand Down

9 changes: 8 additions & 1 deletion
src/Adapter/MSTestAdapter/Execution/TestExecutionManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;

Expand DownExpand Up@@ -41,6 +42,7 @@ public TestExecutionManager()
 {
 this.TestMethodFilter = new TestMethodFilter();
 this.sessionParameters = new Dictionary<string, object>();
 this.adapterSettings = new MSTestSettings();
 }

 /// <summary>
Expand DownExpand Up@@ -326,7 +328,7 @@ private void LogWarnings(ITestExecutionRecorder testExecutionRecorder, IEnumerab
 }
 }

private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
internal void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
 {
 if (!(unitTestResults?.Length > 0))
 {
Expand All@@ -342,6 +344,11 @@ private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, Da
 }

 var testResult = unitTestResult.ToTestResult(test, startTime, endTime, adapterSettings.MapInconclusiveToFailed);

 if (unitTestResult.DatarowIndex >= 0)
 {
 testResult.DisplayName = string.Format(CultureInfo.CurrentCulture, Resource.DataDrivenResultDisplayName, test.DisplayName, unitTestResult.DatarowIndex);
 }
 testExecutionRecorder.RecordEnd(test, testResult.Outcome);

 if (testResult.Outcome == TestOutcome.Failed)
Expand Down

1 change: 1 addition & 0 deletions
src/Adapter/MSTestAdapter/Execution/TestMethodRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ internal UnitTestResult[] ConvertTestResultToUnitTestResult(UTF.TestResult[] res
 unitTestResult.DebugTrace = results[i].DebugTrace;
 unitTestResult.Duration = results[i].Duration;
 unitTestResult.DisplayName = results[i].DisplayName;
 unitTestResult.DatarowIndex = results[i].DatarowIndex;
 unitTestResult.ResultFiles = testContext.GetResultFiles();
 unitTestResults[i] = unitTestResult;
 }
Expand Down

15 changes: 11 additions & 4 deletions
src/Adapter/MSTestAdapter/ObjectModel/UnitTestResult.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,14 @@ public class UnitTestResult
 /// </summary>
 internal UnitTestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Initializes a new instance of the <see cref="UnitTestResult"/> class.
 /// </summary>
 /// <param name="testFailedException"> The test failed exception. </param>
 internal UnitTestResult(TestFailedException testFailedException)
 internal UnitTestResult(TestFailedException testFailedException):this()
 {
 this.Outcome = testFailedException.Outcome;
 this.ErrorMessage = testFailedException.Message;
Expand All@@ -52,7 +53,7 @@ internal UnitTestResult(TestFailedException testFailedException)
 /// </summary>
 /// <param name="outcome"> The outcome. </param>
 /// <param name="errorMessage"> The error message. </param>
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage):this()
 {
 this.Outcome = outcome;
 this.ErrorMessage = errorMessage;
Expand DownExpand Up@@ -113,6 +114,12 @@ internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 /// </summary>
 public int ErrorColumnNumber { get; private set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; internal set; }

 /// <summary>
 /// Gets the result files attached by the test. 
 /// </summary>
Expand All@@ -137,8 +144,8 @@ internal TestResult ToTestResult(TestCase testCase, DateTimeOffset startTime, Da
 ErrorStackTrace = this.ErrorStackTrace,
 Outcome = UnitTestOutcomeHelper.ToTestOutcome(this.Outcome, mapInconclusiveToFailed),
 StartTime = startTime,
 EndTime = endTime
};
 EndTime = endTime
 };

 if (!string.IsNullOrEmpty(this.StandardOut))
 {
Expand Down

9 changes: 9 additions & 0 deletions
src/Adapter/MSTestAdapter/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.


3 changes: 3 additions & 0 deletions
src/Adapter/MSTestAdapter/Resource.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,4 +274,7 @@
 <data name="InvalidSettingsXmlElement" xml:space="preserve">
 <value>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</value>
 </data>
 <data name="DataDrivenResultDisplayName" xml:space="preserve">
 <value>{0} (Data Row {1})</value>
 </data>
</root>

15 changes: 15 additions & 0 deletions
src/TestFramework/vnext/VSTestAttributes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -313,6 +313,15 @@ public TimeoutAttribute(TestTimeout timeout)
 /// </summary>
 public class TestResult
 {

 /// <summary>
 /// Initializes a new instance of the <see cref="TestResult"/> class.
 /// </summary>
 public TestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Gets or sets the display name of the result. Useful when returning multiple results.
 /// If null then Method name is used as DisplayName.
Expand DownExpand Up@@ -349,6 +358,12 @@ public class TestResult
 /// </summary>
 public TimeSpan Duration { get; set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; set; }

 /// <summary>
 /// Gets or sets the return value of the test method. (Currently null always).
 /// </summary>
Expand Down

45 changes: 44 additions & 1 deletion
...Tests/MSTestAdapter.PlatformServices.Desktop.Tests/Services/DesktopTestDataSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,51 @@ public void RunDataDrivenTestsGivesTestResultAsFailedWhenTestMethodFails()
 Assert.AreEqual(result[0].Outcome, TestFrameworkV2.UnitTestOutcome.Failed);
 }

 [TestMethod]
 public void RunDataDrivenTestsShouldSetDataRowIndex()
 {
 this.testContextImplementation = new TestContextImplementation(this.testMethod.Object, new System.IO.StringWriter(), this.properties);

 TestFrameworkV2.DataSourceAttribute dataSourceAttribute = new TestFrameworkV2.DataSourceAttribute(
 "Microsoft.VisualStudio.TestTools.DataSource.XML", "DataTestSourceFile.xml", "settings", TestFrameworkV2.DataAccessMethod.Sequential);

 this.mockTestMethodInfo.Setup(ds => ds.GetAttributes<TestFrameworkV2.DataSourceAttribute>(false))
 .Returns(new TestFrameworkV2.DataSourceAttribute[] { dataSourceAttribute });

 TestFrameworkV2.TestResult testResult = new TestFrameworkV2.TestResult();
 DummyTestClass testClassInstance = new DummyTestClass();
 var methodInfo = typeof(DummyTestClass).GetMethod("PassingTest");

 this.mockTestMethodInfo.Setup(ds => ds.Invoke(null)).
 Callback(() =>
 {
 try
 {
 testClassInstance.TestContext = this.testContextImplementation;

 var task = methodInfo.Invoke(testClassInstance, null) as Task;
 task?.GetAwaiter().GetResult();

 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Passed;
 }
 catch (Exception ex)
 {
 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Failed;
 testResult.TestFailureException = ex;
 }
 }
 ).Returns(testResult);
 this.mockTestMethodInfo.Setup(ds => ds.MethodInfo).Returns(methodInfo);

 TestFrameworkV2.TestMethodAttribute testMethodAttribute = new TestFrameworkV2.TestMethodAttribute();
 TestDataSource testDataSource = new TestDataSource();

 TestFrameworkV2.TestResult[] result = testDataSource.RunDataDrivenTest(this.testContextImplementation, this.mockTestMethodInfo.Object, null, testMethodAttribute);
 Assert.AreEqual(result[0].DatarowIndex, 0);
 }

 #region Dummy implementation

 public class DummyTestClass
 {
 private DesktopTestFrameworkV2.TestContext testContextInstance;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"#7

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

Jayarani garg (jayaranigarg)
merged 7 commits into

from

Sep 6, 2016
 Merged


Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
255a16b

Bug Fix #258333 with UT


jayaranigarg Aug 31, 2016
86f8d13

Correcting UT


jayaranigarg Aug 31, 2016
6ce370b

Editing UT


jayaranigarg Aug 31, 2016
9cd135f

Bug Fix #233637 with UT


jayaranigarg Sep 2, 2016
d3471e7

Resolving merge conflicts


jayaranigarg Sep 6, 2016
39a0423

Resolving merge conflicts


jayaranigarg Sep 6, 2016
97d3eb9

Addressing PR comments


jayaranigarg Sep 6, 2016

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


2 changes: 2 additions & 0 deletions
src/Adapter/MSTestAdapter.PlatformServices.Desktop/Services/DesktopTestDataSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,8 @@ public UTF.TestResult[] RunDataDrivenTest(UTF.TestContext testContext, UTF.ITest

 }

 currentResult[0].DatarowIndex = rowIndex;

 watch.Stop();
 currentResult[0].Duration = watch.Elapsed;

Expand Down

9 changes: 8 additions & 1 deletion
src/Adapter/MSTestAdapter/Execution/TestExecutionManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;

Expand DownExpand Up@@ -41,6 +42,7 @@ public TestExecutionManager()
 {
 this.TestMethodFilter = new TestMethodFilter();
 this.sessionParameters = new Dictionary<string, object>();
 this.adapterSettings = new MSTestSettings();
 }

 /// <summary>
Expand DownExpand Up@@ -326,7 +328,7 @@ private void LogWarnings(ITestExecutionRecorder testExecutionRecorder, IEnumerab
 }
 }

private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
internal void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
 {
 if (!(unitTestResults?.Length > 0))
 {
Expand All@@ -342,6 +344,11 @@ private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, Da
 }

 var testResult = unitTestResult.ToTestResult(test, startTime, endTime, adapterSettings.MapInconclusiveToFailed);

 if (unitTestResult.DatarowIndex >= 0)
 {
 testResult.DisplayName = string.Format(CultureInfo.CurrentCulture, Resource.DataDrivenResultDisplayName, test.DisplayName, unitTestResult.DatarowIndex);
 }
 testExecutionRecorder.RecordEnd(test, testResult.Outcome);

 if (testResult.Outcome == TestOutcome.Failed)
Expand Down

1 change: 1 addition & 0 deletions
src/Adapter/MSTestAdapter/Execution/TestMethodRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ internal UnitTestResult[] ConvertTestResultToUnitTestResult(UTF.TestResult[] res
 unitTestResult.DebugTrace = results[i].DebugTrace;
 unitTestResult.Duration = results[i].Duration;
 unitTestResult.DisplayName = results[i].DisplayName;
 unitTestResult.DatarowIndex = results[i].DatarowIndex;
 unitTestResult.ResultFiles = testContext.GetResultFiles();
 unitTestResults[i] = unitTestResult;
 }
Expand Down

15 changes: 11 additions & 4 deletions
src/Adapter/MSTestAdapter/ObjectModel/UnitTestResult.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,14 @@ public class UnitTestResult
 /// </summary>
 internal UnitTestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Initializes a new instance of the <see cref="UnitTestResult"/> class.
 /// </summary>
 /// <param name="testFailedException"> The test failed exception. </param>
 internal UnitTestResult(TestFailedException testFailedException)
 internal UnitTestResult(TestFailedException testFailedException):this()
 {
 this.Outcome = testFailedException.Outcome;
 this.ErrorMessage = testFailedException.Message;
Expand All@@ -52,7 +53,7 @@ internal UnitTestResult(TestFailedException testFailedException)
 /// </summary>
 /// <param name="outcome"> The outcome. </param>
 /// <param name="errorMessage"> The error message. </param>
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage):this()
 {
 this.Outcome = outcome;
 this.ErrorMessage = errorMessage;
Expand DownExpand Up@@ -113,6 +114,12 @@ internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 /// </summary>
 public int ErrorColumnNumber { get; private set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; internal set; }

 /// <summary>
 /// Gets the result files attached by the test. 
 /// </summary>
Expand All@@ -137,8 +144,8 @@ internal TestResult ToTestResult(TestCase testCase, DateTimeOffset startTime, Da
 ErrorStackTrace = this.ErrorStackTrace,
 Outcome = UnitTestOutcomeHelper.ToTestOutcome(this.Outcome, mapInconclusiveToFailed),
 StartTime = startTime,
 EndTime = endTime
};
 EndTime = endTime
 };

 if (!string.IsNullOrEmpty(this.StandardOut))
 {
Expand Down

9 changes: 9 additions & 0 deletions
src/Adapter/MSTestAdapter/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.


3 changes: 3 additions & 0 deletions
src/Adapter/MSTestAdapter/Resource.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,4 +274,7 @@
 <data name="InvalidSettingsXmlElement" xml:space="preserve">
 <value>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</value>
 </data>
 <data name="DataDrivenResultDisplayName" xml:space="preserve">
 <value>{0} (Data Row {1})</value>
 </data>
</root>

15 changes: 15 additions & 0 deletions
src/TestFramework/vnext/VSTestAttributes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -313,6 +313,15 @@ public TimeoutAttribute(TestTimeout timeout)
 /// </summary>
 public class TestResult
 {

 /// <summary>
 /// Initializes a new instance of the <see cref="TestResult"/> class.
 /// </summary>
 public TestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Gets or sets the display name of the result. Useful when returning multiple results.
 /// If null then Method name is used as DisplayName.
Expand DownExpand Up@@ -349,6 +358,12 @@ public class TestResult
 /// </summary>
 public TimeSpan Duration { get; set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; set; }

 /// <summary>
 /// Gets or sets the return value of the test method. (Currently null always).
 /// </summary>
Expand Down

45 changes: 44 additions & 1 deletion
...Tests/MSTestAdapter.PlatformServices.Desktop.Tests/Services/DesktopTestDataSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,51 @@ public void RunDataDrivenTestsGivesTestResultAsFailedWhenTestMethodFails()
 Assert.AreEqual(result[0].Outcome, TestFrameworkV2.UnitTestOutcome.Failed);
 }

 [TestMethod]
 public void RunDataDrivenTestsShouldSetDataRowIndex()
 {
 this.testContextImplementation = new TestContextImplementation(this.testMethod.Object, new System.IO.StringWriter(), this.properties);

 TestFrameworkV2.DataSourceAttribute dataSourceAttribute = new TestFrameworkV2.DataSourceAttribute(
 "Microsoft.VisualStudio.TestTools.DataSource.XML", "DataTestSourceFile.xml", "settings", TestFrameworkV2.DataAccessMethod.Sequential);

 this.mockTestMethodInfo.Setup(ds => ds.GetAttributes<TestFrameworkV2.DataSourceAttribute>(false))
 .Returns(new TestFrameworkV2.DataSourceAttribute[] { dataSourceAttribute });

 TestFrameworkV2.TestResult testResult = new TestFrameworkV2.TestResult();
 DummyTestClass testClassInstance = new DummyTestClass();
 var methodInfo = typeof(DummyTestClass).GetMethod("PassingTest");

 this.mockTestMethodInfo.Setup(ds => ds.Invoke(null)).
 Callback(() =>
 {
 try
 {
 testClassInstance.TestContext = this.testContextImplementation;

 var task = methodInfo.Invoke(testClassInstance, null) as Task;
 task?.GetAwaiter().GetResult();

 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Passed;
 }
 catch (Exception ex)
 {
 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Failed;
 testResult.TestFailureException = ex;
 }
 }
 ).Returns(testResult);
 this.mockTestMethodInfo.Setup(ds => ds.MethodInfo).Returns(methodInfo);

 TestFrameworkV2.TestMethodAttribute testMethodAttribute = new TestFrameworkV2.TestMethodAttribute();
 TestDataSource testDataSource = new TestDataSource();

 TestFrameworkV2.TestResult[] result = testDataSource.RunDataDrivenTest(this.testContextImplementation, this.mockTestMethodInfo.Object, null, testMethodAttribute);
 Assert.AreEqual(result[0].DatarowIndex, 0);
 }

 #region Dummy implementation

 public class DummyTestClass
 {
 private DesktopTestFrameworkV2.TestContext testContextInstance;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"#7

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

Jayarani garg (jayaranigarg)
merged 7 commits into

from

Sep 6, 2016
 Merged


Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
255a16b

Bug Fix #258333 with UT


jayaranigarg Aug 31, 2016
86f8d13

Correcting UT


jayaranigarg Aug 31, 2016
6ce370b

Editing UT


jayaranigarg Aug 31, 2016
9cd135f

Bug Fix #233637 with UT


jayaranigarg Sep 2, 2016
d3471e7

Resolving merge conflicts


jayaranigarg Sep 6, 2016
39a0423

Resolving merge conflicts


jayaranigarg Sep 6, 2016
97d3eb9

Addressing PR comments


jayaranigarg Sep 6, 2016

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


2 changes: 2 additions & 0 deletions
src/Adapter/MSTestAdapter.PlatformServices.Desktop/Services/DesktopTestDataSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,8 @@ public UTF.TestResult[] RunDataDrivenTest(UTF.TestContext testContext, UTF.ITest

 }

 currentResult[0].DatarowIndex = rowIndex;

 watch.Stop();
 currentResult[0].Duration = watch.Elapsed;

Expand Down

9 changes: 8 additions & 1 deletion
src/Adapter/MSTestAdapter/Execution/TestExecutionManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;

Expand DownExpand Up@@ -41,6 +42,7 @@ public TestExecutionManager()
 {
 this.TestMethodFilter = new TestMethodFilter();
 this.sessionParameters = new Dictionary<string, object>();
 this.adapterSettings = new MSTestSettings();
 }

 /// <summary>
Expand DownExpand Up@@ -326,7 +328,7 @@ private void LogWarnings(ITestExecutionRecorder testExecutionRecorder, IEnumerab
 }
 }

private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
internal void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
 {
 if (!(unitTestResults?.Length > 0))
 {
Expand All@@ -342,6 +344,11 @@ private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, Da
 }

 var testResult = unitTestResult.ToTestResult(test, startTime, endTime, adapterSettings.MapInconclusiveToFailed);

 if (unitTestResult.DatarowIndex >= 0)
 {
 testResult.DisplayName = string.Format(CultureInfo.CurrentCulture, Resource.DataDrivenResultDisplayName, test.DisplayName, unitTestResult.DatarowIndex);
 }
 testExecutionRecorder.RecordEnd(test, testResult.Outcome);

 if (testResult.Outcome == TestOutcome.Failed)
Expand Down

1 change: 1 addition & 0 deletions
src/Adapter/MSTestAdapter/Execution/TestMethodRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ internal UnitTestResult[] ConvertTestResultToUnitTestResult(UTF.TestResult[] res
 unitTestResult.DebugTrace = results[i].DebugTrace;
 unitTestResult.Duration = results[i].Duration;
 unitTestResult.DisplayName = results[i].DisplayName;
 unitTestResult.DatarowIndex = results[i].DatarowIndex;
 unitTestResult.ResultFiles = testContext.GetResultFiles();
 unitTestResults[i] = unitTestResult;
 }
Expand Down

15 changes: 11 additions & 4 deletions
src/Adapter/MSTestAdapter/ObjectModel/UnitTestResult.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,14 @@ public class UnitTestResult
 /// </summary>
 internal UnitTestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Initializes a new instance of the <see cref="UnitTestResult"/> class.
 /// </summary>
 /// <param name="testFailedException"> The test failed exception. </param>
 internal UnitTestResult(TestFailedException testFailedException)
 internal UnitTestResult(TestFailedException testFailedException):this()
 {
 this.Outcome = testFailedException.Outcome;
 this.ErrorMessage = testFailedException.Message;
Expand All@@ -52,7 +53,7 @@ internal UnitTestResult(TestFailedException testFailedException)
 /// </summary>
 /// <param name="outcome"> The outcome. </param>
 /// <param name="errorMessage"> The error message. </param>
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage):this()
 {
 this.Outcome = outcome;
 this.ErrorMessage = errorMessage;
Expand DownExpand Up@@ -113,6 +114,12 @@ internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 /// </summary>
 public int ErrorColumnNumber { get; private set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; internal set; }

 /// <summary>
 /// Gets the result files attached by the test. 
 /// </summary>
Expand All@@ -137,8 +144,8 @@ internal TestResult ToTestResult(TestCase testCase, DateTimeOffset startTime, Da
 ErrorStackTrace = this.ErrorStackTrace,
 Outcome = UnitTestOutcomeHelper.ToTestOutcome(this.Outcome, mapInconclusiveToFailed),
 StartTime = startTime,
 EndTime = endTime
};
 EndTime = endTime
 };

 if (!string.IsNullOrEmpty(this.StandardOut))
 {
Expand Down

9 changes: 9 additions & 0 deletions
src/Adapter/MSTestAdapter/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.


3 changes: 3 additions & 0 deletions
src/Adapter/MSTestAdapter/Resource.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,4 +274,7 @@
 <data name="InvalidSettingsXmlElement" xml:space="preserve">
 <value>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</value>
 </data>
 <data name="DataDrivenResultDisplayName" xml:space="preserve">
 <value>{0} (Data Row {1})</value>
 </data>
</root>

15 changes: 15 additions & 0 deletions
src/TestFramework/vnext/VSTestAttributes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -313,6 +313,15 @@ public TimeoutAttribute(TestTimeout timeout)
 /// </summary>
 public class TestResult
 {

 /// <summary>
 /// Initializes a new instance of the <see cref="TestResult"/> class.
 /// </summary>
 public TestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Gets or sets the display name of the result. Useful when returning multiple results.
 /// If null then Method name is used as DisplayName.
Expand DownExpand Up@@ -349,6 +358,12 @@ public class TestResult
 /// </summary>
 public TimeSpan Duration { get; set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; set; }

 /// <summary>
 /// Gets or sets the return value of the test method. (Currently null always).
 /// </summary>
Expand Down

45 changes: 44 additions & 1 deletion
...Tests/MSTestAdapter.PlatformServices.Desktop.Tests/Services/DesktopTestDataSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,51 @@ public void RunDataDrivenTestsGivesTestResultAsFailedWhenTestMethodFails()
 Assert.AreEqual(result[0].Outcome, TestFrameworkV2.UnitTestOutcome.Failed);
 }

 [TestMethod]
 public void RunDataDrivenTestsShouldSetDataRowIndex()
 {
 this.testContextImplementation = new TestContextImplementation(this.testMethod.Object, new System.IO.StringWriter(), this.properties);

 TestFrameworkV2.DataSourceAttribute dataSourceAttribute = new TestFrameworkV2.DataSourceAttribute(
 "Microsoft.VisualStudio.TestTools.DataSource.XML", "DataTestSourceFile.xml", "settings", TestFrameworkV2.DataAccessMethod.Sequential);

 this.mockTestMethodInfo.Setup(ds => ds.GetAttributes<TestFrameworkV2.DataSourceAttribute>(false))
 .Returns(new TestFrameworkV2.DataSourceAttribute[] { dataSourceAttribute });

 TestFrameworkV2.TestResult testResult = new TestFrameworkV2.TestResult();
 DummyTestClass testClassInstance = new DummyTestClass();
 var methodInfo = typeof(DummyTestClass).GetMethod("PassingTest");

 this.mockTestMethodInfo.Setup(ds => ds.Invoke(null)).
 Callback(() =>
 {
 try
 {
 testClassInstance.TestContext = this.testContextImplementation;

 var task = methodInfo.Invoke(testClassInstance, null) as Task;
 task?.GetAwaiter().GetResult();

 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Passed;
 }
 catch (Exception ex)
 {
 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Failed;
 testResult.TestFailureException = ex;
 }
 }
 ).Returns(testResult);
 this.mockTestMethodInfo.Setup(ds => ds.MethodInfo).Returns(methodInfo);

 TestFrameworkV2.TestMethodAttribute testMethodAttribute = new TestFrameworkV2.TestMethodAttribute();
 TestDataSource testDataSource = new TestDataSource();

 TestFrameworkV2.TestResult[] result = testDataSource.RunDataDrivenTest(this.testContextImplementation, this.mockTestMethodInfo.Object, null, testMethodAttribute);
 Assert.AreEqual(result[0].DatarowIndex, 0);
 }

 #region Dummy implementation

 public class DummyTestClass
 {
 private DesktopTestFrameworkV2.TestContext testContextInstance;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"#7

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

Jayarani garg (jayaranigarg)
merged 7 commits into

from

Sep 6, 2016
 Merged


Bug Fix#233637 : DataSource tests name is not getting appended by "(Data Row *)"
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
255a16b

Bug Fix #258333 with UT


jayaranigarg Aug 31, 2016
86f8d13

Correcting UT


jayaranigarg Aug 31, 2016
6ce370b

Editing UT


jayaranigarg Aug 31, 2016
9cd135f

Bug Fix #233637 with UT


jayaranigarg Sep 2, 2016
d3471e7

Resolving merge conflicts


jayaranigarg Sep 6, 2016
39a0423

Resolving merge conflicts


jayaranigarg Sep 6, 2016
97d3eb9

Addressing PR comments


jayaranigarg Sep 6, 2016

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


2 changes: 2 additions & 0 deletions
src/Adapter/MSTestAdapter.PlatformServices.Desktop/Services/DesktopTestDataSource.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,6 +113,8 @@ public UTF.TestResult[] RunDataDrivenTest(UTF.TestContext testContext, UTF.ITest

 }

 currentResult[0].DatarowIndex = rowIndex;

 watch.Stop();
 currentResult[0].Duration = watch.Elapsed;

Expand Down

9 changes: 8 additions & 1 deletion
src/Adapter/MSTestAdapter/Execution/TestExecutionManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;

Expand DownExpand Up@@ -41,6 +42,7 @@ public TestExecutionManager()
 {
 this.TestMethodFilter = new TestMethodFilter();
 this.sessionParameters = new Dictionary<string, object>();
 this.adapterSettings = new MSTestSettings();
 }

 /// <summary>
Expand DownExpand Up@@ -326,7 +328,7 @@ private void LogWarnings(ITestExecutionRecorder testExecutionRecorder, IEnumerab
 }
 }

private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
internal void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, DateTimeOffset startTime, DateTimeOffset endTime, ITestExecutionRecorder testExecutionRecorder)
 {
 if (!(unitTestResults?.Length > 0))
 {
Expand All@@ -342,6 +344,11 @@ private void SendTestResults(TestCase test, UnitTestResult[] unitTestResults, Da
 }

 var testResult = unitTestResult.ToTestResult(test, startTime, endTime, adapterSettings.MapInconclusiveToFailed);

 if (unitTestResult.DatarowIndex >= 0)
 {
 testResult.DisplayName = string.Format(CultureInfo.CurrentCulture, Resource.DataDrivenResultDisplayName, test.DisplayName, unitTestResult.DatarowIndex);
 }
 testExecutionRecorder.RecordEnd(test, testResult.Outcome);

 if (testResult.Outcome == TestOutcome.Failed)
Expand Down

1 change: 1 addition & 0 deletions
src/Adapter/MSTestAdapter/Execution/TestMethodRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -275,6 +275,7 @@ internal UnitTestResult[] ConvertTestResultToUnitTestResult(UTF.TestResult[] res
 unitTestResult.DebugTrace = results[i].DebugTrace;
 unitTestResult.Duration = results[i].Duration;
 unitTestResult.DisplayName = results[i].DisplayName;
 unitTestResult.DatarowIndex = results[i].DatarowIndex;
 unitTestResult.ResultFiles = testContext.GetResultFiles();
 unitTestResults[i] = unitTestResult;
 }
Expand Down

15 changes: 11 additions & 4 deletions
src/Adapter/MSTestAdapter/ObjectModel/UnitTestResult.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,13 +27,14 @@ public class UnitTestResult
 /// </summary>
 internal UnitTestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Initializes a new instance of the <see cref="UnitTestResult"/> class.
 /// </summary>
 /// <param name="testFailedException"> The test failed exception. </param>
 internal UnitTestResult(TestFailedException testFailedException)
 internal UnitTestResult(TestFailedException testFailedException):this()
 {
 this.Outcome = testFailedException.Outcome;
 this.ErrorMessage = testFailedException.Message;
Expand All@@ -52,7 +53,7 @@ internal UnitTestResult(TestFailedException testFailedException)
 /// </summary>
 /// <param name="outcome"> The outcome. </param>
 /// <param name="errorMessage"> The error message. </param>
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 internal UnitTestResult(UnitTestOutcome outcome, string errorMessage):this()
 {
 this.Outcome = outcome;
 this.ErrorMessage = errorMessage;
Expand DownExpand Up@@ -113,6 +114,12 @@ internal UnitTestResult(UnitTestOutcome outcome, string errorMessage)
 /// </summary>
 public int ErrorColumnNumber { get; private set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; internal set; }

 /// <summary>
 /// Gets the result files attached by the test. 
 /// </summary>
Expand All@@ -137,8 +144,8 @@ internal TestResult ToTestResult(TestCase testCase, DateTimeOffset startTime, Da
 ErrorStackTrace = this.ErrorStackTrace,
 Outcome = UnitTestOutcomeHelper.ToTestOutcome(this.Outcome, mapInconclusiveToFailed),
 StartTime = startTime,
 EndTime = endTime
};
 EndTime = endTime
 };

 if (!string.IsNullOrEmpty(this.StandardOut))
 {
Expand Down

9 changes: 9 additions & 0 deletions
src/Adapter/MSTestAdapter/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.


3 changes: 3 additions & 0 deletions
src/Adapter/MSTestAdapter/Resource.resx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -274,4 +274,7 @@
 <data name="InvalidSettingsXmlElement" xml:space="preserve">
 <value>Invalid settings '{0}'. Unexpected XmlElement: '{1}'.</value>
 </data>
 <data name="DataDrivenResultDisplayName" xml:space="preserve">
 <value>{0} (Data Row {1})</value>
 </data>
</root>

15 changes: 15 additions & 0 deletions
src/TestFramework/vnext/VSTestAttributes.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -313,6 +313,15 @@ public TimeoutAttribute(TestTimeout timeout)
 /// </summary>
 public class TestResult
 {

 /// <summary>
 /// Initializes a new instance of the <see cref="TestResult"/> class.
 /// </summary>
 public TestResult()
 {
 DatarowIndex = -1;
 }

 /// <summary>
 /// Gets or sets the display name of the result. Useful when returning multiple results.
 /// If null then Method name is used as DisplayName.
Expand DownExpand Up@@ -349,6 +358,12 @@ public class TestResult
 /// </summary>
 public TimeSpan Duration { get; set; }

 /// <summary>
 /// Data row index in data source. Set only for results of individual 
 /// run of data row of a data driven test.
 /// </summary>
 public int DatarowIndex { get; set; }

 /// <summary>
 /// Gets or sets the return value of the test method. (Currently null always).
 /// </summary>
Expand Down

45 changes: 44 additions & 1 deletion
...Tests/MSTestAdapter.PlatformServices.Desktop.Tests/Services/DesktopTestDataSourceTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,51 @@ public void RunDataDrivenTestsGivesTestResultAsFailedWhenTestMethodFails()
 Assert.AreEqual(result[0].Outcome, TestFrameworkV2.UnitTestOutcome.Failed);
 }

 [TestMethod]
 public void RunDataDrivenTestsShouldSetDataRowIndex()
 {
 this.testContextImplementation = new TestContextImplementation(this.testMethod.Object, new System.IO.StringWriter(), this.properties);

 TestFrameworkV2.DataSourceAttribute dataSourceAttribute = new TestFrameworkV2.DataSourceAttribute(
 "Microsoft.VisualStudio.TestTools.DataSource.XML", "DataTestSourceFile.xml", "settings", TestFrameworkV2.DataAccessMethod.Sequential);

 this.mockTestMethodInfo.Setup(ds => ds.GetAttributes<TestFrameworkV2.DataSourceAttribute>(false))
 .Returns(new TestFrameworkV2.DataSourceAttribute[] { dataSourceAttribute });

 TestFrameworkV2.TestResult testResult = new TestFrameworkV2.TestResult();
 DummyTestClass testClassInstance = new DummyTestClass();
 var methodInfo = typeof(DummyTestClass).GetMethod("PassingTest");

 this.mockTestMethodInfo.Setup(ds => ds.Invoke(null)).
 Callback(() =>
 {
 try
 {
 testClassInstance.TestContext = this.testContextImplementation;

 var task = methodInfo.Invoke(testClassInstance, null) as Task;
 task?.GetAwaiter().GetResult();

 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Passed;
 }
 catch (Exception ex)
 {
 testResult.Outcome = TestFrameworkV2.UnitTestOutcome.Failed;
 testResult.TestFailureException = ex;
 }
 }
 ).Returns(testResult);
 this.mockTestMethodInfo.Setup(ds => ds.MethodInfo).Returns(methodInfo);

 TestFrameworkV2.TestMethodAttribute testMethodAttribute = new TestFrameworkV2.TestMethodAttribute();
 TestDataSource testDataSource = new TestDataSource();

 TestFrameworkV2.TestResult[] result = testDataSource.RunDataDrivenTest(this.testContextImplementation, this.mockTestMethodInfo.Object, null, testMethodAttribute);
 Assert.AreEqual(result[0].DatarowIndex, 0);
 }

 #region Dummy implementation

 public class DummyTestClass
 {
 private DesktopTestFrameworkV2.TestContext testContextInstance;
Expand Down
Loading