Merge pull request #63 from testit-tms/hotfix/fix_filtering_by_labels

Fixed filtering by labels with "tmsLabelsOfTestsToRun" parameter.
testit-tms · Oct 8, 2024 · 56a71ca · 56a71ca
2 parents b360155 + 55265c3
commit 56a71ca
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/Tms.Adapter.Core/Tms.Adapter.Core.csproj b/Tms.Adapter.Core/Tms.Adapter.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-		<Version>1.6.4</Version>
+		<Version>1.6.5</Version>
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>

diff --git a/Tms.Adapter.SpecFlowPlugin/Tms.Adapter.SpecFlowPlugin.csproj b/Tms.Adapter.SpecFlowPlugin/Tms.Adapter.SpecFlowPlugin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-		<Version>1.6.4</Version>
+		<Version>1.6.5</Version>
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>

diff --git a/Tms.Adapter.XUnit/Tms.Adapter.XUnit.csproj b/Tms.Adapter.XUnit/Tms.Adapter.XUnit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-		<Version>1.6.4</Version>
+		<Version>1.6.5</Version>
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>

diff --git a/Tms.Adapter/Tms.Adapter.csproj b/Tms.Adapter/Tms.Adapter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>1.6.4</Version>
+        <Version>1.6.5</Version>
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>

diff --git a/TmsRunner/App.cs b/TmsRunner/App.cs
@@ -48,7 +48,7 @@ public async Task<int> RunAsync()
 
                     if (!string.IsNullOrEmpty(adapterConfig.TmsLabelsOfTestsToRun))
                     {
-                        testCases = FilterService.FilterTestCasesByLabels(adapterConfig, testCases);
+                        testCases = filterService.FilterTestCasesByLabels(adapterConfig, testCases);
                     }
 
                     break;

diff --git a/TmsRunner/Services/FilterService.cs b/TmsRunner/Services/FilterService.cs
@@ -66,21 +66,25 @@ private string GetExternalId(MethodInfo testMethod, TestCase testCase)
         return (testMethod.DeclaringType!.FullName + "." + testMethod.Name).ComputeHash();
     }
 
-    public static List<TestCase> FilterTestCasesByLabels(AdapterConfig config, IReadOnlyCollection<TestCase> testCases)
+    public List<TestCase> FilterTestCasesByLabels(AdapterConfig config, IReadOnlyCollection<TestCase> testCases)
     {
         var labelsToRun = config.TmsLabelsOfTestsToRun?.Split(',').Select(x => x.Trim()).ToList();
-        var testCasesName = testCases.Select(t => t.FullyQualifiedName);
         var testCasesToRun = new List<TestCase>();
         var assembly = Assembly.LoadFrom(config.TestAssemblyPath ?? string.Empty);
-        var testMethods = new List<MethodInfo>(
-            assembly.GetExportedTypes()
-                .SelectMany(type => type.GetMethods())
-                .Where(m => testCasesName.Contains(m.DeclaringType!.FullName + "." + m.Name))
-        );
+        var allTestMethods = new List<MethodInfo>(assembly.GetExportedTypes().SelectMany(type => type.GetMethods()));
 
-        foreach (var testMethod in testMethods)
+        foreach (var testCase in testCases)
         {
-            var fullName = testMethod.DeclaringType?.FullName + "." + testMethod.Name;
+            var testMethod = allTestMethods.FirstOrDefault(
+                m => (m.DeclaringType!.FullName + "." + m.Name).Contains(ParametersRegex.Replace(testCase.FullyQualifiedName, string.Empty))
+            );
+
+            if (testMethod == null)
+            {
+                logger.LogError("TestMethod {@FullyQualifiedName} not found", testCase.FullyQualifiedName);
+                continue;
+            }
+
             var customAttributes = testMethod.GetCustomAttributes(false);
 
             foreach (var attribute in customAttributes)
@@ -89,8 +93,6 @@ public static List<TestCase> FilterTestCasesByLabels(AdapterConfig config, IRead
                 {
                     if (labelsAttr.Value?.Any(x => labelsToRun?.Contains(x) ?? false) ?? false)
                     {
-                        var testCase = testCases.FirstOrDefault(x => x.FullyQualifiedName == fullName);
-
                         if (testCase != null)
                         {
                             testCasesToRun.Add(testCase);

diff --git a/TmsRunner/TmsRunner.csproj b/TmsRunner/TmsRunner.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<Version>1.6.4</Version>
+	<Version>1.6.5</Version>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/TmsRunnerTests/Services/FilterServiceTests.cs b/TmsRunnerTests/Services/FilterServiceTests.cs
@@ -33,14 +33,15 @@ public void FilterTestCases()
     public void FilterTestCasesByLabels()
     {
         // Arrange
+        var filterService = new FilterService(_logger, _replacer);
         var config = new AdapterConfig
         {
             TestAssemblyPath = typeof(FilterServiceTests).Assembly.Location
         };
-        var testcases = new[] { new TestCase() };
+        var testcases = new[] { new TestCase { FullyQualifiedName = "test" } };
 
         // Act
-        var actual = FilterService.FilterTestCasesByLabels(config, testcases);
+        var actual = filterService.FilterTestCasesByLabels(config, testcases);
 
         // Assert
         Assert.AreEqual(0, actual.Count);
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ public async Task<int> RunAsync() @@
                         if (!string.IsNullOrEmpty(adapterConfig.TmsLabelsOfTestsToRun))
                         {
-                            testCases = FilterService.FilterTestCasesByLabels(adapterConfig, testCases);
+                            testCases = filterService.FilterTestCasesByLabels(adapterConfig, testCases);
                         }
                         break;
@@ Expand Down @@