Updated changes from master

unickq · May 16, 2021 · 21b8bac · 21b8bac
1 parent 7ce44f7
commit 21b8bac
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 29 deletions.
diff --git a/src/allure-nunit/Attributes/AllureDescriptionAttribute.cs b/src/allure-nunit/Attributes/AllureDescriptionAttribute.cs
@@ -1,18 +1,30 @@
 using System;
-using NUnit.Framework;
+using Allure.Commons;
 
 namespace NUnit.Allure.Attributes
 {
     [AttributeUsage(AttributeTargets.Method)]
-    public class AllureDescriptionAttribute : NUnitAttribute
+    public class AllureDescriptionAttribute : AllureTestCaseAttribute
     {
         public AllureDescriptionAttribute(string description, bool html = false)
         {
             TestDescription = description;
             IsHtml = html;
         }
 
-        internal string TestDescription { get; }
-        internal bool IsHtml { get; }
+        private string TestDescription { get; }
+        private bool IsHtml { get; }
+
+        public override void UpdateTestResult(TestResult testResult)
+        {
+            if (IsHtml)
+            {
+                testResult.descriptionHtml += TestDescription;
+            }
+            else
+            {
+                testResult.description += TestDescription;
+            }
+        }
     }
 }
diff --git a/src/allure-nunit/Attributes/AllureDisplayIgnoredAttribute.cs b/src/allure-nunit/Attributes/AllureDisplayIgnoredAttribute.cs
@@ -71,9 +71,11 @@ public void AfterTest(ITest suite)
             }
         }
 
-        private static IEnumerable<ITest> GetAllTests(ITest test) =>
-            test.Tests.Concat(test.Tests.SelectMany(GetAllTests));
-
         public ActionTargets Targets => ActionTargets.Suite;
+
+        private static IEnumerable<ITest> GetAllTests(ITest test)
+        {
+            return test.Tests.Concat(test.Tests.SelectMany(GetAllTests));
+        }
     }
 }
diff --git a/src/allure-nunit/Attributes/AllureEpicAttribute.cs b/src/allure-nunit/Attributes/AllureEpicAttribute.cs
@@ -11,7 +11,7 @@ public AllureEpicAttribute(string epic)
             Epic = epic;
         }
 
-        public string Epic { get; }
+        private string Epic { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureFeatureAttribute.cs b/src/allure-nunit/Attributes/AllureFeatureAttribute.cs
@@ -11,7 +11,7 @@ public AllureFeatureAttribute(params string[] feature)
             Features = feature;
         }
 
-        internal string[] Features { get; }
+        private string[] Features { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureIssueAttribute.cs b/src/allure-nunit/Attributes/AllureIssueAttribute.cs
@@ -16,7 +16,7 @@ public AllureIssueAttribute(string name)
             IssueLink = new Link {name = name, type = "issue", url = name};
         }
 
-        internal Link IssueLink { get; }
+        private Link IssueLink { get; }
 
         public override void UpdateTestResult(TestResult testCaseResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureLabelAttribute.cs b/src/allure-nunit/Attributes/AllureLabelAttribute.cs
@@ -12,12 +12,12 @@ public AllureLabelAttribute(string name, string value)
             Value = value;
         }
 
-        internal string Name { get; }
-        internal string Value { get; }
+        private string Name { get; }
+        private string Value { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {
-            testResult.labels.Add(new Label { name = Name, value = Value });
+            testResult.labels.Add(new Label {name = Name, value = Value});
         }
     }
 }
diff --git a/src/allure-nunit/Attributes/AllureLinkAttribute.cs b/src/allure-nunit/Attributes/AllureLinkAttribute.cs
@@ -16,7 +16,7 @@ public AllureLinkAttribute(string url)
             Link = new Link {name = url, type = "link", url = url};
         }
 
-        internal Link Link { get; }
+        private Link Link { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureNameAttribute.cs b/src/allure-nunit/Attributes/AllureNameAttribute.cs
@@ -1,16 +1,21 @@
 using System;
-using NUnit.Framework;
+using Allure.Commons;
 
 namespace NUnit.Allure.Attributes
 {
     [AttributeUsage(AttributeTargets.Method)]
-    public class AllureNameAttribute : NUnitAttribute
+    public class AllureNameAttribute : AllureTestCaseAttribute
     {
         public AllureNameAttribute(string name)
         {
             TestName = name;
         }
 
-        internal string TestName { get; }
+        private string TestName { get; }
+
+        public override void UpdateTestResult(TestResult testResult)
+        {
+            testResult.name = TestName;
+        }
     }
 }
diff --git a/src/allure-nunit/Attributes/AllureOwnerAttribute.cs b/src/allure-nunit/Attributes/AllureOwnerAttribute.cs
@@ -11,7 +11,7 @@ public AllureOwnerAttribute(string owner)
             Owner = owner;
         }
 
-        internal string Owner { get; }
+        private string Owner { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureParentSuiteAttribute.cs b/src/allure-nunit/Attributes/AllureParentSuiteAttribute.cs
@@ -11,7 +11,7 @@ public AllureParentSuiteAttribute(string parentSuite)
             ParentSuite = parentSuite;
         }
 
-        internal string ParentSuite { get; }
+        private string ParentSuite { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureSeverityAttribute.cs b/src/allure-nunit/Attributes/AllureSeverityAttribute.cs
@@ -11,7 +11,7 @@ public AllureSeverityAttribute(SeverityLevel severity = SeverityLevel.normal)
             Severity = severity;
         }
 
-        internal SeverityLevel Severity { get; }
+        private SeverityLevel Severity { get; }
 
         public override void UpdateTestResult(TestResult testCaseResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureStoryAttribute.cs b/src/allure-nunit/Attributes/AllureStoryAttribute.cs
@@ -11,7 +11,7 @@ public AllureStoryAttribute(params string[] story)
             Stories = story;
         }
 
-        internal string[] Stories { get; }
+        private string[] Stories { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureSubSuiteAttribute.cs b/src/allure-nunit/Attributes/AllureSubSuiteAttribute.cs
@@ -11,7 +11,7 @@ public AllureSubSuiteAttribute(string subSuite)
             SubSuite = subSuite;
         }
 
-        internal string SubSuite { get; }
+        private string SubSuite { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureSuiteAttribute.cs b/src/allure-nunit/Attributes/AllureSuiteAttribute.cs
@@ -11,7 +11,7 @@ public AllureSuiteAttribute(string suite)
             Suite = suite;
         }
 
-        internal string Suite { get; }
+        private string Suite { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureTagAttribute.cs b/src/allure-nunit/Attributes/AllureTagAttribute.cs
@@ -11,7 +11,7 @@ public AllureTagAttribute(params string[] tags)
             Tags = tags;
         }
 
-        internal string[] Tags { get; }
+        private string[] Tags { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {

diff --git a/src/allure-nunit/Attributes/AllureTestCaseAttribute.cs b/src/allure-nunit/Attributes/AllureTestCaseAttribute.cs
@@ -7,4 +7,4 @@ public abstract class AllureTestCaseAttribute : NUnitAttribute
     {
         public abstract void UpdateTestResult(TestResult testResult);
     }
-}
+}
diff --git a/src/allure-nunit/Attributes/AllureTmsAttribute.cs b/src/allure-nunit/Attributes/AllureTmsAttribute.cs
@@ -16,7 +16,7 @@ public AllureTmsAttribute(string name)
             TmsLink = new Link {name = name, type = "tms", url = name};
         }
 
-        internal Link TmsLink { get; }
+        private Link TmsLink { get; }
 
         public override void UpdateTestResult(TestResult testResult)
         {

diff --git a/src/allure-nunit/allure-nunit.csproj b/src/allure-nunit/allure-nunit.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <AssemblyVersion>1.0.14-beta2</AssemblyVersion>
-    <FileVersion>1.0.14-beta2</FileVersion>
-    <Version>1.0.14-beta2</Version>
+    <AssemblyVersion>1.0.14-beta3</AssemblyVersion>
+    <FileVersion>1.0.14-beta3</FileVersion>
+    <Version>1.0.14-beta3</Version>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Nick Chursin</Authors>
     <Description>NUnit attributes extenstions for Allure</Description>
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ public abstract class AllureTestCaseAttribute : NUnitAttribute @@
         {
             public abstract void UpdateTestResult(TestResult testResult);
         }
-    }
+    }