Improved sample

NikolayPianikov · NikolayPianikov · commit 4a4d5ec57e02 · 2024-06-26T23:04:34.000+03:00
diff --git a/CSharpInteractive.HostApi/BuildMessage.cs b/CSharpInteractive.HostApi/BuildMessage.cs
@@ -78,7 +78,7 @@ private static bool TryGetTestState(string? name, out TestState state)
         switch(name?.ToLowerInvariant()) 
         {
             case "testfinished":
-                state = TestState.Passed;
+                state = TestState.Finished;
                 return true;
                 
             case "testignored":
diff --git a/CSharpInteractive.HostApi/TestState.cs b/CSharpInteractive.HostApi/TestState.cs
@@ -2,7 +2,7 @@ namespace HostApi;
 
 public enum TestState
 {
-    Passed,
+    Finished,
     Failed,
     Ignored
 }
diff --git a/CSharpInteractive.Tests/BuildContextTests.cs b/CSharpInteractive.Tests/BuildContextTests.cs
@@ -88,7 +88,7 @@ public void ShouldProcessTestFinished()
         test.DisplayName.ShouldBe("Test1");
         test.FullyQualifiedName.ShouldBe("Full Test1");
         test.Duration.ShouldBe(TimeSpan.FromMilliseconds(123));
-        test.State.ShouldBe(TestState.Passed);
+        test.State.ShouldBe(TestState.Finished);
         test.Message.ShouldBeEmpty();
         test.Details.ShouldBeEmpty();
         test.Output.ShouldBe(new[]
diff --git a/CSharpInteractive.Tests/BuildResultTests.cs b/CSharpInteractive.Tests/BuildResultTests.cs
@@ -29,7 +29,7 @@ public void ShouldSupportToString(string shortName, int? exitCode, int errors, i
                 .WithTests(
                     GetTests(TestState.Failed, failedTests)
                         .Concat(GetTests(TestState.Ignored, ignoredTests))
-                        .Concat(GetTests(TestState.Passed, passedTests))
+                        .Concat(GetTests(TestState.Finished, passedTests))
                         .ToArray());
 
         // When
diff --git a/CSharpInteractive.Tests/UsageScenarios/DotNetBuildScenario.cs b/CSharpInteractive.Tests/UsageScenarios/DotNetBuildScenario.cs
@@ -36,7 +36,7 @@ public void Run()
         result = new DotNetTest().WithWorkingDirectory("MyLib").Build();
         result.ExitCode.ShouldBe(0);
         result.Summary.Tests.ShouldBe(1);
-        result.Tests.Count(test => test.State == TestState.Passed).ShouldBe(1);
+        result.Tests.Count(test => test.State == TestState.Finished).ShouldBe(1);
         // }
     }
 }
diff --git a/CSharpInteractive.Tests/UsageScenarios/DotNetMSBuildVSTestScenario.cs b/CSharpInteractive.Tests/UsageScenarios/DotNetMSBuildVSTestScenario.cs
@@ -33,7 +33,7 @@ public void Run()
         // The "result" variable provides details about a build
         result.ExitCode.ShouldBe(0);
         result.Summary.Tests.ShouldBe(1);
-        result.Tests.Count(test => test.State == TestState.Passed).ShouldBe(1);
+        result.Tests.Count(test => test.State == TestState.Finished).ShouldBe(1);
         // }
     }
 }
diff --git a/CSharpInteractive.Tests/UsageScenarios/DotNetTestScenario.cs b/CSharpInteractive.Tests/UsageScenarios/DotNetTestScenario.cs
@@ -30,7 +30,7 @@ public void Run()
         // The "result" variable provides details about a build
         result.ExitCode.ShouldBe(0);
         result.Summary.Tests.ShouldBe(1);
-        result.Tests.Count(test => test.State == TestState.Passed).ShouldBe(1);
+        result.Tests.Count(test => test.State == TestState.Finished).ShouldBe(1);
         // }
     }
 }
diff --git a/CSharpInteractive.Tests/UsageScenarios/DotNetTestWithDotCoverScenario.cs b/CSharpInteractive.Tests/UsageScenarios/DotNetTestWithDotCoverScenario.cs
@@ -54,7 +54,7 @@ public void Run()
 
         // The "result" variable provides details about a build
         result.ExitCode.ShouldBe(0);
-        result.Tests.Count(i => i.State == TestState.Passed).ShouldBe(1);
+        result.Tests.Count(i => i.State == TestState.Finished).ShouldBe(1);
         
         // Generates a HTML code coverage report.
         exitCode = new DotNetCustom("dotCover", "report", $"--source={dotCoverSnapshot}", $"--output={dotCoverReport}", "--reportType=HTML").Run();
diff --git a/CSharpInteractive.Tests/UsageScenarios/DotNetVSTestScenario.cs b/CSharpInteractive.Tests/UsageScenarios/DotNetVSTestScenario.cs
@@ -38,7 +38,7 @@ public void Run()
         // The "result" variable provides details about a build
         result.ExitCode.ShouldBe(0);
         result.Summary.Tests.ShouldBe(1);
-        result.Tests.Count(test => test.State == TestState.Passed).ShouldBe(1);
+        result.Tests.Count(test => test.State == TestState.Finished).ShouldBe(1);
         // }
     }
 }
diff --git a/CSharpInteractive/BuildContext.cs b/CSharpInteractive/BuildContext.cs
@@ -85,7 +85,7 @@ private IEnumerable<BuildMessage> OnTestFinished(IServiceMessage message)
         }
 
         
-        _tests.Add(BuildMessage.CreateResult(testKey, message, TestState.Passed).WithDuration(duration).WithOutput(ctx.Output));
+        _tests.Add(BuildMessage.CreateResult(testKey, message, TestState.Finished).WithDuration(duration).WithOutput(ctx.Output));
     }
 
     private IEnumerable<BuildMessage> OnTestIgnored(IServiceMessage message)
diff --git a/CSharpInteractive/BuildResult.cs b/CSharpInteractive/BuildResult.cs
@@ -78,7 +78,7 @@ group testResult by (AssemblyName: testResult.SuiteName, testResult.Name)
             // ReSharper disable once SwitchStatementHandlesSomeKnownEnumValuesWithDefault
             switch (test.State)
             {
-                case TestState.Passed:
+                case TestState.Finished:
                     passedTests++;
                     break;
 
diff --git a/Samples/MySampleLib/Build/Program.cs b/Samples/MySampleLib/Build/Program.cs
@@ -20,7 +20,7 @@
 }
 
 var testResult = new DotNetTest()
-    .WithShortName("Test")
+    .WithShortName("Tests")
     .WithNoBuild(true)
     .WithConfiguration(configuration)
     .Build(i =>
@@ -29,20 +29,20 @@
         {
             switch (testResult.State)
             {
-                case TestState.Passed:
-                    Info($"{testResult.FullyQualifiedName} - OK");
+                case TestState.Failed:
+                    Error($"{testResult.FullyQualifiedName}: {testResult.State}");
                     break;
                 
-                case TestState.Failed:
-                    Error($"{testResult.FullyQualifiedName} - Failed");
+                case TestState.Ignored:
+                    Warning($"{testResult.FullyQualifiedName}: {testResult.State}");
                     break;
             }
         }
     });
 
 if (testResult.ExitCode != 0)
 {
-    Error("Test failed.");
+    Error("Tests failed.");
     return 1;
 }
 
diff --git a/Samples/MySampleLib/MySampleLib.Tests/MySampleLibTests.cs b/Samples/MySampleLib/MySampleLib.Tests/MySampleLibTests.cs
@@ -30,4 +30,10 @@ public void ShouldSub()
         // Then
         Assert.AreEqual(1, result);
     }
+    
+    [TestMethod]
+    [Ignore]
+    public void ShouldDiv()
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private static bool TryGetTestState(string? name, out TestState state)`
`78`	`78`	`switch(name?.ToLowerInvariant())`
`79`	`79`	`{`
`80`	`80`	`case "testfinished":`
`81`		`- state = TestState.Passed;`
	`81`	`+ state = TestState.Finished;`
`82`	`82`	`return true;`
`83`	`83`
`84`	`84`	`case "testignored":`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ namespace HostApi;`
`2`	`2`
`3`	`3`	`public enum TestState`
`4`	`4`	`{`
`5`		`- Passed,`
	`5`	`+ Finished,`
`6`	`6`	`Failed,`
`7`	`7`	`Ignored`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void Run()`
`36`	`36`	`result = new DotNetTest().WithWorkingDirectory("MyLib").Build();`
`37`	`37`	`result.ExitCode.ShouldBe(0);`
`38`	`38`	`result.Summary.Tests.ShouldBe(1);`
`39`		`- result.Tests.Count(test => test.State == TestState.Passed).ShouldBe(1);`
	`39`	`+ result.Tests.Count(test => test.State == TestState.Finished).ShouldBe(1);`
`40`	`40`	`// }`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void Run()`
`33`	`33`	`// The "result" variable provides details about a build`
`34`	`34`	`result.ExitCode.ShouldBe(0);`
`35`	`35`	`result.Summary.Tests.ShouldBe(1);`
`36`		`- result.Tests.Count(test => test.State == TestState.Passed).ShouldBe(1);`
	`36`	`+ result.Tests.Count(test => test.State == TestState.Finished).ShouldBe(1);`
`37`	`37`	`// }`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public void Run()`
`30`	`30`	`// The "result" variable provides details about a build`
`31`	`31`	`result.ExitCode.ShouldBe(0);`
`32`	`32`	`result.Summary.Tests.ShouldBe(1);`
`33`		`- result.Tests.Count(test => test.State == TestState.Passed).ShouldBe(1);`
	`33`	`+ result.Tests.Count(test => test.State == TestState.Finished).ShouldBe(1);`
`34`	`34`	`// }`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void Run()`
`38`	`38`	`// The "result" variable provides details about a build`
`39`	`39`	`result.ExitCode.ShouldBe(0);`
`40`	`40`	`result.Summary.Tests.ShouldBe(1);`
`41`		`- result.Tests.Count(test => test.State == TestState.Passed).ShouldBe(1);`
	`41`	`+ result.Tests.Count(test => test.State == TestState.Finished).ShouldBe(1);`
`42`	`42`	`// }`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ private IEnumerable<BuildMessage> OnTestFinished(IServiceMessage message)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`
`88`		`- _tests.Add(BuildMessage.CreateResult(testKey, message, TestState.Passed).WithDuration(duration).WithOutput(ctx.Output));`
	`88`	`+ _tests.Add(BuildMessage.CreateResult(testKey, message, TestState.Finished).WithDuration(duration).WithOutput(ctx.Output));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`private IEnumerable<BuildMessage> OnTestIgnored(IServiceMessage message)`