Clarify naming

bradwilson · bradwilson · commit 8b0b13ca02e8 · 2024-05-06T11:28:09.000-07:00
diff --git a/test/test.xunit.execution/Acceptance/Xunit2AcceptanceTests.cs b/test/test.xunit.execution/Acceptance/Xunit2AcceptanceTests.cs
@@ -540,43 +540,43 @@ public void Passing() { }
         [Fact]
         public void ClassWithBrokenFactShouldNotDisruptDiscovery()
         {
-            var msgs = Run<ITestResultMessage>(new[] { typeof(ClassWithBrokenFactAttribute) }).OrderBy(x => x.Test.DisplayName).ToList();
+            var msgs = Run<ITestResultMessage>(new[] { typeof(ClassWithReadOnlySkipFactAttribute) }).OrderBy(x => x.Test.DisplayName).ToList();
 
             Assert.Collection(msgs,
                 msg =>
                 {
-                    Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithBrokenFactAttribute.Test1", msg.Test.DisplayName);
+                    Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithReadOnlySkipFactAttribute.Test1", msg.Test.DisplayName);
                     var skip = Assert.IsAssignableFrom<ITestSkipped>(msg);
                     Assert.Equal("Skipped with Fact", skip.Reason);
                 },
                 msg =>
                 {
-                    Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithBrokenFactAttribute.Test2", msg.Test.DisplayName);
+                    Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithReadOnlySkipFactAttribute.Test2", msg.Test.DisplayName);
                     var fail = Assert.IsAssignableFrom<ITestFailed>(msg);
                     Assert.StartsWith(
                         "Exception during discovery:" + Environment.NewLine +
-                        "System.ArgumentException: Could not set property named 'Skip' on instance of 'Xunit2AcceptanceTests+CustomFacts+SkipFact'" + Environment.NewLine +
+                        "System.ArgumentException: Could not set property named 'Skip' on instance of 'Xunit2AcceptanceTests+CustomFacts+ReadOnlySkipFact'" + Environment.NewLine +
                         "Parameter name: attributeData",
                         fail.Messages.Single()
                     );
                 },
                 msg =>
                 {
-                    Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithBrokenFactAttribute.Test3", msg.Test.DisplayName);
+                    Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithReadOnlySkipFactAttribute.Test3", msg.Test.DisplayName);
                     Assert.IsAssignableFrom<ITestPassed>(msg);
                 }
             );
         }
 
-        class ClassWithBrokenFactAttribute
+        class ClassWithReadOnlySkipFactAttribute
         {
             [Fact(Skip = "Skipped with Fact")]
             public void Test1()
             {
                 Assert.True(false);
             }
 
-            [SkipFact(Skip = "Simple not run, not skipped")]
+            [ReadOnlySkipFact(Skip = "Simple not run, not skipped")]
             public void Test2()
             {
                 Assert.True(false);
@@ -587,7 +587,7 @@ public void Test3()
             { }
         }
 
-        public class SkipFact : FactAttribute
+        public class ReadOnlySkipFact : FactAttribute
         {
             // Property setter here is missing, so trying to use it with the overridden skip message will fail at runtime
             public override string Skip => "Skipped";

Original file line number	Diff line number	Diff line change
`@@ -540,43 +540,43 @@ public void Passing() { }`
`540`	`540`	`[Fact]`
`541`	`541`	`public void ClassWithBrokenFactShouldNotDisruptDiscovery()`
`542`	`542`	`{`
`543`		`- var msgs = Run<ITestResultMessage>(new[] { typeof(ClassWithBrokenFactAttribute) }).OrderBy(x => x.Test.DisplayName).ToList();`
	`543`	`+ var msgs = Run<ITestResultMessage>(new[] { typeof(ClassWithReadOnlySkipFactAttribute) }).OrderBy(x => x.Test.DisplayName).ToList();`
`544`	`544`
`545`	`545`	`Assert.Collection(msgs,`
`546`	`546`	`msg =>`
`547`	`547`	`{`
`548`		`- Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithBrokenFactAttribute.Test1", msg.Test.DisplayName);`
	`548`	`+ Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithReadOnlySkipFactAttribute.Test1", msg.Test.DisplayName);`
`549`	`549`	`var skip = Assert.IsAssignableFrom<ITestSkipped>(msg);`
`550`	`550`	`Assert.Equal("Skipped with Fact", skip.Reason);`
`551`	`551`	`},`
`552`	`552`	`msg =>`
`553`	`553`	`{`
`554`		`- Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithBrokenFactAttribute.Test2", msg.Test.DisplayName);`
	`554`	`+ Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithReadOnlySkipFactAttribute.Test2", msg.Test.DisplayName);`
`555`	`555`	`var fail = Assert.IsAssignableFrom<ITestFailed>(msg);`
`556`	`556`	`Assert.StartsWith(`
`557`	`557`	`"Exception during discovery:" + Environment.NewLine +`
`558`		`- "System.ArgumentException: Could not set property named 'Skip' on instance of 'Xunit2AcceptanceTests+CustomFacts+SkipFact'" + Environment.NewLine +`
	`558`	`+ "System.ArgumentException: Could not set property named 'Skip' on instance of 'Xunit2AcceptanceTests+CustomFacts+ReadOnlySkipFact'" + Environment.NewLine +`
`559`	`559`	`"Parameter name: attributeData",`
`560`	`560`	`fail.Messages.Single()`
`561`	`561`	`);`
`562`	`562`	`},`
`563`	`563`	`msg =>`
`564`	`564`	`{`
`565`		`- Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithBrokenFactAttribute.Test3", msg.Test.DisplayName);`
	`565`	`+ Assert.Equal("Xunit2AcceptanceTests+CustomFacts+ClassWithReadOnlySkipFactAttribute.Test3", msg.Test.DisplayName);`
`566`	`566`	`Assert.IsAssignableFrom<ITestPassed>(msg);`
`567`	`567`	`}`
`568`	`568`	`);`
`569`	`569`	`}`
`570`	`570`
`571`		`- class ClassWithBrokenFactAttribute`
	`571`	`+ class ClassWithReadOnlySkipFactAttribute`
`572`	`572`	`{`
`573`	`573`	`[Fact(Skip = "Skipped with Fact")]`
`574`	`574`	`public void Test1()`
`575`	`575`	`{`
`576`	`576`	`Assert.True(false);`
`577`	`577`	`}`
`578`	`578`
`579`		`- [SkipFact(Skip = "Simple not run, not skipped")]`
	`579`	`+ [ReadOnlySkipFact(Skip = "Simple not run, not skipped")]`
`580`	`580`	`public void Test2()`
`581`	`581`	`{`
`582`	`582`	`Assert.True(false);`
`@@ -587,7 +587,7 @@ public void Test3()`
`587`	`587`	`{ }`
`588`	`588`	`}`
`589`	`589`
`590`		`- public class SkipFact : FactAttribute`
	`590`	`+ public class ReadOnlySkipFact : FactAttribute`
`591`	`591`	`{`
`592`	`592`	`// Property setter here is missing, so trying to use it with the overridden skip message will fail at runtime`
`593`	`593`	`public override string Skip => "Skipped";`