Base class data rows should not be executed

src/Adapter/MSTest.CoreAdapter/Execution/TestMethodRunner.cs

@@ -303,7 +303,7 @@ internal UnitTestResult[] RunTestMethod()
                 }
                 else
                 {
-                    UTF.ITestDataSource[] testDataSources = this.testMethodInfo.GetAttributes<Attribute>(true)?.Where(a => a is UTF.ITestDataSource).OfType<UTF.ITestDataSource>().ToArray();
+                    UTF.ITestDataSource[] testDataSources = this.testMethodInfo.GetAttributes<Attribute>(false)?.Where(a => a is UTF.ITestDataSource).OfType<UTF.ITestDataSource>().ToArray();
 
                     if (testDataSources != null && testDataSources.Length > 0)
                     {

test/E2ETests/Automation.CLI/CLITestBase.cs

@@ -117,12 +117,16 @@ public void ValidateDiscoveredTests(params string[] discoveredTestsList)
         /// <remarks>Provide the full test name similar to this format SampleTest.TestCode.TestMethodPass.</remarks>
         public void ValidatePassedTests(params string[] passedTests)
         {
-            // Make sure only expected number of tests passed and not more.
-            Assert.AreEqual(passedTests.Length, this.runEventsHandler.PassedTests.Count);
-
+            this.ValidatePassedTestsCount(passedTests.Length);
             this.ValidatePassedTestsContain(passedTests);
         }
 
+        public void ValidatePassedTestsCount(int expectedPassedTestsCount)
+        {
+            // Make sure only expected number of tests passed and not more.
+            Assert.AreEqual(expectedPassedTestsCount, this.runEventsHandler.PassedTests.Count);
+        }
+
         /// <summary>
         /// Validates if the test results have the specified set of failed tests.
         /// </summary>

test/E2ETests/Smoke.E2E.Tests/DataRowTests.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace MSTestAdapter.Smoke.E2ETests
+{
+    using Microsoft.MSTestV2.CLIAutomation;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    [TestClass]
+    public class DataRowTests : CLITestBase
+    {
+        private const string TestAssembly = "DataRowTestProject.dll";
+
+        [TestMethod]
+        public void ExecuteOnlyDerivedClassDataRowsWhenBothBaseAndDerviedClassHasDataRows()
+        {
+            this.InvokeVsTestForExecution(new string[] { TestAssembly });
+
+            this.ValidatePassedTestsContain(
+                "DataRowTestMethod (cherry)",
+                "DataRowTestMethod (banana)",
+                "DataRowTestMethod (Apple)",
+                "DataRowTestMethod (orange)",
+                "DataRowTestMethod (pineapple)");
+
+            // 4 tests of BaseClass - 3 datarow result and 1 parent result
+            // 3 tests of DerivedClass - 2 datarow result and 1 parent result
+            // Total 7 tests - Making sure that DerivedClass doesn't run BaseClass tests
+            this.ValidatePassedTestsCount(7);
+        }
+    }
+}

test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj

@@ -48,6 +48,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DynamicDataExtensibilityTests.cs" />
     <Compile Include="TestDataSourceExtensibilityTests.cs" />
+    <Compile Include="DataRowTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

test/E2ETests/TestAssets/DataRowTestProject/BaseClass.cs

@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information. 
+
+namespace DataRowTestProject
+{
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    [TestClass]
+    public class BaseClass
+    {
+        [TestMethod]
+        [DataRow("cherry")]
+        [DataRow("banana")]
+        [DataRow("Apple")]
+        public virtual void DataRowTestMethod(string a)
+        {
+            Assert.IsTrue(true);
+        }
+    }
+}

test/E2ETests/TestAssets/DataRowTestProject/DataRowTestProject.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TestFxRoot Condition="$(TestFxRoot) == ''">..\..\..\..\</TestFxRoot>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net452</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <OutputPath>$(TestFxRoot)artifacts\TestAssets\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\src\TestFramework\Extension.Desktop\Extension.Desktop.csproj" />
+    <ProjectReference Include="..\..\..\..\src\TestFramework\MSTest.Core\MSTest.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>

test/E2ETests/TestAssets/DataRowTestProject/DerivedClass.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace DataRowTestProject
+{
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    [TestClass]
+    public class DerivedClass : BaseClass
+    {
+        [TestMethod]
+        [DataRow("orange")]
+        [DataRow("pineapple")]
+        public override void DataRowTestMethod(string a)
+        {
+            Assert.IsTrue(true);
+        }
+    }
+}