Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor util into separate classes

Browse Source
This commit is contained in:
Caelan
2024-09-21 12:48:05 -06:00
parent cb9447821d
commit 8347f29309
83 changed files with 1104 additions and 1048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/Velopack.CommandLine.Tests/Commands/LocalDownloadCommandTests.cs
View File

@@ -1,4 +1,5 @@
using System.CommandLine;
using Velopack.Util;
using Velopack.Vpk.Commands.Deployment;
namespace Velopack.CommandLine.Tests.Commands;
@@ -9,7 +10,7 @@ public class LocalDownloadCommandTests : BaseCommandTests<LocalDownloadCommand>
{
var command = new LocalDownloadCommand();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
File.Create(Path.Combine(releaseDir, "test.txt")).Close();
ParseResult parseResult = command.ParseAndApply($"--path {releaseDir}");
@@ -22,7 +23,7 @@ public class LocalDownloadCommandTests : BaseCommandTests<LocalDownloadCommand>
public void Path_WithEmptyPath_ParsesValue()
{
var command = new LocalDownloadCommand();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
ParseResult parseResult = command.ParseAndApply($"--path {releaseDir}");

3
test/Velopack.Packaging.Tests/AzureDeploymentTests.cs
View File

@@ -1,6 +1,7 @@
using NuGet.Versioning;
using Velopack.Deployment;
using Velopack.Sources;
using Velopack.Util;
namespace Velopack.Packaging.Tests;
@@ -23,7 +24,7 @@ public class AzureDeploymentTests
{
Skip.If(String.IsNullOrWhiteSpace(AZ_KEY), "VELOPACK_AZ_TEST_TOKEN is not set.");
using var logger = _output.BuildLoggerFor<S3DeploymentTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
string channel = String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("CI"))
? VelopackRuntimeInfo.SystemOs.GetOsShortName()

11
test/Velopack.Packaging.Tests/CompatUtilTests.cs
View File

@@ -1,6 +1,7 @@
using Neovolve.Logging.Xunit;
using Velopack.Packaging.Exceptions;
using Velopack.Packaging.Windows;
using Velopack.Util;
using Velopack.Vpk;
using Velopack.Vpk.Logging;
@@ -35,7 +36,7 @@ public class CompatUtilTests
{
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = GetCompat(out var compat);
using var _1 = Utility.GetTempDirectory(out var dir);
using var _1 = TempUtil.GetTempDirectory(out var dir);
var sample = PathHelper.GetAvaloniaSample();
Exe.InvokeAndThrowIfNonZero(
"dotnet",
@@ -56,7 +57,7 @@ public class CompatUtilTests
{
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = GetCompat(out var compat);
using var _1 = Utility.GetTempDirectory(out var dir);
using var _1 = TempUtil.GetTempDirectory(out var dir);
var sample = PathHelper.GetAvaloniaSample();
Exe.InvokeAndThrowIfNonZero(
"dotnet",
@@ -77,7 +78,7 @@ public class CompatUtilTests
{
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = GetCompat(out var compat);
using var _1 = Utility.GetTempDirectory(out var dir);
using var _1 = TempUtil.GetTempDirectory(out var dir);
var sample = PathHelper.GetWpfSample();
Exe.InvokeAndThrowIfNonZero(
"dotnet",
@@ -97,7 +98,7 @@ public class CompatUtilTests
{
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = GetCompat(out var compat);
using var _1 = Utility.GetTempDirectory(out var dir);
using var _1 = TempUtil.GetTempDirectory(out var dir);
var sample = PathHelper.GetTestRootPath("TestApp");
Exe.InvokeAndThrowIfNonZero(
"dotnet",
@@ -114,7 +115,7 @@ public class CompatUtilTests
{
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = GetCompat(out var compat);
using var _1 = Utility.GetTempDirectory(out var dir);
using var _1 = TempUtil.GetTempDirectory(out var dir);
var sample = PathHelper.GetTestRootPath("TestApp");
Exe.InvokeAndThrowIfNonZero(
"dotnet",

7
test/Velopack.Packaging.Tests/CrossCompile.cs
View File

@@ -1,4 +1,5 @@
using Velopack.Packaging.Unix;
using Velopack.Util;
namespace Velopack.Packaging.Tests;
@@ -20,7 +21,7 @@ public class CrossCompile
var rid = RID.Parse(target);
string id = $"from-{VelopackRuntimeInfo.SystemOs.GetOsShortName()}-targets-{rid.BaseRID.GetOsShortName()}";
using var _1 = Utility.GetTempDirectory(out var tempDir);
using var _1 = TempUtil.GetTempDirectory(out var tempDir);
TestApp.PackTestApp(id, "1.0.0", id, tempDir, logger, targetRid: rid);
var artifactsDir = PathHelper.GetTestRootPath("artifacts");
@@ -84,7 +85,7 @@ public class CrossCompile
var appExe = Path.Combine(appRoot, "current", "TestApp.exe");
var appUpdate = Path.Combine(appRoot, "Update.exe");
Utility.DeleteFileOrDirectoryHard(appRoot);
IoUtil.DeleteFileOrDirectoryHard(appRoot);
Assert.False(File.Exists(appExe));
@@ -102,6 +103,6 @@ public class CrossCompile
Assert.False(File.Exists(appExe));
Assert.True(File.Exists(Path.Combine(appRoot, ".dead")));
Utility.DeleteFileOrDirectoryHard(appRoot);
IoUtil.DeleteFileOrDirectoryHard(appRoot);
}
}

21
test/Velopack.Packaging.Tests/GithubDeploymentTests.cs
View File

@@ -2,6 +2,7 @@
using Velopack.Sources;
using Octokit;
using Velopack.Packaging.Exceptions;
using Velopack.Util;
namespace Velopack.Packaging.Tests;
@@ -22,8 +23,8 @@ public class GithubDeploymentTests
{
Skip.If(String.IsNullOrWhiteSpace(GITHUB_TOKEN), "VELOPACK_GITHUB_TEST_TOKEN is not set.");
using var logger = _output.BuildLoggerFor<GithubDeploymentTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _2 = Utility.GetTempDirectory(out var releaseDir2);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
using var _2 = TempUtil.GetTempDirectory(out var releaseDir2);
using var ghvar = GitHubReleaseTest.Create("nomerge", logger);
var id = "GithubUpdateTest";
TestApp.PackTestApp(id, $"0.0.1-{ghvar.UniqueSuffix}", "t1", releaseDir, logger);
@@ -51,8 +52,8 @@ public class GithubDeploymentTests
{
Skip.If(String.IsNullOrWhiteSpace(GITHUB_TOKEN), "VELOPACK_GITHUB_TEST_TOKEN is not set.");
using var logger = _output.BuildLoggerFor<GithubDeploymentTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _2 = Utility.GetTempDirectory(out var releaseDir2);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
using var _2 = TempUtil.GetTempDirectory(out var releaseDir2);
using var ghvar = GitHubReleaseTest.Create("mixmatched", logger);
var id = "GithubUpdateTest";
TestApp.PackTestApp(id, $"0.0.1-{ghvar.UniqueSuffix}", "t1", releaseDir, logger);
@@ -81,8 +82,8 @@ public class GithubDeploymentTests
{
Skip.If(String.IsNullOrWhiteSpace(GITHUB_TOKEN), "VELOPACK_GITHUB_TEST_TOKEN is not set.");
using var logger = _output.BuildLoggerFor<GithubDeploymentTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _2 = Utility.GetTempDirectory(out var releaseDir2);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
using var _2 = TempUtil.GetTempDirectory(out var releaseDir2);
using var ghvar = GitHubReleaseTest.Create("yesmerge", logger);
var id = "GithubUpdateTest";
TestApp.PackTestApp(id, $"0.0.1-{ghvar.UniqueSuffix}", "t1", releaseDir, logger);
@@ -114,7 +115,7 @@ public class GithubDeploymentTests
Skip.If(String.IsNullOrWhiteSpace(GITHUB_TOKEN), "VELOPACK_GITHUB_TEST_TOKEN is not set.");
using var logger = _output.BuildLoggerFor<GithubDeploymentTests>();
var id = "GithubUpdateTest";
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
var (repoOwner, repoName) = GitHubRepository.GetOwnerAndRepo(GITHUB_REPOURL);
using var ghvar = GitHubReleaseTest.Create("integration", logger);
var releaseName = ghvar.ReleaseName;
@@ -172,7 +173,7 @@ This is just a _test_!
Assert.Equal(newVer, r.Version.ToNormalizedString());
}
using var _2 = Utility.GetTempDirectory(out var releaseDirNew);
using var _2 = TempUtil.GetTempDirectory(out var releaseDirNew);
gh.DownloadLatestFullPackageAsync(new GitHubDownloadOptions {
Token = GITHUB_TOKEN,
RepoUrl = GITHUB_REPOURL,
@@ -189,7 +190,7 @@ This is just a _test_!
{
Skip.If(String.IsNullOrWhiteSpace(GITHUB_TOKEN), "VELOPACK_GITHUB_TEST_TOKEN is not set.");
using var logger = _output.BuildLoggerFor<GithubDeploymentTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
using var ghvar = GitHubReleaseTest.Create("targetCommitish", logger, true);
var (repoOwner, repoName) = GitHubRepository.GetOwnerAndRepo(GITHUB_REPOURL);
var id = "GithubUpdateTest";
@@ -225,7 +226,7 @@ This is just a _test_!
{
Skip.If(String.IsNullOrWhiteSpace(GITHUB_TOKEN), "VELOPACK_GITHUB_TEST_TOKEN is not set.");
using var logger = _output.BuildLoggerFor<GithubDeploymentTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
using var ghvar = GitHubReleaseTest.Create("targetCommitish", logger, true);
var (repoOwner, repoName) = GitHubRepository.GetOwnerAndRepo(GITHUB_REPOURL);
var id = "GithubUpdateTest";

7
test/Velopack.Packaging.Tests/OsxPackTests.cs
View File

@@ -1,5 +1,6 @@
using System.Runtime.Versioning;
using Velopack.Compression;
using Velopack.Util;
namespace Velopack.Packaging.Tests;
@@ -20,9 +21,9 @@ public class OsxPackTests
using var logger = _output.BuildLoggerFor<OsxPackTests>();
using var _1 = Utility.GetTempDirectory(out var tmpOutput);
using var _2 = Utility.GetTempDirectory(out var tmpReleaseDir);
using var _3 = Utility.GetTempDirectory(out var unzipDir);
using var _1 = TempUtil.GetTempDirectory(out var tmpOutput);
using var _2 = TempUtil.GetTempDirectory(out var tmpReleaseDir);
using var _3 = TempUtil.GetTempDirectory(out var unzipDir);
const string id = "MyAppId";
const string title = "MyAppTitle";

15
test/Velopack.Packaging.Tests/ResourceEditTests.cs
View File

@@ -8,6 +8,7 @@ using AsmResolver.PE.Win32Resources.Icon;
using AsmResolver.PE.Win32Resources.Version;
using Velopack.NuGet;
using Velopack.Packaging.Windows;
using Velopack.Util;
namespace Velopack.Packaging.Tests;
@@ -37,7 +38,7 @@ public class ResourceEditTests
public void CommitResourcesInCorrectOrder()
{
using var logger = _output.BuildLoggerFor<ResourceEditTests>();
using var _1 = Utility.GetTempFileName(out var tempFile);
using var _1 = TempUtil.GetTempFileName(out var tempFile);
var exe = PathHelper.GetRustAsset("setup.exe");
File.Copy(exe, tempFile);
@@ -65,7 +66,7 @@ public class ResourceEditTests
{
using var logger = _output.BuildLoggerFor<ResourceEditTests>();
using var _1 = Utility.GetTempFileName(out var tempFile);
using var _1 = TempUtil.GetTempFileName(out var tempFile);
CreateTestPEFileWithoutRsrc(tempFile);
var edit = new ResourceEdit(tempFile, logger);
@@ -81,7 +82,7 @@ public class ResourceEditTests
{
using var logger = _output.BuildLoggerFor<ResourceEditTests>();
using var _1 = Utility.GetTempFileName(out var tempFile);
using var _1 = TempUtil.GetTempFileName(out var tempFile);
var exe = PathHelper.GetFixture("SquirrelAwareTweakedNetCoreApp.exe");
File.Copy(exe, tempFile);
@@ -98,7 +99,7 @@ public class ResourceEditTests
{
using var logger = _output.BuildLoggerFor<ResourceEditTests>();
using var _1 = Utility.GetTempFileName(out var tempFile);
using var _1 = TempUtil.GetTempFileName(out var tempFile);
var exe = PathHelper.GetFixture("atom.exe");
File.Copy(exe, tempFile);
@@ -125,7 +126,7 @@ public class ResourceEditTests
{
using var logger = _output.BuildLoggerFor<ResourceEditTests>();
using var _1 = Utility.GetTempFileName(out var tempFile);
using var _1 = TempUtil.GetTempFileName(out var tempFile);
CreateTestPEFileWithoutRsrc(tempFile);
var beforeRsrc = PEImage.FromFile(PEFile.FromFile(tempFile)).Resources;
@@ -146,7 +147,7 @@ public class ResourceEditTests
public void SetVersionInfoWithPreExistingRsrc()
{
using var logger = _output.BuildLoggerFor<ResourceEditTests>();
using var _1 = Utility.GetTempFileName(out var tempFile);
using var _1 = TempUtil.GetTempFileName(out var tempFile);
var exe = PathHelper.GetFixture("atom.exe");
File.Copy(exe, tempFile);
@@ -165,7 +166,7 @@ public class ResourceEditTests
public void SetVersionInfoWithoutRsrc()
{
using var logger = _output.BuildLoggerFor<ResourceEditTests>();
using var _1 = Utility.GetTempFileName(out var tempFile);
using var _1 = TempUtil.GetTempFileName(out var tempFile);
CreateTestPEFileWithoutRsrc(tempFile);
var nuspec = PathHelper.GetFixture("FullNuspec.nuspec");

3
test/Velopack.Packaging.Tests/S3DeploymentTests.cs
View File

@@ -1,6 +1,7 @@
using NuGet.Versioning;
using Velopack.Deployment;
using Velopack.Sources;
using Velopack.Util;
namespace Velopack.Packaging.Tests;
@@ -23,7 +24,7 @@ public class S3DeploymentTests
{
Skip.If(String.IsNullOrWhiteSpace(B2_SECRET), "VELOPACK_B2_TEST_TOKEN is not set.");
using var logger = _output.BuildLoggerFor<S3DeploymentTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
string channel = String.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("CI"))
? VelopackRuntimeInfo.SystemOs.GetOsShortName()

1
test/Velopack.Packaging.Tests/SimpleJsonTests.cs
View File

@@ -1,7 +1,6 @@
using System.Text.Json.Serialization;
using System.Text.Json;
using NuGet.Versioning;
using Velopack.Json;
using Velopack.Packaging;
using Velopack.Sources;
using JsonPropertyNameAttribute = System.Text.Json.Serialization.JsonPropertyNameAttribute;

1
test/Velopack.Packaging.Tests/TestApp.cs
View File

@@ -1,6 +1,7 @@
using System.Diagnostics;
using Velopack.Packaging.Unix.Commands;
using Velopack.Packaging.Windows.Commands;
using Velopack.Util;
using Velopack.Vpk;
using Velopack.Vpk.Logging;

43
test/Velopack.Packaging.Tests/WindowsPackTests.cs
View File

@@ -8,6 +8,7 @@ using Velopack.Compression;
using Velopack.Packaging.Commands;
using Velopack.Packaging.Exceptions;
using Velopack.Packaging.Windows.Commands;
using Velopack.Util;
using Velopack.Vpk;
using Velopack.Vpk.Logging;
using Velopack.Windows;
@@ -37,9 +38,9 @@ public class WindowsPackTests
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
using var _1 = Utility.GetTempDirectory(out var tmpOutput);
using var _2 = Utility.GetTempDirectory(out var tmpReleaseDir);
using var _3 = Utility.GetTempDirectory(out var unzipDir);
using var _1 = TempUtil.GetTempDirectory(out var tmpOutput);
using var _2 = TempUtil.GetTempDirectory(out var tmpReleaseDir);
using var _3 = TempUtil.GetTempDirectory(out var unzipDir);
var exe = "testapp.exe";
var pdb = Path.ChangeExtension(exe, ".pdb");
@@ -106,8 +107,8 @@ public class WindowsPackTests
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
using var _1 = Utility.GetTempDirectory(out var tmpOutput);
using var _2 = Utility.GetTempDirectory(out var tmpReleaseDir);
using var _1 = TempUtil.GetTempDirectory(out var tmpOutput);
using var _2 = TempUtil.GetTempDirectory(out var tmpReleaseDir);
var exe = "testapp.exe";
var pdb = Path.ChangeExtension(exe, ".pdb");
@@ -139,8 +140,8 @@ public class WindowsPackTests
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
using var _1 = Utility.GetTempDirectory(out var tmpOutput);
using var _2 = Utility.GetTempDirectory(out var tmpReleaseDir);
using var _1 = TempUtil.GetTempDirectory(out var tmpOutput);
using var _2 = TempUtil.GetTempDirectory(out var tmpReleaseDir);
var exe = "testapp.exe";
var pdb = Path.ChangeExtension(exe, ".pdb");
@@ -177,9 +178,9 @@ public class WindowsPackTests
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
using var _1 = Utility.GetTempDirectory(out var tmpOutput);
using var _2 = Utility.GetTempDirectory(out var tmpReleaseDir);
using var _3 = Utility.GetTempDirectory(out var tmpInstallDir);
using var _1 = TempUtil.GetTempDirectory(out var tmpOutput);
using var _2 = TempUtil.GetTempDirectory(out var tmpReleaseDir);
using var _3 = TempUtil.GetTempDirectory(out var tmpInstallDir);
var exe = "testapp.exe";
var pdb = Path.ChangeExtension(exe, ".pdb");
@@ -260,8 +261,8 @@ public class WindowsPackTests
{
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _2 = Utility.GetTempDirectory(out var installDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
using var _2 = TempUtil.GetTempDirectory(out var installDir);
string id = "SquirrelAutoUpdateTest";
var appPath = Path.Combine(installDir, "current", "TestApp.exe");
@@ -293,7 +294,7 @@ public class WindowsPackTests
[SkippableFact]
public void TestPackGeneratesValidDelta()
{
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
string id = "SquirrelDeltaTest";
@@ -304,7 +305,7 @@ public class WindowsPackTests
// did a zsdiff get created for our v2 update?
var deltaPath = Path.Combine(releaseDir, $"{id}-2.0.0-delta.nupkg");
Assert.True(File.Exists(deltaPath));
using var _2 = Utility.GetTempDirectory(out var extractDir);
using var _2 = TempUtil.GetTempDirectory(out var extractDir);
EasyZip.ExtractZipToDirectory(logger, deltaPath, extractDir);
var extractDllDiff = Path.Combine(extractDir, "lib", "app", "testapp.dll.zsdiff");
var extractDllShasum = Path.Combine(extractDir, "lib", "app", "testapp.dll.shasum");
@@ -366,8 +367,8 @@ public class WindowsPackTests
{
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _2 = Utility.GetTempDirectory(out var installDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
using var _2 = TempUtil.GetTempDirectory(out var installDir);
string id = "SquirrelHookTest";
var appPath = Path.Combine(installDir, "current", "TestApp.exe");
@@ -415,8 +416,8 @@ public class WindowsPackTests
{
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
using var logger = _output.BuildLoggerFor<WindowsPackTests>();
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _2 = Utility.GetTempDirectory(out var installDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
using var _2 = TempUtil.GetTempDirectory(out var installDir);
string id = "SquirrelIntegrationTest";
@@ -507,7 +508,7 @@ public class WindowsPackTests
var rootDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "LegacyTestApp");
if (Directory.Exists(rootDir)) {
Utility.Retry(() => Utility.DeleteFileOrDirectoryHard(rootDir), 10, 1000);
IoUtil.Retry(() => IoUtil.DeleteFileOrDirectoryHard(rootDir), 10, 1000);
}
var setup = PathHelper.GetFixture(fixture);
@@ -520,7 +521,7 @@ public class WindowsPackTests
Assert.True(File.Exists(appExe));
Assert.True(File.Exists(updateExe));
using var _1 = Utility.GetTempDirectory(out var releaseDir);
using var _1 = TempUtil.GetTempDirectory(out var releaseDir);
PackTestApp("LegacyTestApp", "2.0.0", "hello!", releaseDir, logger);
RunNoCoverage(appExe, new string[] { "download", releaseDir }, currentDir, logger, exitCode: 0);
@@ -612,7 +613,7 @@ public class WindowsPackTests
logger.Info($"TEST: Process exited with code {p.ExitCode} in {elapsed.TotalSeconds}s");
using var fs = Utility.Retry(() => {
using var fs = IoUtil.Retry(() => {
return File.Open(outputFile, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
}, 10, 1000, logger);

1
test/Velopack.Tests/RuntimeInfoTests.cs
View File

@@ -1,5 +1,6 @@
using System.Diagnostics;
using System.Runtime.InteropServices;
using Velopack.Util;
namespace Velopack.Tests;

3
test/Velopack.Tests/ShortcutTests.cs
View File

@@ -1,6 +1,7 @@
#pragma warning disable CS0618 // Type or member is obsolete
using System.Runtime.Versioning;
using Velopack.Locators;
using Velopack.Util;
using Velopack.Windows;
namespace Velopack.Tests;
@@ -21,7 +22,7 @@ public class ShortcutTests
using var logger = _output.BuildLoggerFor<ShortcutTests>();
string exeName = "NotSquirrelAwareApp.exe";
using var _1 = Utility.GetTempDirectory(out var rootDir);
using var _1 = TempUtil.GetTempDirectory(out var rootDir);
var packages = Directory.CreateDirectory(Path.Combine(rootDir, "packages"));
var current = Directory.CreateDirectory(Path.Combine(rootDir, "current"));

35
test/Velopack.Tests/SymbolicLinkTests.cs
View File

@@ -1,5 +1,6 @@
using System.IO.Compression;
using Velopack.Compression;
using Velopack.Util;
namespace Velopack.Tests;
@@ -8,14 +9,14 @@ public class SymbolicLinkTests
[Fact]
public void Exists_NoSuchFile()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
Assert.False(SymbolicLink.Exists(Path.Combine(tempFolder, "$$$NoSuchFolder$$$")));
}
[Fact]
public void Exists_IsADirectory()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
File.Create(Path.Combine(tempFolder, "AFile")).Close();
Assert.False(SymbolicLink.Exists(Path.Combine(tempFolder, "AFile")));
@@ -24,7 +25,7 @@ public class SymbolicLinkTests
[Fact]
public void CreateDirectory_VerifyExists_GetTarget_Delete()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
string targetFolder = Path.Combine(tempFolder, "ADirectory");
string junctionPoint = Path.Combine(tempFolder, "SymLink");
@@ -64,7 +65,7 @@ public class SymbolicLinkTests
[Fact]
public void CreateFile_VerifyExists_GetTarget_Delete()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
var tmpFile = Path.Combine(tempFolder, "AFile");
var symFile = Path.Combine(tempFolder, "SymFile");
File.Create(tmpFile).Close();
@@ -92,7 +93,7 @@ public class SymbolicLinkTests
[Fact]
public void CreateFile_RelativePath()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
var subDir = Directory.CreateDirectory(Path.Combine(tempFolder, "SubDir")).FullName;
var tmpFile = Path.Combine(tempFolder, "AFile");
@@ -122,7 +123,7 @@ public class SymbolicLinkTests
[Fact]
public void CreateDirectory_RelativePath()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
var subDir = Directory.CreateDirectory(Path.Combine(tempFolder, "SubDir")).FullName;
var subSubDir = Directory.CreateDirectory(Path.Combine(subDir, "SubSub")).FullName;
var subDir2 = Directory.CreateDirectory(Path.Combine(tempFolder, "SubDir2")).FullName;
@@ -145,7 +146,7 @@ public class SymbolicLinkTests
[Fact]
public void Create_ThrowsIfOverwriteNotSpecifiedAndDirectoryExists()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
string targetFolder = Path.Combine(tempFolder, "ADirectory");
string junctionPoint = Path.Combine(tempFolder, "SymLink");
@@ -156,7 +157,7 @@ public class SymbolicLinkTests
[Fact]
public void Create_OverwritesIfSpecifiedAndDirectoryExists()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
string targetFolder = Path.Combine(tempFolder, "ADirectory");
string junctionPoint = Path.Combine(tempFolder, "SymLink");
@@ -171,7 +172,7 @@ public class SymbolicLinkTests
[Fact]
public void Create_ThrowsIfTargetDirectoryDoesNotExist()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
string targetFolder = Path.Combine(tempFolder, "ADirectory");
string junctionPoint = Path.Combine(tempFolder, "SymLink");
Assert.Throws<IOException>(() => SymbolicLink.Create(junctionPoint, targetFolder, false));
@@ -180,21 +181,21 @@ public class SymbolicLinkTests
[Fact]
public void GetTarget_NonExistentJunctionPoint()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
Assert.Throws<IOException>(() => SymbolicLink.GetTarget(Path.Combine(tempFolder, "SymLink")));
}
[Fact]
public void GetTarget_CalledOnADirectoryThatIsNotAJunctionPoint()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
Assert.Throws<IOException>(() => SymbolicLink.GetTarget(tempFolder));
}
[Fact]
public void GetTarget_CalledOnAFile()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
File.Create(Path.Combine(tempFolder, "AFile")).Close();
Assert.Throws<IOException>(() => SymbolicLink.GetTarget(Path.Combine(tempFolder, "AFile")));
@@ -204,21 +205,21 @@ public class SymbolicLinkTests
public void Delete_NonExistentJunctionPoint()
{
// Should do nothing.
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
SymbolicLink.Delete(Path.Combine(tempFolder, "SymLink"));
}
[Fact]
public void Delete_CalledOnADirectoryThatIsNotAJunctionPoint()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
Assert.Throws<IOException>(() => SymbolicLink.Delete(tempFolder));
}
[Fact]
public void Delete_CalledOnAFile()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
File.Create(Path.Combine(tempFolder, "AFile")).Close();
Assert.Throws<IOException>(() => SymbolicLink.Delete(Path.Combine(tempFolder, "AFile")));
@@ -227,7 +228,7 @@ public class SymbolicLinkTests
[Fact]
public async Task ComplexSymlinkDirGetsZippedCorrectly()
{
using var _1 = Utility.GetTempDirectory(out var tempFolder);
using var _1 = TempUtil.GetTempDirectory(out var tempFolder);
var temp = new DirectoryInfo(tempFolder);
var versions = temp.CreateSubdirectory("Versions");
var a = versions.CreateSubdirectory("A");
@@ -238,7 +239,7 @@ public class SymbolicLinkTests
SymbolicLink.Create(Path.Combine(temp.FullName, "Resources"), Path.Combine(versions.FullName, "Current", "Resources"), false, true);
SymbolicLink.Create(Path.Combine(temp.FullName, "App"), Path.Combine(versions.FullName, "Current", "App"), false, true);
using var _2 = Utility.GetTempDirectory(out var tempOutput);
using var _2 = TempUtil.GetTempDirectory(out var tempOutput);
var output = Path.Combine(tempOutput, "output.zip");
await EasyZip.CreateZipFromDirectoryAsync(NullLogger.Instance, output, tempFolder);

5
test/Velopack.Tests/TestHelpers/FakeFixtureRepository.cs
View File

@@ -3,6 +3,7 @@
using System.Text;
using Velopack.Packaging;
using Velopack.Sources;
using Velopack.Util;
namespace Velopack.Tests.TestHelpers;
@@ -16,8 +17,8 @@ internal class FakeFixtureRepository : Sources.IFileDownloader
public FakeFixtureRepository(string pkgId, bool mockLatestFullVer, string channel = null)
{
_releasesName = Utility.GetReleasesFileName(channel);
_releasesNameNew = Utility.GetVeloReleaseIndexName(channel);
_releasesName = CoreUtil.GetReleasesFileName(channel);
_releasesNameNew = CoreUtil.GetVeloReleaseIndexName(channel);
_pkgId = pkgId;
var releases = ReleaseEntry.BuildReleasesFile(PathHelper.GetFixturesDir(), false)
.Where(r => r.OriginalFilename.StartsWith(_pkgId))

1
test/Velopack.Tests/TestHelpers/StaticHttpServer.cs
View File

@@ -1,5 +1,6 @@
using System.Net;
using System.Text;
using Velopack.Util;
namespace Velopack.Tests;

39
test/Velopack.Tests/UpdateManagerTests.cs
View File

@@ -5,6 +5,7 @@ using Velopack.Packaging;
using Velopack.Locators;
using Velopack.Sources;
using Velopack.Tests.TestHelpers;
using Velopack.Util;
namespace Velopack.Tests;
@@ -107,7 +108,7 @@ public class UpdateManagerTests
var fixture = PathHelper.GetFixture("AvaloniaCrossPlat-1.0.11-win-full.nupkg");
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var dl = new FakeDownloader() {
MockedResponseBytes = Encoding.UTF8.GetBytes(SimpleJson.SerializeObject(
new VelopackAssetFeed {
@@ -117,7 +118,7 @@ public class UpdateManagerTests
Version = new SemanticVersion(1, 0, 11),
Type = VelopackAssetType.Full,
FileName = $"https://mysite.com/releases/AvaloniaCrossPlat$-1.1.0.nupkg",
SHA1 = Utility.CalculateFileSHA1(fixture),
SHA1 = IoUtil.CalculateFileSHA1(fixture),
Size = new FileInfo(fixture).Length,
} }
}))
@@ -145,7 +146,7 @@ public class UpdateManagerTests
public void CheckFromLocal()
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var dl = GetMockDownloaderNoDelta();
var source = new SimpleWebSource("http://any.com", dl);
var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger);
@@ -162,7 +163,7 @@ public class UpdateManagerTests
public void CheckFromLocalWithChannel()
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var dl = GetMockDownloaderNoDelta();
var source = new SimpleWebSource("http://any.com", dl);
var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger);
@@ -180,7 +181,7 @@ public class UpdateManagerTests
public void CheckForSameAsInstalledVersion()
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var dl = GetMockDownloaderWith2Delta();
var myVer = new VelopackAsset() {
PackageId = "MyCoolApp",
@@ -220,7 +221,7 @@ public class UpdateManagerTests
public void CheckForLowerThanInstalledVersion()
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var dl = GetMockDownloaderWith2Delta();
var myVer = new VelopackAsset() {
PackageId = "MyCoolApp",
@@ -254,7 +255,7 @@ public class UpdateManagerTests
public void CheckFromLocalWithDelta()
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var dl = GetMockDownloaderWith2Delta();
var myVer = new VelopackAsset() {
PackageId = "MyCoolApp",
@@ -282,7 +283,7 @@ public class UpdateManagerTests
string version = "3.4.287";
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var packagesDir);
using var _1 = TempUtil.GetTempDirectory(out var packagesDir);
var repo = new FakeFixtureRepository(id, false);
var source = new SimpleWebSource("http://any.com", repo);
var locator = new TestVelopackLocator(id, "1.0.0", packagesDir, logger);
@@ -316,7 +317,7 @@ public class UpdateManagerTests
string version = "3.4.287";
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var packagesDir);
using var _1 = TempUtil.GetTempDirectory(out var packagesDir);
var repo = new FakeFixtureRepository(id, false);
var source = new SimpleWebSource("http://any.com", repo);
var locator = new TestVelopackLocator(id, "1.0.0", packagesDir, logger);
@@ -347,7 +348,7 @@ public class UpdateManagerTests
public void NoDeltaIfNoBasePackage()
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var dl = GetMockDownloaderWith2Delta();
var source = new SimpleWebSource("http://any.com", dl);
var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger: logger);
@@ -363,7 +364,7 @@ public class UpdateManagerTests
public void CheckFromLocalWithDeltaNoLocalPackage()
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var dl = GetMockDownloaderWith2Delta();
var source = new SimpleWebSource("http://any.com", dl);
var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger: logger);
@@ -380,7 +381,7 @@ public class UpdateManagerTests
{
// https://github.com/caesay/SquirrelCustomLauncherTestApp
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger);
var source = new GithubSource("https://github.com/caesay/SquirrelCustomLauncherTestApp", null, false);
var um = new UpdateManager(source, null, logger, locator);
@@ -394,7 +395,7 @@ public class UpdateManagerTests
{
// https://github.com/caesay/SquirrelCustomLauncherTestApp
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger);
var source = new GithubSource("https://github.com/caesay/SquirrelCustomLauncherTestApp", null, false);
var opt = new UpdateOptions { ExplicitChannel = "hello" };
@@ -406,7 +407,7 @@ public class UpdateManagerTests
{
// https://github.com/caesay/SquirrelCustomLauncherTestApp
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger);
var source = new GiteaSource("https://gitea.com/remco1271/VeloPackTest", null, false);
var um = new UpdateManager(source, null, logger, locator);
@@ -419,7 +420,7 @@ public class UpdateManagerTests
public void CheckFromEmptyFileSource()
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var source = new SimpleFileSource(new DirectoryInfo(tempPath));
var locator = new TestVelopackLocator("MyCoolApp", "1.0.0", tempPath, logger);
var um = new UpdateManager(source, null, logger, locator);
@@ -431,7 +432,7 @@ public class UpdateManagerTests
public void NoUpdatesIfCurrentEqualsRemoteVersion()
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var dl = GetMockDownloaderNoDelta();
var source = new SimpleWebSource("http://any.com", dl);
var locator = new TestVelopackLocator("MyCoolApp", "1.1.0", tempPath, logger);
@@ -444,7 +445,7 @@ public class UpdateManagerTests
public void NoUpdatesIfCurrentGreaterThanRemoteVersion()
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var tempPath);
using var _1 = TempUtil.GetTempDirectory(out var tempPath);
var dl = GetMockDownloaderNoDelta();
var source = new SimpleWebSource("http://any.com", dl);
var locator = new TestVelopackLocator("MyCoolApp", "1.2.0", tempPath, logger);
@@ -459,7 +460,7 @@ public class UpdateManagerTests
public void DownloadsLatestFullVersion(string id, string version)
{
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var packagesDir);
using var _1 = TempUtil.GetTempDirectory(out var packagesDir);
var repo = new FakeFixtureRepository(id, false);
var source = new SimpleWebSource("http://any.com", repo);
var locator = new TestVelopackLocator(id, "1.0.0", packagesDir, logger);
@@ -484,7 +485,7 @@ public class UpdateManagerTests
{
Skip.If(VelopackRuntimeInfo.IsLinux);
using var logger = _output.BuildLoggerFor<UpdateManagerTests>();
using var _1 = Utility.GetTempDirectory(out var packagesDir);
using var _1 = TempUtil.GetTempDirectory(out var packagesDir);
var repo = new FakeFixtureRepository(id, true);
var source = new SimpleWebSource("http://any.com", repo);

49
test/Velopack.Tests/UtilityTests.cs
View File

@@ -2,6 +2,7 @@
using System.Runtime.Versioning;
using System.Security.Cryptography;
using System.Text;
using Velopack.Util;
using Velopack.Windows;
namespace Velopack.Tests;
@@ -26,7 +27,7 @@ public class UtilityTests
{
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
var exp = Path.GetFullPath(expected);
var normal = Utility.NormalizePath(input);
var normal = PathUtil.NormalizePath(input);
Assert.Equal(exp, normal);
}
@@ -43,7 +44,7 @@ public class UtilityTests
public void FileIsInDirectory(string directory, string file, bool isIn)
{
Skip.IfNot(VelopackRuntimeInfo.IsWindows);
var fileInDir = Utility.IsFileInDirectory(file, directory);
var fileInDir = PathUtil.IsFileInDirectory(file, directory);
Assert.Equal(isIn, fileInDir);
}
@@ -84,24 +85,24 @@ public class UtilityTests
var emptyString = string.Empty;
string nullString = null;
byte[] nullByteArray = { };
Assert.Equal(string.Empty, Utility.RemoveByteOrderMarkerIfPresent(emptyString));
Assert.Equal(string.Empty, Utility.RemoveByteOrderMarkerIfPresent(nullString));
Assert.Equal(string.Empty, Utility.RemoveByteOrderMarkerIfPresent(nullByteArray));
Assert.Equal(string.Empty, CoreUtil.RemoveByteOrderMarkerIfPresent(emptyString));
Assert.Equal(string.Empty, CoreUtil.RemoveByteOrderMarkerIfPresent(nullString));
Assert.Equal(string.Empty, CoreUtil.RemoveByteOrderMarkerIfPresent(nullByteArray));
Assert.Equal(string.Empty, Utility.RemoveByteOrderMarkerIfPresent(utf32Be));
Assert.Equal(string.Empty, Utility.RemoveByteOrderMarkerIfPresent(utf32Le));
Assert.Equal(string.Empty, Utility.RemoveByteOrderMarkerIfPresent(utf16Be));
Assert.Equal(string.Empty, Utility.RemoveByteOrderMarkerIfPresent(utf16Le));
Assert.Equal(string.Empty, Utility.RemoveByteOrderMarkerIfPresent(utf8));
Assert.Equal(string.Empty, CoreUtil.RemoveByteOrderMarkerIfPresent(utf32Be));
Assert.Equal(string.Empty, CoreUtil.RemoveByteOrderMarkerIfPresent(utf32Le));
Assert.Equal(string.Empty, CoreUtil.RemoveByteOrderMarkerIfPresent(utf16Be));
Assert.Equal(string.Empty, CoreUtil.RemoveByteOrderMarkerIfPresent(utf16Le));
Assert.Equal(string.Empty, CoreUtil.RemoveByteOrderMarkerIfPresent(utf8));
Assert.Equal("hello world", Utility.RemoveByteOrderMarkerIfPresent(utf32BeHelloWorld));
Assert.Equal("hello world", Utility.RemoveByteOrderMarkerIfPresent(utf32LeHelloWorld));
Assert.Equal("hello world", Utility.RemoveByteOrderMarkerIfPresent(utf16BeHelloWorld));
Assert.Equal("hello world", Utility.RemoveByteOrderMarkerIfPresent(utf16LeHelloWorld));
Assert.Equal("hello world", Utility.RemoveByteOrderMarkerIfPresent(utf8HelloWorld));
Assert.Equal("hello world", CoreUtil.RemoveByteOrderMarkerIfPresent(utf32BeHelloWorld));
Assert.Equal("hello world", CoreUtil.RemoveByteOrderMarkerIfPresent(utf32LeHelloWorld));
Assert.Equal("hello world", CoreUtil.RemoveByteOrderMarkerIfPresent(utf16BeHelloWorld));
Assert.Equal("hello world", CoreUtil.RemoveByteOrderMarkerIfPresent(utf16LeHelloWorld));
Assert.Equal("hello world", CoreUtil.RemoveByteOrderMarkerIfPresent(utf8HelloWorld));
Assert.Equal("hello world", Utility.RemoveByteOrderMarkerIfPresent(asciiMultipleChars));
Assert.Equal("A", Utility.RemoveByteOrderMarkerIfPresent(asciiSingleChar));
Assert.Equal("hello world", CoreUtil.RemoveByteOrderMarkerIfPresent(asciiMultipleChars));
Assert.Equal("A", CoreUtil.RemoveByteOrderMarkerIfPresent(asciiSingleChar));
}
[Fact]
@@ -110,7 +111,7 @@ public class UtilityTests
var sha1FromExternalTool = "75255cfd229a1ed1447abe1104f5635e69975d30";
var inputPackage = PathHelper.GetFixture("Squirrel.Core.1.0.0.0.nupkg");
var stream = File.OpenRead(inputPackage);
var sha1 = Utility.CalculateStreamSHA1(stream);
var sha1 = IoUtil.CalculateStreamSHA1(stream);
Assert.NotEqual(sha1FromExternalTool, sha1);
Assert.Equal(sha1FromExternalTool, sha1, StringComparer.OrdinalIgnoreCase);
@@ -121,7 +122,7 @@ public class UtilityTests
{
using var logger = _output.BuildLoggerFor<UtilityTests>();
string tempDir;
using (Utility.GetTempDirectory(out tempDir)) {
using (TempUtil.GetTempDirectory(out tempDir)) {
for (var i = 0; i < 50; i++) {
var directory = Path.Combine(tempDir, newId());
CreateSampleDirectory(directory);
@@ -135,7 +136,7 @@ public class UtilityTests
var sw = new Stopwatch();
sw.Start();
Utility.DeleteFileOrDirectoryHard(tempDir);
IoUtil.DeleteFileOrDirectoryHard(tempDir);
sw.Stop();
logger.Info($"Delete took {sw.ElapsedMilliseconds}ms");
@@ -147,7 +148,7 @@ public class UtilityTests
//public void CreateFakePackageSmokeTest()
//{
// string path;
// using (Utility.GetTempDirectory(out path)) {
// using (TempUtil.GetTempDirectory(out path)) {
// var output = IntegrationTestHelper.CreateFakeInstalledApp("0.3.0", path);
// Assert.True(File.Exists(output));
// }
@@ -161,7 +162,7 @@ public class UtilityTests
[InlineData(".rels", false)]
public void FileIsLikelyPEImageTest(string input, bool result)
{
Assert.Equal(result, Utility.FileIsLikelyPEImage(input));
Assert.Equal(result, PathUtil.FileIsLikelyPEImage(input));
}
[Fact(Skip = "Only really need to run this test after changes to FileDownloader")]
@@ -170,10 +171,10 @@ public class UtilityTests
// this probably should use a local http server instead.
const string testUrl = "http://speedtest.tele2.net/1MB.zip";
var dl = Utility.CreateDefaultDownloader();
var dl = HttpUtil.CreateDefaultDownloader();
List<int> prog = new List<int>();
using (Utility.GetTempFileName(out var tempPath))
using (TempUtil.GetTempFileName(out var tempPath))
await dl.DownloadFile(testUrl, tempPath, prog.Add);
Assert.True(prog.Count > 10);

9
test/Velopack.Tests/ZipPackageTests.cs
View File

@@ -2,6 +2,7 @@
using NuGet.Versioning;
using Velopack.NuGet;
using Velopack.Tests.TestHelpers;
using Velopack.Util;
using ZipPackage = Velopack.NuGet.ZipPackage;
namespace Velopack.Tests;
@@ -19,9 +20,9 @@ public class ZipPackageTests
{
using var logger = _output.BuildLoggerFor<ZipPackageTests>();
using var _1 = Utility.GetTempDirectory(out var tempDir);
using var _2 = Utility.GetTempDirectory(out var zipDir);
using var _3 = Utility.GetTempDirectory(out var extractedDir);
using var _1 = TempUtil.GetTempDirectory(out var tempDir);
using var _2 = TempUtil.GetTempDirectory(out var zipDir);
using var _3 = TempUtil.GetTempDirectory(out var extractedDir);
var actual = Path.Combine(tempDir, "actual");
var actualFile = Path.Combine(actual, "file.txt");
@@ -56,7 +57,7 @@ public class ZipPackageTests
[Fact]
public void HasSameFilesAndDependenciesAsPackaging()
{
using var _1 = Utility.GetTempDirectory(out var tempDir);
using var _1 = TempUtil.GetTempDirectory(out var tempDir);
var inputPackage = PathHelper.GetFixture("slack-1.1.8-full.nupkg");
var copyPackage = Path.Combine(tempDir, "slack-1.1.8-full.nupkg");
File.Copy(inputPackage, copyPackage);