Merge pull request #122 from Blazam-App/Beta-Nightly

v0.8.2 Update

.github/workflows/build-dev.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore
       - name: Build application
-        run: dotnet publish -c Release -o bin/publish
+        run: dotnet publish -c Release -o bin/publish BLAZAM/BLAZAM.csproj
       - name: Test application
         run: dotnet test -c Release
 

.github/workflows/build-nightly.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore
       - name: Build application
-        run: dotnet publish -c Release -o bin/publish
+        run: dotnet publish -c Release -o bin/publish BLAZAM/BLAZAM.csproj
       - name: Test application
         run: dotnet test -c Release
 

.github/workflows/deploy-demo.yml

@@ -27,7 +27,7 @@ jobs:
         run: dotnet build --configuration Release
 
       - name: dotnet publish
-        run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp
+        run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp BLAZAM/BLAZAM.csproj
 
       - name: Upload artifact for deployment job
         uses: actions/upload-artifact@v2

.github/workflows/release-stable.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore
       - name: Build application
-        run: dotnet publish -c Release -o bin\Publish
+        run: dotnet publish -c Release -o bin\Publish BLAZAM/BLAZAM.csproj
       - name: Set assembly version as environment variable
         shell: pwsh
         id: get_version

.gitignore

@@ -368,3 +368,5 @@ FodyWeavers.xsd
 /BLAZAM/appsettings.json
 /Setup/BLAZAM.msi
 /BLAZAM/database.db
+/BLAZAM/database - Copy.db
+/BLAZAM/export

BLAZAM.Tests/BLAZAM.Tests.csproj

@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

BLAZAM.Tests/FileSystem/FileSystemBaseTests.cs

@@ -0,0 +1,123 @@
+using BLAZAM.FileSystem;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.AccessControl;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLAZAM.Tests.FileSystem
+{
+    public class FileSystemBaseTests
+    {
+        [Fact]
+        public void Constructor_ThrowsArgumentException_WhenPathIsNull()
+        {
+            // Arrange
+            string path = null;
+
+            // Act and Assert
+            Assert.Throws<ArgumentException>(() => new FileSystemBase(path));
+        }
+
+        [Fact]
+        public void Constructor_ReplacesTempVariable_WhenPathContainsTemp()
+        {
+            // Arrange
+            string path = "%temp%\\test.txt";
+
+            // Act
+            var fileSystemBase = new FileSystemBase(path);
+
+            // Assert
+            Assert.Equal(Path.GetTempPath() + "test.txt", fileSystemBase.Path);
+        }
+
+        [Fact]
+        public void Constructor_SetsFullPath_WhenPathIsRelative()
+        {
+            // Arrange
+            string path = "..\\test.txt";
+
+            // Act
+            var fileSystemBase = new FileSystemBase(path);
+
+            // Assert
+            Assert.Equal(Path.GetFullPath(path), fileSystemBase.Path);
+        }
+
+        [Fact]
+        public void Writable_ReturnsTrue_WhenFileHasWritePermission()
+        {
+            // Arrange
+            string path = Path.GetTempFileName();
+            var fileSystemBase = new FileSystemBase(path);
+
+            // Act
+            bool writable = fileSystemBase.Writable;
+
+            // Assert
+            Assert.True(writable);
+
+            // Clean up
+            File.Delete(path);
+        }
+        //TODO Fix checking when no write permission
+        //[Fact]
+        //public void Writable_ReturnsFalse_WhenFileHasNoWritePermission()
+        //{
+        //    // Arrange
+        //    string path = Path.GetTempFileName();
+        //    var fileSystemBase = new FileSystemBase(path);
+
+        //    // Deny write permission to the file
+        //    var ac = new FileInfo(path).GetAccessControl();
+        //    ac.AddAccessRule(new FileSystemAccessRule(Environment.UserName, FileSystemRights.Write, AccessControlType.Deny));
+        //    new FileInfo(path).SetAccessControl(ac);
+
+        //    // Act
+        //    bool writable = fileSystemBase.Writable;
+
+        //    // Assert
+        //    Assert.False(writable);
+
+        //    // Clean up
+        //    File.Delete(path);
+        //}
+
+        [Fact]
+        public void GetHashCode_ReturnsPathHashCode()
+        {
+            // Arrange
+            string path = Path.GetTempFileName();
+            var fileSystemBase = new FileSystemBase(path);
+
+            // Act
+            int hashCode = fileSystemBase.GetHashCode();
+
+            // Assert
+            Assert.Equal(path.GetHashCode(), hashCode);
+
+            // Clean up
+            File.Delete(path);
+        }
+
+        [Fact]
+        public void ToString_ReturnsPath()
+        {
+            // Arrange
+            string path = Path.GetTempFileName();
+            var fileSystemBase = new FileSystemBase(path);
+
+            // Act
+            string toString = fileSystemBase.ToString();
+
+            // Assert
+            Assert.Equal(path, toString);
+
+            // Clean up
+            File.Delete(path);
+        }
+    }
+
+}

BLAZAM.Tests/Mocks/Mock_HttpClientFactory.cs

@@ -10,7 +10,8 @@ internal class Mock_HttpClientFactory : IHttpClientFactory
     {
         public HttpClient CreateClient(string name)
         {
-            return HttpClientFactory.Create();
+            HttpClient client = new HttpClient();
+            return client;
         }
     }
 }

BLAZAM.Tests/Mocks/Mock_UpdateService.cs

@@ -1,17 +1,28 @@
-using BLAZAM.Server.Data.Services.Update;
+
+using BLAZAM.Common.Data;
+using BLAZAM.FileSystem;
+using BLAZAM.Update.Services;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace BLAZAM.Tests.Mocks
 {
     internal class Mock_UpdateService : UpdateService
     {
-        public Mock_UpdateService() : base(new Mock_HttpClientFactory())
+        public Mock_UpdateService() : base(new Mock_HttpClientFactory(), new()
         {
-
+            ApplicationRoot = new SystemDirectory("C:\\temp"),
+            RunningProcess = Process.GetCurrentProcess(),
+            RunningVersion = new ApplicationVersion("0.0.1"),
+             TempDirectory = new SystemDirectory("C:\\temp")
+        },null)
+        {
+
             SelectedBranch = "Stable";
         }
     }

BLAZAM.Tests/Updates/UpdateTests.cs

@@ -1,5 +1,6 @@
-using BLAZAM.Server.Data.Services.Update;
+
 using BLAZAM.Tests.Mocks;
+using BLAZAM.Update;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -46,7 +47,7 @@ private async void Update_Stages_OK(ApplicationUpdate latest)
         private async void Update_Cleanup_OK(ApplicationUpdate latest)
         {
 
-            latest.CleanStaging();
+            await latest.CleanStaging();
             latest.UpdateFile.Delete();
             Assert.True(!latest.UpdateFile.Exists);
             Assert.True(latest.UpdateStagingDirectory.Files.Count == 0);

BLAZAM.Tests/Updates/VersionTests.cs

@@ -1,5 +1,6 @@
-using BLAZAM.Server.Data;
-using BLAZAM.Server.Data.Services.Update;
+using BLAZAM.Common.Data;
+using BLAZAM.Server.Data;
+using BLAZAM.Update;
 using System;
 using System.Collections.Generic;
 using System.Linq;