Fix identification properties and parameter formatting

.github/workflows/release.yml

@@ -47,6 +47,26 @@ jobs:
         run: |
           sed -i -e '/<PropertyGroup>/,/<\/PropertyGroup>/ s|<Version>[0-9a-zA-Z.|-]*</Version>|<Version>${{ env.release_version }}</Version>|g' ./Directory.Build.props
           cat ./Directory.Build.props
+      - name: "Update schema links"
+        run: |
+          sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.NUnit/Schemas/allureConfig.schema.json
+          cat ./Allure.NUnit/Schemas/allureConfig.schema.json
+          sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.XUnit/Schemas/allureConfig.schema.json
+          cat ./Allure.XUnit/Schemas/allureConfig.schema.json
+          sed -i -e '/"$ref"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.SpecFlowPlugin/Schemas/allureConfig.schema.json
+          cat ./Allure.SpecFlowPlugin/Schemas/allureConfig.schema.json
+          sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.NUnit/allureConfig.json
+          cat ./Allure.NUnit/allureConfig.json
+          sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.NUnit.Examples/allureConfig.json
+          cat ./Allure.NUnit.Examples/allureConfig.json
+          sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.XUnit.Examples/allureConfig.json
+          cat ./Allure.XUnit.Examples/allureConfig.json
+          sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.SpecFlowPlugin/allureConfig.Template.json
+          cat ./Allure.SpecFlowPlugin/allureConfig.Template.json
+          sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.Features/allureConfig.json
+          cat ./Allure.Features/allureConfig.json
+          sed -i -e '/"$schema"/s|/allure-csharp/[^/]*|/allure-csharp/${{ env.release_version }}|g' ./Allure.SpecFlowPlugin.Tests/allureConfig.json
+          cat ./Allure.SpecFlowPlugin.Tests/allureConfig.json
       - name: "Commit release version and create tag"
         run: |
           git commit -am "release ${{ env.release_version }}"

Allure.Features/Allure.Features.csproj

@@ -7,8 +7,8 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
         <PackageReference Include="Castle.Core" Version="4.4.1" />
-        <PackageReference Include="NUnit" Version="3.13.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
         <PackageReference Include="SpecFlow" Version="3.9.74" />
         <PackageReference Include="SpecFlow.SharedSteps" Version="3.0.7" />
 

Allure.Features/allureConfig.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/allure-framework/allure-csharp/identifiers-fix/Allure.SpecFlowPlugin/Schemas/allureConfig.schema.json",
   "allure": {
     "title": "5994A3F7-AF84-46AD-9393-000BB45553CC",
     "directory": "allure-results",

Allure.NUnit.Examples/Allure.NUnit.Examples.csproj

@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="NUnit" Version="3.13.3" />
-        <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     </ItemGroup>
 
@@ -16,9 +16,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Resource Include="allureConfig.json">
+        <Content Include="allureConfig.json">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </Resource>
+        </Content>
         <Resource Include="AllureIgnoredTest.cs" />
         <None Include="./../img/Allure-Color.png" PackagePath="\">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>

Allure.NUnit.Examples/AllureStepNameInternalsTest.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Reflection;
+using Allure.Net.Commons;
 using Allure.Net.Commons.Steps;
 using NUnit.Allure.Attributes;
 using NUnit.Framework;
@@ -22,10 +24,10 @@ public void TestMethod(string name, LocalTestClass request, int id)
 
         [TestCase("", ExpectedResult = "")]
         [TestCase(null, ExpectedResult = "")]
-        [TestCase("{0} - {1} - {2} - {3} - {100} - {-100}", ExpectedResult = "Super Mario - Allure.NUnit.Examples.AllureStepNameInternalsTest+LocalTestClass - 12345 - {3} - {100} - {-100}")]
-        [TestCase("{id} - {0}", ExpectedResult = "12345 - Super Mario")]
-        [TestCase("{id} - {name} ({request})", ExpectedResult = "12345 - Super Mario (Allure.NUnit.Examples.AllureStepNameInternalsTest+LocalTestClass)")]
-        [TestCase("{id} - {request.TestField} - {request.TestProp}", ExpectedResult = "12345 - FieldValue - PropValue")]
+        [TestCase("{0} - {1} - {2} - {3} - {100} - {-100}", ExpectedResult = "\"Super Mario\" - {\"TestField\":\"FieldValue\",\"TestProp\":\"PropValue\"} - 12345 - {3} - {100} - {-100}")]
+        [TestCase("{id} - {0}", ExpectedResult = "12345 - \"Super Mario\"")]
+        [TestCase("{id} - {name} ({request})", ExpectedResult = "12345 - \"Super Mario\" ({\"TestField\":\"FieldValue\",\"TestProp\":\"PropValue\"})")]
+        [TestCase("{id} - {request.TestField} - {request.TestProp}", ExpectedResult = "12345 - \"FieldValue\" - \"PropValue\"")]
         [TestCase("{notExistingParameter} - {request.NotExistingField}", ExpectedResult = "{notExistingParameter} - {request.NotExistingField}")]
         public string ApplyValues_Test(string stepNamePattern)
         {
@@ -41,14 +43,19 @@ public string ApplyValues_Test(string stepNamePattern)
                 12345, // id = {2}
             };
 
-            return AllureStepParameterHelper.GetStepName(stepNamePattern, methodBase, arguments);
+            return AllureStepParameterHelper.GetStepName(
+                stepNamePattern,
+                methodBase,
+                arguments,
+                new Dictionary<Type, ITypeFormatter>()
+            );
         }
 
         [TestCase("", ExpectedResult = "")]
         [TestCase(null, ExpectedResult = "")]
-        [TestCase("{0} - {1} - {2} - {3} - {100} - {-100}", ExpectedResult = "Super Mario - null - 12345 - {3} - {100} - {-100}")]
-        [TestCase("{id} - {0}", ExpectedResult = "12345 - Super Mario")]
-        [TestCase("{id} - {name} ({request})", ExpectedResult = "12345 - Super Mario (null)")]
+        [TestCase("{0} - {1} - {2} - {3} - {100} - {-100}", ExpectedResult = "\"Super Mario\" - null - 12345 - {3} - {100} - {-100}")]
+        [TestCase("{id} - {0}", ExpectedResult = "12345 - \"Super Mario\"")]
+        [TestCase("{id} - {name} ({request})", ExpectedResult = "12345 - \"Super Mario\" (null)")]
         [TestCase("{id} - {request.TestField} - {request.TestProp}", ExpectedResult = "12345 - {request.TestField} - {request.TestProp}")]
         [TestCase("{notExistingParameter} - {request.NotExistingField}", ExpectedResult = "{notExistingParameter} - {request.NotExistingField}")]
         public string ApplyNullValues_Test(string stepNamePattern)
@@ -61,7 +68,12 @@ public string ApplyNullValues_Test(string stepNamePattern)
                 12345, // id = {2}
             };
 
-            return AllureStepParameterHelper.GetStepName(stepNamePattern, methodBase, arguments);
+            return AllureStepParameterHelper.GetStepName(
+                stepNamePattern,
+                methodBase,
+                arguments,
+                new Dictionary<Type, ITypeFormatter>()
+            );
         }
     }
 }

Allure.NUnit.Examples/allureConfig.json

@@ -1,4 +1,5 @@
 {
+	"$schema": "https://raw.githubusercontent.com/allure-framework/allure-csharp/identifiers-fix/Allure.NUnit/Schemas/allureConfig.schema.json",
 	"allure": {
 		"directory": "allure-results",
 		"links": [

Allure.NUnit/Attributes/AllureDisplayIgnoredAttribute.cs

@@ -1,19 +1,27 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using Allure.Net.Commons;
+using NUnit.Allure.Core;
 using NUnit.Framework;
 using NUnit.Framework.Interfaces;
 using NUnit.Framework.Internal;
 using TestResult = Allure.Net.Commons.TestResult;
 
+#nullable enable
+
 namespace NUnit.Allure.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class AllureDisplayIgnoredAttribute : NUnitAttribute, ITestAction
     {
-        private readonly string _suiteName;
+        private readonly string? _suiteName = null;
+
+        public AllureDisplayIgnoredAttribute(){}
 
+        [Obsolete("Allure attributes are now supported for ignored tests. Use them instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public AllureDisplayIgnoredAttribute(string suiteNameForIgnoredTests = "Ignored")
         {
             _suiteName = suiteNameForIgnoredTests;
@@ -40,38 +48,7 @@ public void AfterTest(ITest suite)
                     );
                 foreach (var test in ignoredTests)
                 {
-                    AllureLifecycle.Instance.UpdateTestContainer(
-                        t => t.children.Add(test.Id)
-                    );
-
-                    var reason = test.Properties.Get(
-                        PropertyNames.SkipReason
-                    ).ToString();
-
-                    var ignoredTestResult = new TestResult
-                    {
-                        uuid = test.Id,
-                        name = test.Name,
-                        fullName = test.FullName,
-                        status = Status.skipped,
-                        statusDetails = new StatusDetails
-                        {
-                            message = test.Name
-                        },
-                        labels = new List<Label>
-                        {
-                            Label.Suite(_suiteName),
-                            Label.SubSuite(reason),
-                            Label.Thread(),
-                            Label.Host(),
-                            Label.TestClass(test.ClassName),
-                            Label.TestMethod(test.MethodName),
-                            Label.Package(test.ClassName)
-                        }
-                    };
-                    AllureLifecycle.Instance.StartTestCase(ignoredTestResult);
-                    AllureLifecycle.Instance.StopTestCase();
-                    AllureLifecycle.Instance.WriteTestCase();
+                    this.EmitResultForIgnoredTest(test);
                 }
 
                 AllureLifecycle.Instance.StopTestContainer();
@@ -85,5 +62,36 @@ private static IEnumerable<ITest> GetAllTests(ITest test)
         {
             return test.Tests.Concat(test.Tests.SelectMany(GetAllTests));
         }
+
+        void EmitResultForIgnoredTest(ITest test)
+        {
+            AllureLifecycle.Instance.UpdateTestContainer(
+                        t => t.children.Add(test.Id)
+                    );
+
+            var reason = test.Properties.Get(
+                PropertyNames.SkipReason
+            )?.ToString() ?? "";
+
+            var ignoredTestResult = AllureNUnitHelper.CreateTestResult(test);
+            ignoredTestResult.status = Status.skipped;
+            ignoredTestResult.statusDetails = new() { message = test.Name };
+            this.ApplyLegacySuiteLabels(ignoredTestResult, reason);
+            AllureLifecycle.Instance.StartTestCase(ignoredTestResult);
+            AllureLifecycle.Instance.StopTestCase();
+            AllureLifecycle.Instance.WriteTestCase();
+        }
+
+        void ApplyLegacySuiteLabels(TestResult testResult, string reason)
+        {
+            if (!string.IsNullOrWhiteSpace(this._suiteName))
+            {
+                testResult.labels.AddRange(new[]
+                {
+                    Label.Suite(this._suiteName),
+                    Label.SubSuite(reason)
+                });
+            }
+        }
     }
 }