Revert "Support for NUnit3 (Lifecycle) (#237)" (#238)

This reverts commit dae7a94.
mattwhitfield · Nov 6, 2023 · 59729bb · 59729bb
1 parent dae7a94
commit 59729bb
Show file tree

Hide file tree

Showing 22 changed files with 19 additions and 240 deletions.
diff --git a/docs/examples/FrameworksNUnitLifecycleNSubstitute.md b/docs/examples/FrameworksNUnitLifecycleNSubstitute.md
diff --git a/docs/examples/index.md b/docs/examples/index.md
@@ -14,7 +14,6 @@ This section contains examples of the output that Unitverse outputs, refreshed e
 | [Frameworks - MSTest & Moq](FrameworksMsTestMoq.md) | Demonstrates how tests are generated using MsTest for the test framework and Moq for the mocking framework |
 | [Frameworks - MSTest & Moq (with Moq.AutoMock)](FrameworksMsTestMoqAutoMock.md) | Demonstrates how tests are generated using MsTest for the test framework and Moq for the mocking framework, using Moq.AutoMock for object creation |
 | [Frameworks - NUnit 3 & FakeItEasy](FrameworksNUnitFakeItEasy.md) | Demonstrates how tests are generated using NUnit 3 for the test framework and FakeItEasy for the mocking framework |
-| [Frameworks - NUnit 3 (Lifecycle) & NSubstitute](FrameworksNUnitLifecycleNSubstitute.md) | Demonstrates how tests are generated using NUnit 3 (Lifecycle) for the test framework and NSubstitute for the mocking framework |
 | [Frameworks - XUnit & JustMock](FrameworksXUnitJustMock.md) | Demonstrates how tests are generated using XUnit for the test framework and JustMock for the mocking framework |
 | [Frameworks - XUnit & NSubstitute](FrameworksXUnitNSubstitute.md) | Demonstrates how tests are generated using XUnit for the test framework and NSubstitute for the mocking framework |
 | [Generic Methods](GenericMethod.md) | Demonstrates how Unitverse generates tests for generic methods |

diff --git a/src/Unitverse.Core.Tests/Frameworks/Test/TestFrameworkTests.cs b/src/Unitverse.Core.Tests/Frameworks/Test/TestFrameworkTests.cs
@@ -211,7 +211,7 @@ public void CanGetSingleThreadedApartmentAttribute(TestFrameworkTypes frameworkT
         public void CanGetTestClassAttribute(TestFrameworkTypes frameworkTypes, string expected)
         {
             var testClass = CreateFramework(frameworkTypes);
-            Assert.That(testClass.TestClassAttributes?.FirstOrDefault()?.Name.ToString() ?? string.Empty, Is.EqualTo(expected));
+            Assert.That(testClass.TestClassAttribute, Is.EqualTo(expected));
         }
 
         [TestCaseSource(nameof(Targets))]

diff --git a/src/Unitverse.Core.Tests/UnitTestGeneratorTests.cs b/src/Unitverse.Core.Tests/UnitTestGeneratorTests.cs
@@ -36,7 +36,6 @@
     using Expression = System.Linq.Expressions.Expression;
 
     [TestFixture]
-    [FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
     public class UnitTestGeneratorTests
     {
         // useAutoFixture, useAutoFixtureForMocking, useFieldForAutoFixture
@@ -72,7 +71,7 @@ public static IEnumerable<object[]> TestClassResourceNames
                     entryKeys.Add(entry.Key.ToString());
                 }
 
-                var frameworks = new object[] { TestFrameworkTypes.MsTest, TestFrameworkTypes.NUnit3, TestFrameworkTypes.NUnit3Lifecycle, TestFrameworkTypes.XUnit };
+                var frameworks = new object[] { TestFrameworkTypes.MsTest, TestFrameworkTypes.NUnit3, TestFrameworkTypes.XUnit };
                 var mocks = new object[] { MockingFrameworkType.Moq, MockingFrameworkType.NSubstitute, MockingFrameworkType.FakeItEasy, MockingFrameworkType.MoqAutoMock, MockingFrameworkType.JustMock };
 
 #if VS2019
@@ -363,7 +362,7 @@ private static IEnumerable<PortableExecutableReference> GetReferences(TestFramew
                 yield return MetadataReference.CreateFromFile(typeof(Xunit.Assert).Assembly.Location);
             }
 
-            if ((testFrameworkTypes & (TestFrameworkTypes.NUnit3Lifecycle | TestFrameworkTypes.NUnit3 | TestFrameworkTypes.NUnit2)) > 0)
+            if ((testFrameworkTypes & (TestFrameworkTypes.NUnit3 | TestFrameworkTypes.NUnit2)) > 0)
             {
                 yield return MetadataReference.CreateFromFile(typeof(TestFixtureAttribute).Assembly.Location);
             }

diff --git a/src/Unitverse.Core/Assets/PropertyTesterAsset.cs b/src/Unitverse.Core/Assets/PropertyTesterAsset.cs
@@ -19,7 +19,7 @@ public string Content(string targetNamespace, TestFrameworkTypes testFrameworkTy
                 return AssetResources.PropertyTesterXUnit.Replace("%targetNamespace%", targetNamespace);
             }
 
-            if ((testFrameworkTypes & (TestFrameworkTypes.NUnit2 | TestFrameworkTypes.NUnit3 | TestFrameworkTypes.NUnit3Lifecycle)) > 0)
+            if ((testFrameworkTypes & (TestFrameworkTypes.NUnit2 | TestFrameworkTypes.NUnit3)) > 0)
             {
                 return AssetResources.PropertyTesterNUnit.Replace("%targetNamespace%", targetNamespace);
             }

diff --git a/src/Unitverse.Core/Frameworks/FrameworkPackageProvider.cs b/src/Unitverse.Core/Frameworks/FrameworkPackageProvider.cs
@@ -55,7 +55,6 @@ public static IEnumerable<INugetPackageReference> Get(IGenerationOptions generat
                     yield return new NugetPackageReference("NUnitTestAdapter", null);
                     break;
                 case TestFrameworkTypes.NUnit3:
-                case TestFrameworkTypes.NUnit3Lifecycle:
                     yield return new NugetPackageReference("nunit", null);
                     yield return new NugetPackageReference("NUnit3TestAdapter", null);
                     break;

diff --git a/src/Unitverse.Core/Frameworks/FrameworkSetFactory.cs b/src/Unitverse.Core/Frameworks/FrameworkSetFactory.cs
@@ -79,11 +79,6 @@ private static IExtendedTestFramework CreateTestFramework(IUnitTestGeneratorOpti
                 return new NUnit3TestFramework(options);
             }
 
-            if ((testFrameworkTypes & TestFrameworkTypes.NUnit3Lifecycle) > 0)
-            {
-                return new NUnit3LifeCycleFramework(options);
-            }
-
             if ((testFrameworkTypes & TestFrameworkTypes.NUnit2) > 0)
             {
                 return new NUnit2TestFramework(options);

diff --git a/src/Unitverse.Core/Frameworks/ITestFramework.cs b/src/Unitverse.Core/Frameworks/ITestFramework.cs
@@ -1,6 +1,5 @@
 namespace Unitverse.Core.Frameworks
 {
-    using System.Collections.Generic;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
 
     public interface ITestFramework : IAssertionFramework
@@ -9,6 +8,6 @@ public interface ITestFramework : IAssertionFramework
 
         AttributeSyntax? SingleThreadedApartmentAttribute { get; }
 
-        IEnumerable<AttributeSyntax>? TestClassAttributes { get; }
+        string TestClassAttribute { get; }
     }
 }
diff --git a/src/Unitverse.Core/Frameworks/Test/MsTestTestFramework.cs b/src/Unitverse.Core/Frameworks/Test/MsTestTestFramework.cs
@@ -20,7 +20,7 @@ public MsTestTestFramework(IUnitTestGeneratorOptions options)
 
         public AttributeSyntax? SingleThreadedApartmentAttribute => null;
 
-        public IEnumerable<AttributeSyntax> TestClassAttributes => new[] { Generate.Attribute("TestClass") };
+        public string TestClassAttribute => "TestClass";
 
         protected override string TestAttributeName => "TestMethod";
 

diff --git a/src/Unitverse.Core/Frameworks/Test/NUnit3LifeCycleFramework.cs b/src/Unitverse.Core/Frameworks/Test/NUnit3LifeCycleFramework.cs
diff --git a/src/Unitverse.Core/Frameworks/Test/NUnit3TestFramework.cs b/src/Unitverse.Core/Frameworks/Test/NUnit3TestFramework.cs
@@ -1,7 +1,6 @@
 namespace Unitverse.Core.Frameworks.Test
 {
     using System.Collections.Generic;
-    using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Unitverse.Core.Helpers;
     using Unitverse.Core.Options;

diff --git a/src/Unitverse.Core/Frameworks/Test/NUnitTestFramework.cs b/src/Unitverse.Core/Frameworks/Test/NUnitTestFramework.cs
@@ -20,7 +20,7 @@ protected NUnitTestFramework(IUnitTestGeneratorOptions options)
 
         public abstract AttributeSyntax SingleThreadedApartmentAttribute { get; }
 
-        public virtual IEnumerable<AttributeSyntax> TestClassAttributes => new[] { Generate.Attribute("TestFixture") };
+        public string TestClassAttribute => "TestFixture";
 
         protected override string TestAttributeName => "Test";
 

diff --git a/src/Unitverse.Core/Frameworks/Test/XUnitTestFramework.cs b/src/Unitverse.Core/Frameworks/Test/XUnitTestFramework.cs
@@ -2,7 +2,6 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.Linq;
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Unitverse.Core.Helpers;
@@ -21,7 +20,7 @@ public XUnitTestFramework(IUnitTestGeneratorOptions options)
 
         public AttributeSyntax? SingleThreadedApartmentAttribute => null;
 
-        public IEnumerable<AttributeSyntax>? TestClassAttributes => null;
+        public string TestClassAttribute => string.Empty;
 
         protected override string TestAttributeName => "Fact";
 

diff --git a/src/Unitverse.Core/Helpers/Generate.cs b/src/Unitverse.Core/Helpers/Generate.cs
@@ -280,11 +280,6 @@ public static AttributeListSyntax AsList(this AttributeSyntax attribute)
             return SyntaxFactory.AttributeList(SyntaxFactory.SingletonSeparatedList(attribute));
         }
 
-        public static AttributeListSyntax AsList(this IEnumerable<AttributeSyntax> attributes)
-        {
-            return SyntaxFactory.AttributeList(SyntaxFactory.SeparatedList(attributes));
-        }
-
         public static AttributeSyntax Attribute(string name)
         {
             if (string.IsNullOrWhiteSpace(name))

diff --git a/src/Unitverse.Core/Options/TestFrameworkTypes.cs b/src/Unitverse.Core/Options/TestFrameworkTypes.cs
@@ -14,7 +14,5 @@ public enum TestFrameworkTypes
         MsTest = 4,
         [Description("xUnit")]
         XUnit = 8,
-        [Description("NUnit v3 (lifecycle)")]
-        NUnit3Lifecycle = 16,
     }
 }
diff --git a/src/Unitverse.Core/Strategies/ClassGeneration/AbstractClassGenerationStrategy.cs b/src/Unitverse.Core/Strategies/ClassGeneration/AbstractClassGenerationStrategy.cs
@@ -54,9 +54,10 @@ public ClassDeclarationSyntax Create(ClassModel model)
             var classDeclaration = SyntaxFactory.ClassDeclaration(targetTypeName);
 
             classDeclaration = classDeclaration.AddModifiers(SyntaxFactory.Token(SyntaxKind.PublicKeyword));
-            if (_frameworkSet.TestFramework.TestClassAttributes != null)
+            if (!string.IsNullOrWhiteSpace(_frameworkSet.TestFramework.TestClassAttribute))
             {
-                classDeclaration = classDeclaration.AddAttributeLists(_frameworkSet.TestFramework.TestClassAttributes.AsList());
+                var testFixtureAtt = Generate.Attribute(_frameworkSet.TestFramework.TestClassAttribute);
+                classDeclaration = classDeclaration.AddAttributeLists(testFixtureAtt.AsList());
             }
 
             classDeclaration = classDeclaration.AddMembers(GenerateConcreteInheritor(model));

diff --git a/src/Unitverse.Core/Strategies/ClassGeneration/StandardClassGenerationStrategy.cs b/src/Unitverse.Core/Strategies/ClassGeneration/StandardClassGenerationStrategy.cs
@@ -53,9 +53,10 @@ public ClassDeclarationSyntax Create(ClassModel model)
             var classDeclaration = SyntaxFactory.ClassDeclaration(targetTypeName);
 
             classDeclaration = classDeclaration.AddModifiers(SyntaxFactory.Token(SyntaxKind.PublicKeyword));
-            if (_frameworkSet.TestFramework.TestClassAttributes != null)
+            if (!string.IsNullOrWhiteSpace(_frameworkSet.TestFramework.TestClassAttribute))
             {
-                classDeclaration = classDeclaration.AddAttributeLists(_frameworkSet.TestFramework.TestClassAttributes.AsList());
+                var testFixtureAtt = Generate.Attribute(_frameworkSet.TestFramework.TestClassAttribute);
+                classDeclaration = classDeclaration.AddAttributeLists(testFixtureAtt.AsList());
             }
 
             var variableDeclaration = SyntaxFactory.VariableDeclaration(model.TypeSyntax)

diff --git a/src/Unitverse.Core/Strategies/ClassGeneration/StaticClassGenerationStrategy.cs b/src/Unitverse.Core/Strategies/ClassGeneration/StaticClassGenerationStrategy.cs
@@ -69,9 +69,10 @@ public ClassDeclarationSyntax Create(ClassModel model)
                 classDeclaration = classDeclaration.AddMembers(field);
             }
 
-            if (_frameworkSet.TestFramework.TestClassAttributes != null)
+            if (!string.IsNullOrWhiteSpace(_frameworkSet.TestFramework.TestClassAttribute))
             {
-                classDeclaration = classDeclaration.AddAttributeLists(_frameworkSet.TestFramework.TestClassAttributes.AsList());
+                var testFixtureAtt = Generate.Attribute(_frameworkSet.TestFramework.TestClassAttribute);
+                classDeclaration = classDeclaration.AddAttributeLists(testFixtureAtt.AsList());
             }
 
             return classDeclaration;

diff --git a/src/Unitverse.ExampleGenerator/Examples.Designer.cs b/src/Unitverse.ExampleGenerator/Examples.Designer.cs
diff --git a/src/Unitverse.ExampleGenerator/Examples.resx b/src/Unitverse.ExampleGenerator/Examples.resx
@@ -151,9 +151,6 @@
   <data name="FrameworksNUnitFakeItEasy" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\FrameworksNUnitFakeItEasy.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="FrameworksNUnitLifecycleNSubstitute" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\FrameworksNUnitLifecycleNSubstitute.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
   <data name="FrameworksXUnitJustMock" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\FrameworksXUnitJustMock.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>