Merge pull request #25 from dotnet-campus/t/lindexi/FixNotFoundName

修复找不到测试方法

Author: walterlv

.github/workflows/dotnet-build.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
@@ -23,6 +23,8 @@ jobs:
             3.1.x
             5.0.x
             6.0.x
+            8.0.x
+            9.0.x
 
       - name: Build
         run: dotnet build --configuration $env:Configuration

.github/workflows/nuget-push.yml

@@ -10,7 +10,13 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: Install tool
+        run: dotnet tool install -g dotnetCampus.TagToVersion
+
+      - name: Set tag to version
+        run: dotnet TagToVersion -t ${{ github.ref }}  
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
@@ -19,14 +25,10 @@ jobs:
             3.1.x
             5.0.x
             6.0.x
-
-      - name: Install tool
-        run: dotnet tool install -g dotnetCampus.TagToVersion
-
-      - name: Set tag to version
-        run: dotnet TagToVersion -t ${{ github.ref }}  
+            8.0.x
+            9.0.x
         
       - name: Pack
         run: dotnet build --configuration Release
       - name: Push
-        run: dotnet nuget push .\bin\Release\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NugetKey }} --skip-duplicate --no-symbols 1
+        run: dotnet nuget push .\bin\Release\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NugetKey }} --skip-duplicate

Directory.Build.props

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <Import Project="build\Version.props" />
   <PropertyGroup>
     <PackageOutputPath>$(MSBuildThisFileDirectory)bin\$(Configuration)</PackageOutputPath>
@@ -8,12 +8,25 @@
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>source;dotnet;nuget;msbuild</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryUrl>https://github.com/dotnet-campus/CUnit.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageProjectUrl>https://github.com/dotnet-campus/CUnit</PackageProjectUrl>
+    <Copyright>Copyright (c) 2018-$([System.DateTime]::Now.ToString(`yyyy`)) dotnet职业技术学院</Copyright>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <!-- 输出 pdb 文件 NuGet 包 -->
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+
+    <!-- 输出符号文件 -->
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <PropertyGroup>
     <PackageIcon>icon.png</PackageIcon>
   </PropertyGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath=""/>
+    <None Include="..\..\README.md" Link="README.md" Pack="True" PackagePath="\"/>
   </ItemGroup>
+
 </Project>

MSTest.Extensions.sln

@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_SolutionItems", "_Solution
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		build\code-style.ruleset = build\code-style.ruleset
+		Directory.Build.props = Directory.Build.props
 		LICENSE = LICENSE
 	EndProjectSection
 EndProject

demo/dotnetCampus.UITest.WPF.Demo/dotnetCampus.UITest.WPF.Demo.csproj

@@ -22,9 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="coverlet.collector" Version="3.1.0" />
   </ItemGroup>
 

src/MSTest.Extensions/Contracts/ContractTest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
 using MSTest.Extensions.Core;
@@ -24,7 +24,7 @@ public static void Test([NotNull] this string contract, [NotNull] Action testCas
             if (testCase == null) throw new ArgumentNullException(nameof(testCase));
             Contract.EndContractBlock();
 
-            Method.Current.Add(new ContractTestCase(contract, testCase));
+            Method.AddToCurrent(new ContractTestCase(contract, testCase));
         }
 
         /// <summary>
@@ -39,7 +39,7 @@ public static void Test([NotNull] this string contract, [NotNull] Func<Task> tes
             if (testCase == null) throw new ArgumentNullException(nameof(testCase));
             Contract.EndContractBlock();
 
-            Method.Current.Add(new ContractTestCase(contract, testCase));
+            Method.AddToCurrent(new ContractTestCase(contract, testCase));
         }
 
         #endregion

src/MSTest.Extensions/Contracts/ContractTestCaseAttribute.cs

@@ -1,13 +1,16 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using MSTest.Extensions.Core;
+using MSTest.Extensions.Utils;
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Reflection;
+using System.Security.Cryptography;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MSTest.Extensions.Core;
-using MSTest.Extensions.Utils;
 
 // ## How it works?
 // 
@@ -80,12 +83,9 @@ public IEnumerable<object[]> GetData([NotNull] MethodInfo methodInfo)
             Contract.EndContractBlock();
 
             // Collect all test cases from the target unit test method.
-            Collect(methodInfo);
-
-            var cases = ContractTest.Method[methodInfo];
-            VerifyContracts(cases);
+            var cases = Collect(methodInfo);
 
-            return Enumerable.Range(0, cases.Count).Select(x => (object[]) null);
+            return cases.Select(t => new object[] { t });
         }
 
         /// <summary>
@@ -96,9 +96,13 @@ public IEnumerable<object[]> GetData([NotNull] MethodInfo methodInfo)
         /// <param name="data">The parameter list which was returned by <see cref="GetData"/>.</param>
         /// <returns>The display name of this test case.</returns>
         [NotNull]
-        public string GetDisplayName([NotNull] MethodInfo methodInfo, [NotNull] object[] data)
+        public string GetDisplayName([NotNull] MethodInfo methodInfo, [CanBeNull] object[] data)
         {
-            return ContractTest.Method[methodInfo][_testCaseIndex++].DisplayName;
+            Contract.Requires(methodInfo != null, "The method must not be null.");
+
+            return data is not null && data.Length > 0 && data[0] is ITestCase testCase
+                ? testCase.DisplayName
+                : methodInfo.Name;
         }
 
         #endregion
@@ -107,14 +111,18 @@ public string GetDisplayName([NotNull] MethodInfo methodInfo, [NotNull] object[]
 
         [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")]
         [SuppressMessage("ReSharper", "PossibleNullReferenceException")]
-        private static void Collect([NotNull] MethodInfo methodInfo)
+        [NotNull]
+        private static IReadOnlyList<ITestCase> Collect([NotNull] MethodInfo methodInfo)
         {
             var type = methodInfo.DeclaringType;
             Contract.Requires(type != null,
                 "The method must be declared in a type. If this exception happened, there might be a bug in MSTest v2.");
 
             var testInstance = Activator.CreateInstance(type);
-            var testCaseList = ContractTest.Method[methodInfo];
+
+          
+            var testCaseList = new List<ITestCase>();
+            ContractTest.Method.SetCurrentCollection(methodInfo, testCaseList);
             try
             {
                 // Invoke target test method to collect all test cases.
@@ -155,13 +163,16 @@ Try to call Test extension method to collect one.
 
 If you only need to write a normal test method, use `TestMethodAttribute` instead of `ContractTestCaseAttribute`."));
             }
+
+            VerifyContracts(testCaseList);
+            return testCaseList;
         }
 
         /// <summary>
         /// Find out the test cases which have the same contract string, add a special exception to it.
         /// </summary>
         /// <param name="cases">The test cases of a single test method.</param>
-        private void VerifyContracts([NotNull] IList<ITestCase> cases)
+        private static void VerifyContracts([NotNull] List<ITestCase> cases)
         {
             var caseContractSet = new HashSet<string>();
             var duplicatedCases = new HashSet<ITestCase>();
@@ -200,13 +211,6 @@ 1. Please check whether you have created two test cases which have the same cont
 
         #endregion
 
-        /// <summary>
-        /// Gets or increment the current test case index.
-        /// <see cref="Execute"/> and <see cref="GetDisplayName"/> should increment it separately
-        /// because they are not in the same instance.
-        /// </summary>
-        private int _testCaseIndex;
-
         /// <summary>
         /// the proxy of ITestMethod(TestMethodInfo in fact)
         /// overwrite the invoke method

src/MSTest.Extensions/Contracts/ContractTestContext.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.Contracts;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -97,7 +97,7 @@ public ContractTestContext<T> WithArguments([CanBeNullWhenTIsSingle] params T[]
                 }
 
                 // Add an argument test case to the test case list.
-                ContractTest.Method.Current.Add(new ContractTestCase(contract, () => _testCase(t)));
+                ContractTest.Method.AddToCurrent(new ContractTestCase(contract, () => _testCase(t)));
             }
 
             return this;
@@ -120,7 +120,7 @@ private string ForT<TInput>([CanBeNull] TInput value)
         [NotNull, PublicAPI]
         public ContractTestContext<T> WithArguments(T t)
         {
-            ContractTest.Method.Current.Add(new ContractTestCase(
+            ContractTest.Method.AddToCurrent(new ContractTestCase(
                 string.Format(_contract, t), () => _testCase(t)));
             return this;
         }

src/MSTest.Extensions/Core/ContractTestCase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Globalization;
@@ -129,8 +129,8 @@ internal async Task<TestResult> ExecuteAsync()
                         if (ContractTestConfiguration.MustSTAThread &&
                             Thread.CurrentThread.GetApartmentState() != ApartmentState.STA)
                         {
-                            // 强行要求 STA 且当前运行非 STA 线程的情况，就需要进行切换线程
-                            // 这里是单元测试，就可以无视性能问题哈
+                            // 强行要求 STA 且当前运行非 STA 线程的情况，就需要进行切换线程
+                            // 这里是单元测试，就可以无视性能问题哈
                             var thread = new Thread(() =>
                             {
                                 try
@@ -139,7 +139,7 @@ internal async Task<TestResult> ExecuteAsync()
                                 }
                                 catch (Exception e)
                                 {
-                                    // 不能抛到后台线程去
+                                    // 不能抛到后台线程去
                                     exception = e;
                                 }
                             });
@@ -155,7 +155,7 @@ internal async Task<TestResult> ExecuteAsync()
                     }
                     catch (AggregateException ex)
                     {
-                        // If this test case is an async method, extract the inner excetion.
+                        // If this test case is an async method, extract the inner exception.
                         exception = ex.InnerExceptions.Count == 1 ? ex.InnerException : ex;
                     }
                     catch (Exception ex)