Don't mark points to non test methods

Author: aromaa

Core/Core.csproj

@@ -19,6 +19,7 @@
     <PackageReference Include="Microsoft.Build" Version="16.5.0">
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
+    <PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
     <PackageReference Include="xunit.runner.utility" Version="2.4.1" />
   </ItemGroup>
 

Core/Data/TestProjectData.cs

@@ -6,6 +6,7 @@
 using System.Runtime.Loader;
 using System.Text;
 using TestMyCode.CSharp.API.Attributes;
+using Xunit;
 
 namespace TestMyCode.CSharp.Core.Data
 {
@@ -58,8 +59,18 @@ private void FindPoints(Assembly assembly)
             {
                 PointsAttribute? typeAttribute = type.GetCustomAttribute<PointsAttribute>();
 
-                foreach (MethodInfo methodInfo in type.GetMethods())
+                foreach (MethodInfo methodInfo in type.GetMethods(BindingFlags.Instance
+                                                                  | BindingFlags.Static //xUnit allows static methods
+                                                                  | BindingFlags.Public
+                                                                  | BindingFlags.NonPublic)) //xUnit allows private methods
                 {
+                    //TheoryAttribute inherits from FactAttribute
+                    FactAttribute? factAttribute = methodInfo.GetCustomAttribute<FactAttribute>();
+                    if (factAttribute is null)
+                    {
+                        continue;
+                    }
+
                     PointsAttribute? methodAttribute = methodInfo.GetCustomAttribute<PointsAttribute>();
                     if (typeAttribute is null && methodAttribute is null)
                     {

TestAssembly/TestPoints.cs

@@ -9,15 +9,24 @@ namespace TestMyCode.CSharp.TestAssembly
     [Points("1")]
     public class TestPoints
     {
+        [Fact]
         [Points("1.3")]
         public void TestWithPoints()
         {
 
         }
 
+        [Fact]
         public void TestWithoutPoints()
         {
 
+        }
+
+#pragma warning disable xUnit1013 // Public method should be marked as test
+        public void NotActuallyTestNoPoints()
+#pragma warning restore xUnit1013 // Public method should be marked as test
+        {
+
         }
     }
 }

Tests/Points/TestPoints.cs

@@ -20,11 +20,15 @@ public TestPoints()
         [Theory]
         [InlineData(typeof(TestAssembly.TestPoints), nameof(TestAssembly.TestPoints.TestWithPoints), new[] { "1", "1.3" })]
         [InlineData(typeof(TestAssembly.TestPoints), nameof(TestAssembly.TestPoints.TestWithoutPoints), new[] { "1" })]
+        [InlineData(typeof(TestAssembly.TestPoints), nameof(TestAssembly.TestPoints.NotActuallyTestNoPoints), null)]
+        [InlineData(typeof(TestAssembly.TestPoints), nameof(TestAssembly.TestPoints.Equals), null)]
         public void ClassHasPoints(Type methodClass, string methodName, string[] expect)
         {
-            HashSet<string> points = this.TestProjectData.Points[$"{methodClass.FullName}.{methodName}"];
+            string key = $"{methodClass.FullName}.{methodName}";
 
-            Assert.Equal(points, expect);
+            this.TestProjectData.Points.TryGetValue(key, out HashSet<string> methodPoints);
+
+            Assert.Equal(expect, methodPoints);
         }
     }
 }