Merge branch 'master' into fix-scenario-cfg-command

Advance-Technologies-Foundation · Aug 15, 2024 · 29f3410 · 29f3410
2 parents 917ca9a + 70d9dac
commit 29f3410
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,10 +20,11 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: powershell
         run: |
-          dotnet test .\clio.tests\clio.tests.csproj -nowarn:none `
-          /p:CollectCoverage=true /p:CoverletOutputFormat=opencover `
-          /p:CoverletOutput=".\..\TestResults\coverage.opencover.xml";
-          dotnet build-server shutdown;
+            $ErrorActionPreference = 'Stop'
+            dotnet test .\clio.tests\clio.tests.csproj -nowarn:none `
+            /p:CollectCoverage=true /p:CoverletOutputFormat=opencover `
+            /p:CoverletOutput=".\..\TestResults\coverage.opencover.xml";
+
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any

diff --git a/clio.tests/Command/SchemaBuilderTestFixture.cs b/clio.tests/Command/SchemaBuilderTestFixture.cs
@@ -9,8 +9,7 @@
 
 namespace Clio.Tests.Command;
 
-public class SchemaBuilderTestFixture : BaseClioModuleTests
-{
+public class SchemaBuilderTestFixture : BaseClioModuleTests {
 
 	#region Constants: Private
 
@@ -22,7 +21,7 @@ public class SchemaBuilderTestFixture : BaseClioModuleTests
 
 	#region Methods: Private
 
-	private void AssertOnDescriptor(string descriptorPath){
+	private void AssertOnDescriptor(string descriptorPath) {
 		string dContent = FileSystem.File.ReadAllText(descriptorPath);
 		JObject obj = JObject.Parse(dContent);
 		string schemaUid = (string)obj.SelectToken("$.Descriptor.UId");
@@ -35,7 +34,7 @@ private void AssertOnDescriptor(string descriptorPath){
 		modifiedOnUtc.Should().BeAfter(DateTime.MinValue);
 	}
 
-	private void AssertOnMetaData(string metadataPath){
+	private void AssertOnMetaData(string metadataPath) {
 		string dContent = FileSystem.File.ReadAllText(metadataPath);
 		JObject obj = JObject.Parse(dContent);
 
@@ -57,7 +56,7 @@ private void AssertOnMetaData(string metadataPath){
 		HD1.Should().Be(Guid.Parse("50E3ACC0-26FC-4237-A095-849A1D534BD3"));
 	}
 
-	private void AssertOnSchema(string schemaPath){
+	private void AssertOnSchema(string schemaPath) {
 		IPackageInfoProvider pif = Container.Resolve<IPackageInfoProvider>();
 		PackageInfo packageInfo = pif.GetPackageInfo(PackagePath);
 		string content = FileSystem.File.ReadAllText(schemaPath);
@@ -71,7 +70,7 @@ private void AssertOnSchema(string schemaPath){
 
 	#region Methods: Public
 
-	public override void Setup(){
+	public override void Setup() {
 		base.Setup();
 		string tplFileContent = File.ReadAllText("tpl/schemas-template/source-code/Resources/resource.en-US.xml.tpl");
 		FileSystem.AddFile("E:\\Clio\\tpl\\schemas-template\\source-code\\Resources\\resource.en-US.xml.tpl",
@@ -100,6 +99,11 @@ public override void Setup(){
 		WorkingDirectoriesProvider._executingDirectory = "E:\\Clio";
 	}
 
+	[TearDown]
+	public void TearDown() {
+		WorkingDirectoriesProvider._executingDirectory = null;
+	}
+
 	#endregion
 
 	[Test]